Commit db473df2 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'selftests/xsk: speed-ups, fixes, and new XDP programs' 



Magnus Karlsson says:

====================

This is a patch set of various performance improvements, fixes, and
the introduction of more than one XDP program to the xsk selftests
framework so we can test more things in the future such as upcoming
multi-buffer and metadata support for AF_XDP. The new programs just
reuse the framework that all the other eBPF selftests use. The new
feature is used to implement one new test that does XDP_DROP on every
other packet. More tests using this will be added in future commits.

Contents:

* The run-time of the test suite is cut by 10x when executing the
  tests on a real NIC, by only attaching the XDP program once per mode
  tested, instead of once per test program.

* Over 700 lines of code have been removed. The xsk.c control file was
  moved straight over from libbpf when the xsk support was deprecated
  there. As it is now not used as library code that has to work with
  all kinds of versions of Linux, a lot of code could be dropped or
  simplified.

* Add a new command line option "-d" that can be used when a test
  fails and you want to debug it with gdb or some other debugger. The
  option creates the two veth netdevs and prints them to the screen
  without deleting them afterwards. This way these veth netdevs can be
  used when running xskxceiver in a debugger.

* Implemented the possibility to load external XDP programs so we can
  have more than the default one. This feature is used to implement a
  test where every other packet is dropped. Good exercise for the
  recycling mechanism of the xsk buffer pool used in zero-copy mode.

* Various clean-ups and small fixes in patches 1 to 5. None of these
  fixes has any impact on the correct execution of the tests when they
  pass, though they can be irritating when a test fails. IMHO, they do
  not need to go to bpf as they will not fix anything there. The first
  version of patches 1, 2, and 4 where previously sent to bpf, but has
  now been included here.

v2 -> v3:
* Fixed compilation error for llvm [David]
* Made the function xsk_is_in_drv_mode(ifobj) more generic by changing
  it to xsk_is_in_mode(ifobj, xdp_mode) [Maciej]
* Added Maciej's acks to all the patches

v1 -> v2:
* Fixed spelling error in commit message of patch #6 [Björn]
* Added explanation on why it is safe to use C11 atomics in patch #7
  [Daniel]
* Put all XDP programs in the same file so that adding more XDP
  programs to xskxceiver.c becomes more scalable in patches #11 and
  #12 [Maciej]
* Removed more dead code in patch #8 [Maciej]
* Removed stale %s specifier in error print, patch #9 [Maciej]
* Changed name of XDP_CONSUMES_SOME_PACKETS to XDP_DROP_HALF to
  hopefully make it clearer [Maciej]
* ifobj_rx and ifobj_tx name changes in patch #13 [Maciej]
* Simplified XDP attachment code in patch #15 [Maciej]

Patches:
1-5:   Small fixes and clean-ups
6:     New convenient debug option when using a debugger such as gdb
7-8:   Removal of unnecessary code
9:     Add the ability to load external XDP programs
10-11: Removal of more unnecessary code
12:    Implement a new test where every other packet is XDP_DROP:ed
13:    Unify the thread dispatching code
14-15: Simplify the way tests are written when using custom packet_streams
       or custom XDP programs

Thanks: Magnus
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents 5fbea423 7d8319a7

tools/testing/selftests/bpf/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ $(OUTPUT)/flow_dissector_load: $(TESTING_HELPERS) 
$(OUTPUT)/test_maps: $(TESTING_HELPERS)

$(OUTPUT)/test_verifier: $(TESTING_HELPERS) $(CAP_HELPERS)

$(OUTPUT)/xsk.o: $(BPFOBJ)

$(OUTPUT)/xskxceiver: $(OUTPUT)/xsk.o



BPFTOOL ?= $(DEFAULT_BPFTOOL)

$(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile)    \
@@ -383,6 +382,7 @@ linked_maps.skel.h-deps := linked_maps1.bpf.o linked_maps2.bpf.o 
test_subskeleton.skel.h-deps := test_subskeleton_lib2.bpf.o test_subskeleton_lib.bpf.o test_subskeleton.bpf.o

test_subskeleton_lib.skel.h-deps := test_subskeleton_lib2.bpf.o test_subskeleton_lib.bpf.o

test_usdt.skel.h-deps := test_usdt.bpf.o test_usdt_multispec.bpf.o

xsk_xdp_progs.skel.h-deps := xsk_xdp_progs.bpf.o



LINKED_BPF_SRCS := $(patsubst %.bpf.o,%.c,$(foreach skel,$(LINKED_SKELS),$($(skel)-deps)))
@@ -576,6 +576,10 @@ $(OUTPUT)/test_verifier: test_verifier.c verifier/tests.h $(BPFOBJ) | $(OUTPUT) 
	$(call msg,BINARY,,$@)

	$(Q)$(CC) $(CFLAGS) $(filter %.a %.o %.c,$^) $(LDLIBS) -o $@



$(OUTPUT)/xskxceiver: xskxceiver.c $(OUTPUT)/xsk.o $(OUTPUT)/xsk_xdp_progs.skel.h $(BPFOBJ) | $(OUTPUT)

	$(call msg,BINARY,,$@)

	$(Q)$(CC) $(CFLAGS) $(filter %.a %.o %.c,$^) $(LDLIBS) -o $@



# Make sure we are able to include and link libbpf against c++.

$(OUTPUT)/test_cpp: test_cpp.cpp $(OUTPUT)/test_core_extern.skel.h $(BPFOBJ)

	$(call msg,CXX,,$@)

tools/testing/selftests/bpf/progs/xsk_xdp_progs.c

0 → 100644
+30 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (c) 2022 Intel */



#include <linux/bpf.h>

#include <bpf/bpf_helpers.h>



struct {

	__uint(type, BPF_MAP_TYPE_XSKMAP);

	__uint(max_entries, 1);

	__uint(key_size, sizeof(int));

	__uint(value_size, sizeof(int));

} xsk SEC(".maps");



static unsigned int idx;



SEC("xdp") int xsk_def_prog(struct xdp_md *xdp)

{

	return bpf_redirect_map(&xsk, 0, XDP_DROP);

}



SEC("xdp") int xsk_xdp_drop(struct xdp_md *xdp)

{

	/* Drop every other packet */

	if (idx++ % 2)

		return XDP_DROP;



	return bpf_redirect_map(&xsk, 0, XDP_DROP);

}



char _license[] SEC("license") = "GPL";

tools/testing/selftests/bpf/test_xsk.sh

+21 −21
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#      -----------     |     ----------

#      |  vethX  | --------- |  vethY |

#      -----------   peer    ----------

#           |          |          |

#      namespaceX      |     namespaceY

#

# AF_XDP is an address family optimized for high performance packet processing,

# it is XDP’s user-space interface.
@@ -39,10 +37,9 @@ 
# Prerequisites setup by script:

#

#   Set up veth interfaces as per the topology shown ^^:

#   * setup two veth interfaces and one namespace

#   ** veth<xxxx> in root namespace

#   ** veth<yyyy> in af_xdp<xxxx> namespace

#   ** namespace af_xdp<xxxx>

#   * setup two veth interfaces

#   ** veth<xxxx>

#   ** veth<yyyy>

#   *** xxxx and yyyy are randomly generated 4 digit numbers used to avoid

#       conflict with any existing interface

#   * tests the veth and xsk layers of the topology
@@ -74,6 +71,9 @@ 
# Run and dump packet contents:

#   sudo ./test_xsk.sh -D

#

# Set up veth interfaces and leave them up so xskxceiver can be launched in a debugger:

#   sudo ./test_xsk.sh -d

#

# Run test suite for physical device in loopback mode

#   sudo ./test_xsk.sh -i IFACE
@@ -81,11 +81,12 @@ 


ETH=""



while getopts "vDi:" flag

while getopts "vDi:d" flag

do

	case "${flag}" in

		v) verbose=1;;

		D) dump_pkts=1;;

		d) debug=1;;

		i) ETH=${OPTARG};;

	esac

done
@@ -99,28 +100,25 @@ VETH0_POSTFIX=$(cat ${URANDOM} | tr -dc '0-9' | fold -w 256 | head -n 1 | head - 
VETH0=ve${VETH0_POSTFIX}

VETH1_POSTFIX=$(cat ${URANDOM} | tr -dc '0-9' | fold -w 256 | head -n 1 | head --bytes 4)

VETH1=ve${VETH1_POSTFIX}

NS0=root

NS1=af_xdp${VETH1_POSTFIX}

MTU=1500



trap ctrl_c INT



function ctrl_c() {

        cleanup_exit ${VETH0} ${VETH1} ${NS1}

        cleanup_exit ${VETH0} ${VETH1}

	exit 1

}



setup_vethPairs() {

	if [[ $verbose -eq 1 ]]; then

	        echo "setting up ${VETH0}: namespace: ${NS0}"

	        echo "setting up ${VETH0}"

	fi

	ip netns add ${NS1}

	ip link add ${VETH0} numtxqueues 4 numrxqueues 4 type veth peer name ${VETH1} numtxqueues 4 numrxqueues 4

	if [ -f /proc/net/if_inet6 ]; then

		echo 1 > /proc/sys/net/ipv6/conf/${VETH0}/disable_ipv6

	fi

	if [[ $verbose -eq 1 ]]; then

	        echo "setting up ${VETH1}: namespace: ${NS1}"

	        echo "setting up ${VETH1}"

	fi



	if [[ $busy_poll -eq 1 ]]; then
@@ -130,18 +128,15 @@ setup_vethPairs() { 
		echo 200000 > /sys/class/net/${VETH1}/gro_flush_timeout

	fi



	ip link set ${VETH1} netns ${NS1}

	ip netns exec ${NS1} ip link set ${VETH1} mtu ${MTU}

	ip link set ${VETH1} mtu ${MTU}

	ip link set ${VETH0} mtu ${MTU}

	ip netns exec ${NS1} ip link set ${VETH1} up

	ip netns exec ${NS1} ip link set dev lo up

	ip link set ${VETH1} up

	ip link set ${VETH0} up

}



if [ ! -z $ETH ]; then

	VETH0=${ETH}

	VETH1=${ETH}

	NS1=""

else

	validate_root_exec

	validate_veth_support ${VETH0}
@@ -151,7 +146,7 @@ else 
	retval=$?

	if [ $retval -ne 0 ]; then

		test_status $retval "${TEST_NAME}"

		cleanup_exit ${VETH0} ${VETH1} ${NS1}

		cleanup_exit ${VETH0} ${VETH1}

		exit $retval

	fi

fi
@@ -174,10 +169,15 @@ statusList=() 


TEST_NAME="XSK_SELFTESTS_${VETH0}_SOFTIRQ"



if [[ $debug -eq 1 ]]; then

    echo "-i" ${VETH0} "-i" ${VETH1}

    exit

fi



exec_xskxceiver



if [ -z $ETH ]; then

	cleanup_exit ${VETH0} ${VETH1} ${NS1}

	cleanup_exit ${VETH0} ${VETH1}

fi

TEST_NAME="XSK_SELFTESTS_${VETH0}_BUSY_POLL"

busy_poll=1
@@ -190,7 +190,7 @@ exec_xskxceiver 
## END TESTS



if [ -z $ETH ]; then

	cleanup_exit ${VETH0} ${VETH1} ${NS1}

	cleanup_exit ${VETH0} ${VETH1}

fi



failures=0

tools/testing/selftests/bpf/xsk.c

+36 −641

File changed.

Preview size limit exceeded, changes collapsed.

tools/testing/selftests/bpf/xsk.h

+11 −86

File changed.

Preview size limit exceeded, changes collapsed.