Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754234AbcKQDYk (ORCPT ); Wed, 16 Nov 2016 22:24:40 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:49548 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752742AbcKQDYi (ORCPT ); Wed, 16 Nov 2016 22:24:38 -0500 Subject: Re: [PATCH 05/34] tools lib bpf: Add missing bpf map functions To: , References: <20161115040617.69788-1-wangnan0@huawei.com> <20161115040617.69788-6-wangnan0@huawei.com> CC: , , , , Joe Stringer From: "Wangnan (F)" Message-ID: <582D22CE.5060203@huawei.com> Date: Thu, 17 Nov 2016 11:23:58 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <20161115040617.69788-6-wangnan0@huawei.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.111.66.109] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2751 Lines: 99 On 2016/11/15 12:05, Wang Nan wrote: > Add more BPF map operations to libbpf. > > Signed-off-by: Wang Nan > Cc: Alexei Starovoitov > Cc: Arnaldo Carvalho de Melo > Cc: Li Zefan > --- > 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