Skip to contentSkip to conversation

ixgbe: xsk: fix for metasize when construct skb by xdp_buff

PATCH In review Xuan Zhuo 2 participants 3 messages Jun 9, 2021 – Jun 15, 2021

Subsystems (4)
lore
Share & tools
lore

Xuan Zhuo

author
#0 lore raw

PATCH 1/1 ixgbe: xsk: fix for metasize when construct skb by xdp_buff

We should copy data_meta to the skb space. Then use __skb_pull to correct skb->data

Fixes d0bcacd0a1309 ("ixgbe: add AF_XDP zero-copy Rx support")
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c +6 -4
index f72d2978263b..ee88107fa57a 100644
@@ -204,7 +204,7 @@ static struct sk_buff *ixgbe_construct_skb_zc(struct ixgbe_ring *rx_ring,
 					      struct ixgbe_rx_buffer *bi)
 {
 	unsigned int metasize = bi->xdp->data - bi->xdp->data_meta;
-	unsigned int datasize = bi->xdp->data_end - bi->xdp->data;
+	unsigned int datasize = bi->xdp->data_end - bi->xdp->data_meta;
 	struct sk_buff *skb;
 
 	/* allocate a skb to store the frags */
@@ -214,10 +214,12 @@ static struct sk_buff *ixgbe_construct_skb_zc(struct ixgbe_ring *rx_ring,
 	if (unlikely(!skb))
 		return NULL;
 
-	skb_reserve(skb, bi->xdp->data - bi->xdp->data_hard_start);
-	memcpy(__skb_put(skb, datasize), bi->xdp->data, datasize);
-	if (metasize)
+	skb_reserve(skb, bi->xdp->data_meta - bi->xdp->data_hard_start);
+	memcpy(__skb_put(skb, datasize), bi->xdp->data_meta, datasize);
+	if (metasize) {
+		__skb_pull(skb, metasize);
 		skb_metadata_set(skb, metasize);
+	}
 
 	xsk_buff_free(bi->xdp);
 	bi->xdp = NULL;
Signature · 1 line
2.31.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 2 lines · Xuan Zhuo

We should copy data_meta to the skb space. Then use __skb_pull to correct skb->data

This looks like a bug that has been sitting over here for sometime. Have you encountered this during your virtio-net's AF_XDP ZC work? I'm all ears how you spotted this.

Anyway, other drivers needs such fixing too. Are you willing to do that or should we take it on our side?

Magnus is OOO today, I'd like to get his final ack on that.

From me:

Thanks!

Quoted 39 lines
Fixes d0bcacd0a1309 ("ixgbe: add AF_XDP zero-copy Rx support")
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c +6 -4
index f72d2978263b..ee88107fa57a 100644
@@ -204,7 +204,7 @@ static struct sk_buff *ixgbe_construct_skb_zc(struct ixgbe_ring *rx_ring,
 					      struct ixgbe_rx_buffer *bi)
 {
 	unsigned int metasize = bi->xdp->data - bi->xdp->data_meta;
-	unsigned int datasize = bi->xdp->data_end - bi->xdp->data;
+	unsigned int datasize = bi->xdp->data_end - bi->xdp->data_meta;
 	struct sk_buff *skb;
 
 	/* allocate a skb to store the frags */
@@ -214,10 +214,12 @@ static struct sk_buff *ixgbe_construct_skb_zc(struct ixgbe_ring *rx_ring,
 	if (unlikely(!skb))
 		return NULL;
 
-	skb_reserve(skb, bi->xdp->data - bi->xdp->data_hard_start);
-	memcpy(__skb_put(skb, datasize), bi->xdp->data, datasize);
-	if (metasize)
+	skb_reserve(skb, bi->xdp->data_meta - bi->xdp->data_hard_start);
+	memcpy(__skb_put(skb, datasize), bi->xdp->data_meta, datasize);
+	if (metasize) {
+		__skb_pull(skb, metasize);
 		skb_metadata_set(skb, metasize);
+	}
 
 	xsk_buff_free(bi->xdp);
 	bi->xdp = NULL;
Signature · 1 line
2.31.0
author
#2 lore raw

PATCH 1/1 ixgbe: xsk: fix for metasize when construct skb by xdp_buff

Quoted 10 lines · Maciej Fijalkowski
Quoted 2 lines · Xuan Zhuo

We should copy data_meta to the skb space. Then use __skb_pull to correct skb->data

This looks like a bug that has been sitting over here for sometime. Have you encountered this during your virtio-net's AF_XDP ZC work? I'm all ears how you spotted this.

Anyway, other drivers needs such fixing too. Are you willing to do that or should we take it on our side?

You are right, I didn't pay attention to other drivers before. I have already submitted the patch.

[PATCH net] xdp, net: fix for construct skb by xdp inside xsk zc rx

Thanks!

Quoted 47 lines

Magnus is OOO today, I'd like to get his final ack on that.

From me:

Thanks!

Quoted 39 lines
Fixes d0bcacd0a1309 ("ixgbe: add AF_XDP zero-copy Rx support")
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c +6 -5
index f72d2978263b..ee88107fa57a 100644
@@ -204,7 +204,7 @@ static struct sk_buff *ixgbe_construct_skb_zc(struct ixgbe_ring *rx_ring,
 					      struct ixgbe_rx_buffer *bi)
 {
 	unsigned int metasize = bi->xdp->data - bi->xdp->data_meta;
-	unsigned int datasize = bi->xdp->data_end - bi->xdp->data;
+	unsigned int datasize = bi->xdp->data_end - bi->xdp->data_meta;
 	struct sk_buff *skb;
 
 	/* allocate a skb to store the frags */
@@ -214,10 +214,12 @@ static struct sk_buff *ixgbe_construct_skb_zc(struct ixgbe_ring *rx_ring,
 	if (unlikely(!skb))
 		return NULL;
 
-	skb_reserve(skb, bi->xdp->data - bi->xdp->data_hard_start);
-	memcpy(__skb_put(skb, datasize), bi->xdp->data, datasize);
-	if (metasize)
+	skb_reserve(skb, bi->xdp->data_meta - bi->xdp->data_hard_start);
+	memcpy(__skb_put(skb, datasize), bi->xdp->data_meta, datasize);
+	if (metasize) {
+		__skb_pull(skb, metasize);
 		skb_metadata_set(skb, metasize);
+	}
 
 	xsk_buff_free(bi->xdp);
 	bi->xdp = NULL;
--

2.31.0