From: Stanislav Fomichev <stfomichev@gmail.com>
To: "Bastien Curutchet (eBPF Foundation)" <bastien.curutchet@bootlin.com>
Cc: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
Andrii Nakryiko <andrii@kernel.org>,
Eduard Zingerman <eddyz87@gmail.com>,
Mykola Lysenko <mykolal@fb.com>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>,
Yonghong Song <yonghong.song@linux.dev>,
KP Singh <kpsingh@kernel.org>,
Stanislav Fomichev <sdf@fomichev.me>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>, Shuah Khan <shuah@kernel.org>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Alexis Lothore <alexis.lothore@bootlin.com>,
netdev@vger.kernel.org, bpf@vger.kernel.org,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH bpf-next 2/2] selftests/bpf: Migrate test_xdp_vlan.sh into test_progs
Date: Fri, 21 Feb 2025 08:14:52 -0800 [thread overview]
Message-ID: <Z7imfH-Adq5qUUsB@mini-arch> (raw)
In-Reply-To: <20250221-xdp_vlan-v1-2-7d29847169af@bootlin.com>
On 02/21, Bastien Curutchet (eBPF Foundation) wrote:
> test_xdp_vlan.sh isn't used by the BPF CI.
>
> Migrate test_xdp_vlan.sh in prog_tests/xdp_vlan.c.
> It uses the same BPF programs located in progs/test_xdp_vlan.c and the
> same network topology.
> Remove test_xdp_vlan*.sh and their Makefile entries.
>
> Signed-off-by: Bastien Curutchet (eBPF Foundation) <bastien.curutchet@bootlin.com>
> ---
> tools/testing/selftests/bpf/Makefile | 4 +-
> tools/testing/selftests/bpf/prog_tests/xdp_vlan.c | 175 ++++++++++++++++
> tools/testing/selftests/bpf/test_xdp_vlan.sh | 233 ---------------------
> .../selftests/bpf/test_xdp_vlan_mode_generic.sh | 9 -
> .../selftests/bpf/test_xdp_vlan_mode_native.sh | 9 -
> 5 files changed, 176 insertions(+), 254 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> index 5dc9c84ed30f6e5a46572a9e428f692a79623469..09c1f731b8280696c729e3c87020ef749fee9dcb 100644
> --- a/tools/testing/selftests/bpf/Makefile
> +++ b/tools/testing/selftests/bpf/Makefile
> @@ -103,8 +103,6 @@ TEST_PROGS := test_kmod.sh \
> test_tunnel.sh \
> test_lwt_seg6local.sh \
> test_lirc_mode2.sh \
> - test_xdp_vlan_mode_generic.sh \
> - test_xdp_vlan_mode_native.sh \
> test_lwt_ip_encap.sh \
> test_tc_tunnel.sh \
> test_tc_edt.sh \
> @@ -118,7 +116,7 @@ TEST_PROGS := test_kmod.sh \
>
> TEST_PROGS_EXTENDED := \
> ima_setup.sh verify_sig_setup.sh \
> - test_xdp_vlan.sh test_bpftool.py
> + test_bpftool.py
>
> TEST_KMODS := bpf_testmod.ko bpf_test_no_cfi.ko bpf_test_modorder_x.ko \
> bpf_test_modorder_y.ko
> diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_vlan.c b/tools/testing/selftests/bpf/prog_tests/xdp_vlan.c
> new file mode 100644
> index 0000000000000000000000000000000000000000..18dd25344de768aa83a162a0c091f28a4e5f505e
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/prog_tests/xdp_vlan.c
> @@ -0,0 +1,175 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +/*
> + * Network topology:
> + * ----------- -----------
> + * | NS1 | | NS2 |
> + * | veth0 -|--------|- veth0 |
> + * ----------- -----------
> + *
> + */
> +
> +#define _GNU_SOURCE
> +#include <net/if.h>
> +#include <uapi/linux/if_link.h>
> +
> +#include "network_helpers.h"
> +#include "test_progs.h"
> +#include "test_xdp_vlan.skel.h"
> +
> +
> +#define VETH_NAME "veth0"
> +#define NS_MAX_SIZE 32
> +#define NS1_NAME "ns-xdp-vlan-1-"
> +#define NS2_NAME "ns-xdp-vlan-2-"
> +#define NS1_IP_ADDR "100.64.10.1"
> +#define NS2_IP_ADDR "100.64.10.2"
> +#define VLAN_ID 4011
> +
> +static int setup_network(char *ns1, char *ns2)
> +{
> + if (!ASSERT_OK(append_tid(ns1, NS_MAX_SIZE), "create ns1 name"))
> + goto fail;
> + if (!ASSERT_OK(append_tid(ns2, NS_MAX_SIZE), "create ns2 name"))
> + goto fail;
> +
[..]
> + SYS(fail, "ip netns add %s", ns1);
> + SYS(fail, "ip netns add %s", ns2);
Will replacing these with open_netns work? Or we don't setup up enough
state to cooperate with 'ip' tool? (same for cleanup_network if it
works)
> + SYS(fail, "ip -n %s link add %s type veth peer name %s netns %s",
> + ns1, VETH_NAME, VETH_NAME, ns2);
> +
> + /* NOTICE: XDP require VLAN header inside packet payload
> + * - Thus, disable VLAN offloading driver features
> + */
> + SYS(fail, "ip netns exec %s ethtool -K %s rxvlan off txvlan off", ns1, VETH_NAME);
> + SYS(fail, "ip netns exec %s ethtool -K %s rxvlan off txvlan off", ns2, VETH_NAME);
> +
> + /* NS1 configuration */
> + SYS(fail, "ip -n %s addr add %s/24 dev %s", ns1, NS1_IP_ADDR, VETH_NAME);
> + SYS(fail, "ip -n %s link set %s up", ns1, VETH_NAME);
> +
> + /* NS2 configuration */
> + SYS(fail, "ip -n %s link add link %s name %s.%d type vlan id %d",
> + ns2, VETH_NAME, VETH_NAME, VLAN_ID, VLAN_ID);
> + SYS(fail, "ip -n %s addr add %s/24 dev %s.%d", ns2, NS2_IP_ADDR, VETH_NAME, VLAN_ID);
> + SYS(fail, "ip -n %s link set %s up", ns2, VETH_NAME);
> + SYS(fail, "ip -n %s link set %s.%d up", ns2, VETH_NAME, VLAN_ID);
> +
> + /* At this point ping should fail because VLAN tags are only used by NS2 */
> + return !SYS_NOFAIL("ip netns exec %s ping -W 1 -c1 %s", ns2, NS1_IP_ADDR);
> +
> +fail:
> + return -1;
> +}
> +
> +static void cleanup_network(const char *ns1, const char *ns2)
> +{
> + SYS_NOFAIL("ip netns del %s", ns1);
> + SYS_NOFAIL("ip netns del %s", ns2);
> +}
> +
> +static void xdp_vlan(struct bpf_program *xdp, struct bpf_program *tc, u32 flags)
> +{
> + LIBBPF_OPTS(bpf_tc_hook, tc_hook, .attach_point = BPF_TC_EGRESS);
> + LIBBPF_OPTS(bpf_tc_opts, tc_opts, .handle = 1, .priority = 1);
> + char ns1[NS_MAX_SIZE] = NS1_NAME;
> + char ns2[NS_MAX_SIZE] = NS2_NAME;
> + struct nstoken *nstoken = NULL;
> + int interface;
> + int ret;
> +
> + if (!ASSERT_OK(setup_network(ns1, ns2), "setup network"))
> + goto cleanup;
> +
> + nstoken = open_netns(ns1);
> + if (!ASSERT_OK_PTR(nstoken, "open NS1"))
> + goto cleanup;
> +
> + interface = if_nametoindex(VETH_NAME);
> + if (!ASSERT_NEQ(interface, 0, "get interface index"))
> + goto cleanup;
> +
> + ret = bpf_xdp_attach(interface, bpf_program__fd(xdp), flags, NULL);
> + if (!ASSERT_OK(ret, "attach xdp_vlan_change"))
> + goto cleanup;
> +
> + tc_hook.ifindex = interface;
> + ret = bpf_tc_hook_create(&tc_hook);
> + if (!ASSERT_OK(ret, "bpf_tc_hook_create"))
> + goto detach_xdp;
> +
> + /* Now we'll use BPF programs to pop/push the VLAN tags */
> + tc_opts.prog_fd = bpf_program__fd(tc);
> + ret = bpf_tc_attach(&tc_hook, &tc_opts);
> + if (!ASSERT_OK(ret, "bpf_tc_attach"))
> + goto detach_xdp;
> +
> + close_netns(nstoken);
> + nstoken = NULL;
> +
> + /* Now the namespaces can reach each-other, test with pings */
> + SYS(detach_tc, "ip netns exec %s ping -i 0.2 -W 2 -c 2 %s > /dev/null", ns1, NS2_IP_ADDR);
> + SYS(detach_tc, "ip netns exec %s ping -i 0.2 -W 2 -c 2 %s > /dev/null", ns2, NS1_IP_ADDR);
> +
> +
> +detach_tc:
> + bpf_tc_detach(&tc_hook, &tc_opts);
> +detach_xdp:
> + bpf_xdp_detach(interface, flags, NULL);
> +cleanup:
> + close_netns(nstoken);
> + cleanup_network(ns1, ns2);
> +}
> +
> +/* First test: Remove VLAN by setting VLAN ID 0, using "xdp_vlan_change"
> + * egress use TC to add back VLAN tag 4011
> + */
> +void test_xdp_vlan_change(void)
> +{
> + struct test_xdp_vlan *skel;
> +
> + skel = test_xdp_vlan__open_and_load();
> + if (!ASSERT_OK_PTR(skel, "xdp_vlan__open_and_load"))
> + return;
> +
[..]
> + if (test__start_subtest("0"))
> + xdp_vlan(skel->progs.xdp_vlan_change, skel->progs.tc_vlan_push, 0);
Does the original test also test with flags=0? What is the purpose?
next prev parent reply other threads:[~2025-02-21 16:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-21 10:04 [PATCH bpf-next 0/2] selftests/bpf: Migrate test_xdp_vlan.sh into test_progs Bastien Curutchet (eBPF Foundation)
2025-02-21 10:04 ` [PATCH bpf-next 1/2] selftests/bpf: test_xdp_vlan: Rename BPF sections Bastien Curutchet (eBPF Foundation)
2025-02-21 10:04 ` [PATCH bpf-next 2/2] selftests/bpf: Migrate test_xdp_vlan.sh into test_progs Bastien Curutchet (eBPF Foundation)
2025-02-21 16:14 ` Stanislav Fomichev [this message]
2025-02-24 9:27 ` Bastien Curutchet
2025-02-24 16:10 ` Stanislav Fomichev
2025-02-24 16:10 ` [PATCH bpf-next 0/2] " Stanislav Fomichev
2025-03-18 10:25 ` Bastien Curutchet
2025-03-19 23:05 ` Martin KaFai Lau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Z7imfH-Adq5qUUsB@mini-arch \
--to=stfomichev@gmail.com \
--cc=alexis.lothore@bootlin.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bastien.curutchet@bootlin.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=eddyz87@gmail.com \
--cc=haoluo@google.com \
--cc=hawk@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=mykolal@fb.com \
--cc=netdev@vger.kernel.org \
--cc=sdf@fomichev.me \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=thomas.petazzoni@bootlin.com \
--cc=yonghong.song@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.