bpf: selftests: send packet to devmap redirect XDP

The current xdp_devmap_attach test attaches a program
that redirects to another program via devmap.

It is, however, never executed, so do that to catch
any bugs that might occur during execution.

Also, execute the same for a veth pair so that we
also cover the non-generic path.

Warning: Running this without the bugfix in this series
will likely crash your system.

Signed-off-by: Florian Kauer <florian.kauer@linutronix.de>
Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/r/20240911-devel-koalo-fix-ingress-ifindex-v4-2-5c643ae10258@linutronix.de
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c b/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c
index ce6812558287a415d2b1ee42058ccb84ff490a1d..27ffed17d4be33fab8776baa1dd1a6055e7194bf 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c
@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0
+#include <arpa/inet.h>
 #include <uapi/linux/bpf.h>
 #include <linux/if_link.h>
+#include <network_helpers.h>
+#include <net/if.h>
 #include <test_progs.h>
 
 #include "test_xdp_devmap_helpers.skel.h"
@@ -8,31 +11,36 @@
 #include "test_xdp_with_devmap_helpers.skel.h"
 
 #define IFINDEX_LO 1
+#define TEST_NS "devmap_attach_ns"
 
 static void test_xdp_with_devmap_helpers(void)
 {
-       struct test_xdp_with_devmap_helpers *skel;
+       struct test_xdp_with_devmap_helpers *skel = NULL;
        struct bpf_prog_info info = {};
        struct bpf_devmap_val val = {
                .ifindex = IFINDEX_LO,
        };
        __u32 len = sizeof(info);
-       int err, dm_fd, map_fd;
+       int err, dm_fd, dm_fd_redir, map_fd;
+       struct nstoken *nstoken = NULL;
+       char data[10] = {};
        __u32 idx = 0;
 
+       SYS(out_close, "ip netns add %s", TEST_NS);
+       nstoken = open_netns(TEST_NS);
+       if (!ASSERT_OK_PTR(nstoken, "open_netns"))
+               goto out_close;
+       SYS(out_close, "ip link set dev lo up");
 
        skel = test_xdp_with_devmap_helpers__open_and_load();
        if (!ASSERT_OK_PTR(skel, "test_xdp_with_devmap_helpers__open_and_load"))
-               return;
+               goto out_close;
 
-       dm_fd = bpf_program__fd(skel->progs.xdp_redir_prog);
-       err = bpf_xdp_attach(IFINDEX_LO, dm_fd, XDP_FLAGS_SKB_MODE, NULL);
+       dm_fd_redir = bpf_program__fd(skel->progs.xdp_redir_prog);
+       err = bpf_xdp_attach(IFINDEX_LO, dm_fd_redir, XDP_FLAGS_SKB_MODE, NULL);
        if (!ASSERT_OK(err, "Generic attach of program with 8-byte devmap"))
                goto out_close;
 
-       err = bpf_xdp_detach(IFINDEX_LO, XDP_FLAGS_SKB_MODE, NULL);
-       ASSERT_OK(err, "XDP program detach");
-
        dm_fd = bpf_program__fd(skel->progs.xdp_dummy_dm);
        map_fd = bpf_map__fd(skel->maps.dm_ports);
        err = bpf_prog_get_info_by_fd(dm_fd, &info, &len);
@@ -47,6 +55,22 @@ static void test_xdp_with_devmap_helpers(void)
        ASSERT_OK(err, "Read devmap entry");
        ASSERT_EQ(info.id, val.bpf_prog.id, "Match program id to devmap entry prog_id");
 
+       /* send a packet to trigger any potential bugs in there */
+       DECLARE_LIBBPF_OPTS(bpf_test_run_opts, opts,
+                           .data_in = &data,
+                           .data_size_in = 10,
+                           .flags = BPF_F_TEST_XDP_LIVE_FRAMES,
+                           .repeat = 1,
+               );
+       err = bpf_prog_test_run_opts(dm_fd_redir, &opts);
+       ASSERT_OK(err, "XDP test run");
+
+       /* wait for the packets to be flushed */
+       kern_sync_rcu();
+
+       err = bpf_xdp_detach(IFINDEX_LO, XDP_FLAGS_SKB_MODE, NULL);
+       ASSERT_OK(err, "XDP program detach");
+
        /* can not attach BPF_XDP_DEVMAP program to a device */
        err = bpf_xdp_attach(IFINDEX_LO, dm_fd, XDP_FLAGS_SKB_MODE, NULL);
        if (!ASSERT_NEQ(err, 0, "Attach of BPF_XDP_DEVMAP program"))
@@ -67,6 +91,8 @@ static void test_xdp_with_devmap_helpers(void)
        ASSERT_NEQ(err, 0, "Add BPF_XDP program with frags to devmap entry");
 
 out_close:
+       close_netns(nstoken);
+       SYS_NOFAIL("ip netns del %s", TEST_NS);
        test_xdp_with_devmap_helpers__destroy(skel);
 }
 
@@ -124,6 +150,86 @@ out_close:
        test_xdp_with_devmap_frags_helpers__destroy(skel);
 }
 
+static void test_xdp_with_devmap_helpers_veth(void)
+{
+       struct test_xdp_with_devmap_helpers *skel = NULL;
+       struct bpf_prog_info info = {};
+       struct bpf_devmap_val val = {};
+       struct nstoken *nstoken = NULL;
+       __u32 len = sizeof(info);
+       int err, dm_fd, dm_fd_redir, map_fd, ifindex_dst;
+       char data[10] = {};
+       __u32 idx = 0;
+
+       SYS(out_close, "ip netns add %s", TEST_NS);
+       nstoken = open_netns(TEST_NS);
+       if (!ASSERT_OK_PTR(nstoken, "open_netns"))
+               goto out_close;
+
+       SYS(out_close, "ip link add veth_src type veth peer name veth_dst");
+       SYS(out_close, "ip link set dev veth_src up");
+       SYS(out_close, "ip link set dev veth_dst up");
+
+       val.ifindex = if_nametoindex("veth_src");
+       ifindex_dst = if_nametoindex("veth_dst");
+       if (!ASSERT_NEQ(val.ifindex, 0, "val.ifindex") ||
+           !ASSERT_NEQ(ifindex_dst, 0, "ifindex_dst"))
+               goto out_close;
+
+       skel = test_xdp_with_devmap_helpers__open_and_load();
+       if (!ASSERT_OK_PTR(skel, "test_xdp_with_devmap_helpers__open_and_load"))
+               goto out_close;
+
+       dm_fd_redir = bpf_program__fd(skel->progs.xdp_redir_prog);
+       err = bpf_xdp_attach(val.ifindex, dm_fd_redir, XDP_FLAGS_DRV_MODE, NULL);
+       if (!ASSERT_OK(err, "Attach of program with 8-byte devmap"))
+               goto out_close;
+
+       dm_fd = bpf_program__fd(skel->progs.xdp_dummy_dm);
+       map_fd = bpf_map__fd(skel->maps.dm_ports);
+       err = bpf_prog_get_info_by_fd(dm_fd, &info, &len);
+       if (!ASSERT_OK(err, "bpf_prog_get_info_by_fd"))
+               goto out_close;
+
+       val.bpf_prog.fd = dm_fd;
+       err = bpf_map_update_elem(map_fd, &idx, &val, 0);
+       ASSERT_OK(err, "Add program to devmap entry");
+
+       err = bpf_map_lookup_elem(map_fd, &idx, &val);
+       ASSERT_OK(err, "Read devmap entry");
+       ASSERT_EQ(info.id, val.bpf_prog.id, "Match program id to devmap entry prog_id");
+
+       /* attach dummy to other side to enable reception */
+       dm_fd = bpf_program__fd(skel->progs.xdp_dummy_prog);
+       err = bpf_xdp_attach(ifindex_dst, dm_fd, XDP_FLAGS_DRV_MODE, NULL);
+       if (!ASSERT_OK(err, "Attach of dummy XDP"))
+               goto out_close;
+
+       /* send a packet to trigger any potential bugs in there */
+       DECLARE_LIBBPF_OPTS(bpf_test_run_opts, opts,
+                           .data_in = &data,
+                           .data_size_in = 10,
+                           .flags = BPF_F_TEST_XDP_LIVE_FRAMES,
+                           .repeat = 1,
+               );
+       err = bpf_prog_test_run_opts(dm_fd_redir, &opts);
+       ASSERT_OK(err, "XDP test run");
+
+       /* wait for the packets to be flushed */
+       kern_sync_rcu();
+
+       err = bpf_xdp_detach(val.ifindex, XDP_FLAGS_DRV_MODE, NULL);
+       ASSERT_OK(err, "XDP program detach");
+
+       err = bpf_xdp_detach(ifindex_dst, XDP_FLAGS_DRV_MODE, NULL);
+       ASSERT_OK(err, "XDP program detach");
+
+out_close:
+       close_netns(nstoken);
+       SYS_NOFAIL("ip netns del %s", TEST_NS);
+       test_xdp_with_devmap_helpers__destroy(skel);
+}
+
 void serial_test_xdp_devmap_attach(void)
 {
        if (test__start_subtest("DEVMAP with programs in entries"))
@@ -134,4 +240,7 @@ void serial_test_xdp_devmap_attach(void)
 
        if (test__start_subtest("Verifier check of DEVMAP programs"))
                test_neg_xdp_devmap_helpers();
+
+       if (test__start_subtest("DEVMAP with programs in entries on veth"))
+               test_xdp_with_devmap_helpers_veth();
 }

diff --git a/tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c b/tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c
index 4139a14f9996723780e866842490ee6cc905b823..92b65a485d4a9725f01e99671c7399656f04f4f4 100644 (file)
--- a/tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c
+++ b/tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c
@@ -12,7 +12,7 @@ struct {
 SEC("xdp")
 int xdp_redir_prog(struct xdp_md *ctx)
 {
-       return bpf_redirect_map(&dm_ports, 1, 0);
+       return bpf_redirect_map(&dm_ports, 0, 0);
 }
 
 /* invalid program on DEVMAP entry;