[PATCH bpf-next V1 5/7] net: veth: Read xdp metadata from rx_meta struct if available

Jesper Dangaard Brouer
2025-06-03T17:46:27Z

From: Lorenzo Bianconi <lorenzo@kernel.org>

Report xdp_rx_meta info if available in xdp_buff struct in
xdp_metadata_ops callbacks for veth driver

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/veth.c | 12 +++++++++++
include/net/xdp.h | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+)

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 7bb53961c0ea..94b470b6b680 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -1614,6 +1614,10 @@ static int veth_xdp(struct net_device *dev, struct netdev_bpf *xdp)
static int veth_xdp_rx_timestamp(const struct xdp_md *ctx, u64 *timestamp)
{
struct veth_xdp_buff *_ctx = (void *)ctx;
+ const struct xdp_buff *xdp = &_ctx->xdp;
+
+ if (!xdp_load_rx_ts_from_buff(xdp, timestamp))
+ return 0;

if (!_ctx->skb)
return -ENODATA;
@@ -1626,8 +1630,12 @@ static int veth_xdp_rx_hash(const struct xdp_md *ctx, u32 *hash,
enum xdp_rss_hash_type *rss_type)
{
struct veth_xdp_buff *_ctx = (void *)ctx;
+ const struct xdp_buff *xdp = &_ctx->xdp;
struct sk_buff *skb = _ctx->skb;

+ if (!xdp_load_rx_hash_from_buff(xdp, hash, rss_type))
+ return 0;
+
if (!skb)
return -ENODATA;

@@ -1641,9 +1649,13 @@ static int veth_xdp_rx_vlan_tag(const struct xdp_md *ctx, __be16 *vlan_proto,
u16 *vlan_tci)
{
const struct veth_xdp_buff *_ctx = (void *)ctx;
+ const struct xdp_buff *xdp = &_ctx->xdp;
const struct sk_buff *skb = _ctx->skb;
int err;

+ if (!xdp_load_rx_vlan_tag_from_buff(xdp, vlan_proto, vlan_tci))
+ return 0;
+
if (!skb)
return -ENODATA;

diff --git a/include/net/xdp.h b/include/net/xdp.h
index 1ecbfe2053f2..6d93f0cf1b53 100644
--- a/include/net/xdp.h
+++ b/include/net/xdp.h
@@ -158,6 +158,23 @@ static __always_inline bool xdp_buff_has_valid_meta_area(struct xdp_buff *xdp)
return !!(xdp->flags & XDP_FLAGS_META_AREA);
}

+static __always_inline bool
+xdp_buff_has_rx_meta_hash(const struct xdp_buff *xdp)
+{
+ return !!(xdp->flags & XDP_FLAGS_META_RX_HASH);
+}
+
+static __always_inline bool
+xdp_buff_has_rx_meta_vlan(const struct xdp_buff *xdp)
+{
+ return !!(xdp->flags & XDP_FLAGS_META_RX_VLAN);
+}
+
+static __always_inline bool xdp_buff_has_rx_meta_ts(const struct xdp_buff *xdp)
+{
+ return !!(xdp->flags & XDP_FLAGS_META_RX_TS);
+}
+
static __always_inline void
xdp_init_buff(struct xdp_buff *xdp, u32 frame_sz, struct xdp_rxq_info *rxq)
{
@@ -708,4 +725,44 @@ static __always_inline u32 bpf_prog_run_xdp(const struct bpf_prog *prog,

return act;
}
+
+static inline int xdp_load_rx_hash_from_buff(const struct xdp_buff *xdp,
+ u32 *hash,
+ enum xdp_rss_hash_type *rss_type)
+{
+ if (!xdp_buff_has_rx_meta_hash(xdp))
+ return -ENODATA;
+
+ *hash = xdp->rx_meta->hash.val;
+ *rss_type = xdp->rx_meta->hash.type;
+
+ return 0;
+}
+
+static inline int xdp_load_rx_vlan_tag_from_buff(const struct xdp_buff *xdp,
+ __be16 *vlan_proto,
+ u16 *vlan_tci)
+{
+ if (!xdp_buff_has_rx_meta_vlan(xdp))
+ return -ENODATA;
+
+ *vlan_proto = xdp->rx_meta->vlan.proto;
+ *vlan_tci = xdp->rx_meta->vlan.tci;
+
+ return 0;
+}
+
+static inline int xdp_load_rx_ts_from_buff(const struct xdp_buff *xdp, u64 *ts)
+{
+ struct skb_shared_info *sinfo;
+
+ if (!xdp_buff_has_rx_meta_ts(xdp))
+ return -ENODATA;
+
+ sinfo = xdp_get_shared_info_from_buff(xdp);
+ *ts = sinfo->hwtstamps.hwtstamp;
+
+ return 0;
+}
+
#endif /* __LINUX_NET_XDP_H__ */