Commit d28b25a6 authored by Hangbin Liu's avatar Hangbin Liu Committed by Jakub Kicinski
Browse files

selftests/net: fix section name when using xdp_dummy.o 



Since commit 8fffa0e3 ("selftests/bpf: Normalize XDP section names in
selftests") the xdp_dummy.o's section name has changed to xdp. But some
tests are still using "section xdp_dummy", which make the tests failed.
Fix them by updating to the new section name.

Fixes: 8fffa0e3 ("selftests/bpf: Normalize XDP section names in selftests")
Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20220630062228.3453016-1-liuhangbin@gmail.com


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

tools/testing/selftests/net/udpgro.sh

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,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_dummy

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

}



run_one() {

tools/testing/selftests/net/udpgro_bench.sh

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,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_dummy

	ip -n "${PEER_NS}" link set veth1 xdp object ../bpf/xdp_dummy.o 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 &

tools/testing/selftests/net/udpgro_frglist.sh

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,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_dummy

	ip -n "${PEER_NS}" link set veth1 xdp object ../bpf/xdp_dummy.o 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

tools/testing/selftests/net/udpgro_fwd.sh

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,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_dummy 2>/dev/null

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

}



create_vxlan_endpoint() {

tools/testing/selftests/net/veth.sh

+3 −3
Original line number Diff line number Diff line
@@ -289,14 +289,14 @@ if [ $CPUS -gt 1 ]; then 
	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 \

		section xdp_dummy 2>/dev/null &&\

		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 \

		section xdp_dummy 2>/dev/null

		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 &&\

		echo "fail - set operation successful ?!?" || echo " ok "
@@ -311,7 +311,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_dummy 2>/dev/null

ip -n $NS_DST link set dev veth$DST xdp object ../bpf/xdp_dummy.o 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