Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934039AbcLBKie (ORCPT ); Fri, 2 Dec 2016 05:38:34 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41624 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933505AbcLBKid (ORCPT ); Fri, 2 Dec 2016 05:38:33 -0500 Date: Fri, 2 Dec 2016 02:38:13 -0800 From: tip-bot for Wang Nan Message-ID: Cc: hekuang@huawei.com, linux-kernel@vger.kernel.org, acme@redhat.com, mingo@kernel.org, jolsa@kernel.org, lizefan@huawei.com, wangnan0@huawei.com, tglx@linutronix.de, hpa@zytor.com, ast@kernel.org, joe@ovn.org Reply-To: hekuang@huawei.com, linux-kernel@vger.kernel.org, mingo@kernel.org, acme@redhat.com, tglx@linutronix.de, jolsa@kernel.org, lizefan@huawei.com, wangnan0@huawei.com, joe@ovn.org, hpa@zytor.com, ast@kernel.org In-Reply-To: <20161126070354.141764-4-wangnan0@huawei.com> References: <20161126070354.141764-4-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib bpf: Retrive bpf_map through offset of bpf_map_def Git-Commit-ID: 5a6acad17d2e81765dd4c2fce7346a6f045eab25 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2341 Lines: 74 Commit-ID: 5a6acad17d2e81765dd4c2fce7346a6f045eab25 Gitweb: http://git.kernel.org/tip/5a6acad17d2e81765dd4c2fce7346a6f045eab25 Author: Wang Nan AuthorDate: Sat, 26 Nov 2016 07:03:27 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 29 Nov 2016 12:10:19 -0300 tools lib bpf: Retrive bpf_map through offset of bpf_map_def Add a new API to libbpf, caller is able to get bpf_map through the offset of bpf_map_def to 'maps' section. The API will be used to help jitted perf hook code find fd of a map. Signed-off-by: Wang Nan Acked-by: Alexei Starovoitov Cc: He Kuang Cc: Jiri Olsa Cc: Joe Stringer Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/20161126070354.141764-4-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/bpf/libbpf.c | 12 ++++++++++++ tools/lib/bpf/libbpf.h | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 866d5cd..2e97459 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -1524,3 +1524,15 @@ bpf_object__find_map_by_name(struct bpf_object *obj, const char *name) } return NULL; } + +struct bpf_map * +bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset) +{ + int i; + + for (i = 0; i < obj->nr_maps; i++) { + if (obj->maps[i].offset == offset) + return &obj->maps[i]; + } + return ERR_PTR(-ENOENT); +} diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 0c0b012..a5a8b86 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -24,6 +24,7 @@ #include #include #include +#include // for size_t enum libbpf_errno { __LIBBPF_ERRNO__START = 4000, @@ -200,6 +201,13 @@ struct bpf_map; struct bpf_map * bpf_object__find_map_by_name(struct bpf_object *obj, const char *name); +/* + * Get bpf_map through the offset of corresponding struct bpf_map_def + * in the bpf object file. + */ +struct bpf_map * +bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset); + struct bpf_map * bpf_map__next(struct bpf_map *map, struct bpf_object *obj); #define bpf_map__for_each(pos, obj) \