libbpf: Fix build on read-only filesystems
Subsystems (6)
PATCH 1/1 libbpf: Fix build on read-only filesystems
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf
$ make O=$HOME/build/perf
...
CC /home/namhyung/build/perf/lib.o
/bin/sh: bpf_helper_defs.h: Read-only file system
make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1
make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2
make[2]: *** Waiting for unfinished jobs....
LD /home/namhyung/build/perf/libperf-in.o
AR /home/namhyung/build/perf/libperf.a
PERF_VERSION = 5.4.0
make[1]: *** [Makefile.perf:225: sub-make] Error 2
make: *** [Makefile:70: all] Error 2It was becaused bpf_helper_defs.h was generated in current directory. Move it to OUTPUT directory.
--- tools/lib/bpf/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
tools/lib/bpf/Makefile +7 -7
@@ -159,7 +159,7 @@ all: fixdep all_cmd: $(CMD_TARGETS) check -$(BPF_IN_SHARED): force elfdep bpfdep bpf_helper_defs.h +$(BPF_IN_SHARED): force elfdep bpfdep $(OUTPUT)bpf_helper_defs.h @(test -f ../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \ (diff -B ../../include/uapi/linux/bpf.h ../../../include/uapi/linux/bpf.h >/dev/null) || \ echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h'" >&2 )) || true
@@ -177,12 +177,12 @@ $(BPF_IN_SHARED): force elfdep bpfdep bpf_helper_defs.h echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/if_xdp.h' differs from latest version at 'include/uapi/linux/if_xdp.h'" >&2 )) || true $(Q)$(MAKE) $(build)=libbpf OUTPUT=$(SHARED_OBJDIR) CFLAGS="$(CFLAGS) $(SHLIB_FLAGS)" -$(BPF_IN_STATIC): force elfdep bpfdep bpf_helper_defs.h +$(BPF_IN_STATIC): force elfdep bpfdep $(OUTPUT)bpf_helper_defs.h $(Q)$(MAKE) $(build)=libbpf OUTPUT=$(STATIC_OBJDIR) -bpf_helper_defs.h: $(srctree)/include/uapi/linux/bpf.h +$(OUTPUT)bpf_helper_defs.h: $(srctree)/include/uapi/linux/bpf.h $(Q)$(srctree)/scripts/bpf_helpers_doc.py --header \ - --file $(srctree)/include/uapi/linux/bpf.h > bpf_helper_defs.h + --file $(srctree)/include/uapi/linux/bpf.h > $(OUTPUT)bpf_helper_defs.h $(OUTPUT)libbpf.so: $(OUTPUT)libbpf.so.$(LIBBPF_VERSION)
@@ -246,7 +246,7 @@ install_lib: all_cmd $(call do_install_mkdir,$(libdir_SQ)); \ cp -fpR $(LIB_FILE) $(DESTDIR)$(libdir_SQ) -install_headers: bpf_helper_defs.h +install_headers: $(OUTPUT)bpf_helper_defs.h $(call QUIET_INSTALL, headers) \ $(call do_install,bpf.h,$(prefix)/include/bpf,644); \ $(call do_install,libbpf.h,$(prefix)/include/bpf,644); \
@@ -254,7 +254,7 @@ install_headers: bpf_helper_defs.h $(call do_install,libbpf_util.h,$(prefix)/include/bpf,644); \ $(call do_install,xsk.h,$(prefix)/include/bpf,644); \ $(call do_install,bpf_helpers.h,$(prefix)/include/bpf,644); \ - $(call do_install,bpf_helper_defs.h,$(prefix)/include/bpf,644); \ + $(call do_install,$(OUTPUT)bpf_helper_defs.h,$(prefix)/include/bpf,644); \ $(call do_install,bpf_tracing.h,$(prefix)/include/bpf,644); \ $(call do_install,bpf_endian.h,$(prefix)/include/bpf,644); \ $(call do_install,bpf_core_read.h,$(prefix)/include/bpf,644);
@@ -274,7 +274,7 @@ install: install_lib install_pkgconfig clean: $(call QUIET_CLEAN, libbpf) $(RM) -rf $(CMD_TARGETS) \ *.o *~ *.a *.so *.so.$(LIBBPF_MAJOR_VERSION) .*.d .*.cmd \ - *.pc LIBBPF-CFLAGS bpf_helper_defs.h \ + *.pc LIBBPF-CFLAGS $(OUTPUT)bpf_helper_defs.h \ $(SHARED_OBJDIR) $(STATIC_OBJDIR) $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf
Signature · 1 line
2.24.1.735.g03f4e72817-goog
Quoted 18 lines · Namhyung Kim
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf $ make O=$HOME/build/perf ... CC /home/namhyung/build/perf/lib.o /bin/sh: bpf_helper_defs.h: Read-only file system make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1 make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2 make[2]: *** Waiting for unfinished jobs.... LD /home/namhyung/build/perf/libperf-in.o AR /home/namhyung/build/perf/libperf.a PERF_VERSION = 5.4.0 make[1]: *** [Makefile.perf:225: sub-make] Error 2 make: *** [Makefile:70: all] Error 2
Quoted 5 lines
It was becaused
bpf_helper_defs.hwas generated in current directory. Move it to OUTPUT directory.Signed-off-by Namhyung Kim <[email protected]>---
Overall nothing is obviously broken, except you need to fix up selftests/bpf's Makefile as well.
BTW, this patch doesn't apply cleanly to latest bpf-next, so please rebase.
Also subject prefix should look like [PATCH bpf-next] if it's meant to be applied against bpf-next.
Quoted 3 lines
tools/lib/bpf/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
[...]
Em Fri, Dec 20, 2019 at 12:29:36PM -0800, Andrii Nakryiko escreveu:
Quoted 24 lines · Namhyung Kim
Quoted 17 lines
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf $ make O=$HOME/build/perf ... CC /home/namhyung/build/perf/lib.o /bin/sh: bpf_helper_defs.h: Read-only file system make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1 make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2 make[2]: *** Waiting for unfinished jobs.... LD /home/namhyung/build/perf/libperf-in.o AR /home/namhyung/build/perf/libperf.a PERF_VERSION = 5.4.0 make[1]: *** [Makefile.perf:225: sub-make] Error 2 make: *** [Makefile:70: all] Error 2Quoted 5 lines
It was becaused
bpf_helper_defs.hwas generated in current directory. Move it to OUTPUT directory.Signed-off-by Namhyung Kim <[email protected]>---
Quoted 7 lines
Overall nothing is obviously broken, except you need to fix up selftests/bpf's
Makefileas well.BTW, this patch doesn't apply cleanly to latest bpf-next, so please rebase.
Also subject prefix should look like [PATCH bpf-next] if it's meant to be applied against bpf-next.
Shouldn't this be applied to the current merge window since a behaviour that people relied, i.e. using O= to generate the build in a separate directory, since its not possible to use the source dir tree as it is read-only is now broken, i.e. isn't this a regression?
- Arnaldo
Quoted 5 lines
Quoted 3 lines
tools/lib/bpf/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)[...]
Signature · 1 line
- Arnaldo
Quoted 31 lines · Arnaldo Carvalho de Melo
Em Fri, Dec 20, 2019 at 12:29:36PM -0800, Andrii Nakryiko escreveu:
Quoted 29 lines · Namhyung Kim
Quoted 17 lines
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf $ make O=$HOME/build/perf ... CC /home/namhyung/build/perf/lib.o /bin/sh: bpf_helper_defs.h: Read-only file system make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1 make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2 make[2]: *** Waiting for unfinished jobs.... LD /home/namhyung/build/perf/libperf-in.o AR /home/namhyung/build/perf/libperf.a PERF_VERSION = 5.4.0 make[1]: *** [Makefile.perf:225: sub-make] Error 2 make: *** [Makefile:70: all] Error 2Quoted 5 lines
It was becaused
bpf_helper_defs.hwas generated in current directory. Move it to OUTPUT directory.Signed-off-by Namhyung Kim <[email protected]>---
Overall nothing is obviously broken, except you need to fix up selftests/bpf's
Makefileas well.BTW, this patch doesn't apply cleanly to latest bpf-next, so please rebase.
Quoted 7 lines
Quoted 2 lines
Also subject prefix should look like [PATCH bpf-next] if it's meant to be applied against bpf-next.
Shouldn't this be applied to the current merge window since a behaviour that people relied, i.e. using O= to generate the build in a separate directory, since its not possible to use the source dir tree as it is read-only is now broken, i.e. isn't this a regression?
Sure, it can be applied against bpf as well, but selftests still need to be fixed first.
Quoted 12 lines
- Arnaldo
Quoted 5 lines
Quoted 3 lines
tools/lib/bpf/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)[...]
--
- Arnaldo
Em Fri, Dec 20, 2019 at 01:45:52PM -0800, Andrii Nakryiko escreveu:
Quoted 34 lines · Arnaldo Carvalho de Melo
Quoted 32 lines
Em Fri, Dec 20, 2019 at 12:29:36PM -0800, Andrii Nakryiko escreveu:
Quoted 31 lines · Namhyung Kim
Quoted 17 lines
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf $ make O=$HOME/build/perf ... CC /home/namhyung/build/perf/lib.o /bin/sh: bpf_helper_defs.h: Read-only file system make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1 make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2 make[2]: *** Waiting for unfinished jobs.... LD /home/namhyung/build/perf/libperf-in.o AR /home/namhyung/build/perf/libperf.a PERF_VERSION = 5.4.0 make[1]: *** [Makefile.perf:225: sub-make] Error 2 make: *** [Makefile:70: all] Error 2Quoted 5 lines
It was becaused
bpf_helper_defs.hwas generated in current directory. Move it to OUTPUT directory.Signed-off-by Namhyung Kim <[email protected]>---
Overall nothing is obviously broken, except you need to fix up selftests/bpf's
Makefileas well.BTW, this patch doesn't apply cleanly to latest bpf-next, so please rebase.
Also subject prefix should look like [PATCH bpf-next] if it's meant to be applied against bpf-next.
Quoted 7 lines
Quoted 4 lines
Shouldn't this be applied to the current merge window since a behaviour that people relied, i.e. using O= to generate the build in a separate directory, since its not possible to use the source dir tree as it is read-only is now broken, i.e. isn't this a regression?
Sure, it can be applied against bpf as well, but selftests still need to be fixed first.
I guess this can be done on a separate patch? I.e. if the user doesn't use selftests the only regression it will see is when trying to build tools/perf using O=.
I think two patches is best, better granularity, do you see a strict need for both to be in the same patch?
- Arnaldo
Quoted 44 lines · Arnaldo Carvalho de Melo
Em Fri, Dec 20, 2019 at 01:45:52PM -0800, Andrii Nakryiko escreveu:
Quoted 34 lines · Arnaldo Carvalho de Melo
Quoted 32 lines
Em Fri, Dec 20, 2019 at 12:29:36PM -0800, Andrii Nakryiko escreveu:
Quoted 31 lines · Namhyung Kim
Quoted 17 lines
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf $ make O=$HOME/build/perf ... CC /home/namhyung/build/perf/lib.o /bin/sh: bpf_helper_defs.h: Read-only file system make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1 make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2 make[2]: *** Waiting for unfinished jobs.... LD /home/namhyung/build/perf/libperf-in.o AR /home/namhyung/build/perf/libperf.a PERF_VERSION = 5.4.0 make[1]: *** [Makefile.perf:225: sub-make] Error 2 make: *** [Makefile:70: all] Error 2Quoted 5 lines
It was becaused
bpf_helper_defs.hwas generated in current directory. Move it to OUTPUT directory.Signed-off-by Namhyung Kim <[email protected]>---
Overall nothing is obviously broken, except you need to fix up selftests/bpf's
Makefileas well.BTW, this patch doesn't apply cleanly to latest bpf-next, so please rebase.
Also subject prefix should look like [PATCH bpf-next] if it's meant to be applied against bpf-next.
Quoted 7 lines
Quoted 4 lines
Shouldn't this be applied to the current merge window since a behaviour that people relied, i.e. using O= to generate the build in a separate directory, since its not possible to use the source dir tree as it is read-only is now broken, i.e. isn't this a regression?
Sure, it can be applied against bpf as well, but selftests still need to be fixed first.
Quoted 6 lines
I guess this can be done on a separate patch? I.e. if the user doesn't use selftests the only regression it will see is when trying to build
tools/perfusing O=.I think two patches is best, better granularity, do you see a strict need for both to be in the same patch?
Sure, it can be two separate patches, but they should go in together, otherwise selftests will be broken.
Quoted 2 lines
- Arnaldo
Em Fri, Dec 20, 2019 at 02:00:48PM -0800, Andrii Nakryiko escreveu:
Quoted 15 lines · Arnaldo Carvalho de Melo
Quoted 13 lines
Em Fri, Dec 20, 2019 at 01:45:52PM -0800, Andrii Nakryiko escreveu:
Quoted 8 lines · Arnaldo Carvalho de Melo
Quoted 4 lines
Shouldn't this be applied to the current merge window since a behaviour that people relied, i.e. using O= to generate the build in a separate directory, since its not possible to use the source dir tree as it is read-only is now broken, i.e. isn't this a regression?
Sure, it can be applied against bpf as well, but selftests still need to be fixed first.
I guess this can be done on a separate patch? I.e. if the user doesn't use selftests the only regression it will see is when trying to build
tools/perfusing O=.
Quoted 5 lines
Quoted 2 lines
I think two patches is best, better granularity, do you see a strict need for both to be in the same patch?
Sure, it can be two separate patches, but they should go in together, otherwise selftests will be broken.
Sure, both have to be fixed :-)
- Arnaldo
Hello,
Quoted 20 lines · Andrii Nakryiko
Quoted 18 lines · Namhyung Kim
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf $ make O=$HOME/build/perf ... CC /home/namhyung/build/perf/lib.o /bin/sh: bpf_helper_defs.h: Read-only file system make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1 make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2 make[2]: *** Waiting for unfinished jobs.... LD /home/namhyung/build/perf/libperf-in.o AR /home/namhyung/build/perf/libperf.a PERF_VERSION = 5.4.0 make[1]: *** [Makefile.perf:225: sub-make] Error 2 make: *** [Makefile:70: all] Error 2
Quoted 8 lines
Quoted 5 lines
It was becaused
bpf_helper_defs.hwas generated in current directory. Move it to OUTPUT directory.Signed-off-by Namhyung Kim <[email protected]>---
Overall nothing is obviously broken, except you need to fix up selftests/bpf's
Makefileas well.
Thanks for pointing this out. It's because bpf selftest also needs the bpf_helper_defs.h right? But I'm currently having a problem with LLVM when building the selftests. Can you help me testing the patch below? (It should be applied after this patch. Are you ok with it?)
Quoted 5 lines
BTW, this patch doesn't apply cleanly to latest bpf-next, so please rebase.
Also subject prefix should look like [PATCH bpf-next] if it's meant to be applied against bpf-next.
Will do.
Thanks
Namhyung
-----------8<-------------
(quoted diff) +0 -0
b/tools/testing/selftests/bpf/Makefile
index 866fc1cadd7c..897877f7849b 100644
tools/testing/selftests/bpf/Makefile +3 -3
@@ -151,9 +151,9 @@ $(DEFAULT_BPFTOOL): force $(BPFOBJ): force $(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ -BPF_HELPERS := $(BPFDIR)/bpf_helper_defs.h $(wildcard $(BPFDIR)/bpf_*.h) -$(BPFDIR)/bpf_helper_defs.h: - $(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ bpf_helper_defs.h +BPF_HELPERS := $(OUTPUT)/bpf_helper_defs.h $(wildcard $(BPFDIR)/bpf_*.h) +$(OUTPUT)/bpf_helper_defs.h: + $(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ $(OUTPUT)/bpf_helper_defs.h # Get Clang's default includes on this system, as opposed to those seen by # '-target bpf'. This fixes "missing" files on some architectures/distros,
Quoted 57 lines · Namhyung Kim
Hello,
Quoted 20 lines · Andrii Nakryiko
Quoted 18 lines · Namhyung Kim
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf $ make O=$HOME/build/perf ... CC /home/namhyung/build/perf/lib.o /bin/sh: bpf_helper_defs.h: Read-only file system make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1 make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2 make[2]: *** Waiting for unfinished jobs.... LD /home/namhyung/build/perf/libperf-in.o AR /home/namhyung/build/perf/libperf.a PERF_VERSION = 5.4.0 make[1]: *** [Makefile.perf:225: sub-make] Error 2 make: *** [Makefile:70: all] Error 2Quoted 8 lines
Quoted 5 lines
It was becaused
bpf_helper_defs.hwas generated in current directory. Move it to OUTPUT directory.Signed-off-by Namhyung Kim <[email protected]>---
Overall nothing is obviously broken, except you need to fix up selftests/bpf's
Makefileas well.Thanks for pointing this out. It's because bpf selftest also needs the
bpf_helper_defs.hright? But I'm currently having a problem with LLVM when building the selftests. Can you help me testing the patch below? (It should be applied after this patch. Are you ok with it?)Quoted 5 lines
BTW, this patch doesn't apply cleanly to latest bpf-next, so please rebase.
Also subject prefix should look like [PATCH bpf-next] if it's meant to be applied against bpf-next.
Will do.
Thanks
Namhyung-----------8<-------------
tools/testing/selftests/bpf/Makefile +0
-0
tools/testing/selftests/bpf/Makefile $(DEFAULT_BPFTOOL): force · line 156
Quoted 9 lines
tools/testing/selftests/bpf/Makefile +3
-3@@ -151,9 +151,9 @@ $(DEFAULT_BPFTOOL): force $(BPFOBJ): force $(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ -BPF_HELPERS := $(BPFDIR)/bpf_helper_defs.h $(wildcard $(BPFDIR)/bpf_*.h) -$(BPFDIR)/bpf_helper_defs.h: - $(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ bpf_helper_defs.h +BPF_HELPERS := $(OUTPUT)/bpf_helper_defs.h $(wildcard $(BPFDIR)/bpf_*.h) +$(OUTPUT)/bpf_helper_defs.h: + $(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ $(OUTPUT)/bpf_helper_defs.h
The fix makes sense, but you cannot break it down into two patches. The selftests/bpf are absolutely essential for everyone working on bpf. For both developers and maintainers. You cannot break them in one patch and then try to fix in another.
Please resubmit as one patch and tag the subject as [PATCH bpf].
PATCH 1/1 libbpf: Fix build on read-only filesystems
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf
$ make O=$HOME/build/perf
...
CC /home/namhyung/build/perf/lib.o
/bin/sh: bpf_helper_defs.h: Read-only file system
make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1
make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2
make[2]: *** Waiting for unfinished jobs....
LD /home/namhyung/build/perf/libperf-in.o
AR /home/namhyung/build/perf/libperf.a
PERF_VERSION = 5.4.0
make[1]: *** [Makefile.perf:225: sub-make] Error 2
make: *** [Makefile:70: all] Error 2It was becaused bpf_helper_defs.h was generated in current directory. Move it to OUTPUT directory.
--- tools/lib/bpf/Makefile | 15 ++++++++------- tools/testing/selftests/bpf/Makefile | 6 +++--- 2 files changed, 11 insertions(+), 10 deletions(-)
tools/lib/bpf/Makefile +8 -7
@@ -138,6 +138,7 @@ STATIC_OBJDIR := $(OUTPUT)staticobjs/ BPF_IN_SHARED := $(SHARED_OBJDIR)libbpf-in.o BPF_IN_STATIC := $(STATIC_OBJDIR)libbpf-in.o VERSION_SCRIPT := libbpf.map +BPF_HELPER_DEFS := $(OUTPUT)bpf_helper_defs.h LIB_TARGET := $(addprefix $(OUTPUT),$(LIB_TARGET)) LIB_FILE := $(addprefix $(OUTPUT),$(LIB_FILE))
@@ -159,7 +160,7 @@ all: fixdep all_cmd: $(CMD_TARGETS) check -$(BPF_IN_SHARED): force elfdep bpfdep bpf_helper_defs.h +$(BPF_IN_SHARED): force elfdep bpfdep $(BPF_HELPER_DEFS) @(test -f ../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \ (diff -B ../../include/uapi/linux/bpf.h ../../../include/uapi/linux/bpf.h >/dev/null) || \ echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h'" >&2 )) || true
@@ -177,12 +178,12 @@ $(BPF_IN_SHARED): force elfdep bpfdep bpf_helper_defs.h echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/if_xdp.h' differs from latest version at 'include/uapi/linux/if_xdp.h'" >&2 )) || true $(Q)$(MAKE) $(build)=libbpf OUTPUT=$(SHARED_OBJDIR) CFLAGS="$(CFLAGS) $(SHLIB_FLAGS)" -$(BPF_IN_STATIC): force elfdep bpfdep bpf_helper_defs.h +$(BPF_IN_STATIC): force elfdep bpfdep $(BPF_HELPER_DEFS) $(Q)$(MAKE) $(build)=libbpf OUTPUT=$(STATIC_OBJDIR) -bpf_helper_defs.h: $(srctree)/tools/include/uapi/linux/bpf.h +$(BPF_HELPER_DEFS): $(srctree)/tools/include/uapi/linux/bpf.h $(Q)$(srctree)/scripts/bpf_helpers_doc.py --header \ - --file $(srctree)/tools/include/uapi/linux/bpf.h > bpf_helper_defs.h + --file $(srctree)/tools/include/uapi/linux/bpf.h > $(BPF_HELPER_DEFS) $(OUTPUT)libbpf.so: $(OUTPUT)libbpf.so.$(LIBBPF_VERSION)
@@ -243,7 +244,7 @@ install_lib: all_cmd $(call do_install_mkdir,$(libdir_SQ)); \ cp -fpR $(LIB_FILE) $(DESTDIR)$(libdir_SQ) -install_headers: bpf_helper_defs.h +install_headers: $(BPF_HELPER_DEFS) $(call QUIET_INSTALL, headers) \ $(call do_install,bpf.h,$(prefix)/include/bpf,644); \ $(call do_install,libbpf.h,$(prefix)/include/bpf,644); \
@@ -251,7 +252,7 @@ install_headers: bpf_helper_defs.h $(call do_install,libbpf_util.h,$(prefix)/include/bpf,644); \ $(call do_install,xsk.h,$(prefix)/include/bpf,644); \ $(call do_install,bpf_helpers.h,$(prefix)/include/bpf,644); \ - $(call do_install,bpf_helper_defs.h,$(prefix)/include/bpf,644); \ + $(call do_install,$(BPF_HELPER_DEFS),$(prefix)/include/bpf,644); \ $(call do_install,bpf_tracing.h,$(prefix)/include/bpf,644); \ $(call do_install,bpf_endian.h,$(prefix)/include/bpf,644); \ $(call do_install,bpf_core_read.h,$(prefix)/include/bpf,644);
@@ -271,7 +272,7 @@ install: install_lib install_pkgconfig clean: $(call QUIET_CLEAN, libbpf) $(RM) -rf $(CMD_TARGETS) \ *.o *~ *.a *.so *.so.$(LIBBPF_MAJOR_VERSION) .*.d .*.cmd \ - *.pc LIBBPF-CFLAGS bpf_helper_defs.h \ + *.pc LIBBPF-CFLAGS $(BPF_HELPER_DEFS) \ $(SHARED_OBJDIR) $(STATIC_OBJDIR) $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf
tools/testing/selftests/bpf/Makefile +3 -3
@@ -120,9 +120,9 @@ $(OUTPUT)/test_cgroup_attach: cgroup_helpers.c $(BPFOBJ): force $(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ -BPF_HELPERS := $(BPFDIR)/bpf_helper_defs.h $(wildcard $(BPFDIR)/bpf_*.h) -$(BPFDIR)/bpf_helper_defs.h: - $(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ bpf_helper_defs.h +BPF_HELPERS := $(OUTPUT)/bpf_helper_defs.h $(wildcard $(BPFDIR)/bpf_*.h) +$(OUTPUT)/bpf_helper_defs.h: + $(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ $(OUTPUT)/bpf_helper_defs.h # Get Clang's default includes on this system, as opposed to those seen by # '-target bpf'. This fixes "missing" files on some architectures/distros,
Signature · 1 line
2.24.1.735.g03f4e72817-goog
Quoted 18 lines · Namhyung Kim
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf $ make O=$HOME/build/perf ... CC /home/namhyung/build/perf/lib.o /bin/sh: bpf_helper_defs.h: Read-only file system make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1 make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2 make[2]: *** Waiting for unfinished jobs.... LD /home/namhyung/build/perf/libperf-in.o AR /home/namhyung/build/perf/libperf.a PERF_VERSION = 5.4.0 make[1]: *** [Makefile.perf:225: sub-make] Error 2 make: *** [Makefile:70: all] Error 2
Quoted 5 lines
It was becaused
bpf_helper_defs.hwas generated in current directory. Move it to OUTPUT directory.Signed-off-by Namhyung Kim <[email protected]>---
Looks good, thanks!
Quoted 4 lines
tools/lib/bpf/Makefile | 15 ++++++++------- tools/testing/selftests/bpf/Makefile | 6 +++--- 2 files changed, 11 insertions(+), 10 deletions(-)
[...]
Quoted 20 lines · Andrii Nakryiko
Quoted 18 lines · Namhyung Kim
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf $ make O=$HOME/build/perf ... CC /home/namhyung/build/perf/lib.o /bin/sh: bpf_helper_defs.h: Read-only file system make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1 make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2 make[2]: *** Waiting for unfinished jobs.... LD /home/namhyung/build/perf/libperf-in.o AR /home/namhyung/build/perf/libperf.a PERF_VERSION = 5.4.0 make[1]: *** [Makefile.perf:225: sub-make] Error 2 make: *** [Makefile:70: all] Error 2
Quoted 7 lines
Quoted 5 lines
It was becaused
bpf_helper_defs.hwas generated in current directory. Move it to OUTPUT directory.Signed-off-by Namhyung Kim <[email protected]>---
Looks good, thanks!
just one minor thing: bpf_helper_defs.h has to be added to .gitignore under selftests/bpf now
Quoted 10 lines
Tested-by Andrii Nakryiko <[email protected]>Acked-by Andrii Nakryiko <[email protected]>Quoted 4 lines
tools/lib/bpf/Makefile | 15 ++++++++------- tools/testing/selftests/bpf/Makefile | 6 +++--- 2 files changed, 11 insertions(+), 10 deletions(-)[...]
Hello,
Quoted 26 lines · Andrii Nakryiko
Quoted 23 lines · Andrii Nakryiko
Quoted 21 lines · Namhyung Kim
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf $ make O=$HOME/build/perf ... CC /home/namhyung/build/perf/lib.o /bin/sh: bpf_helper_defs.h: Read-only file system make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1 make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2 make[2]: *** Waiting for unfinished jobs.... LD /home/namhyung/build/perf/libperf-in.o AR /home/namhyung/build/perf/libperf.a PERF_VERSION = 5.4.0 make[1]: *** [Makefile.perf:225: sub-make] Error 2 make: *** [Makefile:70: all] Error 2It was becaused
bpf_helper_defs.hwas generated in current directory. Move it to OUTPUT directory.
Quoted 11 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Namhyung Kim <[email protected]>---
Looks good, thanks!
just one minor thing:
bpf_helper_defs.hhas to be added to .gitignore under selftests/bpf nowQuoted 3 lines
Tested-by Andrii Nakryiko <[email protected]>Acked-by Andrii Nakryiko <[email protected]>
Thanks a lot for the review, I'll send v3 soon
Thanks
Namhyung
PATCH v3 1/1 libbpf: Fix build on read-only filesystems
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf
$ make O=$HOME/build/perf
...
CC /home/namhyung/build/perf/lib.o
/bin/sh: bpf_helper_defs.h: Read-only file system
make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1
make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2
make[2]: *** Waiting for unfinished jobs....
LD /home/namhyung/build/perf/libperf-in.o
AR /home/namhyung/build/perf/libperf.a
PERF_VERSION = 5.4.0
make[1]: *** [Makefile.perf:225: sub-make] Error 2
make: *** [Makefile:70: all] Error 2It was becaused bpf_helper_defs.h was generated in current directory. Move it to OUTPUT directory.
--- tools/lib/bpf/Makefile | 15 ++++++++------- tools/testing/selftests/bpf/.gitignore | 1 + tools/testing/selftests/bpf/Makefile | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-)
tools/lib/bpf/Makefile +8 -7
@@ -138,6 +138,7 @@ STATIC_OBJDIR := $(OUTPUT)staticobjs/ BPF_IN_SHARED := $(SHARED_OBJDIR)libbpf-in.o BPF_IN_STATIC := $(STATIC_OBJDIR)libbpf-in.o VERSION_SCRIPT := libbpf.map +BPF_HELPER_DEFS := $(OUTPUT)bpf_helper_defs.h LIB_TARGET := $(addprefix $(OUTPUT),$(LIB_TARGET)) LIB_FILE := $(addprefix $(OUTPUT),$(LIB_FILE))
@@ -159,7 +160,7 @@ all: fixdep all_cmd: $(CMD_TARGETS) check -$(BPF_IN_SHARED): force elfdep bpfdep bpf_helper_defs.h +$(BPF_IN_SHARED): force elfdep bpfdep $(BPF_HELPER_DEFS) @(test -f ../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \ (diff -B ../../include/uapi/linux/bpf.h ../../../include/uapi/linux/bpf.h >/dev/null) || \ echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h'" >&2 )) || true
@@ -177,12 +178,12 @@ $(BPF_IN_SHARED): force elfdep bpfdep bpf_helper_defs.h echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/if_xdp.h' differs from latest version at 'include/uapi/linux/if_xdp.h'" >&2 )) || true $(Q)$(MAKE) $(build)=libbpf OUTPUT=$(SHARED_OBJDIR) CFLAGS="$(CFLAGS) $(SHLIB_FLAGS)" -$(BPF_IN_STATIC): force elfdep bpfdep bpf_helper_defs.h +$(BPF_IN_STATIC): force elfdep bpfdep $(BPF_HELPER_DEFS) $(Q)$(MAKE) $(build)=libbpf OUTPUT=$(STATIC_OBJDIR) -bpf_helper_defs.h: $(srctree)/tools/include/uapi/linux/bpf.h +$(BPF_HELPER_DEFS): $(srctree)/tools/include/uapi/linux/bpf.h $(Q)$(srctree)/scripts/bpf_helpers_doc.py --header \ - --file $(srctree)/tools/include/uapi/linux/bpf.h > bpf_helper_defs.h + --file $(srctree)/tools/include/uapi/linux/bpf.h > $(BPF_HELPER_DEFS) $(OUTPUT)libbpf.so: $(OUTPUT)libbpf.so.$(LIBBPF_VERSION)
@@ -243,7 +244,7 @@ install_lib: all_cmd $(call do_install_mkdir,$(libdir_SQ)); \ cp -fpR $(LIB_FILE) $(DESTDIR)$(libdir_SQ) -install_headers: bpf_helper_defs.h +install_headers: $(BPF_HELPER_DEFS) $(call QUIET_INSTALL, headers) \ $(call do_install,bpf.h,$(prefix)/include/bpf,644); \ $(call do_install,libbpf.h,$(prefix)/include/bpf,644); \
@@ -251,7 +252,7 @@ install_headers: bpf_helper_defs.h $(call do_install,libbpf_util.h,$(prefix)/include/bpf,644); \ $(call do_install,xsk.h,$(prefix)/include/bpf,644); \ $(call do_install,bpf_helpers.h,$(prefix)/include/bpf,644); \ - $(call do_install,bpf_helper_defs.h,$(prefix)/include/bpf,644); \ + $(call do_install,$(BPF_HELPER_DEFS),$(prefix)/include/bpf,644); \ $(call do_install,bpf_tracing.h,$(prefix)/include/bpf,644); \ $(call do_install,bpf_endian.h,$(prefix)/include/bpf,644); \ $(call do_install,bpf_core_read.h,$(prefix)/include/bpf,644);
@@ -271,7 +272,7 @@ install: install_lib install_pkgconfig clean: $(call QUIET_CLEAN, libbpf) $(RM) -rf $(CMD_TARGETS) \ *.o *~ *.a *.so *.so.$(LIBBPF_MAJOR_VERSION) .*.d .*.cmd \ - *.pc LIBBPF-CFLAGS bpf_helper_defs.h \ + *.pc LIBBPF-CFLAGS $(BPF_HELPER_DEFS) \ $(SHARED_OBJDIR) $(STATIC_OBJDIR) $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf
tools/testing/selftests/bpf/.gitignore +1 -0
@@ -40,3 +40,4 @@ xdping test_cpp /no_alu32 /bpf_gcc +bpf_helper_defs.h
tools/testing/selftests/bpf/Makefile +3 -3
@@ -120,9 +120,9 @@ $(OUTPUT)/test_cgroup_attach: cgroup_helpers.c $(BPFOBJ): force $(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ -BPF_HELPERS := $(BPFDIR)/bpf_helper_defs.h $(wildcard $(BPFDIR)/bpf_*.h) -$(BPFDIR)/bpf_helper_defs.h: - $(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ bpf_helper_defs.h +BPF_HELPERS := $(OUTPUT)/bpf_helper_defs.h $(wildcard $(BPFDIR)/bpf_*.h) +$(OUTPUT)/bpf_helper_defs.h: + $(MAKE) -C $(BPFDIR) OUTPUT=$(OUTPUT)/ $(OUTPUT)/bpf_helper_defs.h # Get Clang's default includes on this system, as opposed to those seen by # '-target bpf'. This fixes "missing" files on some architectures/distros,
Signature · 1 line
2.24.1.735.g03f4e72817-goog
Quoted 30 lines · Namhyung Kim
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf $ make O=$HOME/build/perf ... CC /home/namhyung/build/perf/lib.o /bin/sh: bpf_helper_defs.h: Read-only file system make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1 make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2 make[2]: *** Waiting for unfinished jobs.... LD /home/namhyung/build/perf/libperf-in.o AR /home/namhyung/build/perf/libperf.a PERF_VERSION = 5.4.0 make[1]: *** [Makefile.perf:225: sub-make] Error 2 make: *** [Makefile:70: all] Error 2It was becaused
bpf_helper_defs.hwas generated in current directory. Move it to OUTPUT directory.Tested-by Andrii Nakryiko <[email protected]>Acked-by Andrii Nakryiko <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/lib/bpf/Makefile | 15 ++++++++------- tools/testing/selftests/bpf/.gitignore | 1 + tools/testing/selftests/bpf/Makefile | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-)
[...]
tools/testing/selftests/bpf/.gitignore xdping · line 43
Quoted 9 lines
tools/testing/selftests/bpf/.gitignore +1
-0@@ -40,3 +40,4 @@ xdping test_cpp /no_alu32 /bpf_gcc +bpf_helper_defs.h
looks good, thanks!
[...]
Quoted 34 lines · Andrii Nakryiko
Quoted 30 lines · Namhyung Kim
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf $ make O=$HOME/build/perf ... CC /home/namhyung/build/perf/lib.o /bin/sh: bpf_helper_defs.h: Read-only file system make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1 make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2 make[2]: *** Waiting for unfinished jobs.... LD /home/namhyung/build/perf/libperf-in.o AR /home/namhyung/build/perf/libperf.a PERF_VERSION = 5.4.0 make[1]: *** [Makefile.perf:225: sub-make] Error 2 make: *** [Makefile:70: all] Error 2It was becaused
bpf_helper_defs.hwas generated in current directory. Move it to OUTPUT directory.Tested-by Andrii Nakryiko <[email protected]>Acked-by Andrii Nakryiko <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/lib/bpf/Makefile | 15 ++++++++------- tools/testing/selftests/bpf/.gitignore | 1 + tools/testing/selftests/bpf/Makefile | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-)[...]
Quoted 11 lines
tools/testing/selftests/bpf/.gitignore xdping · line 43
Quoted 9 lines
tools/testing/selftests/bpf/.gitignore +1
-0@@ -40,3 +40,4 @@ xdping test_cpp /no_alu32 /bpf_gcc +bpf_helper_defs.hlooks good, thanks!
Applied, thanks!
Quoted 31 lines · Namhyung Kim
I got the following error when I tried to build perf on a read-only filesystem with O=dir option.
$ cd /some/where/ro/linux/tools/perf $ make O=$HOME/build/perf ... CC /home/namhyung/build/perf/lib.o /bin/sh: bpf_helper_defs.h: Read-only file system make[3]: *** [Makefile:184: bpf_helper_defs.h] Error 1 make[2]: *** [Makefile.perf:778: /home/namhyung/build/perf/libbpf.a] Error 2 make[2]: *** Waiting for unfinished jobs.... LD /home/namhyung/build/perf/libperf-in.o AR /home/namhyung/build/perf/libperf.a PERF_VERSION = 5.4.0 make[1]: *** [Makefile.perf:225: sub-make] Error 2 make: *** [Makefile:70: all] Error 2It was becaused
bpf_helper_defs.hwas generated in current directory. Move it to OUTPUT directory.Signed-off-by Namhyung Kim <[email protected]>--- tools/lib/bpf/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)tools/lib/bpf/Makefile +0
-0
tools/lib/bpf/Makefile all: fixdep · line 162
Quoted 5 lines
tools/lib/bpf/Makefile +1
-1@@ -159,7 +159,7 @@ all: fixdep all_cmd: $(CMD_TARGETS) check -$(BPF_IN_SHARED): force elfdep bpfdep bpf_helper_defs.h +$(BPF_IN_SHARED): force elfdep bpfdep $(OUTPUT)bpf_helper_defs.h
btw, there is a lot of $(OUTPUT)bpf_helper_defs.h repetition, could you please extract it into a variable, similar to BPF_IN_SHARED and others? E.g., just BPF_HELPER_DEFS would work. Thanks!
Quoted 6 lines
tools/lib/bpf/Makefile +0
-0@(test -f ../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \ (diff -B ../../include/uapi/linux/bpf.h ../../../include/uapi/linux/bpf.h >/dev/null) || \ echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h'" >&2 )) || true@@ -177,12 +177,12 @@ $(BPF_IN_SHARED): force elfdep bpfdep bpf_helper_defs.h echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/if_xdp.h' differs from latest version at 'include/uapi/linux/if_xdp.h'" >&2 )) || true $(Q)$(MAKE) $(build)=libbpf OUTPUT=$(SHARED_OBJDIR) CFLAGS="$(CFLAGS) $(SHLIB_FLAGS)"
[...]