patch 'net/iavf: fix segmentation offload buffer size' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/06/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/15ff989ca85ff5a4b6b9520224c8bd68247e456e

Thanks.

Kevin

---
>From 15ff989ca85ff5a4b6b9520224c8bd68247e456e Mon Sep 17 00:00:00 2001
From: Radu Nicolau <radu.nicolau at intel.com>
Date: Tue, 15 Feb 2022 15:50:23 +0000
Subject: [PATCH] net/iavf: fix segmentation offload buffer size

[ upstream commit 6a28563d1f86d8c51d8ec4a5f3d9bbd30514c20e ]

This fix commit ff8b8bcd2ebe, which resulted in incorrect buffer size
being computed for non IPses TSO packets.

Fixes: ff8b8bcd2ebe ("net/iavf: fix segmentation offload condition")

Signed-off-by: Radu Nicolau <radu.nicolau at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/iavf/iavf_rxtx.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index b0fed1b992..29ab1b84f2 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -2465,7 +2465,8 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc,
 
 	/* calculate data buffer size less set header lengths */
-	if (m->ol_flags & (RTE_MBUF_F_TX_TCP_SEG | RTE_MBUF_F_TX_UDP_SEG)) {
-		if (m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)
-			hdrlen += m->outer_l3_len;
+	if ((m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) &&
+			(m->ol_flags & (RTE_MBUF_F_TX_TCP_SEG |
+					RTE_MBUF_F_TX_UDP_SEG))) {
+		hdrlen += m->outer_l3_len;
 		if (m->ol_flags & RTE_MBUF_F_TX_L4_MASK)
 			hdrlen += m->l3_len + m->l4_len;
@@ -2475,4 +2476,12 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc,
 			hdrlen += ipseclen;
 		bufsz = hdrlen + tlen;
+	} else if ((m->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) &&
+			(m->ol_flags & (RTE_MBUF_F_TX_TCP_SEG |
+					RTE_MBUF_F_TX_UDP_SEG))) {
+		hdrlen += m->outer_l3_len + m->l3_len + ipseclen;
+		if (m->ol_flags & RTE_MBUF_F_TX_L4_MASK)
+			hdrlen += m->l4_len;
+		bufsz = hdrlen + tlen;
+
 	} else {
 		bufsz = m->data_len;
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-01 10:41:03.114010793 +0000
+++ 0063-net-iavf-fix-segmentation-offload-buffer-size.patch	2022-03-01 10:41:01.351244108 +0000
@@ -1 +1 @@
-From 6a28563d1f86d8c51d8ec4a5f3d9bbd30514c20e Mon Sep 17 00:00:00 2001
+From 15ff989ca85ff5a4b6b9520224c8bd68247e456e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6a28563d1f86d8c51d8ec4a5f3d9bbd30514c20e ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 41244055e5..ca54c70dd0 100644
+index b0fed1b992..29ab1b84f2 100644
@@ -22 +23 @@
-@@ -2464,7 +2464,8 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc,
+@@ -2465,7 +2465,8 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc,
@@ -34 +35 @@
-@@ -2474,4 +2475,12 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc,
+@@ -2475,4 +2476,12 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc,