Commit 98cb12eb authored by Paolo Abeni's avatar Paolo Abeni Committed by Jakub Kicinski
Browse files

selftests: net: remove dependency on ebpf tests 



Several net tests requires an XDP program build under the ebpf
directory, and error out if such program is not available.

That makes running successful net test hard, let's duplicate into the
net dir the [very small] program, re-using the existing rules to build
it, and finally dropping the bogus dependency.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Link: https://lore.kernel.org/r/28e7af7c031557f691dc8045ee41dd549dd5e74c.1706131762.git.pabeni@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b6478784

tools/testing/selftests/net/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ TEST_PROGS += sctp_vrf.sh 
TEST_GEN_FILES += sctp_hello

TEST_GEN_FILES += csum

TEST_GEN_FILES += nat6to4.o

TEST_GEN_FILES += xdp_dummy.o

TEST_GEN_FILES += ip_local_port_range

TEST_GEN_FILES += bind_wildcard

TEST_PROGS += test_vxlan_mdb.sh
@@ -104,7 +105,7 @@ $(OUTPUT)/tcp_inq: LDLIBS += -lpthread 
$(OUTPUT)/bind_bhash: LDLIBS += -lpthread

$(OUTPUT)/io_uring_zerocopy_tx: CFLAGS += -I../../../include/



# Rules to generate bpf obj nat6to4.o

# Rules to generate bpf objs

CLANG ?= clang

SCRATCH_DIR := $(OUTPUT)/tools

BUILD_DIR := $(SCRATCH_DIR)/build
@@ -139,7 +140,7 @@ endif 


CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG),$(CLANG_TARGET_ARCH))



$(OUTPUT)/nat6to4.o: nat6to4.c $(BPFOBJ) | $(MAKE_DIRS)

$(OUTPUT)/nat6to4.o $(OUTPUT)/xdp_dummy.o: $(OUTPUT)/%.o : %.c $(BPFOBJ) | $(MAKE_DIRS)

	$(CLANG) -O2 --target=bpf -c $< $(CCINCLUDE) $(CLANG_SYS_INCLUDES) -o $@



$(BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile)		       \

tools/testing/selftests/net/udpgro.sh

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ source net_helper.sh 


readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)"



BPF_FILE="../bpf/xdp_dummy.bpf.o"

BPF_FILE="xdp_dummy.o"



# set global exit status, but never reset nonzero one.

check_err()
@@ -197,7 +197,7 @@ run_all() { 
}



if [ ! -f ${BPF_FILE} ]; then

	echo "Missing ${BPF_FILE}. Build bpf selftest first"

	echo "Missing ${BPF_FILE}. Run 'make' first"

	exit -1

fi

tools/testing/selftests/net/udpgro_bench.sh

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ source net_helper.sh 


readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)"



BPF_FILE="../bpf/xdp_dummy.bpf.o"

BPF_FILE="xdp_dummy.o"



cleanup() {

	local -r jobs="$(jobs -p)"
@@ -84,7 +84,7 @@ run_all() { 
}



if [ ! -f ${BPF_FILE} ]; then

	echo "Missing ${BPF_FILE}. Build bpf selftest first"

	echo "Missing ${BPF_FILE}. Run 'make' first"

	exit -1

fi

tools/testing/selftests/net/udpgro_frglist.sh

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ source net_helper.sh 


readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)"



BPF_FILE="../bpf/xdp_dummy.bpf.o"

BPF_FILE="xdp_dummy.o"



cleanup() {

	local -r jobs="$(jobs -p)"
@@ -85,12 +85,12 @@ run_all() { 
}



if [ ! -f ${BPF_FILE} ]; then

	echo "Missing ${BPF_FILE}. Build bpf selftest first"

	echo "Missing ${BPF_FILE}. Run 'make' first"

	exit -1

fi



if [ ! -f nat6to4.o ]; then

	echo "Missing nat6to4 helper. Build bpf nat6to4.o selftest first"

	echo "Missing nat6to4 helper. Run 'make' first"

	exit -1

fi

tools/testing/selftests/net/udpgro_fwd.sh

+1 −1
Original line number Diff line number Diff line 
#!/bin/bash

# SPDX-License-Identifier: GPL-2.0



BPF_FILE="../bpf/xdp_dummy.bpf.o"

BPF_FILE="xdp_dummy.o"

readonly BASE="ns-$(mktemp -u XXXXXX)"

readonly SRC=2

readonly DST=1