linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: <naveen.n.rao@linux.vnet.ibm.com>
Cc: <linux-kernel@vger.kernel.org>, <linuxppc-dev@lists.ozlabs.org>,
	Wang Nan <wangnan0@huawei.com>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	"Alexei Starovoitov" <alexei.starovoitov@gmail.com>,
	Jiri Olsa <jolsa@redhat.com>,
	Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Subject: [PATCH] tools lib bpf: Support libbpf on PowerPC
Date: Mon, 14 Dec 2015 11:35:32 +0000	[thread overview]
Message-ID: <1450092932-123588-1-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1450090232-11437-1-git-send-email-naveen.n.rao@linux.vnet.ibm.com>

Support basic PowerPC compiling.

Checks BPF syscall number, turn off libbpf building on platform doesn't
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: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---

Hi Naveen,

   I don't have PPC environtment. Could you please help me check this patch?

Thank you.

---
 tools/build/feature/test-bpf.c | 23 ++++++++++++++++++++++-
 tools/lib/bpf/bpf.c            |  6 ++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/tools/build/feature/test-bpf.c b/tools/build/feature/test-bpf.c
index 062bac8..dc119ec 100644
--- a/tools/build/feature/test-bpf.c
+++ b/tools/build/feature/test-bpf.c
@@ -1,9 +1,26 @@
+#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
+# elif defined(__powerpc64__)
+#  define __NR_bpf 361
+# else
+#  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 +31,9 @@ int main(void)
 	attr.kern_version = 0;
 
 	attr = attr;
-	return 0;
+	/*
+	 * Test existance of __NR_bpf and BPF_PROG_LOAD.
+	 * This call should fail.
+	 */
+	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..b68c9e2 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__)
@@ -24,6 +24,8 @@
 #  define __NR_bpf 321
 # elif defined(__aarch64__)
 #  define __NR_bpf 280
+# elif defined(__powerpc64__)
+#  define __NR_bpf 361
 # else
 #  error __NR_bpf not defined. libbpf does not support your arch.
 # endif
-- 
1.8.3.4

  reply	other threads:[~2015-12-14 11:42 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-14 10:50 [PATCH] perf: bpf: Fix build breakage due to libbpf Naveen N. Rao
2015-12-14 11:35 ` Wang Nan [this message]
2015-12-14 11:53 ` Wangnan (F)
2015-12-14 15:17   ` Naveen N. Rao
2015-12-14 11:57 ` [PATCH v2] tools lib bpf: Support libbpf on PowerPC Wang Nan
2015-12-14 15:43   ` Naveen N. Rao
2015-12-15  3:35 ` [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf Wang Nan
2015-12-15  3:35   ` [PATCH v3 1/3] perf tools: Fix PowerPC native building Wang Nan
2015-12-15  3:35   ` [PATCH v3 2/3] tools: Move Makefile.arch from perf/config to tools/scripts Wang Nan
2015-12-15  3:35   ` [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf Wang Nan
2015-12-15  8:49     ` Wangnan (F)
2015-12-15  8:51     ` [PATCH v4] " Wang Nan
2015-12-15 11:40       ` Naveen N. Rao
2015-12-16 19:42         ` Arnaldo Carvalho de Melo
2015-12-17  1:29           ` Wangnan (F)
2015-12-17  5:07             ` Naveen N. Rao
2015-12-17 12:19               ` Arnaldo Carvalho de Melo
2016-01-07  6:58                 ` Naveen N. Rao
2016-01-07 16:08                   ` Arnaldo Carvalho de Melo
2016-01-07 20:39                   ` Arnaldo Carvalho de Melo
2016-01-07 21:23                     ` Arnaldo Carvalho de Melo
2016-01-08  1:56                       ` Wangnan (F)
2016-01-08 15:52                       ` Jiri Olsa
2016-01-08  5:39                     ` Naveen N. Rao
2016-01-08 12:51                       ` Arnaldo Carvalho de Melo
2016-01-08 13:31                         ` Wangnan (F)
2016-01-08 13:46                           ` Arnaldo Carvalho de Melo
2016-01-09  2:03                             ` Fengguang Wu
2015-12-15  8:05   ` [PATCH v3 0/3] perf build: PowerPC: " Jiri Olsa
2015-12-15 11:29   ` Naveen N. Rao

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=1450092932-123588-1-git-send-email-wangnan0@huawei.com \
    --to=wangnan0@huawei.com \
    --cc=acme@kernel.org \
    --cc=alexei.starovoitov@gmail.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=naveen.n.rao@linux.vnet.ibm.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;
as well as URLs for NNTP newsgroup(s).