* [PATCH] perf: bpf: Fix build breakage due to libbpf @ 2015-12-14 10:50 Naveen N. Rao 2015-12-14 11:35 ` [PATCH] tools lib bpf: Support libbpf on PowerPC Wang Nan ` (3 more replies) 0 siblings, 4 replies; 30+ messages in thread From: Naveen N. Rao @ 2015-12-14 10:50 UTC (permalink / raw) To: Arnaldo Carvalho de Melo, Wang Nan Cc: Alexei Starovoitov, Jiri Olsa, Sukadev Bhattiprolu, linux-kernel, linuxppc-dev perf build is currently (v4.4-rc5) broken on powerpc: bpf.c:28:4: error: #error __NR_bpf not defined. libbpf does not support your arch. # error __NR_bpf not defined. libbpf does not support your arch. ^ Fix this by including tools/perf/config/Makefile.arch for the proper $ARCH macro. While at it, remove redundant LP64 macro definition. Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> --- tools/lib/bpf/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 636e3dd..050e0e8 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -31,7 +31,8 @@ INSTALL = install DESTDIR ?= DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' -LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) +include $(srctree)/tools/perf/config/Makefile.arch + ifeq ($(LP64), 1) libdir_relative = lib64 else -- 2.6.2 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH] tools lib bpf: Support libbpf on PowerPC 2015-12-14 10:50 [PATCH] perf: bpf: Fix build breakage due to libbpf Naveen N. Rao @ 2015-12-14 11:35 ` Wang Nan 2015-12-14 11:53 ` [PATCH] perf: bpf: Fix build breakage due to libbpf Wangnan (F) ` (2 subsequent siblings) 3 siblings, 0 replies; 30+ messages in thread From: Wang Nan @ 2015-12-14 11:35 UTC (permalink / raw) To: naveen.n.rao Cc: linux-kernel, linuxppc-dev, Wang Nan, Arnaldo Carvalho de Melo, Alexei Starovoitov, Jiri Olsa, Sukadev Bhattiprolu 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 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH] perf: bpf: Fix build breakage due to libbpf 2015-12-14 10:50 [PATCH] perf: bpf: Fix build breakage due to libbpf Naveen N. Rao 2015-12-14 11:35 ` [PATCH] tools lib bpf: Support libbpf on PowerPC Wang Nan @ 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-15 3:35 ` [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf Wang Nan 3 siblings, 1 reply; 30+ messages in thread From: Wangnan (F) @ 2015-12-14 11:53 UTC (permalink / raw) To: Naveen N. Rao, Arnaldo Carvalho de Melo Cc: Alexei Starovoitov, Jiri Olsa, Sukadev Bhattiprolu, linux-kernel, linuxppc-dev Hi Naveen, On 2015/12/14 18:50, Naveen N. Rao wrote: > perf build is currently (v4.4-rc5) broken on powerpc: > > bpf.c:28:4: error: #error __NR_bpf not defined. libbpf does not support > your arch. > # error __NR_bpf not defined. libbpf does not support your arch. > ^ > > Fix this by including tools/perf/config/Makefile.arch for the proper > $ARCH macro. While at it, remove redundant LP64 macro definition. > > Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> > --- > tools/lib/bpf/Makefile | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile > index 636e3dd..050e0e8 100644 > --- a/tools/lib/bpf/Makefile > +++ b/tools/lib/bpf/Makefile > @@ -31,7 +31,8 @@ INSTALL = install > DESTDIR ?= > DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' > > -LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) > +include $(srctree)/tools/perf/config/Makefile.arch > + > ifeq ($(LP64), 1) > libdir_relative = lib64 > else Are you doing cross compiling? In this case you should provide an 'ARCH' to make through cmdline. For example, this is how yocto help me build perf on aarch64: $ make -C /patch/to/kernel/tools/perf O=/path/to/output \ CROSS_COMPILE=aarch64-oe-linux- ARCH=arm64 \ CC=aarch64-oe-linux-gcc --sysroot=... AR=aarch64-oe-linux-ar ... If you include Makefile.arch, I think you are seeking for a 'uname -m' result, then you are not doing cross compiling, right? In this case what you need is providing a __NR_bpf entry for your platform, because in some cases that value is overrided because we have $ find ./tools/ -name "unistd*" ./tools/perf/util/include/asm/unistd_64.h ./tools/perf/util/include/asm/unistd_32.h You can find the reason of these two files through: eae7a755ee81129370c8f555b0d5672e6673735d I posted a patch by replying this mail. I think you can find it through [1] soon. I don't have PPC environment to check it. Could you please help me check this patch in your environment? [1] http://lkml.kernel.org/g/1450092932-123588-1-git-send-email-wangnan0@huawei.com ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH] perf: bpf: Fix build breakage due to libbpf 2015-12-14 11:53 ` [PATCH] perf: bpf: Fix build breakage due to libbpf Wangnan (F) @ 2015-12-14 15:17 ` Naveen N. Rao 0 siblings, 0 replies; 30+ messages in thread From: Naveen N. Rao @ 2015-12-14 15:17 UTC (permalink / raw) To: Wangnan (F) Cc: Arnaldo Carvalho de Melo, linuxppc-dev, Sukadev Bhattiprolu, Jiri Olsa, Alexei Starovoitov, linux-kernel On 2015/12/14 07:53PM, Wang Nan wrote: > Hi Naveen, > > On 2015/12/14 18:50, Naveen N. Rao wrote: > >perf build is currently (v4.4-rc5) broken on powerpc: > > > >bpf.c:28:4: error: #error __NR_bpf not defined. libbpf does not support > >your arch. > > # error __NR_bpf not defined. libbpf does not support your arch. > > ^ > > > >Fix this by including tools/perf/config/Makefile.arch for the proper > >$ARCH macro. While at it, remove redundant LP64 macro definition. > > > >Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> > >--- > > tools/lib/bpf/Makefile | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > >diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile > >index 636e3dd..050e0e8 100644 > >--- a/tools/lib/bpf/Makefile > >+++ b/tools/lib/bpf/Makefile > >@@ -31,7 +31,8 @@ INSTALL = install > > DESTDIR ?= > > DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' > >-LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) > >+include $(srctree)/tools/perf/config/Makefile.arch > >+ > > ifeq ($(LP64), 1) > > libdir_relative = lib64 > > else > > Are you doing cross compiling? In this case you should provide an 'ARCH' to > make > through cmdline. For example, this is how yocto help me build perf on > aarch64: > > $ make -C /patch/to/kernel/tools/perf O=/path/to/output \ > CROSS_COMPILE=aarch64-oe-linux- ARCH=arm64 \ > CC=aarch64-oe-linux-gcc --sysroot=... AR=aarch64-oe-linux-ar ... I am not cross-compiling - the build error was with trying to build perf on ppc64le. Even with cross-compiling (and explicitly specifying $ARCH), Makefile.arch should still work. > > If you include Makefile.arch, I think you are seeking for a 'uname -m' > result, > then you are not doing cross compiling, right? In this case what you need is > providing > a __NR_bpf entry for your platform, because in some cases that value is > overrided because > we have > > $ find ./tools/ -name "unistd*" > ./tools/perf/util/include/asm/unistd_64.h > ./tools/perf/util/include/asm/unistd_32.h > > You can find the reason of these two files through: > eae7a755ee81129370c8f555b0d5672e6673735d I thought of just defining __NR_bpf for powerpc, but it will still break perf build for most other architectures. Moreover, tools/lib/bpf/Makefile explicitly includes headers from the linux kernel build tree (rather than the system headers) and I thought this was specifically to pull in __NR_bpf, among others -- just that we were not properly including the right headers since $ARCH was not defined. More specifically: $ make V=1 <snip> gcc -Wp,-MD,./.bpf.o.d,-MT,bpf.o -g -Wall -DHAVE_LIBELF_MMAP_SUPPORT -DHAVE_ELF_GETPHDRNUM_SUPPORT -Wbad-function-cast -Wdeclaration-after-statement -Wformat-security -Wformat-y2k -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-system-headers -Wold-style-definition -Wpacked -Wredundant-decls -Wshadow -Wstrict-aliasing=3 -Wstrict-prototypes -Wswitch-default -Wswitch-enum -Wundef -Wwrite-strings -Wformat -Werror -Wall -fPIC -I. -I/root/linux/tools/include -I/root/linux/arch//include/uapi -I/root/linux/include/uapi -D"BUILD_STR(s)=#s" -c -o bpf.o bpf.c Notice // in -I/root/linux/arch//include/uapi. Hence, my patch to ensure the right headers get included. I'm thinking the explicit __NR_bpf definitions are only needed for x86 -- since I don't see the definitions in the kernel tree headers. Regards, Naveen > > I posted a patch by replying this mail. I think you can find it through [1] > soon. > I don't have PPC environment to check it. Could you please help me check > this patch > in your environment? > > [1] http://lkml.kernel.org/g/1450092932-123588-1-git-send-email-wangnan0@huawei.com > > > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev ^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH v2] tools lib bpf: Support libbpf on PowerPC 2015-12-14 10:50 [PATCH] perf: bpf: Fix build breakage due to libbpf Naveen N. Rao 2015-12-14 11:35 ` [PATCH] tools lib bpf: Support libbpf on PowerPC Wang Nan 2015-12-14 11:53 ` [PATCH] perf: bpf: Fix build breakage due to libbpf Wangnan (F) @ 2015-12-14 11:57 ` 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 3 siblings, 1 reply; 30+ messages in thread From: Wang Nan @ 2015-12-14 11:57 UTC (permalink / raw) To: naveen.n.rao Cc: linux-kernel, linuxppc-dev, Wang Nan, Arnaldo Carvalho de Melo, Alexei Starovoitov, Jiri Olsa, Sukadev Bhattiprolu 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> --- v1 -> v2: __powerpc64__ -> __powerpc__. Code is from ./tools/perf/perf-sys.h, but not tested yet. Naveen, please help me try this patch on PPC. 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..19497f7 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(__powerpc__) +# 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 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..fd25c58 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(__powerpc__) +# define __NR_bpf 361 # else # error __NR_bpf not defined. libbpf does not support your arch. # endif -- 1.8.3.4 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH v2] tools lib bpf: Support libbpf on PowerPC 2015-12-14 11:57 ` [PATCH v2] tools lib bpf: Support libbpf on PowerPC Wang Nan @ 2015-12-14 15:43 ` Naveen N. Rao 0 siblings, 0 replies; 30+ messages in thread From: Naveen N. Rao @ 2015-12-14 15:43 UTC (permalink / raw) To: Wang Nan Cc: linuxppc-dev, linux-kernel, Arnaldo Carvalho de Melo, Sukadev Bhattiprolu, Jiri Olsa, Alexei Starovoitov On 2015/12/14 11:57AM, Wang Nan wrote: > 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> > --- > > v1 -> v2: __powerpc64__ -> __powerpc__. Code is from > ./tools/perf/perf-sys.h, but not tested yet. > > Naveen, please help me try this patch on PPC. Thanks, this works. However... > > 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..19497f7 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(__powerpc__) > +# define __NR_bpf 361 I think we should drop __aarch64__ and __powerpc__ here since this builds fine on ppc without these hunks. > +# 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. Nit... 'for existence'. > + * 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..fd25c58 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(__powerpc__) > +# define __NR_bpf 361 And, I think we should drop this hunk, but include the patch I sent. That ensures that the proper headers from the kernel source tree are included, so there won't be a need to explicitly define __NR_bpf for each architecture. Regards, Naveen ^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf 2015-12-14 10:50 [PATCH] perf: bpf: Fix build breakage due to libbpf Naveen N. Rao ` (2 preceding siblings ...) 2015-12-14 11:57 ` [PATCH v2] tools lib bpf: Support libbpf on PowerPC Wang Nan @ 2015-12-15 3:35 ` Wang Nan 2015-12-15 3:35 ` [PATCH v3 1/3] perf tools: Fix PowerPC native building Wang Nan ` (4 more replies) 3 siblings, 5 replies; 30+ messages in thread From: Wang Nan @ 2015-12-15 3:35 UTC (permalink / raw) To: naveen.n.rao, acme, jolsa Cc: linux-kernel, linuxppc-dev, Wang Nan, Sukadev Bhattiprolu Hi Naveen, Now I know your problem is in native building and the reason is missing proper $(ARCH). I think other than that there's another problem in libbpf's building: if your problem is unable to compile libbpf, feature checker should find it and set NO_LIBBPF=1 for perf, so perf building won't be blocked, only BPF related features should be turned off. Also, I think including Makefile.arch from tools/scripts would be better, because libbpf is at the same level with perf. So I separate them into 3 patches. Please help me test it on PowerPC. Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Naveen N. Rao (1): perf: bpf: Fix build breakage due to libbpf Wang Nan (2): perf tools: Fix PowerPC native building tools: Move Makefile.arch from perf/config to tools/scripts tools/build/feature/test-bpf.c | 20 +++++++++++++++++++- tools/lib/bpf/Makefile | 3 ++- tools/lib/bpf/bpf.c | 4 ++-- tools/perf/config/Makefile | 2 +- tools/perf/tests/make | 2 +- tools/{perf/config => scripts}/Makefile.arch | 0 6 files changed, 25 insertions(+), 6 deletions(-) rename tools/{perf/config => scripts}/Makefile.arch (100%) -- 1.8.3.4 ^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH v3 1/3] perf tools: Fix PowerPC native building 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 ` Wang Nan 2015-12-15 3:35 ` [PATCH v3 2/3] tools: Move Makefile.arch from perf/config to tools/scripts Wang Nan ` (3 subsequent siblings) 4 siblings, 0 replies; 30+ messages in thread From: Wang Nan @ 2015-12-15 3:35 UTC (permalink / raw) To: naveen.n.rao, acme, jolsa Cc: linux-kernel, linuxppc-dev, Wang Nan, Sukadev Bhattiprolu 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 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH v3 2/3] tools: Move Makefile.arch from perf/config to tools/scripts 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 ` Wang Nan 2015-12-15 3:35 ` [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf Wang Nan ` (2 subsequent siblings) 4 siblings, 0 replies; 30+ messages in thread From: Wang Nan @ 2015-12-15 3:35 UTC (permalink / raw) To: naveen.n.rao, acme, jolsa Cc: linux-kernel, linuxppc-dev, Wang Nan, Sukadev Bhattiprolu After this patch other directories can use this architecture detector without directly including it from perf's directory. Libbpf would utilize it to get proper $(ARCH) so it can receive correct uapi include directory. Signed-off-by: Wang Nan <wangnan0@huawei.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> --- tools/perf/config/Makefile | 2 +- tools/perf/tests/make | 2 +- tools/{perf/config => scripts}/Makefile.arch | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename tools/{perf/config => scripts}/Makefile.arch (100%) diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index a552417..34717e4 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -17,7 +17,7 @@ detected_var = $(shell echo "$(1)=$($(1))" >> $(OUTPUT).config-detected) CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) -include $(src-perf)/config/Makefile.arch +include $(srctree)/tools/scripts/Makefile.arch $(call detected_var,ARCH) diff --git a/tools/perf/tests/make b/tools/perf/tests/make index 8ea3dff..cd9c3ce 100644 --- a/tools/perf/tests/make +++ b/tools/perf/tests/make @@ -12,7 +12,7 @@ endif else PERF := . -include config/Makefile.arch +include $(srctree)/scripts/Makefile.arch # FIXME looks like x86 is the only arch running tests ;-) # we need some IS_(32/64) flag to make this generic diff --git a/tools/perf/config/Makefile.arch b/tools/scripts/Makefile.arch similarity index 100% rename from tools/perf/config/Makefile.arch rename to tools/scripts/Makefile.arch -- 1.8.3.4 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf 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 ` Wang Nan 2015-12-15 8:49 ` Wangnan (F) 2015-12-15 8:51 ` [PATCH v4] " Wang Nan 2015-12-15 8:05 ` [PATCH v3 0/3] perf build: PowerPC: " Jiri Olsa 2015-12-15 11:29 ` Naveen N. Rao 4 siblings, 2 replies; 30+ messages in thread From: Wang Nan @ 2015-12-15 3:35 UTC (permalink / raw) To: naveen.n.rao, acme, jolsa Cc: linux-kernel, linuxppc-dev, Wang Nan, Sukadev Bhattiprolu From: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> perf build is currently (v4.4-rc5) broken on powerpc: bpf.c:28:4: error: #error __NR_bpf not defined. libbpf does not support your arch. # error __NR_bpf not defined. libbpf does not support your arch. ^ Fix this by including tools/perf/config/Makefile.arch for the proper $ARCH macro. While at it, remove redundant LP64 macro definition. Signed-off-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/lib/bpf/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 636e3dd..3d34a8c 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -31,7 +31,8 @@ INSTALL = install DESTDIR ?= DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' -LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) +include $(srctree)/tools/scripts/Makefile.arch + ifeq ($(LP64), 1) libdir_relative = lib64 else -- 1.8.3.4 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf 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 1 sibling, 0 replies; 30+ messages in thread From: Wangnan (F) @ 2015-12-15 8:49 UTC (permalink / raw) To: naveen.n.rao, acme, jolsa; +Cc: linux-kernel, linuxppc-dev, Sukadev Bhattiprolu This patch contains a problem. On 2015/12/15 11:35, Wang Nan wrote: > From: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> > > perf build is currently (v4.4-rc5) broken on powerpc: > > bpf.c:28:4: error: #error __NR_bpf not defined. libbpf does not support > your arch. > # error __NR_bpf not defined. libbpf does not support your arch. > ^ > > Fix this by including tools/perf/config/Makefile.arch for the proper > $ARCH macro. While at it, remove redundant LP64 macro definition. > > Signed-off-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/lib/bpf/Makefile | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile > index 636e3dd..3d34a8c 100644 > --- a/tools/lib/bpf/Makefile > +++ b/tools/lib/bpf/Makefile > @@ -31,7 +31,8 @@ INSTALL = install > DESTDIR ?= > DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' > > -LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) > +include $(srctree)/tools/scripts/Makefile.arch > + Here we depend on $(srctree), but libbpf's Makefile doesn't automatically detect it. Directly 'make' in libbpf directory causes an error. Will post a v4 for it. Thank you. ^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH v4] perf: bpf: Fix build breakage due to libbpf 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 ` Wang Nan 2015-12-15 11:40 ` Naveen N. Rao 1 sibling, 1 reply; 30+ messages in thread From: Wang Nan @ 2015-12-15 8:51 UTC (permalink / raw) To: acme, naveen.n.rao, jolsa; +Cc: linux-kernel, linuxppc-dev, wangnan0, sukadev From: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> perf build is currently (v4.4-rc5) broken on powerpc: bpf.c:28:4: error: #error __NR_bpf not defined. libbpf does not support your arch. # error __NR_bpf not defined. libbpf does not support your arch. ^ Fix this by including tools/scripts/Makefile.arch for the proper $ARCH macro. While at it, remove redundant LP64 macro definition. Also, since libbpf require $(srctree) now, detect the path of srctree like perf. Signed-off-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: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> --- v3 -> v4: Add srctree detector code so directly run 'make' in libbpf directory would not cause error. --- tools/lib/bpf/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 636e3dd..0b6e013 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -6,6 +6,12 @@ BPF_EXTRAVERSION = 1 MAKEFLAGS += --no-print-directory +ifeq ($(srctree),) +srctree := $(patsubst %/,%,$(dir $(shell pwd))) +srctree := $(patsubst %/,%,$(dir $(srctree))) +srctree := $(patsubst %/,%,$(dir $(srctree))) +#$(info Determined 'srctree' to be $(srctree)) +endif # Makefiles suck: This macro sets a default value of $(2) for the # variable named by $(1), unless the variable has been set by @@ -31,7 +37,8 @@ INSTALL = install DESTDIR ?= DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' -LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) +include $(srctree)/tools/scripts/Makefile.arch + ifeq ($(LP64), 1) libdir_relative = lib64 else -- 1.8.3.4 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 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 0 siblings, 1 reply; 30+ messages in thread From: Naveen N. Rao @ 2015-12-15 11:40 UTC (permalink / raw) To: Wang Nan; +Cc: acme, jolsa, linux-kernel, linuxppc-dev, sukadev On 2015/12/15 08:51AM, Wang Nan wrote: > From: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> > > perf build is currently (v4.4-rc5) broken on powerpc: > > bpf.c:28:4: error: #error __NR_bpf not defined. libbpf does not support > your arch. > # error __NR_bpf not defined. libbpf does not support your arch. > ^ > > Fix this by including tools/scripts/Makefile.arch for the proper > $ARCH macro. While at it, remove redundant LP64 macro definition. > > Also, since libbpf require $(srctree) now, detect the path of > srctree like perf. > > Signed-off-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: Arnaldo Carvalho de Melo <acme@kernel.org> > Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> > --- > > v3 -> v4: Add srctree detector code so directly run 'make' in libbpf > directory would not cause error. Good catch! Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> > > --- > tools/lib/bpf/Makefile | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile > index 636e3dd..0b6e013 100644 > --- a/tools/lib/bpf/Makefile > +++ b/tools/lib/bpf/Makefile > @@ -6,6 +6,12 @@ BPF_EXTRAVERSION = 1 > > MAKEFLAGS += --no-print-directory > > +ifeq ($(srctree),) > +srctree := $(patsubst %/,%,$(dir $(shell pwd))) > +srctree := $(patsubst %/,%,$(dir $(srctree))) > +srctree := $(patsubst %/,%,$(dir $(srctree))) > +#$(info Determined 'srctree' to be $(srctree)) > +endif > > # Makefiles suck: This macro sets a default value of $(2) for the > # variable named by $(1), unless the variable has been set by > @@ -31,7 +37,8 @@ INSTALL = install > DESTDIR ?= > DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' > > -LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) > +include $(srctree)/tools/scripts/Makefile.arch > + > ifeq ($(LP64), 1) > libdir_relative = lib64 > else > -- > 1.8.3.4 > ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 2015-12-15 11:40 ` Naveen N. Rao @ 2015-12-16 19:42 ` Arnaldo Carvalho de Melo 2015-12-17 1:29 ` Wangnan (F) 0 siblings, 1 reply; 30+ messages in thread From: Arnaldo Carvalho de Melo @ 2015-12-16 19:42 UTC (permalink / raw) To: Naveen N. Rao; +Cc: Wang Nan, jolsa, linux-kernel, linuxppc-dev, sukadev Em Tue, Dec 15, 2015 at 05:10:46PM +0530, Naveen N. Rao escreveu: > On 2015/12/15 08:51AM, Wang Nan wrote: > > From: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> > > > > perf build is currently (v4.4-rc5) broken on powerpc: > > > > bpf.c:28:4: error: #error __NR_bpf not defined. libbpf does not support > > your arch. > > # error __NR_bpf not defined. libbpf does not support your arch. > > ^ > > > > Fix this by including tools/scripts/Makefile.arch for the proper > > $ARCH macro. While at it, remove redundant LP64 macro definition. > > > > Also, since libbpf require $(srctree) now, detect the path of > > srctree like perf. > > > > Signed-off-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: Arnaldo Carvalho de Melo <acme@kernel.org> > > Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> > > --- > > > > v3 -> v4: Add srctree detector code so directly run 'make' in libbpf > > directory would not cause error. > > Good catch! > > Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Trying to apply the patchkit: [acme@zoo linux]$ make -C tools clean > /dev/null 2>&1 [acme@zoo linux]$ make -C tools/perf build-test make: Entering directory '/home/git/linux/tools/perf' Testing Makefile tests/make:15: /scripts/Makefile.arch: No such file or directory make[2]: *** No rule to make target '/scripts/Makefile.arch'. Stop. tests/make:5: recipe for target 'all' failed make[1]: *** [all] Error 2 Makefile:81: recipe for target 'build-test' failed make: *** [build-test] Error 2 make: Leaving directory '/home/git/linux/tools/perf' [acme@zoo linux]$ What am I doing wrong? - Arnaldo ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 2015-12-16 19:42 ` Arnaldo Carvalho de Melo @ 2015-12-17 1:29 ` Wangnan (F) 2015-12-17 5:07 ` Naveen N. Rao 0 siblings, 1 reply; 30+ messages in thread From: Wangnan (F) @ 2015-12-17 1:29 UTC (permalink / raw) To: Arnaldo Carvalho de Melo, Naveen N. Rao Cc: jolsa, linux-kernel, linuxppc-dev, sukadev On 2015/12/17 3:42, Arnaldo Carvalho de Melo wrote: > Em Tue, Dec 15, 2015 at 05:10:46PM +0530, Naveen N. Rao escreveu: >> On 2015/12/15 08:51AM, Wang Nan wrote: >>> From: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> >>> >>> perf build is currently (v4.4-rc5) broken on powerpc: >>> >>> bpf.c:28:4: error: #error __NR_bpf not defined. libbpf does not support >>> your arch. >>> # error __NR_bpf not defined. libbpf does not support your arch. >>> ^ >>> >>> Fix this by including tools/scripts/Makefile.arch for the proper >>> $ARCH macro. While at it, remove redundant LP64 macro definition. >>> >>> Also, since libbpf require $(srctree) now, detect the path of >>> srctree like perf. >>> >>> Signed-off-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: Arnaldo Carvalho de Melo <acme@kernel.org> >>> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> >>> --- >>> >>> v3 -> v4: Add srctree detector code so directly run 'make' in libbpf >>> directory would not cause error. >> Good catch! >> >> Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> > Trying to apply the patchkit: > > [acme@zoo linux]$ make -C tools clean > /dev/null 2>&1 > [acme@zoo linux]$ make -C tools/perf build-test > make: Entering directory '/home/git/linux/tools/perf' > Testing Makefile > tests/make:15: /scripts/Makefile.arch: No such file or directory > make[2]: *** No rule to make target '/scripts/Makefile.arch'. Stop. > tests/make:5: recipe for target 'all' failed > make[1]: *** [all] Error 2 > Makefile:81: recipe for target 'build-test' failed > make: *** [build-test] Error 2 > make: Leaving directory '/home/git/linux/tools/perf' > [acme@zoo linux]$ > > What am I doing wrong? You need all 3 patches. This v4 patch is a fix for previous v3 3/3 and I send this patch by replying that one. I thought your email client is sorted by thread so you can easily find it but it seems I was wrong... The whole thread is: [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf: http://lkml.kernel.org/g/1450150557-127942-1-git-send-email-wangnan0@huawei.com [PATCH v3 1/3] perf tools: Fix PowerPC native building http://lkml.kernel.org/g/1450150557-127942-2-git-send-email-wangnan0@huawei.com [PATCH v3 2/3] tools: Move Makefile.arch from perf/config to tools/scripts http://lkml.kernel.org/g/1450150557-127942-3-git-send-email-wangnan0@huawei.com [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf http://lkml.kernel.org/g/1450150557-127942-4-git-send-email-wangnan0@huawei.com and [PATCH v3 3/3] breaks local building because the usage of "srctree", and I fix it in this one. Thanks. ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 2015-12-17 1:29 ` Wangnan (F) @ 2015-12-17 5:07 ` Naveen N. Rao 2015-12-17 12:19 ` Arnaldo Carvalho de Melo 0 siblings, 1 reply; 30+ messages in thread From: Naveen N. Rao @ 2015-12-17 5:07 UTC (permalink / raw) To: Wangnan (F) Cc: Arnaldo Carvalho de Melo, jolsa, linux-kernel, linuxppc-dev, sukadev On 2015/12/17 09:29AM, Wang Nan wrote: > > > On 2015/12/17 3:42, Arnaldo Carvalho de Melo wrote: > >Em Tue, Dec 15, 2015 at 05:10:46PM +0530, Naveen N. Rao escreveu: > >>On 2015/12/15 08:51AM, Wang Nan wrote: > >>>From: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> > >>> > >>>perf build is currently (v4.4-rc5) broken on powerpc: > >>> > >>>bpf.c:28:4: error: #error __NR_bpf not defined. libbpf does not support > >>>your arch. > >>> # error __NR_bpf not defined. libbpf does not support your arch. > >>> ^ > >>> > >>>Fix this by including tools/scripts/Makefile.arch for the proper > >>>$ARCH macro. While at it, remove redundant LP64 macro definition. > >>> > >>>Also, since libbpf require $(srctree) now, detect the path of > >>>srctree like perf. > >>> > >>>Signed-off-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: Arnaldo Carvalho de Melo <acme@kernel.org> > >>>Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> > >>>--- > >>> > >>>v3 -> v4: Add srctree detector code so directly run 'make' in libbpf > >>> directory would not cause error. > >>Good catch! > >> > >>Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> > >Trying to apply the patchkit: > > > >[acme@zoo linux]$ make -C tools clean > /dev/null 2>&1 > >[acme@zoo linux]$ make -C tools/perf build-test > >make: Entering directory '/home/git/linux/tools/perf' > >Testing Makefile > >tests/make:15: /scripts/Makefile.arch: No such file or directory > >make[2]: *** No rule to make target '/scripts/Makefile.arch'. Stop. > >tests/make:5: recipe for target 'all' failed > >make[1]: *** [all] Error 2 > >Makefile:81: recipe for target 'build-test' failed > >make: *** [build-test] Error 2 > >make: Leaving directory '/home/git/linux/tools/perf' > >[acme@zoo linux]$ > > > >What am I doing wrong? > > You need all 3 patches. This v4 patch is a fix for previous v3 3/3 and I > send > this patch by replying that one. I thought your email client is sorted by > thread > so you can easily find it but it seems I was wrong... Arrgh! I see the confusion - your v4 didn't explicitly mention patch number 3, so that must have made Arnaldo think that this patch alone is enough. Perhaps [PATCH v4 3/3] would have been clearer. > > The whole thread is: > > [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf: > http://lkml.kernel.org/g/1450150557-127942-1-git-send-email-wangnan0@huawei.com > > [PATCH v3 1/3] perf tools: Fix PowerPC native building > http://lkml.kernel.org/g/1450150557-127942-2-git-send-email-wangnan0@huawei.com > > [PATCH v3 2/3] tools: Move Makefile.arch from perf/config to tools/scripts > http://lkml.kernel.org/g/1450150557-127942-3-git-send-email-wangnan0@huawei.com > > [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf > http://lkml.kernel.org/g/1450150557-127942-4-git-send-email-wangnan0@huawei.com > > and [PATCH v3 3/3] breaks local building because the usage of "srctree", and ^^ You mean v4 here. Anyway, now that you've sent v4, it should be much clearer. Thanks, Naveen ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 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 0 siblings, 1 reply; 30+ messages in thread From: Arnaldo Carvalho de Melo @ 2015-12-17 12:19 UTC (permalink / raw) To: Naveen N. Rao; +Cc: Wangnan (F), jolsa, linux-kernel, linuxppc-dev, sukadev Em Thu, Dec 17, 2015 at 10:37:14AM +0530, Naveen N. Rao escreveu: > On 2015/12/17 09:29AM, Wang Nan wrote: > > The whole thread is: > > > > [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf: > > http://lkml.kernel.org/g/1450150557-127942-1-git-send-email-wangnan0@huawei.com > > > > [PATCH v3 1/3] perf tools: Fix PowerPC native building > > http://lkml.kernel.org/g/1450150557-127942-2-git-send-email-wangnan0@huawei.com > > > > [PATCH v3 2/3] tools: Move Makefile.arch from perf/config to tools/scripts > > http://lkml.kernel.org/g/1450150557-127942-3-git-send-email-wangnan0@huawei.com > > > > [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf > > http://lkml.kernel.org/g/1450150557-127942-4-git-send-email-wangnan0@huawei.com > > > > and [PATCH v3 3/3] breaks local building because the usage of "srctree", and ^^ > You mean v4 here. > Anyway, now that you've sent v4, it should be much clearer. Right, I should've read it more thoroughly, but anyway, I'll process it today. - Arnaldo ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 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 0 siblings, 2 replies; 30+ messages in thread From: Naveen N. Rao @ 2016-01-07 6:58 UTC (permalink / raw) To: Arnaldo Carvalho de Melo Cc: Wangnan (F), jolsa, linux-kernel, linuxppc-dev, sukadev On 2015/12/17 09:19AM, Arnaldo Carvalho de Melo wrote: > Em Thu, Dec 17, 2015 at 10:37:14AM +0530, Naveen N. Rao escreveu: > > On 2015/12/17 09:29AM, Wang Nan wrote: > > > The whole thread is: > > > > > > [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf: > > > http://lkml.kernel.org/g/1450150557-127942-1-git-send-email-wangnan0@huawei.com > > > > > > [PATCH v3 1/3] perf tools: Fix PowerPC native building > > > http://lkml.kernel.org/g/1450150557-127942-2-git-send-email-wangnan0@huawei.com > > > > > > [PATCH v3 2/3] tools: Move Makefile.arch from perf/config to tools/scripts > > > http://lkml.kernel.org/g/1450150557-127942-3-git-send-email-wangnan0@huawei.com > > > > > > [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf > > > http://lkml.kernel.org/g/1450150557-127942-4-git-send-email-wangnan0@huawei.com > > > > > > and [PATCH v3 3/3] breaks local building because the usage of "srctree", and > ^^ > > You mean v4 here. > > > Anyway, now that you've sent v4, it should be much clearer. > > Right, I should've read it more thoroughly, but anyway, I'll process it > today. Bump. Arnaldo, Can you please push at least the initial 3 patches of this for v4.4? Wang Nan has posted v6 here: http://thread.gmane.org/gmane.linux.kernel/2110626 Thanks, Naveen ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 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 1 sibling, 0 replies; 30+ messages in thread From: Arnaldo Carvalho de Melo @ 2016-01-07 16:08 UTC (permalink / raw) To: Naveen N. Rao; +Cc: Wangnan (F), jolsa, linux-kernel, linuxppc-dev, sukadev Em Thu, Jan 07, 2016 at 12:28:15PM +0530, Naveen N. Rao escreveu: > On 2015/12/17 09:19AM, Arnaldo Carvalho de Melo wrote: > > Em Thu, Dec 17, 2015 at 10:37:14AM +0530, Naveen N. Rao escreveu: > > > On 2015/12/17 09:29AM, Wang Nan wrote: > > > > The whole thread is: > > > > > > > > [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf: > > > > http://lkml.kernel.org/g/1450150557-127942-1-git-send-email-wangnan0@huawei.com > > > > > > > > [PATCH v3 1/3] perf tools: Fix PowerPC native building > > > > http://lkml.kernel.org/g/1450150557-127942-2-git-send-email-wangnan0@huawei.com > > > > > > > > [PATCH v3 2/3] tools: Move Makefile.arch from perf/config to tools/scripts > > > > http://lkml.kernel.org/g/1450150557-127942-3-git-send-email-wangnan0@huawei.com > > > > > > > > [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf > > > > http://lkml.kernel.org/g/1450150557-127942-4-git-send-email-wangnan0@huawei.com > > > > > > > > and [PATCH v3 3/3] breaks local building because the usage of "srctree", and > > ^^ > > > You mean v4 here. > > > > > Anyway, now that you've sent v4, it should be much clearer. > > > > Right, I should've read it more thoroughly, but anyway, I'll process it > > today. > > Bump. > > Arnaldo, > Can you please push at least the initial 3 patches of this for v4.4? Sure, I'll try to do that now. > Wang Nan has posted v6 here: > http://thread.gmane.org/gmane.linux.kernel/2110626 And process the other patches in this series, in perf/core. > > > Thanks, > Naveen ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 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 5:39 ` Naveen N. Rao 1 sibling, 2 replies; 30+ messages in thread From: Arnaldo Carvalho de Melo @ 2016-01-07 20:39 UTC (permalink / raw) To: Naveen N. Rao; +Cc: Wangnan (F), jolsa, linux-kernel, linuxppc-dev, sukadev Em Thu, Jan 07, 2016 at 12:28:15PM +0530, Naveen N. Rao escreveu: > On 2015/12/17 09:19AM, Arnaldo Carvalho de Melo wrote: > > Em Thu, Dec 17, 2015 at 10:37:14AM +0530, Naveen N. Rao escreveu: > > > On 2015/12/17 09:29AM, Wang Nan wrote: > > > > The whole thread is: > > > > > > > > [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf: > > > > http://lkml.kernel.org/g/1450150557-127942-1-git-send-email-wangnan0@huawei.com > > > > > > > > [PATCH v3 1/3] perf tools: Fix PowerPC native building > > > > http://lkml.kernel.org/g/1450150557-127942-2-git-send-email-wangnan0@huawei.com > > > > > > > > [PATCH v3 2/3] tools: Move Makefile.arch from perf/config to tools/scripts > > > > http://lkml.kernel.org/g/1450150557-127942-3-git-send-email-wangnan0@huawei.com > > > > > > > > [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf > > > > http://lkml.kernel.org/g/1450150557-127942-4-git-send-email-wangnan0@huawei.com > > > > > > > > and [PATCH v3 3/3] breaks local building because the usage of "srctree", and > > ^^ > > > You mean v4 here. > > > > > Anyway, now that you've sent v4, it should be much clearer. > > > > Right, I should've read it more thoroughly, but anyway, I'll process it > > today. > > Bump. > > Arnaldo, > Can you please push at least the initial 3 patches of this for v4.4? > Wang Nan has posted v6 here: > http://thread.gmane.org/gmane.linux.kernel/2110626 So I tried it again today, from the v6, the latest patch with that subject line in my inbox, and I get this, after applying the first three patches: [acme@zoo linux]$ make -C tools clean > /dev/null [acme@zoo linux]$ make -C tools/perf build-test make: Entering directory '/home/git/linux/tools/perf' Testing Makefile tests/make:15: /scripts/Makefile.arch: No such file or directory make[2]: *** No rule to make target '/scripts/Makefile.arch'. Stop. tests/make:5: recipe for target 'all' failed make[1]: *** [all] Error 2 Makefile:81: recipe for target 'build-test' failed make: *** [build-test] Error 2 make: Leaving directory '/home/git/linux/tools/perf' [acme@zoo linux]$ [acme@zoo linux]$ git log --oneline | head -10 a1f721fa8b82 perf bpf: Fix build breakage due to libbpf 41020638ceb2 tools: Move Makefile.arch from perf/config to tools/scripts abf316e348da perf tools: Fix PowerPC native building 12ca6ad2e3a8 perf: Fix race in swevent hash c12744994465 perf: Fix race in perf_event_exec() 2d2e7ac14a1f Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent fb202539e61b perf list: Robustify event printing routine d643b5aba848 perf list: Add support for PERF_COUNT_SW_BPF_OUT 03fba21adb19 Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent 4938cf0c7a62 perf hists browser: Fix segfault if use symbol filter in cmdline [acme@zoo linux]$ Trying to figure this out... - Arnaldo ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 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 1 sibling, 2 replies; 30+ messages in thread From: Arnaldo Carvalho de Melo @ 2016-01-07 21:23 UTC (permalink / raw) To: Naveen N. Rao, Jiri Olsa; +Cc: Wangnan (F), linux-kernel, linuxppc-dev, sukadev Em Thu, Jan 07, 2016 at 05:39:57PM -0300, Arnaldo Carvalho de Melo escreveu: > Em Thu, Jan 07, 2016 at 12:28:15PM +0530, Naveen N. Rao escreveu: > > Can you please push at least the initial 3 patches of this for v4.4? > > Wang Nan has posted v6 here: > > http://thread.gmane.org/gmane.linux.kernel/2110626 > So I tried it again today, from the v6, the latest patch with that > subject line in my inbox, and I get this, after applying the first three > patches: > [acme@zoo linux]$ make -C tools clean > /dev/null > [acme@zoo linux]$ make -C tools/perf build-test > make: Entering directory '/home/git/linux/tools/perf' > Testing Makefile > tests/make:15: /scripts/Makefile.arch: No such file or directory > make[2]: *** No rule to make target '/scripts/Makefile.arch'. Stop. > tests/make:5: recipe for target 'all' failed > make[1]: *** [all] Error 2 > Makefile:81: recipe for target 'build-test' failed > make: *** [build-test] Error 2 > make: Leaving directory '/home/git/linux/tools/perf' > [acme@zoo linux]$ > Trying to figure this out... So, this doesn't seem to have been tessted, this part, specifically: diff --git a/tools/perf/tests/make b/tools/perf/tests/make index 8ea3dffc5065..cd9c3ce1a5c2 100644 --- a/tools/perf/tests/make +++ b/tools/perf/tests/make @@ -12,7 +12,7 @@ endif else PERF := . -include config/Makefile.arch +include $(srctree)/scripts/Makefile.arch # FIXME looks like x86 is the only arch running tests ;-) # we need some IS_(32/64) flag to make this generic ---------------------------------------------------- Because $(srctree) is not set at that point, I copied the needed bits from tools/perf/Makefile.perf and got the patch below, which makes:L make -C tools/perf build-test Work for me again. This should wrap up the day nicely, making me think of Jens Axboe recent cool reaction to an untested patch: http://lkml.kernel.org/r/5661C2BC.9030007@kernel.dk :-) Jiri, are you ok with the patch below, on top of the second patch in Wang's series, that you acked? - Arnaldo diff --git a/tools/perf/tests/make b/tools/perf/tests/make index cd9c3ce1a5c2..377654f862ec 100644 --- a/tools/perf/tests/make +++ b/tools/perf/tests/make @@ -1,3 +1,5 @@ +include ../scripts/Makefile.include + ifndef MK ifeq ($(MAKECMDGOALS),) # no target specified, trigger the whole suite @@ -12,7 +14,19 @@ endif else PERF := . -include $(srctree)/scripts/Makefile.arch +# As per kernel Makefile, avoid funny character set dependencies +unexport LC_ALL +LC_COLLATE=C +LC_NUMERIC=C +export LC_COLLATE LC_NUMERIC + +ifeq ($(srctree),) +srctree := $(patsubst %/,%,$(dir $(shell pwd))) +srctree := $(patsubst %/,%,$(dir $(srctree))) +#$(info Determined 'srctree' to be $(srctree)) +endif + +include $(srctree)/tools/scripts/Makefile.arch # FIXME looks like x86 is the only arch running tests ;-) # we need some IS_(32/64) flag to make this generic ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 2016-01-07 21:23 ` Arnaldo Carvalho de Melo @ 2016-01-08 1:56 ` Wangnan (F) 2016-01-08 15:52 ` Jiri Olsa 1 sibling, 0 replies; 30+ messages in thread From: Wangnan (F) @ 2016-01-08 1:56 UTC (permalink / raw) To: Arnaldo Carvalho de Melo, Naveen N. Rao, Jiri Olsa Cc: linux-kernel, linuxppc-dev, sukadev On 2016/1/8 5:23, Arnaldo Carvalho de Melo wrote: > Em Thu, Jan 07, 2016 at 05:39:57PM -0300, Arnaldo Carvalho de Melo escreveu: >> Em Thu, Jan 07, 2016 at 12:28:15PM +0530, Naveen N. Rao escreveu: >>> Can you please push at least the initial 3 patches of this for v4.4? >>> Wang Nan has posted v6 here: >>> http://thread.gmane.org/gmane.linux.kernel/2110626 > >> So I tried it again today, from the v6, the latest patch with that >> subject line in my inbox, and I get this, after applying the first three >> patches: > >> [acme@zoo linux]$ make -C tools clean > /dev/null >> [acme@zoo linux]$ make -C tools/perf build-test >> make: Entering directory '/home/git/linux/tools/perf' >> Testing Makefile >> tests/make:15: /scripts/Makefile.arch: No such file or directory >> make[2]: *** No rule to make target '/scripts/Makefile.arch'. Stop. >> tests/make:5: recipe for target 'all' failed >> make[1]: *** [all] Error 2 >> Makefile:81: recipe for target 'build-test' failed >> make: *** [build-test] Error 2 >> make: Leaving directory '/home/git/linux/tools/perf' >> [acme@zoo linux]$ >> Trying to figure this out... > So, this doesn't seem to have been tessted, this part, specifically: > > diff --git a/tools/perf/tests/make b/tools/perf/tests/make > index 8ea3dffc5065..cd9c3ce1a5c2 100644 > --- a/tools/perf/tests/make > +++ b/tools/perf/tests/make > @@ -12,7 +12,7 @@ endif > else > PERF := . > > -include config/Makefile.arch > +include $(srctree)/scripts/Makefile.arch > > # FIXME looks like x86 is the only arch running tests ;-) > # we need some IS_(32/64) flag to make this generic > > > ---------------------------------------------------- > > Because $(srctree) is not set at that point, I copied the needed bits from > tools/perf/Makefile.perf and got the patch below, which makes:L > > make -C tools/perf build-test > > Work for me again. > > This should wrap up the day nicely, making me think of Jens Axboe recent > cool reaction to an untested patch: > > http://lkml.kernel.org/r/5661C2BC.9030007@kernel.dk > > :-) > Sorry. I though I have tested my patch by building perf, but didn't realize perf/tests/make is not used in normal building. Doing build-test takes too long, so I always forget it. Also, in my environment it can fail: LD /opt/wangnan/yocto_build/tmp-eglibc/work/generic_x86_64-oe-linux/perf/1.0-r8/perf-1.0/perf-in.o LINK /opt/wangnan/yocto_build/tmp-eglibc/work/generic_x86_64-oe-linux/perf/1.0-r8/perf-1.0/perf test: test -x ./perf make[2]: *** [make_no_newt] Error 1 make[1]: *** [all] Error 2 make: *** [build-test] Error 2 since I'm in a yocto building environment. I'll look into this problem and give a patch on it. Thank you. ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 2016-01-07 21:23 ` Arnaldo Carvalho de Melo 2016-01-08 1:56 ` Wangnan (F) @ 2016-01-08 15:52 ` Jiri Olsa 1 sibling, 0 replies; 30+ messages in thread From: Jiri Olsa @ 2016-01-08 15:52 UTC (permalink / raw) To: Arnaldo Carvalho de Melo Cc: Naveen N. Rao, Jiri Olsa, Wangnan (F), linux-kernel, linuxppc-dev, sukadev On Thu, Jan 07, 2016 at 06:23:03PM -0300, Arnaldo Carvalho de Melo wrote: > Em Thu, Jan 07, 2016 at 05:39:57PM -0300, Arnaldo Carvalho de Melo escreveu: > > Em Thu, Jan 07, 2016 at 12:28:15PM +0530, Naveen N. Rao escreveu: > > > Can you please push at least the initial 3 patches of this for v4.4? > > > Wang Nan has posted v6 here: > > > http://thread.gmane.org/gmane.linux.kernel/2110626 > > > So I tried it again today, from the v6, the latest patch with that > > subject line in my inbox, and I get this, after applying the first three > > patches: > > > [acme@zoo linux]$ make -C tools clean > /dev/null > > [acme@zoo linux]$ make -C tools/perf build-test > > make: Entering directory '/home/git/linux/tools/perf' > > Testing Makefile > > tests/make:15: /scripts/Makefile.arch: No such file or directory > > make[2]: *** No rule to make target '/scripts/Makefile.arch'. Stop. > > tests/make:5: recipe for target 'all' failed > > make[1]: *** [all] Error 2 > > Makefile:81: recipe for target 'build-test' failed > > make: *** [build-test] Error 2 > > make: Leaving directory '/home/git/linux/tools/perf' > > [acme@zoo linux]$ > > > Trying to figure this out... > > So, this doesn't seem to have been tessted, this part, specifically: > > diff --git a/tools/perf/tests/make b/tools/perf/tests/make > index 8ea3dffc5065..cd9c3ce1a5c2 100644 > --- a/tools/perf/tests/make > +++ b/tools/perf/tests/make > @@ -12,7 +12,7 @@ endif > else > PERF := . > > -include config/Makefile.arch > +include $(srctree)/scripts/Makefile.arch > > # FIXME looks like x86 is the only arch running tests ;-) > # we need some IS_(32/64) flag to make this generic > > > ---------------------------------------------------- > > Because $(srctree) is not set at that point, I copied the needed bits from > tools/perf/Makefile.perf and got the patch below, which makes:L > > make -C tools/perf build-test > > Work for me again. > > This should wrap up the day nicely, making me think of Jens Axboe recent > cool reaction to an untested patch: > > http://lkml.kernel.org/r/5661C2BC.9030007@kernel.dk > > :-) > > Jiri, are you ok with the patch below, on top of the second patch in > Wang's series, that you acked? yep, looks good to me thanks, jirka ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 2016-01-07 20:39 ` Arnaldo Carvalho de Melo 2016-01-07 21:23 ` Arnaldo Carvalho de Melo @ 2016-01-08 5:39 ` Naveen N. Rao 2016-01-08 12:51 ` Arnaldo Carvalho de Melo 1 sibling, 1 reply; 30+ messages in thread From: Naveen N. Rao @ 2016-01-08 5:39 UTC (permalink / raw) To: Arnaldo Carvalho de Melo Cc: Wangnan (F), linuxppc-dev, jolsa, linux-kernel, sukadev On 2016/01/07 05:39PM, Arnaldo Carvalho de Melo wrote: > Em Thu, Jan 07, 2016 at 12:28:15PM +0530, Naveen N. Rao escreveu: > > On 2015/12/17 09:19AM, Arnaldo Carvalho de Melo wrote: > > > Em Thu, Dec 17, 2015 at 10:37:14AM +0530, Naveen N. Rao escreveu: > > > > On 2015/12/17 09:29AM, Wang Nan wrote: > > > > > The whole thread is: > > > > > > > > > > [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf: > > > > > http://lkml.kernel.org/g/1450150557-127942-1-git-send-email-wangnan0@huawei.com > > > > > > > > > > [PATCH v3 1/3] perf tools: Fix PowerPC native building > > > > > http://lkml.kernel.org/g/1450150557-127942-2-git-send-email-wangnan0@huawei.com > > > > > > > > > > [PATCH v3 2/3] tools: Move Makefile.arch from perf/config to tools/scripts > > > > > http://lkml.kernel.org/g/1450150557-127942-3-git-send-email-wangnan0@huawei.com > > > > > > > > > > [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf > > > > > http://lkml.kernel.org/g/1450150557-127942-4-git-send-email-wangnan0@huawei.com > > > > > > > > > > and [PATCH v3 3/3] breaks local building because the usage of "srctree", and > > > ^^ > > > > You mean v4 here. > > > > > > > Anyway, now that you've sent v4, it should be much clearer. > > > > > > Right, I should've read it more thoroughly, but anyway, I'll process it > > > today. > > > > Bump. > > > > Arnaldo, > > Can you please push at least the initial 3 patches of this for v4.4? > > Wang Nan has posted v6 here: > > http://thread.gmane.org/gmane.linux.kernel/2110626 > > So I tried it again today, from the v6, the latest patch with that > subject line in my inbox, and I get this, after applying the first three > patches: > > [acme@zoo linux]$ make -C tools clean > /dev/null > [acme@zoo linux]$ make -C tools/perf build-test Thanks, and sorry for the slip-up there - I should've caught that. > make: Entering directory '/home/git/linux/tools/perf' > Testing Makefile > tests/make:15: /scripts/Makefile.arch: No such file or directory > make[2]: *** No rule to make target '/scripts/Makefile.arch'. Stop. > tests/make:5: recipe for target 'all' failed > make[1]: *** [all] Error 2 > Makefile:81: recipe for target 'build-test' failed > make: *** [build-test] Error 2 > make: Leaving directory '/home/git/linux/tools/perf' > [acme@zoo linux]$ > > [acme@zoo linux]$ git log --oneline | head -10 FWIW, git log --oneline -10 works too :-) Regards, Naveen ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 2016-01-08 5:39 ` Naveen N. Rao @ 2016-01-08 12:51 ` Arnaldo Carvalho de Melo 2016-01-08 13:31 ` Wangnan (F) 0 siblings, 1 reply; 30+ messages in thread From: Arnaldo Carvalho de Melo @ 2016-01-08 12:51 UTC (permalink / raw) To: Naveen N. Rao; +Cc: Wangnan (F), linuxppc-dev, jolsa, linux-kernel, sukadev Em Fri, Jan 08, 2016 at 11:09:35AM +0530, Naveen N. Rao escreveu: > On 2016/01/07 05:39PM, Arnaldo Carvalho de Melo wrote: > > Em Thu, Jan 07, 2016 at 12:28:15PM +0530, Naveen N. Rao escreveu: > > > On 2015/12/17 09:19AM, Arnaldo Carvalho de Melo wrote: > > > > Em Thu, Dec 17, 2015 at 10:37:14AM +0530, Naveen N. Rao escreveu: > > > > > On 2015/12/17 09:29AM, Wang Nan wrote: > > > > > > The whole thread is: > > > > > > > > > > > > [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf: > > > > > > http://lkml.kernel.org/g/1450150557-127942-1-git-send-email-wangnan0@huawei.com > > > > > > > > > > > > [PATCH v3 1/3] perf tools: Fix PowerPC native building > > > > > > http://lkml.kernel.org/g/1450150557-127942-2-git-send-email-wangnan0@huawei.com > > > > > > > > > > > > [PATCH v3 2/3] tools: Move Makefile.arch from perf/config to tools/scripts > > > > > > http://lkml.kernel.org/g/1450150557-127942-3-git-send-email-wangnan0@huawei.com > > > > > > > > > > > > [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf > > > > > > http://lkml.kernel.org/g/1450150557-127942-4-git-send-email-wangnan0@huawei.com > > > > > > > > > > > > and [PATCH v3 3/3] breaks local building because the usage of "srctree", and > > > > ^^ > > > > > You mean v4 here. > > > > > > > > > Anyway, now that you've sent v4, it should be much clearer. > > > > > > > > Right, I should've read it more thoroughly, but anyway, I'll process it > > > > today. > > > > > > Bump. > > > > > > Arnaldo, > > > Can you please push at least the initial 3 patches of this for v4.4? > > > Wang Nan has posted v6 here: > > > http://thread.gmane.org/gmane.linux.kernel/2110626 > > > > So I tried it again today, from the v6, the latest patch with that > > subject line in my inbox, and I get this, after applying the first three > > patches: > > > > [acme@zoo linux]$ make -C tools clean > /dev/null > > [acme@zoo linux]$ make -C tools/perf build-test > > Thanks, and sorry for the slip-up there - I should've caught that. The important thing is that it gets caught before getting to Ingo, let alone Linus, but if you get it before me, I'd appreciate as well 8-) - Arnaldo > > make: Entering directory '/home/git/linux/tools/perf' > > Testing Makefile > > tests/make:15: /scripts/Makefile.arch: No such file or directory > > make[2]: *** No rule to make target '/scripts/Makefile.arch'. Stop. > > tests/make:5: recipe for target 'all' failed > > make[1]: *** [all] Error 2 > > Makefile:81: recipe for target 'build-test' failed > > make: *** [build-test] Error 2 > > make: Leaving directory '/home/git/linux/tools/perf' > > [acme@zoo linux]$ > > > > [acme@zoo linux]$ git log --oneline | head -10 > > FWIW, git log --oneline -10 works too :-) Thanks! perf also has this syndrom of wanting to do a lot of things 8-) ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 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 0 siblings, 1 reply; 30+ messages in thread From: Wangnan (F) @ 2016-01-08 13:31 UTC (permalink / raw) To: Arnaldo Carvalho de Melo, Naveen N. Rao Cc: linuxppc-dev, jolsa, linux-kernel, sukadev, Fengguang Wu On 2016/1/8 20:51, Arnaldo Carvalho de Melo wrote: > Em Fri, Jan 08, 2016 at 11:09:35AM +0530, Naveen N. Rao escreveu: >> On 2016/01/07 05:39PM, Arnaldo Carvalho de Melo wrote: >>> Em Thu, Jan 07, 2016 at 12:28:15PM +0530, Naveen N. Rao escreveu: >>>> On 2015/12/17 09:19AM, Arnaldo Carvalho de Melo wrote: >>>>> Em Thu, Dec 17, 2015 at 10:37:14AM +0530, Naveen N. Rao escreveu: >>>>>> On 2015/12/17 09:29AM, Wang Nan wrote: >>>>>>> The whole thread is: >>>>>>> >>>>>>> [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf: >>>>>>> http://lkml.kernel.org/g/1450150557-127942-1-git-send-email-wangnan0@huawei.com >>>>>>> >>>>>>> [PATCH v3 1/3] perf tools: Fix PowerPC native building >>>>>>> http://lkml.kernel.org/g/1450150557-127942-2-git-send-email-wangnan0@huawei.com >>>>>>> >>>>>>> [PATCH v3 2/3] tools: Move Makefile.arch from perf/config to tools/scripts >>>>>>> http://lkml.kernel.org/g/1450150557-127942-3-git-send-email-wangnan0@huawei.com >>>>>>> >>>>>>> [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf >>>>>>> http://lkml.kernel.org/g/1450150557-127942-4-git-send-email-wangnan0@huawei.com >>>>>>> >>>>>>> and [PATCH v3 3/3] breaks local building because the usage of "srctree", and >>>>> ^^ >>>>>> You mean v4 here. >>>>>> Anyway, now that you've sent v4, it should be much clearer. >>>>> Right, I should've read it more thoroughly, but anyway, I'll process it >>>>> today. >>>> Bump. >>>> >>>> Arnaldo, >>>> Can you please push at least the initial 3 patches of this for v4.4? >>>> Wang Nan has posted v6 here: >>>> http://thread.gmane.org/gmane.linux.kernel/2110626 >>> So I tried it again today, from the v6, the latest patch with that >>> subject line in my inbox, and I get this, after applying the first three >>> patches: >>> >>> [acme@zoo linux]$ make -C tools clean > /dev/null >>> [acme@zoo linux]$ make -C tools/perf build-test >> Thanks, and sorry for the slip-up there - I should've caught that. > The important thing is that it gets caught before getting to Ingo, let > alone Linus, but if you get it before me, I'd appreciate as well 8-) > > - Arnaldo Is it possible to ask Fengguang Wu to help us adding perf building test in his kbuild testing system? Add Fengguang Wu into cc list. Thank you. ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 2016-01-08 13:31 ` Wangnan (F) @ 2016-01-08 13:46 ` Arnaldo Carvalho de Melo 2016-01-09 2:03 ` Fengguang Wu 0 siblings, 1 reply; 30+ messages in thread From: Arnaldo Carvalho de Melo @ 2016-01-08 13:46 UTC (permalink / raw) To: Wangnan (F), Fengguang Wu Cc: Naveen N. Rao, linuxppc-dev, Jiri Olsa, linux-kernel, sukadev Em Fri, Jan 08, 2016 at 09:31:46PM +0800, Wangnan (F) escreveu: > On 2016/1/8 20:51, Arnaldo Carvalho de Melo wrote: > >Em Fri, Jan 08, 2016 at 11:09:35AM +0530, Naveen N. Rao escreveu: > >>On 2016/01/07 05:39PM, Arnaldo Carvalho de Melo wrote: > >>>Em Thu, Jan 07, 2016 at 12:28:15PM +0530, Naveen N. Rao escreveu: > >>>>On 2015/12/17 09:19AM, Arnaldo Carvalho de Melo wrote: > >>>>>Em Thu, Dec 17, 2015 at 10:37:14AM +0530, Naveen N. Rao escreveu: > >>>>Arnaldo, > >>>>Can you please push at least the initial 3 patches of this for v4.4? > >>>>Wang Nan has posted v6 here: > >>>>http://thread.gmane.org/gmane.linux.kernel/2110626 > >>>So I tried it again today, from the v6, the latest patch with that > >>>subject line in my inbox, and I get this, after applying the first three > >>>patches: > >>>$ make -C tools clean > /dev/null > >>>$ make -C tools/perf build-test > >>Thanks, and sorry for the slip-up there - I should've caught that. > >The important thing is that it gets caught before getting to Ingo, let > >alone Linus, but if you get it before me, I'd appreciate as well 8-) > Is it possible to ask Fengguang Wu to help us adding perf building test > in his kbuild testing system? I was thinking about this yesterday, when, IIRC, a change made by Kan Liang (IIRC) to a kernel/events/ file, in the kernel proper, triggered a warning about some casts and I got a warning, since I was in the commig log CC list. Since perf is in the kernel sources, and since we have the 'make -C tools/perf build-test' harness, that would be really great to have it hooked into the 0day bot... > Add Fengguang Wu into cc list. > > Thank you. Thanks! - Arnaldo ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v4] perf: bpf: Fix build breakage due to libbpf 2016-01-08 13:46 ` Arnaldo Carvalho de Melo @ 2016-01-09 2:03 ` Fengguang Wu 0 siblings, 0 replies; 30+ messages in thread From: Fengguang Wu @ 2016-01-09 2:03 UTC (permalink / raw) To: Arnaldo Carvalho de Melo Cc: Wangnan (F), Naveen N. Rao, linuxppc-dev, Jiri Olsa, linux-kernel, sukadev, Philip Li Hi Arnaldo, On Fri, Jan 08, 2016 at 10:46:08AM -0300, Arnaldo Carvalho de Melo wrote: > Em Fri, Jan 08, 2016 at 09:31:46PM +0800, Wangnan (F) escreveu: > > On 2016/1/8 20:51, Arnaldo Carvalho de Melo wrote: > > >Em Fri, Jan 08, 2016 at 11:09:35AM +0530, Naveen N. Rao escreveu: > > >>On 2016/01/07 05:39PM, Arnaldo Carvalho de Melo wrote: > > >>>Em Thu, Jan 07, 2016 at 12:28:15PM +0530, Naveen N. Rao escreveu: > > >>>>On 2015/12/17 09:19AM, Arnaldo Carvalho de Melo wrote: > > >>>>>Em Thu, Dec 17, 2015 at 10:37:14AM +0530, Naveen N. Rao escreveu: > > >>>>Arnaldo, > > >>>>Can you please push at least the initial 3 patches of this for v4.4? > > >>>>Wang Nan has posted v6 here: > > >>>>http://thread.gmane.org/gmane.linux.kernel/2110626 > > >>>So I tried it again today, from the v6, the latest patch with that > > >>>subject line in my inbox, and I get this, after applying the first three > > >>>patches: > > > >>>$ make -C tools clean > /dev/null > > >>>$ make -C tools/perf build-test > > >>Thanks, and sorry for the slip-up there - I should've caught that. > > >The important thing is that it gets caught before getting to Ingo, let > > >alone Linus, but if you get it before me, I'd appreciate as well 8-) > > > Is it possible to ask Fengguang Wu to help us adding perf building test > > in his kbuild testing system? > > I was thinking about this yesterday, when, IIRC, a change made by Kan > Liang (IIRC) to a kernel/events/ file, in the kernel proper, triggered a > warning about some casts and I got a warning, since I was in the commig > log CC list. > > Since perf is in the kernel sources, and since we have the 'make -C > tools/perf build-test' harness, that would be really great to have it > hooked into the 0day bot... Yes it should be handy to do so. CC Philip, he's now maintaining the 0day system. Thanks, Fengguang ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf 2015-12-15 3:35 ` [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf Wang Nan ` (2 preceding siblings ...) 2015-12-15 3:35 ` [PATCH v3 3/3] perf: bpf: Fix build breakage due to libbpf Wang Nan @ 2015-12-15 8:05 ` Jiri Olsa 2015-12-15 11:29 ` Naveen N. Rao 4 siblings, 0 replies; 30+ messages in thread From: Jiri Olsa @ 2015-12-15 8:05 UTC (permalink / raw) To: Wang Nan Cc: naveen.n.rao, acme, linux-kernel, linuxppc-dev, Sukadev Bhattiprolu On Tue, Dec 15, 2015 at 03:35:54AM +0000, Wang Nan wrote: > Hi Naveen, > > Now I know your problem is in native building and the reason is > missing proper $(ARCH). I think other than that there's another problem > in libbpf's building: if your problem is unable to compile libbpf, > feature checker should find it and set NO_LIBBPF=1 for perf, so perf > building won't be blocked, only BPF related features should be turned > off. Also, I think including Makefile.arch from tools/scripts would be > better, because libbpf is at the same level with perf. So I separate > them into 3 patches. Please help me test it on PowerPC. > > Cc: Arnaldo Carvalho de Melo <acme@kernel.org> > Cc: Jiri Olsa <jolsa@redhat.com> > Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> > Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> > > Naveen N. Rao (1): > perf: bpf: Fix build breakage due to libbpf > > Wang Nan (2): > perf tools: Fix PowerPC native building > tools: Move Makefile.arch from perf/config to tools/scripts for the patchset: Acked-by: Jiri Olsa <jolsa@kernel.org> thanks, jirka ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf 2015-12-15 3:35 ` [PATCH v3 0/3] perf build: PowerPC: Fix build breakage due to libbpf Wang Nan ` (3 preceding siblings ...) 2015-12-15 8:05 ` [PATCH v3 0/3] perf build: PowerPC: " Jiri Olsa @ 2015-12-15 11:29 ` Naveen N. Rao 4 siblings, 0 replies; 30+ messages in thread From: Naveen N. Rao @ 2015-12-15 11:29 UTC (permalink / raw) To: Wang Nan; +Cc: acme, jolsa, linux-kernel, linuxppc-dev, Sukadev Bhattiprolu On 2015/12/15 03:35AM, Wang Nan wrote: > Hi Naveen, > > Now I know your problem is in native building and the reason is > missing proper $(ARCH). I think other than that there's another problem > in libbpf's building: if your problem is unable to compile libbpf, > feature checker should find it and set NO_LIBBPF=1 for perf, so perf > building won't be blocked, only BPF related features should be turned > off. Also, I think including Makefile.arch from tools/scripts would be > better, because libbpf is at the same level with perf. So I separate > them into 3 patches. Please help me test it on PowerPC. Hi Wang, Thanks for putting this together. Entire series: Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> > > Cc: Arnaldo Carvalho de Melo <acme@kernel.org> > Cc: Jiri Olsa <jolsa@redhat.com> > Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> > Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> > > Naveen N. Rao (1): > perf: bpf: Fix build breakage due to libbpf > > Wang Nan (2): > perf tools: Fix PowerPC native building > tools: Move Makefile.arch from perf/config to tools/scripts > > tools/build/feature/test-bpf.c | 20 +++++++++++++++++++- > tools/lib/bpf/Makefile | 3 ++- > tools/lib/bpf/bpf.c | 4 ++-- > tools/perf/config/Makefile | 2 +- > tools/perf/tests/make | 2 +- > tools/{perf/config => scripts}/Makefile.arch | 0 > 6 files changed, 25 insertions(+), 6 deletions(-) > rename tools/{perf/config => scripts}/Makefile.arch (100%) > > -- > 1.8.3.4 > ^ permalink raw reply [flat|nested] 30+ messages in thread
end of thread, other threads:[~2016-01-09 2:04 UTC | newest] Thread overview: 30+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2015-12-14 10:50 [PATCH] perf: bpf: Fix build breakage due to libbpf Naveen N. Rao 2015-12-14 11:35 ` [PATCH] tools lib bpf: Support libbpf on PowerPC Wang Nan 2015-12-14 11:53 ` [PATCH] perf: bpf: Fix build breakage due to libbpf 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
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.