From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Wang Nan <wangnan0@huawei.com>,
Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>,
Zefan Li <lizefan@huawei.com>,
pi3orama@163.com, Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 07/12] perf tools: Fix PowerPC native building
Date: Mon, 11 Jan 2016 20:31:56 -0300 [thread overview]
Message-ID: <1452555121-21739-8-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1452555121-21739-1-git-send-email-acme@kernel.org>
From: Wang Nan <wangnan0@huawei.com>
Checks BPF syscall number, turn off libbpf building on platform doesn't
correctly support sys_bpf instead of blocking compiling.
Reported-and-Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1452520124-2073-7-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/build/feature/test-bpf.c | 20 +++++++++++++++++++-
tools/lib/bpf/bpf.c | 4 ++--
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/tools/build/feature/test-bpf.c b/tools/build/feature/test-bpf.c
index 062bac811af9..b389026839b9 100644
--- a/tools/build/feature/test-bpf.c
+++ b/tools/build/feature/test-bpf.c
@@ -1,9 +1,23 @@
+#include <asm/unistd.h>
#include <linux/bpf.h>
+#include <unistd.h>
+
+#ifndef __NR_bpf
+# if defined(__i386__)
+# define __NR_bpf 357
+# elif defined(__x86_64__)
+# define __NR_bpf 321
+# elif defined(__aarch64__)
+# define __NR_bpf 280
+# error __NR_bpf not defined. libbpf does not support your arch.
+# endif
+#endif
int main(void)
{
union bpf_attr attr;
+ /* Check fields in attr */
attr.prog_type = BPF_PROG_TYPE_KPROBE;
attr.insn_cnt = 0;
attr.insns = 0;
@@ -14,5 +28,9 @@ int main(void)
attr.kern_version = 0;
attr = attr;
- return 0;
+ /*
+ * Test existence of __NR_bpf and BPF_PROG_LOAD.
+ * This call should fail if we run the testcase.
+ */
+ return syscall(__NR_bpf, BPF_PROG_LOAD, attr, sizeof(attr));
}
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index 5bdc6eab6852..1f91cc941b7c 100644
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -14,8 +14,8 @@
#include "bpf.h"
/*
- * When building perf, unistd.h is override. Define __NR_bpf is
- * required to be defined.
+ * When building perf, unistd.h is overrided. __NR_bpf is
+ * required to be defined explicitly.
*/
#ifndef __NR_bpf
# if defined(__i386__)
--
2.1.0
next prev parent reply other threads:[~2016-01-11 23:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-11 23:31 [GIT PULL 00/12] perf/core fixes Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 01/12] tools: Add clean targets for tools directory Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 02/12] tools bpf: Add *.cmd files clean up Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 03/12] tools lockdep: " Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 04/12] perf tools: Add missing sources to perf's MANIFEST Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 05/12] perf tools: Add -lutil in python lib list for broken python-config Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 06/12] perf tools: Fix phony build target for build-test Arnaldo Carvalho de Melo
2016-01-11 23:31 ` Arnaldo Carvalho de Melo [this message]
2016-01-11 23:31 ` [PATCH 08/12] tools: Move Makefile.arch from perf/config to tools/scripts Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 09/12] perf bpf: Fix build breakage due to libbpf Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 10/12] tools build: Add BPF feature check to test-all Arnaldo Carvalho de Melo
2016-01-11 23:32 ` [PATCH 11/12] perf test: Fix false TEST_OK result for 'perf test hist' Arnaldo Carvalho de Melo
2016-01-11 23:32 ` [PATCH 12/12] perf test: Reset err after using it hold errcode in hist testcases Arnaldo Carvalho de Melo
2016-01-12 10:04 ` [GIT PULL 00/12] perf/core fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452555121-21739-8-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=mingo@kernel.org \
--cc=pi3orama@163.com \
--cc=sukadev@linux.vnet.ibm.com \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox