Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1291820

[PATCH v3 1/3] perf tools: Fix PowerPC native building

Show all headers | View raw

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>
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] perf: bpf: Fix build breakage due to libbpf "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2015-12-14 12:00 +0100
  [PATCH] tools lib bpf: Support libbpf on PowerPC Wang Nan <wangnan0@huawei.com> - 2015-12-14 12:40 +0100
  Re: [PATCH] perf: bpf: Fix build breakage due to libbpf "Wangnan (F)" <wangnan0@huawei.com> - 2015-12-14 13:00 +0100
    Re: [PATCH] perf: bpf: Fix build breakage due to libbpf "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2015-12-14 16:20 +0100
  [PATCH v2] tools lib bpf: Support libbpf on PowerPC Wang Nan <wangnan0@huawei.com> - 2015-12-14 13:00 +0100
    Re: [PATCH v2] tools lib bpf: Support libbpf on PowerPC "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2015-12-14 16:50 +0100
  [PATCH v3 2/3] tools: Move Makefile.arch from perf/config to tools/scripts Wang Nan <wangnan0@huawei.com> - 2015-12-15 04:40 +0100
  [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf Wang Nan <wangnan0@huawei.com> - 2015-12-15 04:40 +0100
    [PATCH v3 1/3] perf tools: Fix PowerPC native building Wang Nan <wangnan0@huawei.com> - 2015-12-15 04:40 +0100
    [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf Wang Nan <wangnan0@huawei.com> - 2015-12-15 04:40 +0100
      [PATCH v4] perf: bpf: Fix build breakage due to libbpf Wang Nan <wangnan0@huawei.com> - 2015-12-15 10:00 +0100
        Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2015-12-15 12:50 +0100
          Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-16 20:50 +0100
            Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf "Wangnan (F)" <wangnan0@huawei.com> - 2015-12-17 02:40 +0100
              Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2015-12-17 06:10 +0100
                Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-12-17 13:20 +0100
      Re: [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf "Wangnan (F)" <wangnan0@huawei.com> - 2015-12-15 10:00 +0100
    Re: [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to  libbpf Jiri Olsa <jolsa@redhat.com> - 2015-12-15 09:10 +0100
    Re: [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to  libbpf "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2015-12-15 12:40 +0100

csiph-web