From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by mail.toke.dk (Postfix) with ESMTPS id 6D3B0A1B32A for ; Fri, 21 Jul 2023 00:14:18 +0200 (CEST) Authentication-Results: mail.toke.dk; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20221208 header.b=i3oOe6wj Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-563396c1299so964156a12.2 for ; Thu, 20 Jul 2023 15:14:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689891257; x=1690496057; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=xDZO+z4IDTQG6wBE5pfUJb3Uo/b0UiJaJfvx9xUgju8=; b=i3oOe6wjb1muzBZ+xoZA/jZkhy5z8EpfN9e8r1JkPA2LqDt+BOStP8Bpy2VRn0IYmT UhaVhWZ9JzzKeIa3R+ULsY6I+mrRYXvWDwy+sGsjESGytCC1bO2+pUQS5SG3z+WXNO+C lalt+PUxzEhIKZcIHCMa8Q7zvNrGdWhVffmhRx+1lOYfPzbXldArGo/OhvSVzmr/B4UU JgMUS63oSvoSUEsM7GueRI+UvbjOrW01YwuphuFenwZRQvtpjMmkp+1nTN297YewZR5L +8s3cT7S2vn0osvca3H2y9Ts73hds9KskUUvDOYEDJisqOp7wg9Vjq2ygMlzLInfeC0u enkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689891257; x=1690496057; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xDZO+z4IDTQG6wBE5pfUJb3Uo/b0UiJaJfvx9xUgju8=; b=YOwQM8KlnqVQNivlPPHgn1OWA5NpV2XrQRWnc1zaVjrkoXhxsfYhy8i3fZXOjVOiX9 4QSb+xSy9JNM7Gq4/gmjkH2yHHGMU/lrdLHQLhfTO74K+XNatZ7qvPB2Ntuh2yyEq+PK QMcpKU7Itx+s5wEL2feVg9hhSl+jTT0KUsf3OPMo0h6hooXV8kCoa0MbTsznbvvvUsPM t9RZFSHw2cM6jvC4ObqbGisa3DNAQlE89kOPTU3zfTC+/gQzShBc9j0h1AZ55XPo3szF kVYJ8raob72wyz5w+//lgSeSABTXc93Y4qSNeVtYEVz4fkrTESaBATRzxC92E0paRicx G6Hg== X-Gm-Message-State: ABy/qLby4zN7H7y1g5K/y7nZ1tmMtIIOwx/OQi0mNVcxcrFvRv6SDp6V ri3/lCBXcLABWOkxuTRxcqulxCk= X-Google-Smtp-Source: APBJJlGdd1LLnEUkG6/yeHjznhvVqsQjqchOcqfb1Y4zR/q2if/xtGHP8nmI0TJ821m9Xseq8vWWt38= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:a63:731b:0:b0:563:57ea:1d1a with SMTP id o27-20020a63731b000000b0056357ea1d1amr30pgc.12.1689891257270; Thu, 20 Jul 2023 15:14:17 -0700 (PDT) Date: Thu, 20 Jul 2023 15:14:15 -0700 In-Reply-To: <20230719183734.21681-21-larysa.zaremba@intel.com> Mime-Version: 1.0 References: <20230719183734.21681-1-larysa.zaremba@intel.com> <20230719183734.21681-21-larysa.zaremba@intel.com> Message-ID: From: Stanislav Fomichev To: Larysa Zaremba Content-Type: text/plain; charset="utf-8" Message-ID-Hash: C56LRPNKYT7IUU2KZMYLSGSXVJHJ7MIP X-Message-ID-Hash: C56LRPNKYT7IUU2KZMYLSGSXVJHJ7MIP X-MailFrom: 3ubG5ZAMKCTAePRSaaSXQ.OaYjPb-TUZfejPb-bdaVQOf.ZQf@flex--sdf.bounces.google.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: bpf@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, haoluo@google.com, jolsa@kernel.org, David Ahern , Jakub Kicinski , Willem de Bruijn , Jesper Dangaard Brouer , Anatoly Burakov , Alexander Lobakin , Magnus Karlsson , Maryam Tahhan , xdp-hints@xdp-project.net, netdev@vger.kernel.org X-Mailman-Version: 3.3.8 Precedence: list Subject: [xdp-hints] Re: [PATCH bpf-next v3 20/21] selftests/bpf: Check VLAN tag and proto in xdp_metadata List-Id: XDP hardware hints design discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 Acked-by: Stanislav Fomichev > --- > .../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... > +#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 >