tools/bpf: move linux/types.h for selftests and bpftool
Subsystems (4)
PATCH 1/1 tools/bpf: move linux/types.h for selftests and bpftool
Commit fe4eb069edb7 ("bpftool: Use linux/types.h from source tree for profiler build") added a build dependency on tools/testing/selftests/bpf to tools/bpf/bpftool. This is suboptimal with respect to a possible stand-alone build of bpftool.
Fix this by moving tools/testing/selftests/bpf/include/uapi/linux/types.h to tools/include/uapi/linux/types.h
This requires an adjustment in the include search path order for the tests in tools/testing/selftests/bpf so that tools/include/linux/types.h is selected when building host binaries and tools/include/uapi/linux/types.h is selected when building bpf binaries.
Verified by compiling bpftool and the bpf selftests on x86_64 with this change.
---
tools/bpf/bpftool/Makefile | 1 -
.../{testing/selftests/bpf => }/include/uapi/linux/types.h | 0
tools/testing/selftests/bpf/Makefile | 7 ++++---
3 files changed, 4 insertions(+), 4 deletions(-)
rename tools/{testing/selftests/bpf => }/include/uapi/linux/types.h (100%)tools/bpf/bpftool/Makefile +0 -1
@@ -129,7 +129,6 @@ $(OUTPUT)_bpftool: $(_OBJS) $(LIBBPF) skeleton/profiler.bpf.o: skeleton/profiler.bpf.c $(LIBBPF) $(QUIET_CLANG)$(CLANG) \ -I$(srctree)/tools/include/uapi/ \ - -I$(srctree)/tools/testing/selftests/bpf/include/uapi \ -I$(LIBBPF_PATH) -I$(srctree)/tools/lib \ -g -O2 -target bpf -c $< -o $@
tools/include/uapi/linux/types.h renamed from tools/testing/selftests/bpf/include/uapi/linux/types.h +0 -0
tools/testing/selftests/bpf/Makefile +4 -3
@@ -20,8 +20,9 @@ CLANG ?= clang LLC ?= llc LLVM_OBJCOPY ?= llvm-objcopy BPF_GCC ?= $(shell command -v bpf-gcc;) -CFLAGS += -g -rdynamic -Wall -O2 $(GENFLAGS) -I$(CURDIR) -I$(APIDIR) \ +CFLAGS += -g -rdynamic -Wall -O2 $(GENFLAGS) -I$(CURDIR) \ -I$(INCLUDE_DIR) -I$(GENDIR) -I$(LIBDIR) -I$(TOOLSINCDIR) \ + -I$(APIDIR) \ -Dbpf_prog_load=bpf_prog_test_load \ -Dbpf_load_program=bpf_test_load_program LDLIBS += -lcap -lelf -lz -lrt -lpthread
@@ -194,8 +195,8 @@ MENDIAN=$(if $(IS_LITTLE_ENDIAN),-mlittle-endian,-mbig-endian) CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG)) BPF_CFLAGS = -g -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN) \ - -I$(INCLUDE_DIR) -I$(CURDIR) -I$(CURDIR)/include/uapi \ - -I$(APIDIR) -I$(abspath $(OUTPUT)/../usr/include) + -I$(INCLUDE_DIR) -I$(CURDIR) -I$(APIDIR) \ + -I$(abspath $(OUTPUT)/../usr/include) CLANG_CFLAGS = $(CLANG_SYS_INCLUDES) \ -Wno-compare-distinct-pointer-types
Signature · 1 line
2.24.0
2020-03-13 12:31 UTC+0100 ~ Tobias Klauser <[email protected]>
Quoted 9 lines
Commit
fe4eb069edb7("bpftool: Uselinux/types.hfrom source tree for profiler build") added a build dependency ontools/testing/selftests/bpftotools/bpf/bpftool. This is suboptimal with respect to a possible stand-alone build of bpftool.Fix this by moving
tools/testing/selftests/bpf/include/uapi/linux/types.htotools/include/uapi/linux/types.h
Quoted 7 lines
This requires an adjustment in the include search path order for the tests in
tools/testing/selftests/bpfso thattools/include/linux/types.his selected when building host binaries andtools/include/uapi/linux/types.his selected when building bpf binaries.Verified by compiling bpftool and the bpf selftests on
x86_64with this change.
Compiles on my setup too.
Quoted 10 lines · Tobias Klauser
Commit
fe4eb069edb7("bpftool: Uselinux/types.hfrom source tree for profiler build") added a build dependency ontools/testing/selftests/bpftotools/bpf/bpftool. This is suboptimal with respect to a possible stand-alone build of bpftool.Fix this by moving
tools/testing/selftests/bpf/include/uapi/linux/types.htotools/include/uapi/linux/types.h
Quoted 8 lines
This requires an adjustment in the include search path order for the tests in
tools/testing/selftests/bpfso thattools/include/linux/types.his selected when building host binaries andtools/include/uapi/linux/types.his selected when building bpf binaries.Verified by compiling bpftool and the bpf selftests on
x86_64with this change.
Thanks for following up!
My only concern is that tools/include/uapi/ is also used at least by perf and libperf, we need to double check that they are fine with this as well.
Given this is needed for BPF target compilation only, one way to limit the scope of this change would be to have a #if defined(__bpf__) check and falling back to "normal" uapi/linux/types.h. Alternatively, we could have a bpf-specific subdirectory and put this header into tools/include/bpf/uapi/linux/types.h.
I don't have any strong preferences, whatever maintainers are happy with.
Quoted 57 lines
Fixes fe4eb069edb7 ("bpftool: Use linux/types.h from source tree for profiler build")Cc Daniel Borkmann <[email protected]>Cc Quentin Monnet <[email protected]>Suggested-by Andrii Nakryiko <[email protected]>Signed-off-by Tobias Klauser <[email protected]>--- tools/bpf/bpftool/Makefile | 1 - .../{testing/selftests/bpf => }/include/uapi/linux/types.h | 0 tools/testing/selftests/bpf/Makefile | 7 ++++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename tools/{testing/selftests/bpf => }/include/uapi/linux/types.h (100%)tools/bpf/bpftool/Makefile +0
-1@@ -129,7 +129,6 @@ $(OUTPUT)_bpftool: $(_OBJS) $(LIBBPF) skeleton/profiler.bpf.o: skeleton/profiler.bpf.c $(LIBBPF) $(QUIET_CLANG)$(CLANG) \ -I$(srctree)/tools/include/uapi/ \ - -I$(srctree)/tools/testing/selftests/bpf/include/uapi \ -I$(LIBBPF_PATH) -I$(srctree)/tools/lib \ -g -O2 -target bpf -c $< -o $@tools/include/uapi/linux/types.h renamed from tools/testing/selftests/bpf/include/uapi/linux/types.h +0
-0tools/testing/selftests/bpf/Makefile +4
-4@@ -20,8 +20,9 @@ CLANG ?= clang LLC ?= llc LLVM_OBJCOPY ?= llvm-objcopy BPF_GCC ?= $(shell command -v bpf-gcc;) -CFLAGS += -g -rdynamic -Wall -O2 $(GENFLAGS) -I$(CURDIR) -I$(APIDIR) \ +CFLAGS += -g -rdynamic -Wall -O2 $(GENFLAGS) -I$(CURDIR) \ -I$(INCLUDE_DIR) -I$(GENDIR) -I$(LIBDIR) -I$(TOOLSINCDIR) \ + -I$(APIDIR) \ -Dbpf_prog_load=bpf_prog_test_load \ -Dbpf_load_program=bpf_test_load_program LDLIBS += -lcap -lelf -lz -lrt -lpthread@@ -194,8 +195,8 @@ MENDIAN=$(if $(IS_LITTLE_ENDIAN),-mlittle-endian,-mbig-endian) CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG)) BPF_CFLAGS = -g -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN) \ - -I$(INCLUDE_DIR) -I$(CURDIR) -I$(CURDIR)/include/uapi \ - -I$(APIDIR) -I$(abspath $(OUTPUT)/../usr/include) + -I$(INCLUDE_DIR) -I$(CURDIR) -I$(APIDIR) \ + -I$(abspath $(OUTPUT)/../usr/include) CLANG_CFLAGS = $(CLANG_SYS_INCLUDES) \ -Wno-compare-distinct-pointer-types --2.24.0
Daniel Borkmann
maintainer[ +acme ]
Quoted 25 lines · Andrii Nakryiko
Quoted 10 lines · Tobias Klauser
Commit
fe4eb069edb7("bpftool: Uselinux/types.hfrom source tree for profiler build") added a build dependency ontools/testing/selftests/bpftotools/bpf/bpftool. This is suboptimal with respect to a possible stand-alone build of bpftool.Fix this by moving
tools/testing/selftests/bpf/include/uapi/linux/types.htotools/include/uapi/linux/types.hQuoted 7 lines
This requires an adjustment in the include search path order for the tests in
tools/testing/selftests/bpfso thattools/include/linux/types.his selected when building host binaries andtools/include/uapi/linux/types.his selected when building bpf binaries.Verified by compiling bpftool and the bpf selftests on
x86_64with this change.Thanks for following up!
My only concern is that
tools/include/uapi/is also used at least by perf and libperf, we need to double check that they are fine with this as well.
Quoted 7 lines
Given this is needed for BPF target compilation only, one way to limit the scope of this change would be to have a
#if defined(__bpf__)check and falling back to "normal"uapi/linux/types.h. Alternatively, we could have a bpf-specific subdirectory and put this header intotools/include/bpf/uapi/linux/types.h.I don't have any strong preferences, whatever maintainers are happy with.
I would prefer to keep it generic if possible before we take measures of making special cases for bpf in tools include infra. Compilation of perf and libperf seems fine on my side as well, so I've applied it, thanks!