Skip to content

Commit c231e12

Browse files
committed
selftests: net: use the dummy bpf from net/lib
Commit 29b036b ("selftests: drv-net: test XDP, HDS auto and the ioctl path") added an sample XDP_PASS prog in net/lib, so that we can reuse it in various sub-directories. Delete the old sample and use the one from the lib in existing tests. Acked-by: Stanislav Fomichev <[email protected]> Reviewed-by: Willem de Bruijn <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent e514d77 commit c231e12

File tree

7 files changed

+5
-31
lines changed

7 files changed

+5
-31
lines changed

tools/testing/selftests/drivers/net/hw/irq.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def reconfig(cfg) -> None:
6969
def check_reconfig_xdp(cfg) -> None:
7070
def reconfig(cfg) -> None:
7171
ip(f"link set dev %s xdp obj %s sec xdp" %
72-
(cfg.ifname, cfg.test_dir / "xdp_dummy.bpf.o"))
72+
(cfg.ifname, cfg.net_lib_dir / "xdp_dummy.bpf.o"))
7373
ip(f"link set dev %s xdp off" % cfg.ifname)
7474

7575
_check_reconfig(cfg, reconfig)

tools/testing/selftests/drivers/net/hw/xdp_dummy.bpf.c

Lines changed: 0 additions & 13 deletions
This file was deleted.

tools/testing/selftests/net/udpgro_bench.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source net_helper.sh
77

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

10-
BPF_FILE="xdp_dummy.bpf.o"
10+
BPF_FILE="lib/xdp_dummy.bpf.o"
1111

1212
cleanup() {
1313
local -r jobs="$(jobs -p)"

tools/testing/selftests/net/udpgro_frglist.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source net_helper.sh
77

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

10-
BPF_FILE="xdp_dummy.bpf.o"
10+
BPF_FILE="lib/xdp_dummy.bpf.o"
1111

1212
cleanup() {
1313
local -r jobs="$(jobs -p)"

tools/testing/selftests/net/udpgro_fwd.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
source net_helper.sh
55

6-
BPF_FILE="xdp_dummy.bpf.o"
6+
BPF_FILE="lib/xdp_dummy.bpf.o"
77
readonly BASE="ns-$(mktemp -u XXXXXX)"
88
readonly SRC=2
99
readonly DST=1

tools/testing/selftests/net/veth.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
# SPDX-License-Identifier: GPL-2.0
33

4-
BPF_FILE="xdp_dummy.bpf.o"
4+
BPF_FILE="lib/xdp_dummy.bpf.o"
55
readonly STATS="$(mktemp -p /tmp ns-XXXXXX)"
66
readonly BASE=`basename $STATS`
77
readonly SRC=2

tools/testing/selftests/net/xdp_dummy.bpf.c

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)