mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: <ast@kernel.org>, <acme@kernel.org>, <acme@redhat.com>,
	<brendan.d.gregg@gmail.com>, <davem@davemloft.net>,
	<hekuang@huawei.com>, <jolsa@kernel.org>,
	<masami.hiramatsu.pt@hitachi.com>, <namhyung@kernel.org>,
	<naveen.n.rao@linux.vnet.ibm.com>, <sukadev@linux.vnet.ibm.com>,
	<wangnan0@huawei.com>, <lizefan@huawei.com>
Cc: <pi3orama@163.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH v6 01/16] perf tools: Fix PowerPC native building
Date: Thu, 17 Dec 2015 10:55:09 +0000	[thread overview]
Message-ID: <1450349724-178569-2-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1450349724-178569-1-git-send-email-wangnan0@huawei.com>

Checks BPF syscall number, turn off libbpf building on platform doesn't
correctly support sys_bpf instead of blocking compiling.

Reported-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.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 062bac8..b389026 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 5bdc6ea..1f91cc9 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__)
-- 
1.8.3.4


  reply	other threads:[~2015-12-17 10:56 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-17 10:55 [PATCH v6 00/16] perf tools: BPF related update and other improvements Wang Nan
2015-12-17 10:55 ` Wang Nan [this message]
2015-12-17 10:55 ` [PATCH v6 02/16] tools: Move Makefile.arch from perf/config to tools/scripts Wang Nan
2015-12-17 10:55 ` [PATCH v6 03/16] perf: bpf: Fix build breakage due to libbpf Wang Nan
2015-12-17 10:55 ` [PATCH v6 04/16] perf test: Fix false TEST_OK result for 'perf test hist' Wang Nan
2015-12-17 10:55 ` [PATCH v6 05/16] perf test: Reset err after using it hold errcode in hist testcases Wang Nan
2015-12-17 10:55 ` [PATCH v6 06/16] perf tools: Prevent calling machine__delete() on non-allocated machine Wang Nan
2015-12-17 10:55 ` [PATCH v6 07/16] perf test: Check environment before start real BPF test Wang Nan
2015-12-17 10:55 ` [PATCH v6 08/16] perf tools: Add API to config maps in bpf object Wang Nan
2015-12-17 10:55 ` [PATCH v6 09/16] perf tools: Enable BPF object configure syntax Wang Nan
2015-12-17 10:55 ` [PATCH v6 10/16] perf record: Apply config to BPF objects before recording Wang Nan
2015-12-17 10:55 ` [PATCH v6 11/16] perf tools: Enable passing event to BPF object Wang Nan
2015-12-17 10:55 ` [PATCH v6 12/16] perf tools: Support perf event alias name Wang Nan
2015-12-17 10:55 ` [PATCH v6 13/16] perf tools: Support setting different slots in a BPF map separately Wang Nan
2015-12-17 10:55 ` [PATCH v6 14/16] perf tools: Enable indices setting syntax for BPF maps Wang Nan
2015-12-17 10:55 ` [PATCH v6 15/16] perf tools: Introduce bpf-output event Wang Nan
2015-12-17 10:55 ` [PATCH v6 16/16] perf data: Support converting data from bpf_perf_event_output() Wang Nan

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=1450349724-178569-2-git-send-email-wangnan0@huawei.com \
    --to=wangnan0@huawei.com \
    --cc=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=ast@kernel.org \
    --cc=brendan.d.gregg@gmail.com \
    --cc=davem@davemloft.net \
    --cc=hekuang@huawei.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=namhyung@kernel.org \
    --cc=naveen.n.rao@linux.vnet.ibm.com \
    --cc=pi3orama@163.com \
    --cc=sukadev@linux.vnet.ibm.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

all inboxes | Powered by JetHome®