Commit c231e12e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

selftests: net: use the dummy bpf from net/lib 



Commit 29b036be ("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: default avatarStanislav Fomichev <sdf@fomichev.me>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20250327222315.1098596-3-kuba@kernel.org


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

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

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ def check_reconfig_queues(cfg) -> None: 
def check_reconfig_xdp(cfg) -> None:

    def reconfig(cfg) -> None:

        ip(f"link set dev %s xdp obj %s sec xdp" %

           (cfg.ifname, cfg.test_dir / "xdp_dummy.bpf.o"))

           (cfg.ifname, cfg.net_lib_dir / "xdp_dummy.bpf.o"))

        ip(f"link set dev %s xdp off" % cfg.ifname)



    _check_reconfig(cfg, reconfig)

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

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#define KBUILD_MODNAME "xdp_dummy"

#include <linux/bpf.h>

#include <bpf/bpf_helpers.h>



SEC("xdp")

int xdp_dummy_prog(struct xdp_md *ctx)

{

	return XDP_PASS;

}



char _license[] SEC("license") = "GPL";

tools/testing/selftests/net/udpgro_bench.sh

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ source net_helper.sh 


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



BPF_FILE="xdp_dummy.bpf.o"

BPF_FILE="lib/xdp_dummy.bpf.o"



cleanup() {

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

tools/testing/selftests/net/udpgro_frglist.sh

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ source net_helper.sh 


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



BPF_FILE="xdp_dummy.bpf.o"

BPF_FILE="lib/xdp_dummy.bpf.o"



cleanup() {

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

tools/testing/selftests/net/udpgro_fwd.sh

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


source net_helper.sh



BPF_FILE="xdp_dummy.bpf.o"

BPF_FILE="lib/xdp_dummy.bpf.o"

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

readonly SRC=2

readonly DST=1