| Message ID | 20230512152607.992209-16-larysa.zaremba@intel.com |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | new kfunc XDP hints and ice implementation | expand |
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 <larysa.zaremba@intel.com> Acked-by: Stanislav Fomichev <sdf@google.com> > --- > .../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 >
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; };
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 <larysa.zaremba@intel.com> --- .../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(-)