Commit 302e57f8 authored by Wang Yufen's avatar Wang Yufen Committed by David S. Miller
Browse files

selftests/net: fix missing xdp_dummy 



After commit afef88e6 ("selftests/bpf: Store BPF object files with
.bpf.o extension"), we should use xdp_dummy.bpf.o instade of xdp_dummy.o.

In addition, use the BPF_FILE variable to save the BPF object file name,
which can be better identified and modified.

Fixes: afef88e6 ("selftests/bpf: Store BPF object files with .bpf.o extension")
Signed-off-by: default avatarWang Yufen <wangyufen@huawei.com>
Cc: Daniel Müller <deso@posteo.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40b9d1ab

tools/testing/selftests/net/udpgro.sh

+5 −3
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 


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



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



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

check_err()

{
@@ -34,7 +36,7 @@ cfg_veth() { 
	ip -netns "${PEER_NS}" addr add dev veth1 192.168.1.1/24

	ip -netns "${PEER_NS}" addr add dev veth1 2001:db8::1/64 nodad

	ip -netns "${PEER_NS}" link set dev veth1 up

	ip -n "${PEER_NS}" link set veth1 xdp object ../bpf/xdp_dummy.o section xdp

	ip -n "${PEER_NS}" link set veth1 xdp object ${BPF_FILE} section xdp

}



run_one() {
@@ -195,8 +197,8 @@ run_all() { 
	return $ret

}



if [ ! -f ../bpf/xdp_dummy.o ]; then

	echo "Missing xdp_dummy helper. Build bpf selftest first"

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

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

	exit -1

fi

tools/testing/selftests/net/udpgro_bench.sh

+5 −3
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 


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



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



cleanup() {

	local -r jobs="$(jobs -p)"

	local -r ns="$(ip netns list|grep $PEER_NS)"
@@ -34,7 +36,7 @@ run_one() { 
	ip -netns "${PEER_NS}" addr add dev veth1 2001:db8::1/64 nodad

	ip -netns "${PEER_NS}" link set dev veth1 up



	ip -n "${PEER_NS}" link set veth1 xdp object ../bpf/xdp_dummy.o section xdp

	ip -n "${PEER_NS}" link set veth1 xdp object ${BPF_FILE} section xdp

	ip netns exec "${PEER_NS}" ./udpgso_bench_rx ${rx_args} -r &

	ip netns exec "${PEER_NS}" ./udpgso_bench_rx -t ${rx_args} -r &
@@ -80,8 +82,8 @@ run_all() { 
	run_udp "${ipv6_args}"

}



if [ ! -f ../bpf/xdp_dummy.o ]; then

	echo "Missing xdp_dummy helper. Build bpf selftest first"

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

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

	exit -1

fi

tools/testing/selftests/net/udpgro_frglist.sh

+5 −3
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 


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



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



cleanup() {

	local -r jobs="$(jobs -p)"

	local -r ns="$(ip netns list|grep $PEER_NS)"
@@ -36,7 +38,7 @@ run_one() { 
	ip netns exec "${PEER_NS}" ethtool -K veth1 rx-gro-list on





	ip -n "${PEER_NS}" link set veth1 xdp object ../bpf/xdp_dummy.o section xdp

	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
@@ -81,8 +83,8 @@ run_all() { 
	run_udp "${ipv6_args}"

}



if [ ! -f ../bpf/xdp_dummy.o ]; then

	echo "Missing xdp_dummy helper. Build bpf selftest first"

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

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

	exit -1

fi

tools/testing/selftests/net/udpgro_fwd.sh

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

# SPDX-License-Identifier: GPL-2.0



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

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

readonly SRC=2

readonly DST=1
@@ -46,7 +47,7 @@ create_ns() { 
		ip -n $BASE$ns addr add dev veth$ns $BM_NET_V4$ns/24

		ip -n $BASE$ns addr add dev veth$ns $BM_NET_V6$ns/64 nodad

	done

	ip -n $NS_DST link set veth$DST xdp object ../bpf/xdp_dummy.o section xdp 2>/dev/null

	ip -n $NS_DST link set veth$DST xdp object ${BPF_FILE} section xdp 2>/dev/null

}



create_vxlan_endpoint() {

tools/testing/selftests/net/veth.sh

+6 −5
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0



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

readonly STATS="$(mktemp -p /tmp ns-XXXXXX)"

readonly BASE=`basename $STATS`

readonly SRC=2
@@ -216,8 +217,8 @@ while getopts "hs:" option; do 
	esac

done



if [ ! -f ../bpf/xdp_dummy.o ]; then

	echo "Missing xdp_dummy helper. Build bpf selftest first"

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

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

	exit 1

fi
@@ -288,14 +289,14 @@ if [ $CPUS -gt 1 ]; then 
	ip netns exec $NS_DST ethtool -L veth$DST rx 1 tx 2 2>/dev/null

	ip netns exec $NS_SRC ethtool -L veth$SRC rx 1 tx 2 2>/dev/null

	printf "%-60s" "bad setting: XDP with RX nr less than TX"

	ip -n $NS_DST link set dev veth$DST xdp object ../bpf/xdp_dummy.o \

	ip -n $NS_DST link set dev veth$DST xdp object ${BPF_FILE} \

		section xdp 2>/dev/null &&\

		echo "fail - set operation successful ?!?" || echo " ok "



	# the following tests will run with multiple channels active

	ip netns exec $NS_SRC ethtool -L veth$SRC rx 2

	ip netns exec $NS_DST ethtool -L veth$DST rx 2

	ip -n $NS_DST link set dev veth$DST xdp object ../bpf/xdp_dummy.o \

	ip -n $NS_DST link set dev veth$DST xdp object ${BPF_FILE} \

		section xdp 2>/dev/null

	printf "%-60s" "bad setting: reducing RX nr below peer TX with XDP set"

	ip netns exec $NS_DST ethtool -L veth$DST rx 1 2>/dev/null &&\
@@ -311,7 +312,7 @@ if [ $CPUS -gt 2 ]; then 
	chk_channels "setting invalid channels nr" $DST 2 2

fi



ip -n $NS_DST link set dev veth$DST xdp object ../bpf/xdp_dummy.o section xdp 2>/dev/null

ip -n $NS_DST link set dev veth$DST xdp object ${BPF_FILE} section xdp 2>/dev/null

chk_gro_flag "with xdp attached - gro flag" $DST on

chk_gro_flag "        - peer gro flag" $SRC off

chk_tso_flag "        - tso flag" $SRC off