From: Larysa Zaremba <larysa.zaremba@intel.com>
To: Stanislav Fomichev <sdf@google.com>
Cc: "bpf@vger.kernel.org" <bpf@vger.kernel.org>,
"ast@kernel.org" <ast@kernel.org>,
"daniel@iogearbox.net" <daniel@iogearbox.net>,
"andrii@kernel.org" <andrii@kernel.org>,
"martin.lau@linux.dev" <martin.lau@linux.dev>,
"song@kernel.org" <song@kernel.org>, "yhs@fb.com" <yhs@fb.com>,
"john.fastabend@gmail.com" <john.fastabend@gmail.com>,
"kpsingh@kernel.org" <kpsingh@kernel.org>,
"haoluo@google.com" <haoluo@google.com>,
"jolsa@kernel.org" <jolsa@kernel.org>,
David Ahern <dsahern@gmail.com>, Jakub Kicinski <kuba@kernel.org>,
Willem de Bruijn <willemb@google.com>,
"Brouer, Jesper" <brouer@redhat.com>,
"Burakov, Anatoly" <anatoly.burakov@intel.com>,
"Lobakin, Aleksander" <aleksander.lobakin@intel.com>,
Magnus Karlsson <magnus.karlsson@gmail.com>,
"Tahhan, Maryam" <mtahhan@redhat.com>,
"xdp-hints@xdp-project.net" <xdp-hints@xdp-project.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [xdp-hints] Re: [PATCH bpf-next v3 20/21] selftests/bpf: Check VLAN tag and proto in xdp_metadata
Date: Tue, 25 Jul 2023 09:11:34 +0200 [thread overview]
Message-ID: <ZL91pnrvlwdxP7M6@lincoln> (raw)
In-Reply-To: <CAKH8qBtqCnewzcn_rfgNYPYD3oWSaDbf0ws6bDKL3H6gK7x6cg@mail.gmail.com>
On Fri, Jul 21, 2023 at 09:44:17AM -0700, Stanislav Fomichev wrote:
> On Fri, Jul 21, 2023 at 12:47 AM Zaremba, Larysa
> <larysa.zaremba@intel.com> wrote:
> >
> > On Thu, Jul 20, 2023 at 03:14:15PM -0700, Stanislav Fomichev wrote:
> > > On 07/19, Larysa Zaremba wrote:
> > > > Verify, whether VLAN tag and proto are set correctly.
> > > >
> > > > To simulate "stripped" VLAN tag on veth, send test packet from VLAN
> > > > interface.
> > > >
> > > > Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com>
> > >
> > > Acked-by: Stanislav Fomichev <sdf@google.com>
> > >
> > > > ---
> > > > .../selftests/bpf/prog_tests/xdp_metadata.c | 22 +++++++++++++++++--
> > > > .../selftests/bpf/progs/xdp_metadata.c | 4 ++++
> > > > 2 files changed, 24 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c b/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
> > > > index 1877e5c6d6c7..6665cf0c59cc 100644
> > > > --- a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
> > > > +++ b/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
> > > > @@ -38,7 +38,15 @@
> > > > #define TX_MAC "00:00:00:00:00:01"
> > > > #define RX_MAC "00:00:00:00:00:02"
> > > >
> > > > +#define VLAN_ID 59
> > > > +#define VLAN_ID_STR "59"
> > >
> > > I was looking whether we have some str(x) macro in the selftests,
> > > but doesn't look like we have any...
> > >
> >
> > I could add one, if you could hint me at the file, where it would need to go.
> > Or just add it locally for now?
>
> Up to you. I feel like it's fine as is.
>
I need to send v4 with some minor changes anyway, so will add in v4.
> I was expecting to find something like the following in
> tools/testing/selftests/bpf/testing_helpers.h:
>
> #define __TO_STR(x) #x
> #define TO_STR(x) __TO_STR(x)
>
> We have similar patterns in:
> tools/testing/selftests/bpf/sdt.h (_SDT_ARG_CONSTRAINT_STRING)
> tools/testing/selftests/kvm/x86_64/smm_test.c (XSTR)
> tools/tracing/rtla/src/utils.c (STR)
>
> But nothing "generic" it seems...
>
> > > > +#define VLAN_PROTO "802.1Q"
> > > > +#define VLAN_PID htons(ETH_P_8021Q)
> > > > +#define TX_NAME_VLAN TX_NAME "." VLAN_ID_STR
> > > > +#define RX_NAME_VLAN RX_NAME "." VLAN_ID_STR
> > > > +
> > > > #define XDP_RSS_TYPE_L4 BIT(3)
> > > > +#define VLAN_VID_MASK 0xfff
> > > >
> > > > struct xsk {
> > > > void *umem_area;
> > > > @@ -215,6 +223,12 @@ static int verify_xsk_metadata(struct xsk *xsk)
> > > > if (!ASSERT_NEQ(meta->rx_hash_type & XDP_RSS_TYPE_L4, 0, "rx_hash_type"))
> > > > return -1;
> > > >
> > > > + if (!ASSERT_EQ(meta->rx_vlan_tci & VLAN_VID_MASK, VLAN_ID, "rx_vlan_tci"))
> > > > + return -1;
> > > > +
> > > > + if (!ASSERT_EQ(meta->rx_vlan_proto, VLAN_PID, "rx_vlan_proto"))
> > > > + return -1;
> > > > +
> > > > xsk_ring_cons__release(&xsk->rx, 1);
> > > > refill_rx(xsk, comp_addr);
> > > >
> > > > @@ -248,10 +262,14 @@ void test_xdp_metadata(void)
> > > >
> > > > SYS(out, "ip link set dev " TX_NAME " address " TX_MAC);
> > > > SYS(out, "ip link set dev " TX_NAME " up");
> > > > - SYS(out, "ip addr add " TX_ADDR "/" PREFIX_LEN " dev " TX_NAME);
> > > > +
> > > > + SYS(out, "ip link add link " TX_NAME " " TX_NAME_VLAN
> > > > + " type vlan proto " VLAN_PROTO " id " VLAN_ID_STR);
> > > > + SYS(out, "ip link set dev " TX_NAME_VLAN " up");
> > > > + SYS(out, "ip addr add " TX_ADDR "/" PREFIX_LEN " dev " TX_NAME_VLAN);
> > > >
> > > > /* Avoid ARP calls */
> > > > - SYS(out, "ip -4 neigh add " RX_ADDR " lladdr " RX_MAC " dev " TX_NAME);
> > > > + SYS(out, "ip -4 neigh add " RX_ADDR " lladdr " RX_MAC " dev " TX_NAME_VLAN);
> > > > close_netns(tok);
> > > >
> > > > tok = open_netns(RX_NETNS_NAME);
> > > > diff --git a/tools/testing/selftests/bpf/progs/xdp_metadata.c b/tools/testing/selftests/bpf/progs/xdp_metadata.c
> > > > index d151d406a123..d3111649170e 100644
> > > > --- a/tools/testing/selftests/bpf/progs/xdp_metadata.c
> > > > +++ b/tools/testing/selftests/bpf/progs/xdp_metadata.c
> > > > @@ -23,6 +23,9 @@ extern int bpf_xdp_metadata_rx_timestamp(const struct xdp_md *ctx,
> > > > __u64 *timestamp) __ksym;
> > > > extern int bpf_xdp_metadata_rx_hash(const struct xdp_md *ctx, __u32 *hash,
> > > > enum xdp_rss_hash_type *rss_type) __ksym;
> > > > +extern int bpf_xdp_metadata_rx_vlan_tag(const struct xdp_md *ctx,
> > > > + __u16 *vlan_tci,
> > > > + __be16 *vlan_proto) __ksym;
> > > >
> > > > SEC("xdp")
> > > > int rx(struct xdp_md *ctx)
> > > > @@ -57,6 +60,7 @@ int rx(struct xdp_md *ctx)
> > > > meta->rx_timestamp = 1;
> > > >
> > > > bpf_xdp_metadata_rx_hash(ctx, &meta->rx_hash, &meta->rx_hash_type);
> > > > + bpf_xdp_metadata_rx_vlan_tag(ctx, &meta->rx_vlan_tci, &meta->rx_vlan_proto);
> > > >
> > > > return bpf_redirect_map(&xsk, ctx->rx_queue_index, XDP_PASS);
> > > > }
> > > > --
> > > > 2.41.0
> > > >
> > >
next prev parent reply other threads:[~2023-07-25 7:16 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-19 18:37 [xdp-hints] [PATCH bpf-next v3 00/21] XDP metadata via kfuncs for ice Larysa Zaremba
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 01/21] ice: make RX hash reading code more reusable Larysa Zaremba
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 02/21] ice: make RX HW timestamp " Larysa Zaremba
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 03/21] ice: make RX checksum checking " Larysa Zaremba
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 04/21] ice: Make ptype internal to descriptor info processing Larysa Zaremba
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 05/21] ice: Introduce ice_xdp_buff Larysa Zaremba
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 06/21] ice: Support HW timestamp hint Larysa Zaremba
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 07/21] ice: Support RX hash XDP hint Larysa Zaremba
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 08/21] ice: Support XDP hints in AF_XDP ZC mode Larysa Zaremba
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 09/21] xdp: Add VLAN tag hint Larysa Zaremba
2023-07-20 21:49 ` [xdp-hints] " Stanislav Fomichev
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 10/21] ice: Implement " Larysa Zaremba
2023-07-20 18:50 ` [xdp-hints] " Simon Horman
2023-07-21 7:38 ` Zaremba, Larysa
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 11/21] ice: use VLAN proto from ring packet context in skb path Larysa Zaremba
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 12/21] xdp: Add checksum hint Larysa Zaremba
2023-07-19 21:42 ` [xdp-hints] " Willem de Bruijn
2023-07-20 9:57 ` Zaremba, Larysa
2023-07-20 10:10 ` Zaremba, Larysa
2023-07-20 13:55 ` Willem de Bruijn
2023-07-20 16:03 ` Zaremba, Larysa
2023-07-20 22:27 ` Willem de Bruijn
2023-07-21 8:01 ` Zaremba, Larysa
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 13/21] ice: Implement " Larysa Zaremba
2023-07-19 18:59 ` [xdp-hints] " Alexei Starovoitov
2023-07-19 21:51 ` Willem de Bruijn
2023-07-20 9:47 ` Zaremba, Larysa
2023-07-20 15:14 ` Alexei Starovoitov
2023-07-20 15:41 ` Zaremba, Larysa
2023-07-20 21:58 ` Stanislav Fomichev
2023-07-20 22:24 ` Willem de Bruijn
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 14/21] selftests/bpf: Allow VLAN packets in xdp_hw_metadata Larysa Zaremba
2023-07-20 21:58 ` [xdp-hints] " Stanislav Fomichev
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 15/21] net, xdp: allow metadata > 32 Larysa Zaremba
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 16/21] selftests/bpf: Add flags and new hints to xdp_hw_metadata Larysa Zaremba
2023-07-20 22:00 ` [xdp-hints] " Stanislav Fomichev
2023-07-21 7:41 ` Zaremba, Larysa
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 17/21] veth: Implement VLAN tag and checksum XDP hint Larysa Zaremba
2023-07-20 22:02 ` [xdp-hints] " Stanislav Fomichev
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 18/21] net: make vlan_get_tag() return -ENODATA instead of -EINVAL Larysa Zaremba
2023-07-20 22:02 ` [xdp-hints] " Stanislav Fomichev
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 19/21] selftests/bpf: Use AF_INET for TX in xdp_metadata Larysa Zaremba
2023-07-20 22:05 ` [xdp-hints] " Stanislav Fomichev
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 20/21] selftests/bpf: Check VLAN tag and proto " Larysa Zaremba
2023-07-20 22:14 ` [xdp-hints] " Stanislav Fomichev
2023-07-21 7:46 ` Zaremba, Larysa
2023-07-21 16:44 ` Stanislav Fomichev
2023-07-25 7:11 ` Larysa Zaremba [this message]
2023-07-19 18:37 ` [xdp-hints] [PATCH bpf-next v3 21/21] selftests/bpf: check checksum state " Larysa Zaremba
2023-07-20 22:14 ` [xdp-hints] " Stanislav Fomichev
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
List information: https://lists.xdp-project.net/postorius/lists/xdp-hints.xdp-project.net/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZL91pnrvlwdxP7M6@lincoln \
--to=larysa.zaremba@intel.com \
--cc=aleksander.lobakin@intel.com \
--cc=anatoly.burakov@intel.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=dsahern@gmail.com \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=magnus.karlsson@gmail.com \
--cc=martin.lau@linux.dev \
--cc=mtahhan@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sdf@google.com \
--cc=song@kernel.org \
--cc=willemb@google.com \
--cc=xdp-hints@xdp-project.net \
--cc=yhs@fb.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox