xdp_build_skb_from_buff() always calls eth_type_trans() on the skb it builds, which pulls the Ethernet header and advances skb->data. Drivers that still need to process the L2 header before protocol parsing therefore cannot use the helper. stmmac is such a driver: its software VLAN path (stmmac_rx_vlan()) reads the VLAN tag at skb->data and shifts the MAC addresses over it, so it has to run before eth_type_trans(). Split the implementation into __xdp_build_skb_from_buff(), which builds the skb (including the recycle mark, the Rx queue index and the frags info) but leaves skb->dev, skb->protocol, skb->pkt_type and the mac header unset, so the caller must initialize them, usually by calling eth_type_trans(). Make xdp_build_skb_from_buff() a static inline wrapper that still calls eth_type_trans() as before, preserving the behavior of existing in-tree users. A follow-up patch will let stmmac use it. Signed-off-by: Lorenzo Bianconi --- include/net/xdp.h | 29 ++++++++++++++++++++++++++++- net/core/xdp.c | 15 +++++++++------ 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/include/net/xdp.h b/include/net/xdp.h index 07231adfb5f8..054748b37d7d 100644 --- a/include/net/xdp.h +++ b/include/net/xdp.h @@ -7,6 +7,7 @@ #define __LINUX_NET_XDP_H__ #include +#include #include #include #include /* skb_shared_info */ @@ -379,7 +380,33 @@ xdp_update_skb_frags_info(struct sk_buff *skb, u8 nr_frags, void xdp_warn(const char *msg, const char *func, const int line); #define XDP_WARN(msg) xdp_warn(msg, __func__, __LINE__) -struct sk_buff *xdp_build_skb_from_buff(const struct xdp_buff *xdp); +struct sk_buff *__xdp_build_skb_from_buff(const struct xdp_buff *xdp); + +/** + * xdp_build_skb_from_buff - create an skb from &xdp_buff + * @xdp: &xdp_buff to convert to an skb + * + * Same as __xdp_build_skb_from_buff(), but also calls eth_type_trans(), + * which sets skb->dev, skb->protocol and skb->pkt_type, resets the mac + * header and pulls the Ethernet header. + * + * Return: new &sk_buff on success, %NULL on error. + */ +static inline +struct sk_buff *xdp_build_skb_from_buff(const struct xdp_buff *xdp) +{ + const struct xdp_rxq_info *rxq = xdp->rxq; + struct sk_buff *skb; + + skb = __xdp_build_skb_from_buff(xdp); + if (!skb) + return NULL; + + skb->protocol = eth_type_trans(skb, rxq->dev); + + return skb; +} + struct sk_buff *xdp_build_skb_from_zc(struct xdp_buff *xdp); struct xdp_frame *xdp_convert_zc_to_xdp_frame(struct xdp_buff *xdp); struct sk_buff *__xdp_build_skb_from_frame(struct xdp_frame *xdpf, diff --git a/net/core/xdp.c b/net/core/xdp.c index 1d679e8fd649..0db2f68afc5c 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -620,17 +620,22 @@ void xdp_warn(const char *msg, const char *func, const int line) EXPORT_SYMBOL_GPL(xdp_warn); /** - * xdp_build_skb_from_buff - create an skb from &xdp_buff + * __xdp_build_skb_from_buff - create an skb from &xdp_buff * @xdp: &xdp_buff to convert to an skb * * Perform common operations to create a new skb to pass up the stack from * &xdp_buff: allocate an skb head from the NAPI percpu cache, initialize * skb data pointers and offsets, set the recycle bit if the buff is - * PP-backed, Rx queue index, protocol and update frags info. + * PP-backed, record the Rx queue index and update frags info. + * + * This routine does not call eth_type_trans(), so skb->dev, + * skb->protocol, skb->pkt_type and the mac header are left unset. + * Callers must initialize this state themselves, usually by calling + * eth_type_trans(), before passing the skb up the stack. * * Return: new &sk_buff on success, %NULL on error. */ -struct sk_buff *xdp_build_skb_from_buff(const struct xdp_buff *xdp) +struct sk_buff *__xdp_build_skb_from_buff(const struct xdp_buff *xdp) { const struct xdp_rxq_info *rxq = xdp->rxq; const struct skb_shared_info *sinfo; @@ -667,11 +672,9 @@ struct sk_buff *xdp_build_skb_from_buff(const struct xdp_buff *xdp) tsize, xdp_buff_get_skb_flags(xdp)); } - skb->protocol = eth_type_trans(skb, rxq->dev); - return skb; } -EXPORT_SYMBOL_GPL(xdp_build_skb_from_buff); +EXPORT_SYMBOL_GPL(__xdp_build_skb_from_buff); /** * xdp_copy_frags_from_zc - copy frags from XSk buff to skb -- 2.56.1