Re: [PATCH v2 1/2] selftests/net: fix missing xdp_dummy

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxx>
Cc: Daniel Müller <deso@xxxxxxxxxx>
---
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.



[Index of Archives]     [Linux Samsung SoC]     [Linux Rockchip SoC]     [Linux Actions SoC]     [Linux for Synopsys ARC Processors]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]


  Powered by Linux