From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753749AbdAZPbt (ORCPT ); Thu, 26 Jan 2017 10:31:49 -0500 Received: from terminus.zytor.com ([65.50.211.136]:47874 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753715AbdAZPbq (ORCPT ); Thu, 26 Jan 2017 10:31:46 -0500 Date: Thu, 26 Jan 2017 07:31:12 -0800 From: tip-bot for Joe Stringer Message-ID: Cc: ast@fb.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, acme@redhat.com, wangnan0@huawei.com, joe@ovn.org, linux-kernel@vger.kernel.org, daniel@iogearbox.net Reply-To: mingo@kernel.org, acme@redhat.com, daniel@iogearbox.net, linux-kernel@vger.kernel.org, wangnan0@huawei.com, joe@ovn.org, hpa@zytor.com, ast@fb.com, tglx@linutronix.de In-Reply-To: <20170123011128.26534-5-joe@ovn.org> References: <20170123011128.26534-5-joe@ovn.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib bpf: Add libbpf_get_error() Git-Commit-ID: e28ff1a8382ee02b10cf11cf3b48541dc3d14a58 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 Commit-ID: e28ff1a8382ee02b10cf11cf3b48541dc3d14a58 Gitweb: http://git.kernel.org/tip/e28ff1a8382ee02b10cf11cf3b48541dc3d14a58 Author: Joe Stringer AuthorDate: Sun, 22 Jan 2017 17:11:25 -0800 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 26 Jan 2017 11:42:58 -0300 tools lib bpf: Add libbpf_get_error() This function will turn a libbpf pointer into a standard error code (or 0 if the pointer is valid). This also allows removal of the dependency on linux/err.h in the public header file, which causes problems in userspace programs built against libbpf. Signed-off-by: Joe Stringer Acked-by: Wang Nan Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: netdev@vger.kernel.org Link: http://lkml.kernel.org/r/20170123011128.26534-5-joe@ovn.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/bpf/libbpf.c | 8 ++++++++ tools/lib/bpf/libbpf.h | 4 +++- tools/perf/tests/llvm.c | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 406838f..e6cd62b 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -1542,3 +1543,10 @@ bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset) } return ERR_PTR(-ENOENT); } + +long libbpf_get_error(const void *ptr) +{ + if (IS_ERR(ptr)) + return PTR_ERR(ptr); + return 0; +} diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 2188ccd..4014d1b 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -22,8 +22,8 @@ #define __BPF_LIBBPF_H #include +#include #include -#include #include // for size_t enum libbpf_errno { @@ -234,4 +234,6 @@ int bpf_map__set_priv(struct bpf_map *map, void *priv, bpf_map_clear_priv_t clear_priv); void *bpf_map__priv(struct bpf_map *map); +long libbpf_get_error(const void *ptr); + #endif diff --git a/tools/perf/tests/llvm.c b/tools/perf/tests/llvm.c index 02a33eb..d357dab 100644 --- a/tools/perf/tests/llvm.c +++ b/tools/perf/tests/llvm.c @@ -13,7 +13,7 @@ static int test__bpf_parsing(void *obj_buf, size_t obj_buf_sz) struct bpf_object *obj; obj = bpf_object__open_buffer(obj_buf, obj_buf_sz, NULL); - if (IS_ERR(obj)) + if (libbpf_get_error(obj)) return TEST_FAIL; bpf_object__close(obj); return TEST_OK;