| Message ID | 1668507800-45450-2-git-send-email-wangyufen@huawei.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | some fixes for selftest/net | expand |
On 15 Nov 18:23, Wang Yufen wrote: >After commit afef88e65554 ("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: afef88e65554 ("selftests/bpf: Store BPF object files with .bpf.o extension") >Signed-off-by: Wang Yufen <wangyufen@huawei.com> >Cc: Daniel Müller <deso@posteo.net> >--- > tools/testing/selftests/net/udpgro.sh | 6 ++++-- > tools/testing/selftests/net/udpgro_bench.sh | 6 ++++-- > tools/testing/selftests/net/udpgro_frglist.sh | 6 ++++-- > tools/testing/selftests/net/udpgro_fwd.sh | 3 ++- > tools/testing/selftests/net/veth.sh | 9 +++++---- > 5 files changed, 19 insertions(+), 11 deletions(-) > >diff --git a/tools/testing/selftests/net/udpgro.sh b/tools/testing/selftests/net/udpgro.sh >index 6a443ca..a66d62e 100755 >--- a/tools/testing/selftests/net/udpgro.sh >+++ b/tools/testing/selftests/net/udpgro.sh >@@ -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,7 +197,7 @@ run_all() { > return $ret > } > >-if [ ! -f ../bpf/xdp_dummy.o ]; then >+if [ ! -f ${BPF_FILE} ]; then > echo "Missing xdp_dummy helper. Build bpf selftest first" nit: I would improve the error message here to print ${BPF_FILE}. There are 3 more spots in the rest of this patch.
在 2022/11/17 5:57, Saeed Mahameed 写道: > On 15 Nov 18:23, Wang Yufen wrote: >> After commit afef88e65554 ("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: afef88e65554 ("selftests/bpf: Store BPF object files with >> .bpf.o extension") >> Signed-off-by: Wang Yufen <wangyufen@huawei.com> >> Cc: Daniel Müller <deso@posteo.net> >> --- >> tools/testing/selftests/net/udpgro.sh | 6 ++++-- >> tools/testing/selftests/net/udpgro_bench.sh | 6 ++++-- >> tools/testing/selftests/net/udpgro_frglist.sh | 6 ++++-- >> tools/testing/selftests/net/udpgro_fwd.sh | 3 ++- >> tools/testing/selftests/net/veth.sh | 9 +++++---- >> 5 files changed, 19 insertions(+), 11 deletions(-) >> >> diff --git a/tools/testing/selftests/net/udpgro.sh >> b/tools/testing/selftests/net/udpgro.sh >> index 6a443ca..a66d62e 100755 >> --- a/tools/testing/selftests/net/udpgro.sh >> +++ b/tools/testing/selftests/net/udpgro.sh >> @@ -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,7 +197,7 @@ run_all() { >> return $ret >> } >> >> -if [ ! -f ../bpf/xdp_dummy.o ]; then >> +if [ ! -f ${BPF_FILE} ]; then >> echo "Missing xdp_dummy helper. Build bpf selftest first" > > nit: I would improve the error message here to print ${BPF_FILE}. > There are 3 more spots in the rest of this patch. got it, thanks!
diff --git a/tools/testing/selftests/net/udpgro.sh b/tools/testing/selftests/net/udpgro.sh index 6a443ca..a66d62e 100755 --- a/tools/testing/selftests/net/udpgro.sh +++ b/tools/testing/selftests/net/udpgro.sh @@ -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,7 +197,7 @@ run_all() { return $ret } -if [ ! -f ../bpf/xdp_dummy.o ]; then +if [ ! -f ${BPF_FILE} ]; then echo "Missing xdp_dummy helper. Build bpf selftest first" exit -1 fi diff --git a/tools/testing/selftests/net/udpgro_bench.sh b/tools/testing/selftests/net/udpgro_bench.sh index 8a1109a..09c4934 100755 --- a/tools/testing/selftests/net/udpgro_bench.sh +++ b/tools/testing/selftests/net/udpgro_bench.sh @@ -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,7 +82,7 @@ run_all() { run_udp "${ipv6_args}" } -if [ ! -f ../bpf/xdp_dummy.o ]; then +if [ ! -f ${BPF_FILE} ]; then echo "Missing xdp_dummy helper. Build bpf selftest first" exit -1 fi diff --git a/tools/testing/selftests/net/udpgro_frglist.sh b/tools/testing/selftests/net/udpgro_frglist.sh index 7fe85ba..7f94175 100755 --- a/tools/testing/selftests/net/udpgro_frglist.sh +++ b/tools/testing/selftests/net/udpgro_frglist.sh @@ -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,7 +83,7 @@ run_all() { run_udp "${ipv6_args}" } -if [ ! -f ../bpf/xdp_dummy.o ]; then +if [ ! -f ${BPF_FILE} ]; then echo "Missing xdp_dummy helper. Build bpf selftest first" exit -1 fi diff --git a/tools/testing/selftests/net/udpgro_fwd.sh b/tools/testing/selftests/net/udpgro_fwd.sh index 1bcd82e..c079565 100755 --- a/tools/testing/selftests/net/udpgro_fwd.sh +++ b/tools/testing/selftests/net/udpgro_fwd.sh @@ -1,6 +1,7 @@ #!/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() { diff --git a/tools/testing/selftests/net/veth.sh b/tools/testing/selftests/net/veth.sh index 430895d..c9732f7 100755 --- a/tools/testing/selftests/net/veth.sh +++ b/tools/testing/selftests/net/veth.sh @@ -1,6 +1,7 @@ #!/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,7 +217,7 @@ while getopts "hs:" option; do esac done -if [ ! -f ../bpf/xdp_dummy.o ]; then +if [ ! -f ${BPF_FILE} ]; then echo "Missing xdp_dummy helper. 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
After commit afef88e65554 ("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: afef88e65554 ("selftests/bpf: Store BPF object files with .bpf.o extension") Signed-off-by: Wang Yufen <wangyufen@huawei.com> Cc: Daniel Müller <deso@posteo.net> --- tools/testing/selftests/net/udpgro.sh | 6 ++++-- tools/testing/selftests/net/udpgro_bench.sh | 6 ++++-- tools/testing/selftests/net/udpgro_frglist.sh | 6 ++++-- tools/testing/selftests/net/udpgro_fwd.sh | 3 ++- tools/testing/selftests/net/veth.sh | 9 +++++---- 5 files changed, 19 insertions(+), 11 deletions(-)