Hello, May I ask what's the status of this patch? I saw it's deferred[1] but I don't know what I should do. [1] https://patchwork.kernel.org/project/netdevbpf/patch/20221218082448.1829811-1-liuhangbin@xxxxxxxxx/ Thanks Hangbin On Sun, Dec 18, 2022 at 04:24:48PM +0800, Hangbin Liu wrote: > There are some issues with the bpf/nat6to4.c building. > > 1. It use TEST_CUSTOM_PROGS, which will add the nat6to4.o to > kselftest-list file and run by common run_tests. > 2. When building the test via `make -C tools/testing/selftests/ > TARGETS="net"`, the nat6to4.o will be build in selftests/net/bpf/ > folder. But in test udpgro_frglist.sh it refers to ../bpf/nat6to4.o. > The correct path should be ./bpf/nat6to4.o. > 3. If building the test via `make -C tools/testing/selftests/ TARGETS="net" > install`. The nat6to4.o will be installed to kselftest_install/net/ > folder. Then the udpgro_frglist.sh should refer to ./nat6to4.o. > > To fix the confusing test path, let's just move the nat6to4.c to net folder > and build it as TEST_GEN_FILES. > > Fixes: edae34a3ed92 ("selftests net: add UDP GRO fraglist + bpf self-tests") > Tested-by: Björn Töpel <bjorn@xxxxxxxxxx> > Signed-off-by: Hangbin Liu <liuhangbin@xxxxxxxxx> > --- > v3: remove unneeded $(OUTPUT)/bpf dir. > > v2: Update the Makefile rules rely on commit 837a3d66d698 ("selftests: > net: Add cross-compilation support for BPF programs"). > --- > tools/testing/selftests/net/Makefile | 50 +++++++++++++++++- > tools/testing/selftests/net/bpf/Makefile | 51 ------------------- > .../testing/selftests/net/{bpf => }/nat6to4.c | 0 > tools/testing/selftests/net/udpgro_frglist.sh | 8 +-- > 4 files changed, 52 insertions(+), 57 deletions(-) > delete mode 100644 tools/testing/selftests/net/bpf/Makefile > rename tools/testing/selftests/net/{bpf => }/nat6to4.c (100%) > > diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile > index 3007e98a6d64..47314f0b3006 100644 > --- a/tools/testing/selftests/net/Makefile > +++ b/tools/testing/selftests/net/Makefile > @@ -75,14 +75,60 @@ TEST_GEN_PROGS += so_incoming_cpu > TEST_PROGS += sctp_vrf.sh > TEST_GEN_FILES += sctp_hello > TEST_GEN_FILES += csum > +TEST_GEN_FILES += nat6to4.o > > TEST_FILES := settings > > include ../lib.mk > > -include bpf/Makefile > - > $(OUTPUT)/reuseport_bpf_numa: LDLIBS += -lnuma > $(OUTPUT)/tcp_mmap: LDLIBS += -lpthread > $(OUTPUT)/tcp_inq: LDLIBS += -lpthread > $(OUTPUT)/bind_bhash: LDLIBS += -lpthread > + > +# Rules to generate bpf obj nat6to4.o > +CLANG ?= clang > +SCRATCH_DIR := $(OUTPUT)/tools > +BUILD_DIR := $(SCRATCH_DIR)/build > +BPFDIR := $(abspath ../../../lib/bpf) > +APIDIR := $(abspath ../../../include/uapi) > + > +CCINCLUDE += -I../bpf > +CCINCLUDE += -I../../../../usr/include/ > +CCINCLUDE += -I$(SCRATCH_DIR)/include > + > +BPFOBJ := $(BUILD_DIR)/libbpf/libbpf.a > + > +MAKE_DIRS := $(BUILD_DIR)/libbpf > +$(MAKE_DIRS): > + mkdir -p $@ > + > +# Get Clang's default includes on this system, as opposed to those seen by > +# '-target bpf'. This fixes "missing" files on some architectures/distros, > +# such as asm/byteorder.h, asm/socket.h, asm/sockios.h, sys/cdefs.h etc. > +# > +# Use '-idirafter': Don't interfere with include mechanics except where the > +# build would have failed anyways. > +define get_sys_includes > +$(shell $(1) $(2) -v -E - </dev/null 2>&1 \ > + | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }') \ > +$(shell $(1) $(2) -dM -E - </dev/null | grep '__riscv_xlen ' | awk '{printf("-D__riscv_xlen=%d -D__BITS_PER_LONG=%d", $$3, $$3)}') > +endef > + > +ifneq ($(CROSS_COMPILE),) > +CLANG_TARGET_ARCH = --target=$(notdir $(CROSS_COMPILE:%-=%)) > +endif > + > +CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG),$(CLANG_TARGET_ARCH)) > + > +$(OUTPUT)/nat6to4.o: nat6to4.c $(BPFOBJ) | $(MAKE_DIRS) > + $(CLANG) -O2 -target bpf -c $< $(CCINCLUDE) $(CLANG_SYS_INCLUDES) -o $@ > + > +$(BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile) \ > + $(APIDIR)/linux/bpf.h \ > + | $(BUILD_DIR)/libbpf > + $(MAKE) $(submake_extras) -C $(BPFDIR) OUTPUT=$(BUILD_DIR)/libbpf/ \ > + EXTRA_CFLAGS='-g -O0' \ > + DESTDIR=$(SCRATCH_DIR) prefix= all install_headers > + > +EXTRA_CLEAN := $(SCRATCH_DIR) > diff --git a/tools/testing/selftests/net/bpf/Makefile b/tools/testing/selftests/net/bpf/Makefile > deleted file mode 100644 > index 4abaf16d2077..000000000000 > --- a/tools/testing/selftests/net/bpf/Makefile > +++ /dev/null > @@ -1,51 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0 > - > -CLANG ?= clang > -SCRATCH_DIR := $(OUTPUT)/tools > -BUILD_DIR := $(SCRATCH_DIR)/build > -BPFDIR := $(abspath ../../../lib/bpf) > -APIDIR := $(abspath ../../../include/uapi) > - > -CCINCLUDE += -I../../bpf > -CCINCLUDE += -I../../../../../usr/include/ > -CCINCLUDE += -I$(SCRATCH_DIR)/include > - > -BPFOBJ := $(BUILD_DIR)/libbpf/libbpf.a > - > -MAKE_DIRS := $(BUILD_DIR)/libbpf $(OUTPUT)/bpf > -$(MAKE_DIRS): > - mkdir -p $@ > - > -TEST_CUSTOM_PROGS = $(OUTPUT)/bpf/nat6to4.o > -all: $(TEST_CUSTOM_PROGS) > - > -# Get Clang's default includes on this system, as opposed to those seen by > -# '-target bpf'. This fixes "missing" files on some architectures/distros, > -# such as asm/byteorder.h, asm/socket.h, asm/sockios.h, sys/cdefs.h etc. > -# > -# Use '-idirafter': Don't interfere with include mechanics except where the > -# build would have failed anyways. > -define get_sys_includes > -$(shell $(1) $(2) -v -E - </dev/null 2>&1 \ > - | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }') \ > -$(shell $(1) $(2) -dM -E - </dev/null | grep '__riscv_xlen ' | awk '{printf("-D__riscv_xlen=%d -D__BITS_PER_LONG=%d", $$3, $$3)}') > -endef > - > -ifneq ($(CROSS_COMPILE),) > -CLANG_TARGET_ARCH = --target=$(notdir $(CROSS_COMPILE:%-=%)) > -endif > - > -CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG),$(CLANG_TARGET_ARCH)) > - > -$(TEST_CUSTOM_PROGS): $(OUTPUT)/%.o: %.c $(BPFOBJ) | $(MAKE_DIRS) > - $(CLANG) -O2 -target bpf -c $< $(CCINCLUDE) $(CLANG_SYS_INCLUDES) -o $@ > - > -$(BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile) \ > - $(APIDIR)/linux/bpf.h \ > - | $(BUILD_DIR)/libbpf > - $(MAKE) $(submake_extras) -C $(BPFDIR) OUTPUT=$(BUILD_DIR)/libbpf/ \ > - EXTRA_CFLAGS='-g -O0' \ > - DESTDIR=$(SCRATCH_DIR) prefix= all install_headers > - > -EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) > - > diff --git a/tools/testing/selftests/net/bpf/nat6to4.c b/tools/testing/selftests/net/nat6to4.c > similarity index 100% > rename from tools/testing/selftests/net/bpf/nat6to4.c > rename to tools/testing/selftests/net/nat6to4.c > diff --git a/tools/testing/selftests/net/udpgro_frglist.sh b/tools/testing/selftests/net/udpgro_frglist.sh > index c9c4b9d65839..0a6359bed0b9 100755 > --- a/tools/testing/selftests/net/udpgro_frglist.sh > +++ b/tools/testing/selftests/net/udpgro_frglist.sh > @@ -40,8 +40,8 @@ run_one() { > > ip -n "${PEER_NS}" link set veth1 xdp object ${BPF_FILE} section xdp > tc -n "${PEER_NS}" qdisc add dev veth1 clsact > - tc -n "${PEER_NS}" filter add dev veth1 ingress prio 4 protocol ipv6 bpf object-file ../bpf/nat6to4.o section schedcls/ingress6/nat_6 direct-action > - tc -n "${PEER_NS}" filter add dev veth1 egress prio 4 protocol ip bpf object-file ../bpf/nat6to4.o section schedcls/egress4/snat4 direct-action > + tc -n "${PEER_NS}" filter add dev veth1 ingress prio 4 protocol ipv6 bpf object-file nat6to4.o section schedcls/ingress6/nat_6 direct-action > + tc -n "${PEER_NS}" filter add dev veth1 egress prio 4 protocol ip bpf object-file nat6to4.o section schedcls/egress4/snat4 direct-action > echo ${rx_args} > ip netns exec "${PEER_NS}" ./udpgso_bench_rx ${rx_args} -r & > > @@ -88,8 +88,8 @@ if [ ! -f ${BPF_FILE} ]; then > exit -1 > fi > > -if [ ! -f bpf/nat6to4.o ]; then > - echo "Missing nat6to4 helper. Build bpfnat6to4.o selftest first" > +if [ ! -f nat6to4.o ]; then > + echo "Missing nat6to4 helper. Build bpf nat6to4.o selftest first" > exit -1 > fi > > -- > 2.38.1 >
