Prepare to copy the XDP metadata into an skb extension in skb_metadata_set.
Unlike other drivers, veth calls skb_metadata_set after eth_type_trans, which pulls the Ethernet header and moves skb->data. This violates the new contract with skb_metadata. Adjust the driver to pull the MAC header after calling skb_metadata_set. Signed-off-by: Jakub Sitnicki <[email protected]> --- drivers/net/veth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 14e6f2a2fb77..1d1dbfa2e5ef 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -874,11 +874,11 @@ static struct sk_buff *veth_xdp_rcv_skb(struct veth_rq *rq, else skb->data_len = 0; - skb->protocol = eth_type_trans(skb, rq->dev); - metalen = xdp->data - xdp->data_meta; if (metalen) skb_metadata_set(skb, metalen); + + skb->protocol = eth_type_trans(skb, rq->dev); out: return skb; drop: -- 2.43.0
