Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1524059

Re: [PATCH 05/34] tools lib bpf: Add missing bpf map functions

Show all headers | View raw

On 2016/11/15 12:05, Wang Nan wrote:
> Add more BPF map operations to libbpf.
>
> Signed-off-by: Wang Nan <wangnan0@huawei.com>
> Cc: Alexei Starovoitov <ast@fb.com>
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> Cc: Li Zefan <lizefan@huawei.com>
> ---
>   tools/lib/bpf/bpf.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>   tools/lib/bpf/bpf.h |  7 +++++++
>   2 files changed, 63 insertions(+)
>
> diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
> index 4212ed6..e966248 100644
> --- a/tools/lib/bpf/bpf.c
> +++ b/tools/lib/bpf/bpf.c
> @@ -110,3 +110,59 @@ int bpf_map_update_elem(int fd, void *key, void *value,
>   
>   	return sys_bpf(BPF_MAP_UPDATE_ELEM, &attr, sizeof(attr));
>   }
> +
> +int bpf_map_lookup_elem(int fd, void *key, void *value)
> +{
> +	union bpf_attr attr;
> +
> +	bzero(&attr, sizeof(attr));
> +	attr.map_fd = fd;
> +	attr.key = ptr_to_u64(key);
> +	attr.value = ptr_to_u64(value);
> +
> +	return sys_bpf(BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr));
> +}
> +
> +int bpf_map_delete_elem(int fd, void *key)
> +{
> +	union bpf_attr attr;
> +
> +	bzero(&attr, sizeof(attr));
> +	attr.map_fd = fd;
> +	attr.key = ptr_to_u64(key);
> +
> +	return sys_bpf(BPF_MAP_DELETE_ELEM, &attr, sizeof(attr));
> +}
> +
> +int bpf_map_get_next_key(int fd, void *key, void *next_key)
> +{
> +	union bpf_attr attr;
> +
> +	bzero(&attr, sizeof(attr));
> +	attr.map_fd = fd;
> +	attr.key = ptr_to_u64(key);
> +	attr.next_key = ptr_to_u64(next_key);
> +
> +	return sys_bpf(BPF_MAP_GET_NEXT_KEY, &attr, sizeof(attr));
> +}
> +
> +int bpf_map_pin(int fd, const char *pathname)
> +{
> +	union bpf_attr attr;
> +
> +	bzero(&attr, sizeof(attr));
> +	attr.pathname = ptr_to_u64((void *)pathname);
> +	attr.bpf_fd = fd;
> +
> +	return sys_bpf(BPF_OBJ_PIN, &attr, sizeof(attr));
> +}
> +
> +int bpf_map_get(const char *pathname)
> +{
> +	union bpf_attr attr;
> +
> +	bzero(&attr, sizeof(attr));
> +	attr.pathname = ptr_to_u64((void *)pathname);
> +
> +	return sys_bpf(BPF_OBJ_GET, &attr, sizeof(attr));
> +}

bpf_map_{pin,get} should be rename to bpf_obj_{pin,get} since they can
be used on BPF program. Thanks to Joe Stringer.

> diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
> index e8ba540..5b3e52b 100644
> --- a/tools/lib/bpf/bpf.h
> +++ b/tools/lib/bpf/bpf.h
> @@ -35,4 +35,11 @@ int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns,
>   
>   int bpf_map_update_elem(int fd, void *key, void *value,
>   			u64 flags);
> +
> +int bpf_map_lookup_elem(int fd, void *key, void *value);
> +int bpf_map_delete_elem(int fd, void *key);
> +int bpf_map_get_next_key(int fd, void *key, void *next_key);
> +int bpf_map_pin(int fd, const char *pathname);
> +int bpf_map_get(const char *pathname);
> +
>   #endif

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/34] perf clang: Builtin clang and perfhook support Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:10 +0100
  [PATCH 21/34] perf clang: Pass CFLAGS to builtin clang Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:10 +0100
  [PATCH 33/34] perf clang builtin: Define hook helpers by default Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:10 +0100
  [PATCH 28/34] perf clang jit: Access BPF map Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:10 +0100
  [PATCH 16/34] perf clang: Allow passing CFLAGS to builtin clang Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:10 +0100
  [PATCH 23/34] perf clang jit: Insignt BPF and JIT functions in a Module Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:10 +0100
  [PATCH 02/34] perf record: Fix segfault when running with suid and kptr_restrict is 1 Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:10 +0100
  [PATCH 06/34] tools lib bpf: Add private field for bpf_object Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:10 +0100
  [PATCH 03/34] tools perf: Add missing struct defeinition in probe_event.h Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 01/34] perf tools: Fix kernel version error in ubuntu Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 24/34] perf clang jit: add PerfModule::doJIT to JIT perfhook functions Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 30/34] perf clang: Link BPF functions declaration into perf Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 11/34] tools build: Add feature detection for LLVM Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 32/34] perf clang: Include helpers to BPF scripts Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 05/34] tools lib bpf: Add missing bpf map functions Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
    Re: [PATCH 05/34] tools lib bpf: Add missing bpf map functions "Wangnan (F)" <wangnan0@huawei.com> - 2016-11-17 04:30 +0100
  [PATCH 31/34] perf clang: Declare BPF functions for BPF scripts automatically Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 29/34] perf clang jit: Allow jitted perf hook access BPF maps Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 34/34] perf clang git: Export getpid() to perf hook Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 09/34] perf tools: Pass context to perf hook functions Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 22/34] perf clang jit: Wrap llvm::Module using PerfModule Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 25/34] perf clang jit: Export functions for jitted code Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 20/34] perf clang: Pass full path to builtin clang Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 18/34] perf clang: Support compile IR to BPF object and add testcase Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 15/34] perf clang: Use real file system for #include Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 27/34] perf clang jit: Collect the lowest address in maps section as map_base Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 17/34] perf clang: Update test case to use real BPF script Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 13/34] perf build: Add clang and llvm compile and linking support Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 12/34] tools build: Add feature detection for clang Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 08/34] perf tools: Introduce perf hooks Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 07/34] tools lib bpf: Retrive bpf_map through offset of bpf_map_def Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 26/34] perf clang jit: Actually JIT and hook in bpf loader Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 14/34] perf clang: Add builtin clang support ant test case Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 10/34] perf llvm: Extract helpers in llvm-utils.c Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  [PATCH 19/34] perf clang: Compile BPF script use builtin clang support Wang Nan <wangnan0@huawei.com> - 2016-11-15 05:20 +0100
  Re: [PATCH 00/34] perf clang: Builtin clang and perfhook support "Wangnan (F)" <wangnan0@huawei.com> - 2016-11-15 05:40 +0100

csiph-web