From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by mail.toke.dk (Postfix) with ESMTPS id 9D1FCA0658F for ; Fri, 12 May 2023 20:37:49 +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=fblFRNo8 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-b9a7e65b34aso18459492276.0 for ; Fri, 12 May 2023 11:37:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683916668; x=1686508668; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=zboVOwqqV2t+sWom/4kttINSyimT2o2UbgCRgWVc8fA=; b=fblFRNo8UQl44zBJrRLzXecFe1I+pMjTOLDVKmvVGTWEmqhmhmHjsF65sGuIcN8KGo 5aicg+lg/yO6VoujBtMcq9FBX6286ctSUAuJYD/aRQeHfUvaOoWMF1mF8jlNV3BA+Qu7 x6MEddujT5hloeJyBRL7jFkaOcM4Ezx82bqFmBHNjID0qc59h+M0n0vogkO06Vs41V6J ky7JyPkksC0Wjy5jdPDmdqqXlVW2U00tK6yLLQEFc1IcTxh4lVHVt4k5pfjbDA+/KTCl xHLt64efrqmvdHsYyFwWUu9ctUzwNU/IBeXgIGnCN3Kn1ctzE48+4D27ZR8mgjpH3myC FffQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683916668; x=1686508668; 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=zboVOwqqV2t+sWom/4kttINSyimT2o2UbgCRgWVc8fA=; b=QptJ3XAivC0oubWrDgik0oz5x2uGhvv+TRX2U1OqN4kB5ScuaU0q4DwZBABPbweuGZ Qphxr6EgV5p/u0vVxlwHVq2TW0gnzY6JcJA2BeDgyj0VXjG2bIHqEt0oBxguli7iBwc4 6ATKFouOvw6UnsZR9Q62P83qtLubcKLFzqUn/CUdB38ipYDMqtm7DW8KaqSknyNLAk3F axWMei/hzTdYJeX58cV7mlszGnqIwGkr2yT24NL3pTFaf3wS2gMjSgDJwlFvblIqkVQq Bi0tkh5I4sMgx0PpxYtqSApGf7KuvSPNIediLVQlYRmSZyw0zxLN+zEtd/Mw0sffX25o 0/bQ== X-Gm-Message-State: AC+VfDwReCeDmZFirAuarcKvKq3+pkj0yNEk1CXaHFK/pxuecoCf23aj 83wAg2ybiAzFoWEpcMF+Kc3lZNo= X-Google-Smtp-Source: ACHHUZ7USl24Sz0lNjT4gOgSLfYQu6o9kzkQudxt7lv7JTr+L0u0cffl5efd7Q5Gwf/cp+vIHzQhdJ4= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:a25:545:0:b0:b99:4473:ed93 with SMTP id 66-20020a250545000000b00b994473ed93mr11326655ybf.4.1683916667981; Fri, 12 May 2023 11:37:47 -0700 (PDT) Date: Fri, 12 May 2023 11:37:46 -0700 In-Reply-To: <20230512152607.992209-16-larysa.zaremba@intel.com> Mime-Version: 1.0 References: <20230512152607.992209-1-larysa.zaremba@intel.com> <20230512152607.992209-16-larysa.zaremba@intel.com> Message-ID: From: Stanislav Fomichev To: Larysa Zaremba Content-Type: text/plain; charset="utf-8" Message-ID-Hash: CSZNH7LKEYNURCTHPJIQ3SNGTX7FCVMR X-Message-ID-Hash: CSZNH7LKEYNURCTHPJIQ3SNGTX7FCVMR X-MailFrom: 3e4deZAMKCS4cNPQYYQVO.MYWhNZ-RSXdchNZ-ZbYTOMd.XOd@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, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Jakub Kicinski , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Jiri Olsa , Jesse Brandeburg , Tony Nguyen , Anatoly Burakov , Jesper Dangaard Brouer , Alexander Lobakin , Magnus Karlsson , Maryam Tahhan , xdp-hints@xdp-project.net, netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org X-Mailman-Version: 3.3.8 Precedence: list Subject: [xdp-hints] Re: [PATCH RESEND bpf-next 15/15] selftests/bpf: Add flags and new hints to xdp_hw_metadata List-Id: XDP hardware hints design discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On 05/12, Larysa Zaremba wrote: > Add hints added in the previous patches (VLAN tags and checksum level) > to the xdp_hw_metadata program. > > Also, to make metadata layout more straightforward, add flags field > to pass information about validity of every separate hint separately. > > Signed-off-by: Larysa Zaremba Acked-by: Stanislav Fomichev > --- > .../selftests/bpf/progs/xdp_hw_metadata.c | 40 ++++++++++++++++--- > tools/testing/selftests/bpf/xdp_hw_metadata.c | 29 +++++++++++--- > tools/testing/selftests/bpf/xdp_metadata.h | 28 ++++++++++++- > 3 files changed, 85 insertions(+), 12 deletions(-) > > diff --git a/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c b/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c > index f95f82a8b449..97bad79ce4ca 100644 > --- a/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c > +++ b/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c > @@ -20,6 +20,12 @@ 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_ctag(const struct xdp_md *ctx, > + __u16 *vlan_tag) __ksym; > +extern int bpf_xdp_metadata_rx_stag(const struct xdp_md *ctx, > + __u16 *vlan_tag) __ksym; > +extern int bpf_xdp_metadata_rx_csum_lvl(const struct xdp_md *ctx, > + __u8 *csum_level) __ksym; > > SEC("xdp") > int rx(struct xdp_md *ctx) > @@ -83,15 +89,39 @@ int rx(struct xdp_md *ctx) > return XDP_PASS; > } > > + meta->hint_valid = 0; > + > err = bpf_xdp_metadata_rx_timestamp(ctx, &meta->rx_timestamp); > - if (!err) > + if (err) { > + meta->rx_timestamp_err = err; > + } else { > + meta->hint_valid |= XDP_META_FIELD_TS; > meta->xdp_timestamp = bpf_ktime_get_tai_ns(); > - else > - meta->rx_timestamp = 0; /* Used by AF_XDP as not avail signal */ > + } > > err = bpf_xdp_metadata_rx_hash(ctx, &meta->rx_hash, &meta->rx_hash_type); > - if (err < 0) > - meta->rx_hash_err = err; /* Used by AF_XDP as no hash signal */ > + if (err) > + meta->rx_hash_err = err; > + else > + meta->hint_valid |= XDP_META_FIELD_RSS; > + > + err = bpf_xdp_metadata_rx_ctag(ctx, &meta->rx_ctag); > + if (err) > + meta->rx_ctag_err = err; > + else > + meta->hint_valid |= XDP_META_FIELD_CTAG; > + > + err = bpf_xdp_metadata_rx_stag(ctx, &meta->rx_stag); > + if (err) > + meta->rx_stag_err = err; > + else > + meta->hint_valid |= XDP_META_FIELD_STAG; > + > + err = bpf_xdp_metadata_rx_csum_lvl(ctx, &meta->rx_csum_lvl); > + if (err) > + meta->rx_csum_err = err; > + else > + meta->hint_valid |= XDP_META_FIELD_CSUM_LVL; > > __sync_add_and_fetch(&pkts_redir, 1); > return bpf_redirect_map(&xsk, ctx->rx_queue_index, XDP_PASS); > diff --git a/tools/testing/selftests/bpf/xdp_hw_metadata.c b/tools/testing/selftests/bpf/xdp_hw_metadata.c > index 613321eb84c1..efcabe68f64b 100644 > --- a/tools/testing/selftests/bpf/xdp_hw_metadata.c > +++ b/tools/testing/selftests/bpf/xdp_hw_metadata.c > @@ -156,15 +156,16 @@ static void verify_xdp_metadata(void *data, clockid_t clock_id) > > meta = data - sizeof(*meta); > > - if (meta->rx_hash_err < 0) > - printf("No rx_hash err=%d\n", meta->rx_hash_err); > - else > + if (meta->hint_valid & XDP_META_FIELD_RSS) > printf("rx_hash: 0x%X with RSS type:0x%X\n", > meta->rx_hash, meta->rx_hash_type); > + else > + printf("No rx_hash, err=%d\n", meta->rx_hash_err); > + > + if (meta->hint_valid & XDP_META_FIELD_TS) { > + printf("rx_timestamp: %llu (sec:%0.4f)\n", meta->rx_timestamp, > + (double)meta->rx_timestamp / NANOSEC_PER_SEC); > > - printf("rx_timestamp: %llu (sec:%0.4f)\n", meta->rx_timestamp, > - (double)meta->rx_timestamp / NANOSEC_PER_SEC); > - if (meta->rx_timestamp) { > __u64 usr_clock = gettime(clock_id); > __u64 xdp_clock = meta->xdp_timestamp; > __s64 delta_X = xdp_clock - meta->rx_timestamp; > @@ -179,8 +180,24 @@ static void verify_xdp_metadata(void *data, clockid_t clock_id) > usr_clock, (double)usr_clock / NANOSEC_PER_SEC, > (double)delta_X2U / NANOSEC_PER_SEC, > (double)delta_X2U / 1000); > + } else { > + printf("No rx_timestamp, err=%d\n", meta->rx_timestamp_err); > } > > + if (meta->hint_valid & XDP_META_FIELD_CTAG) > + printf("rx_ctag: %u\n", meta->rx_ctag); > + else > + printf("No rx_ctag, err=%d\n", meta->rx_ctag_err); > + > + if (meta->hint_valid & XDP_META_FIELD_STAG) > + printf("rx_stag: %u\n", meta->rx_stag); > + else > + printf("No rx_stag, err=%d\n", meta->rx_stag_err); > + > + if (meta->hint_valid & XDP_META_FIELD_CSUM_LVL) > + printf("Checksum was checked at level %u\n", meta->rx_csum_lvl); > + else > + printf("Checksum was not checked, err=%d\n", meta->rx_csum_err); > } > > static void verify_skb_metadata(int fd) > diff --git a/tools/testing/selftests/bpf/xdp_metadata.h b/tools/testing/selftests/bpf/xdp_metadata.h > index 6664893c2c77..7c0267a8918a 100644 > --- a/tools/testing/selftests/bpf/xdp_metadata.h > +++ b/tools/testing/selftests/bpf/xdp_metadata.h > @@ -17,12 +17,38 @@ > #define ETH_P_8021AD 0x88A8 > #endif > > +#define BIT(nr) (1 << (nr)) > + > +enum xdp_meta_field { > + XDP_META_FIELD_TS = BIT(0), > + XDP_META_FIELD_RSS = BIT(1), > + XDP_META_FIELD_CTAG = BIT(2), > + XDP_META_FIELD_STAG = BIT(3), > + XDP_META_FIELD_CSUM_LVL = BIT(4), > +}; > + > struct xdp_meta { > - __u64 rx_timestamp; > + union { > + __u64 rx_timestamp; > + __s32 rx_timestamp_err; > + }; > __u64 xdp_timestamp; > __u32 rx_hash; > union { > __u32 rx_hash_type; > __s32 rx_hash_err; > }; > + union { > + __u16 rx_ctag; > + __s32 rx_ctag_err; > + }; > + union { > + __u16 rx_stag; > + __s32 rx_stag_err; > + }; > + union { > + __u8 rx_csum_lvl; > + __s32 rx_csum_err; > + }; > + enum xdp_meta_field hint_valid; > }; > -- > 2.35.3 >