Skip to contentSkip to conversation

bpf, i40e: add meta data support

PATCH New Daniel Borkmann 3 participants 5 messages May 28, 2018 – Jun 19, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bpf, i40e: add meta data support

Add support for XDP meta data when using build skb variant of the i40e driver. Implementation is analogous to the existing ixgbe and ixgbevf support for meta data from 366a88fe2f40 ("bpf,
ixgbe: add meta data support") and be8333322eff ("ixgbevf: Add support for meta data"). With the build skb variant we get 192 bytes of extra headroom which can be used for encaps or meta data.

---
 drivers/net/ethernet/intel/i40e/i40e_txrx.c | 39 +++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_txrx.c +31 -8
index 9b698c5..eee6e91 100644
@@ -2032,6 +2032,21 @@ static struct sk_buff *i40e_construct_skb(struct i40e_ring *rx_ring,
 #if L1_CACHE_BYTES < 128
 	prefetch(xdp->data + L1_CACHE_BYTES);
 #endif
+	/* Note, we get here by enabling legacy-rx via:
+	 *
+	 *    ethtool --set-priv-flags <dev> legacy-rx on
+	 *
+	 * In this mode, we currently get 0 extra XDP headroom as
+	 * opposed to having legacy-rx off, where we process XDP
+	 * packets going to stack via i40e_build_skb(). The latter
+	 * provides us currently with 192 bytes of headroom.
+	 *
+	 * For i40e_construct_skb() mode it means that the
+	 * xdp->data_meta will always point to xdp->data, since
+	 * the helper cannot expand the head. Should this ever
+	 * change in future for legacy-rx mode on, then lets also
+	 * add xdp->data_meta handling here.
+	 */
 
 	/* allocate a skb to store the frags */
 	skb = __napi_alloc_skb(&rx_ring->q_vector->napi,
@@ -2083,19 +2098,25 @@ static struct sk_buff *i40e_build_skb(struct i40e_ring *rx_ring,
 				      struct i40e_rx_buffer *rx_buffer,
 				      struct xdp_buff *xdp)
 {
-	unsigned int size = xdp->data_end - xdp->data;
+	unsigned int metasize = xdp->data - xdp->data_meta;
 #if (PAGE_SIZE < 8192)
 	unsigned int truesize = i40e_rx_pg_size(rx_ring) / 2;
 #else
 	unsigned int truesize = SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) +
-				SKB_DATA_ALIGN(I40E_SKB_PAD + size);
+				SKB_DATA_ALIGN(I40E_SKB_PAD +
+					       (xdp->data_end -
+						xdp->data_hard_start));
 #endif
 	struct sk_buff *skb;
 
-	/* prefetch first cache line of first page */
-	prefetch(xdp->data);
+	/* Prefetch first cache line of first page. If xdp->data_meta
+	 * is unused, this points extactly as xdp->data, otherwise we
+	 * likely have a consumer accessing first few bytes of meta
+	 * data, and then actual data.
+	 */
+	prefetch(xdp->data_meta);
 #if L1_CACHE_BYTES < 128
-	prefetch(xdp->data + L1_CACHE_BYTES);
+	prefetch(xdp->data_meta + L1_CACHE_BYTES);
 #endif
 	/* build an skb around the page buffer */
 	skb = build_skb(xdp->data_hard_start, truesize);
@@ -2103,8 +2124,10 @@ static struct sk_buff *i40e_build_skb(struct i40e_ring *rx_ring,
 		return NULL;
 
 	/* update pointers within the skb to store the data */
-	skb_reserve(skb, I40E_SKB_PAD);
-	__skb_put(skb, size);
+	skb_reserve(skb, I40E_SKB_PAD + (xdp->data - xdp->data_hard_start));
+	__skb_put(skb, xdp->data_end - xdp->data);
+	if (metasize)
+		skb_metadata_set(skb, metasize);
 
 	/* buffer is used by skb, update page_offset */
 #if (PAGE_SIZE < 8192)
@@ -2341,7 +2364,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
 		if (!skb) {
 			xdp.data = page_address(rx_buffer->page) +
 				   rx_buffer->page_offset;
-			xdp_set_data_meta_invalid(&xdp);
+			xdp.data_meta = xdp.data;
 			xdp.data_hard_start = xdp.data -
 					      i40e_rx_offset(rx_ring);
 			xdp.data_end = xdp.data + size;
Signature · 1 line
2.9.5
#1 lore raw

PATCH 1/1 bpf, i40e: add meta data support

This patch is breaking ping, with the patch applied the ICMP packets are arriving corrupted on the receiving end. Reverting the patch fixes the problem. Pcap file attached.

--Andrew

Quoted 108 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Daniel Borkmann
Sent: Monday, May 28, 2018 2:07 AM
To: Kirsher, Jeffrey T <[email protected]>
Cc: intel-wired-lan at lists.osuosl.org; daniel at iogearbox.net
Subject: [Intel-wired-lan] [PATCH net-next] bpf, i40e: add meta data support

Add support for XDP meta data when using build skb variant of the i40e driver. Implementation is analogous to the existing ixgbe and ixgbevf support for meta data from 366a88fe2f40 ("bpf,
ixgbe: add meta data support") and be8333322eff ("ixgbevf: Add support for meta data"). With the build skb variant we get
192 bytes of extra headroom which can be used for encaps or meta data.

---
 drivers/net/ethernet/intel/i40e/i40e_txrx.c | 39
+++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_txrx.c +0 -0
index 9b698c5..eee6e91 100644
@@ -2032,6 +2032,21 @@ static struct sk_buff *i40e_construct_skb(struct

i40e_ring *rx_ring, #if L1_CACHE_BYTES < 128

drivers/net/ethernet/intel/i40e/i40e_txrx.c +16 -1
 	prefetch(xdp->data + L1_CACHE_BYTES);
 #endif
+	/* Note, we get here by enabling legacy-rx via:
+	 *
+	 *    ethtool --set-priv-flags <dev> legacy-rx on
+	 *
+	 * In this mode, we currently get 0 extra XDP headroom as
+	 * opposed to having legacy-rx off, where we process XDP
+	 * packets going to stack via i40e_build_skb(). The latter
+	 * provides us currently with 192 bytes of headroom.
+	 *
+	 * For i40e_construct_skb() mode it means that the
+	 * xdp->data_meta will always point to xdp->data, since
+	 * the helper cannot expand the head. Should this ever
+	 * change in future for legacy-rx mode on, then lets also
+	 * add xdp->data_meta handling here.
+	 */
 
 	/* allocate a skb to store the frags */
 	skb = __napi_alloc_skb(&rx_ring->q_vector->napi,
@@ -2083,19 +2098,25 @@ static struct sk_buff *i40e_build_skb(struct
 i40e_ring *rx_ring,
 				      struct i40e_rx_buffer *rx_buffer,
 				      struct xdp_buff *xdp)
 {
-	unsigned int size = xdp->data_end - xdp->data;
+	unsigned int metasize = xdp->data - xdp->data_meta;
 #if (PAGE_SIZE < 8192)
 	unsigned int truesize = i40e_rx_pg_size(rx_ring) / 2;  #else
 	unsigned int truesize = SKB_DATA_ALIGN(sizeof(struct

skb_shared_info)) +

drivers/net/ethernet/intel/i40e/i40e_txrx.c +12 -6
-				SKB_DATA_ALIGN(I40E_SKB_PAD + size);
+				SKB_DATA_ALIGN(I40E_SKB_PAD +
+					       (xdp->data_end -
+						xdp->data_hard_start));
 #endif
 	struct sk_buff *skb;
 
-	/* prefetch first cache line of first page */
-	prefetch(xdp->data);
+	/* Prefetch first cache line of first page. If xdp->data_meta
+	 * is unused, this points extactly as xdp->data, otherwise we
+	 * likely have a consumer accessing first few bytes of meta
+	 * data, and then actual data.
+	 */
+	prefetch(xdp->data_meta);
 #if L1_CACHE_BYTES < 128
-	prefetch(xdp->data + L1_CACHE_BYTES);
+	prefetch(xdp->data_meta + L1_CACHE_BYTES);
 #endif
 	/* build an skb around the page buffer */
 	skb = build_skb(xdp->data_hard_start, truesize); @@ -2103,8
+2124,10 @@ static struct sk_buff *i40e_build_skb(struct i40e_ring *rx_ring,
 		return NULL;
 
 	/* update pointers within the skb to store the data */
-	skb_reserve(skb, I40E_SKB_PAD);
-	__skb_put(skb, size);
+	skb_reserve(skb, I40E_SKB_PAD + (xdp->data - xdp-
Quoted 1 line

data_hard_start));

drivers/net/ethernet/intel/i40e/i40e_txrx.c +3 -0
+	__skb_put(skb, xdp->data_end - xdp->data);
+	if (metasize)
+		skb_metadata_set(skb, metasize);
 
 	/* buffer is used by skb, update page_offset */  #if (PAGE_SIZE <

8192) @@ -2341,7 +2364,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)

drivers/net/ethernet/intel/i40e/i40e_txrx.c +1 -2
 		if (!skb) {
 			xdp.data = page_address(rx_buffer->page) +
 				   rx_buffer->page_offset;
-			xdp_set_data_meta_invalid(&xdp);
+			xdp.data_meta = xdp.data;
 			xdp.data_hard_start = xdp.data -
 					      i40e_rx_offset(rx_ring);
 			xdp.data_end = xdp.data + size;
--

2.9.5

Quoted 4 lines

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan

-------------- next part --------------
A non-text attachment was scrubbed...
Name: corrupted ping.pcapng
Type: application/octet-stream
Size: 5312 bytes
Desc: corrupted ping.pcapng
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20180619/bb21be3f/attachment.obj>

#2 lore raw

PATCH 1/1 bpf, i40e: add meta data support

I thought we knew this patch had an issue. I thought there was an update for it wasn't there?

I called out the line below. Basically we are just supposed to be reporting I40E_SKB_PAD, but it was being doubled because that is also the value represented by xdp->data - xdp->data_hard_start

- Alex

Quoted 95 lines · AndrewX

This patch is breaking ping, with the patch applied the ICMP packets are arriving corrupted on the receiving end. Reverting the patch fixes the problem. Pcap file attached.

--Andrew

Quoted 90 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Daniel Borkmann
Sent: Monday, May 28, 2018 2:07 AM
To: Kirsher, Jeffrey T <[email protected]>
Cc: intel-wired-lan at lists.osuosl.org; daniel at iogearbox.net
Subject: [Intel-wired-lan] [PATCH net-next] bpf, i40e: add meta data support

Add support for XDP meta data when using build skb variant of the i40e driver. Implementation is analogous to the existing ixgbe and ixgbevf support for meta data from 366a88fe2f40 ("bpf,
ixgbe: add meta data support") and be8333322eff ("ixgbevf: Add support for meta data"). With the build skb variant we get
192 bytes of extra headroom which can be used for encaps or meta data.

---
 drivers/net/ethernet/intel/i40e/i40e_txrx.c | 39
+++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_txrx.c +0 -0
index 9b698c5..eee6e91 100644
@@ -2032,6 +2032,21 @@ static struct sk_buff *i40e_construct_skb(struct

i40e_ring *rx_ring, #if L1_CACHE_BYTES < 128

      prefetch(xdp->data + L1_CACHE_BYTES);

#endif

drivers/net/ethernet/intel/i40e/i40e_txrx.c +16 -1
+     /* Note, we get here by enabling legacy-rx via:
+      *
+      *    ethtool --set-priv-flags <dev> legacy-rx on
+      *
+      * In this mode, we currently get 0 extra XDP headroom as
+      * opposed to having legacy-rx off, where we process XDP
+      * packets going to stack via i40e_build_skb(). The latter
+      * provides us currently with 192 bytes of headroom.
+      *
+      * For i40e_construct_skb() mode it means that the
+      * xdp->data_meta will always point to xdp->data, since
+      * the helper cannot expand the head. Should this ever
+      * change in future for legacy-rx mode on, then lets also
+      * add xdp->data_meta handling here.
+      */
 
      /* allocate a skb to store the frags */
      skb = __napi_alloc_skb(&rx_ring->q_vector->napi,
@@ -2083,19 +2098,25 @@ static struct sk_buff *i40e_build_skb(struct
 i40e_ring *rx_ring,
                                    struct i40e_rx_buffer *rx_buffer,
                                    struct xdp_buff *xdp)
 {
-     unsigned int size = xdp->data_end - xdp->data;
+     unsigned int metasize = xdp->data - xdp->data_meta;
 #if (PAGE_SIZE < 8192)
      unsigned int truesize = i40e_rx_pg_size(rx_ring) / 2;  #else
      unsigned int truesize = SKB_DATA_ALIGN(sizeof(struct

skb_shared_info)) +

drivers/net/ethernet/intel/i40e/i40e_txrx.c +12 -6
-                             SKB_DATA_ALIGN(I40E_SKB_PAD + size);
+                             SKB_DATA_ALIGN(I40E_SKB_PAD +
+                                            (xdp->data_end -
+                                             xdp->data_hard_start));
 #endif
      struct sk_buff *skb;
 
-     /* prefetch first cache line of first page */
-     prefetch(xdp->data);
+     /* Prefetch first cache line of first page. If xdp->data_meta
+      * is unused, this points extactly as xdp->data, otherwise we
+      * likely have a consumer accessing first few bytes of meta
+      * data, and then actual data.
+      */
+     prefetch(xdp->data_meta);
 #if L1_CACHE_BYTES < 128
-     prefetch(xdp->data + L1_CACHE_BYTES);
+     prefetch(xdp->data_meta + L1_CACHE_BYTES);
 #endif
      /* build an skb around the page buffer */
      skb = build_skb(xdp->data_hard_start, truesize); @@ -2103,8
+2124,10 @@ static struct sk_buff *i40e_build_skb(struct i40e_ring *rx_ring,
              return NULL;
 
      /* update pointers within the skb to store the data */
-     skb_reserve(skb, I40E_SKB_PAD);
-     __skb_put(skb, size);
+     skb_reserve(skb, I40E_SKB_PAD + (xdp->data - xdp-
Quoted 1 line

data_hard_start));

The problem is here if I recall.

This should be skb_reserve(skb, xdp->data - xdp - data_hard_start);

Quoted 28 lines
Quoted 18 lines
drivers/net/ethernet/intel/i40e/i40e_txrx.c +3 -0
+     __skb_put(skb, xdp->data_end - xdp->data);
+     if (metasize)
+             skb_metadata_set(skb, metasize);
 
      /* buffer is used by skb, update page_offset */  #if (PAGE_SIZE <

8192) @@ -2341,7 +2364,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)

              if (!skb) {
                      xdp.data = page_address(rx_buffer->page) +
                                 rx_buffer->page_offset;
drivers/net/ethernet/intel/i40e/i40e_txrx.c +1 -2
-                     xdp_set_data_meta_invalid(&xdp);
+                     xdp.data_meta = xdp.data;
                      xdp.data_hard_start = xdp.data -
                                            i40e_rx_offset(rx_ring);
                      xdp.data_end = xdp.data + size;
--

2.9.5

Quoted 4 lines

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan

#3 lore raw

PATCH 1/1 bpf, i40e: add meta data support

Try retesting with this patch also applied:
http://patchwork.ozlabs.org/patch/928778/

Thanks.

- Alex

Quoted 139 lines · Alexander Duyck

I thought we knew this patch had an issue. I thought there was an update for it wasn't there?

I called out the line below. Basically we are just supposed to be reporting I40E_SKB_PAD, but it was being doubled because that is also the value represented by xdp->data - xdp->data_hard_start

- Alex

Quoted 95 lines · AndrewX

This patch is breaking ping, with the patch applied the ICMP packets are arriving corrupted on the receiving end. Reverting the patch fixes the problem. Pcap file attached.

--Andrew

Quoted 90 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Daniel Borkmann
Sent: Monday, May 28, 2018 2:07 AM
To: Kirsher, Jeffrey T <[email protected]>
Cc: intel-wired-lan at lists.osuosl.org; daniel at iogearbox.net
Subject: [Intel-wired-lan] [PATCH net-next] bpf, i40e: add meta data support

Add support for XDP meta data when using build skb variant of the i40e driver. Implementation is analogous to the existing ixgbe and ixgbevf support for meta data from 366a88fe2f40 ("bpf,
ixgbe: add meta data support") and be8333322eff ("ixgbevf: Add support for meta data"). With the build skb variant we get
192 bytes of extra headroom which can be used for encaps or meta data.

---
 drivers/net/ethernet/intel/i40e/i40e_txrx.c | 39
+++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_txrx.c +0 -0
index 9b698c5..eee6e91 100644
@@ -2032,6 +2032,21 @@ static struct sk_buff *i40e_construct_skb(struct

i40e_ring *rx_ring, #if L1_CACHE_BYTES < 128

      prefetch(xdp->data + L1_CACHE_BYTES);

#endif

drivers/net/ethernet/intel/i40e/i40e_txrx.c +16 -1
+     /* Note, we get here by enabling legacy-rx via:
+      *
+      *    ethtool --set-priv-flags <dev> legacy-rx on
+      *
+      * In this mode, we currently get 0 extra XDP headroom as
+      * opposed to having legacy-rx off, where we process XDP
+      * packets going to stack via i40e_build_skb(). The latter
+      * provides us currently with 192 bytes of headroom.
+      *
+      * For i40e_construct_skb() mode it means that the
+      * xdp->data_meta will always point to xdp->data, since
+      * the helper cannot expand the head. Should this ever
+      * change in future for legacy-rx mode on, then lets also
+      * add xdp->data_meta handling here.
+      */
 
      /* allocate a skb to store the frags */
      skb = __napi_alloc_skb(&rx_ring->q_vector->napi,
@@ -2083,19 +2098,25 @@ static struct sk_buff *i40e_build_skb(struct
 i40e_ring *rx_ring,
                                    struct i40e_rx_buffer *rx_buffer,
                                    struct xdp_buff *xdp)
 {
-     unsigned int size = xdp->data_end - xdp->data;
+     unsigned int metasize = xdp->data - xdp->data_meta;
 #if (PAGE_SIZE < 8192)
      unsigned int truesize = i40e_rx_pg_size(rx_ring) / 2;  #else
      unsigned int truesize = SKB_DATA_ALIGN(sizeof(struct

skb_shared_info)) +

drivers/net/ethernet/intel/i40e/i40e_txrx.c +12 -6
-                             SKB_DATA_ALIGN(I40E_SKB_PAD + size);
+                             SKB_DATA_ALIGN(I40E_SKB_PAD +
+                                            (xdp->data_end -
+                                             xdp->data_hard_start));
 #endif
      struct sk_buff *skb;
 
-     /* prefetch first cache line of first page */
-     prefetch(xdp->data);
+     /* Prefetch first cache line of first page. If xdp->data_meta
+      * is unused, this points extactly as xdp->data, otherwise we
+      * likely have a consumer accessing first few bytes of meta
+      * data, and then actual data.
+      */
+     prefetch(xdp->data_meta);
 #if L1_CACHE_BYTES < 128
-     prefetch(xdp->data + L1_CACHE_BYTES);
+     prefetch(xdp->data_meta + L1_CACHE_BYTES);
 #endif
      /* build an skb around the page buffer */
      skb = build_skb(xdp->data_hard_start, truesize); @@ -2103,8
+2124,10 @@ static struct sk_buff *i40e_build_skb(struct i40e_ring *rx_ring,
              return NULL;
 
      /* update pointers within the skb to store the data */
-     skb_reserve(skb, I40E_SKB_PAD);
-     __skb_put(skb, size);
+     skb_reserve(skb, I40E_SKB_PAD + (xdp->data - xdp-
Quoted 1 line

data_hard_start));

The problem is here if I recall.

This should be skb_reserve(skb, xdp->data - xdp - data_hard_start);

Quoted 28 lines
Quoted 18 lines
drivers/net/ethernet/intel/i40e/i40e_txrx.c +3 -0
+     __skb_put(skb, xdp->data_end - xdp->data);
+     if (metasize)
+             skb_metadata_set(skb, metasize);
 
      /* buffer is used by skb, update page_offset */  #if (PAGE_SIZE <

8192) @@ -2341,7 +2364,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)

              if (!skb) {
                      xdp.data = page_address(rx_buffer->page) +
                                 rx_buffer->page_offset;
drivers/net/ethernet/intel/i40e/i40e_txrx.c +1 -2
-                     xdp_set_data_meta_invalid(&xdp);
+                     xdp.data_meta = xdp.data;
                      xdp.data_hard_start = xdp.data -
                                            i40e_rx_offset(rx_ring);
                      xdp.data_end = xdp.data + size;
--

2.9.5

Quoted 4 lines

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan

#4 lore raw

PATCH 1/1 bpf, i40e: add meta data support

With that patch applied, it works :-) Maybe this patch needs to be merged into the older one? Just my 2 bucks...

--Andrew

Quoted 162 lines

-----Original Message-----
From: Alexander Duyck [mailto:alexander.duyck at gmail.com]
Sent: Tuesday, June 19, 2018 2:18 PM
To: Bowers, AndrewX <[email protected]>
Cc: Daniel Borkmann <[email protected]>; Kirsher, Jeffrey T <[email protected]>; intel-wired-lan at lists.osuosl.org
Subject: Re: [Intel-wired-lan] [PATCH net-next] bpf, i40e: add meta data support

Try retesting with this patch also applied:
http://patchwork.ozlabs.org/patch/928778/

Thanks.

- Alex

Quoted 12 lines · Alexander Duyck

I thought we knew this patch had an issue. I thought there was an update for it wasn't there?

I called out the line below. Basically we are just supposed to be reporting I40E_SKB_PAD, but it was being doubled because that is also the value represented by xdp->data - xdp->data_hard_start

- Alex

Quoted 1 line · AndrewX

This patch is breaking ping, with the patch applied the ICMP packets are

arriving corrupted on the receiving end. Reverting the patch fixes the problem. Pcap file attached.

Quoted 28 lines
Quoted 28 lines

--Andrew

Quoted 24 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Daniel Borkmann
Sent: Monday, May 28, 2018 2:07 AM
To: Kirsher, Jeffrey T <[email protected]>
Cc: intel-wired-lan at lists.osuosl.org; daniel at iogearbox.net
Subject: [Intel-wired-lan] [PATCH net-next] bpf, i40e: add meta data support

Add support for XDP meta data when using build skb variant of the i40e driver. Implementation is analogous to the existing ixgbe and ixgbevf support for meta data from 366a88fe2f40 ("bpf,
ixgbe: add meta data support") and be8333322eff ("ixgbevf: Add support for meta data"). With the build skb variant we get 192 bytes of extra headroom which can be used for encaps or meta data.

---
 drivers/net/ethernet/intel/i40e/i40e_txrx.c | 39
+++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 8 deletions(-)
Quoted 7 lines
Quoted 7 lines

drivers/net/ethernet/intel/i40e/i40e_txrx.c static struct sk_buff · line 2032

Quoted 7 lines
drivers/net/ethernet/intel/i40e/i40e_txrx.c +0 -0
index 9b698c5..eee6e91 100644
@@ -2032,6 +2032,21 @@ static struct sk_buff
 *i40e_construct_skb(struct i40e_ring *rx_ring,  #if L1_CACHE_BYTES <

128

Quoted 94 lines
Quoted 55 lines
Quoted 55 lines
drivers/net/ethernet/intel/i40e/i40e_txrx.c +16 -1
      prefetch(xdp->data + L1_CACHE_BYTES);  #endif
+     /* Note, we get here by enabling legacy-rx via:
+      *
+      *    ethtool --set-priv-flags <dev> legacy-rx on
+      *
+      * In this mode, we currently get 0 extra XDP headroom as
+      * opposed to having legacy-rx off, where we process XDP
+      * packets going to stack via i40e_build_skb(). The latter
+      * provides us currently with 192 bytes of headroom.
+      *
+      * For i40e_construct_skb() mode it means that the
+      * xdp->data_meta will always point to xdp->data, since
+      * the helper cannot expand the head. Should this ever
+      * change in future for legacy-rx mode on, then lets also
+      * add xdp->data_meta handling here.
+      */
 
      /* allocate a skb to store the frags */
      skb = __napi_alloc_skb(&rx_ring->q_vector->napi,
@@ -2083,19 +2098,25 @@ static struct sk_buff *i40e_build_skb(struct
 i40e_ring *rx_ring,
                                    struct i40e_rx_buffer *rx_buffer,
                                    struct xdp_buff *xdp)  {
-     unsigned int size = xdp->data_end - xdp->data;
+     unsigned int metasize = xdp->data - xdp->data_meta;
 #if (PAGE_SIZE < 8192)
      unsigned int truesize = i40e_rx_pg_size(rx_ring) / 2;  #else
      unsigned int truesize = SKB_DATA_ALIGN(sizeof(struct

skb_shared_info)) +

drivers/net/ethernet/intel/i40e/i40e_txrx.c +13 -4
-                             SKB_DATA_ALIGN(I40E_SKB_PAD + size);
+                             SKB_DATA_ALIGN(I40E_SKB_PAD +
+                                            (xdp->data_end -
+
+ xdp->data_hard_start));
 #endif
      struct sk_buff *skb;
 
-     /* prefetch first cache line of first page */
-     prefetch(xdp->data);
+     /* Prefetch first cache line of first page. If xdp->data_meta
+      * is unused, this points extactly as xdp->data, otherwise we
+      * likely have a consumer accessing first few bytes of meta
+      * data, and then actual data.
+      */
+     prefetch(xdp->data_meta);
 #if L1_CACHE_BYTES < 128
-     prefetch(xdp->data + L1_CACHE_BYTES);
+     prefetch(xdp->data_meta + L1_CACHE_BYTES);
 #endif
      /* build an skb around the page buffer */
      skb = build_skb(xdp->data_hard_start, truesize); @@ -2103,8
+2124,10 @@ static struct sk_buff *i40e_build_skb(struct i40e_ring
+*rx_ring,
              return NULL;
Quoted 5 lines
Quoted 5 lines
      /* update pointers within the skb to store the data */
drivers/net/ethernet/intel/i40e/i40e_txrx.c +1 -2
-     skb_reserve(skb, I40E_SKB_PAD);
-     __skb_put(skb, size);
+     skb_reserve(skb, I40E_SKB_PAD + (xdp->data - xdp-
Quoted 1 line

data_hard_start));

The problem is here if I recall.

This should be skb_reserve(skb, xdp->data - xdp - data_hard_start);

Quoted 29 lines
Quoted 19 lines
drivers/net/ethernet/intel/i40e/i40e_txrx.c +3 -0
+     __skb_put(skb, xdp->data_end - xdp->data);
+     if (metasize)
+             skb_metadata_set(skb, metasize);
 
      /* buffer is used by skb, update page_offset */  #if

(PAGE_SIZE <
8192) @@ -2341,7 +2364,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)

              if (!skb) {
                      xdp.data = page_address(rx_buffer->page) +
                                 rx_buffer->page_offset;
drivers/net/ethernet/intel/i40e/i40e_txrx.c +1 -2
-                     xdp_set_data_meta_invalid(&xdp);
+                     xdp.data_meta = xdp.data;
                      xdp.data_hard_start = xdp.data -
                                            i40e_rx_offset(rx_ring);
                      xdp.data_end = xdp.data + size;
--

2.9.5

Quoted 4 lines

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan