[dpdk-stable] patch 'net/ice: revert fake TSO fixes' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/08/20. 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.

Thanks.

Luca Boccassi

---
>From 5fceb3d600294cf2ceb153d3cbd3277e07dfe0ba Mon Sep 17 00:00:00 2001
From: Haiyue Wang <haiyue.wang at intel.com>
Date: Fri, 31 Jul 2020 13:59:40 +0800
Subject: [PATCH] net/ice: revert fake TSO fixes

[ upstream commit 4339ea2979b06ad6e1ce2582a7b15faedebbd838 ]

The two fixes are not the real root cause for MDD event, it mitigates
the failure rate when different test mode, so revert them.

Fixes: 2a0c9ae4f646 ("net/ice: fix TCP checksum offload")
Fixes: 7365a3cee51f ("net/ice: calculate TCP header size for offload")

Signed-off-by: Haiyue Wang <haiyue.wang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_rxtx.c | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 3d8280bb3..3030550bd 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -2261,7 +2261,7 @@ ice_txd_enable_checksum(uint64_t ol_flags,
 	switch (ol_flags & PKT_TX_L4_MASK) {
 	case PKT_TX_TCP_CKSUM:
 		*td_cmd |= ICE_TX_DESC_CMD_L4T_EOFT_TCP;
-		*td_offset |= (tx_offload.l4_len >> 2) <<
+		*td_offset |= (sizeof(struct rte_tcp_hdr) >> 2) <<
 			      ICE_TX_DESC_LEN_L4_LEN_S;
 		break;
 	case PKT_TX_SCTP_CKSUM:
@@ -2398,28 +2398,6 @@ ice_calc_pkt_desc(struct rte_mbuf *tx_pkt)
 	return count;
 }
 
-/* Calculate TCP header length for PKT_TX_TCP_CKSUM if not provided */
-static inline uint16_t
-ice_calc_pkt_tcp_hdr(struct rte_mbuf *tx_pkt, union ice_tx_offload tx_offload)
-{
-	uint16_t tcpoff = tx_offload.l2_len + tx_offload.l3_len;
-	const struct rte_tcp_hdr *tcp_hdr;
-	struct rte_tcp_hdr _tcp_hdr;
-
-	if (tcpoff + sizeof(struct rte_tcp_hdr) < tx_pkt->data_len) {
-		tcp_hdr = rte_pktmbuf_mtod_offset(tx_pkt, struct rte_tcp_hdr *,
-						  tcpoff);
-
-		return (tcp_hdr->data_off & 0xf0) >> 2;
-	}
-
-	tcp_hdr = rte_pktmbuf_read(tx_pkt, tcpoff, sizeof(_tcp_hdr), &_tcp_hdr);
-	if (tcp_hdr)
-		return (tcp_hdr->data_off & 0xf0) >> 2;
-	else
-		return 0;
-}
-
 uint16_t
 ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
@@ -2518,15 +2496,9 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 						   &cd_tunneling_params);
 
 		/* Enable checksum offloading */
-		if (ol_flags & ICE_TX_CKSUM_OFFLOAD_MASK) {
-			if ((ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM &&
-			    !tx_offload.l4_len)
-				tx_offload.l4_len =
-				     ice_calc_pkt_tcp_hdr(tx_pkt, tx_offload);
-
+		if (ol_flags & ICE_TX_CKSUM_OFFLOAD_MASK)
 			ice_txd_enable_checksum(ol_flags, &td_cmd,
 						&td_offset, tx_offload);
-		}
 
 		if (nb_ctx) {
 			/* Setup TX context descriptor if required */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:17.442114402 +0100
+++ 0043-net-ice-revert-fake-TSO-fixes.patch	2020-08-06 10:53:15.844598272 +0100
@@ -1,14 +1,15 @@
-From 4339ea2979b06ad6e1ce2582a7b15faedebbd838 Mon Sep 17 00:00:00 2001
+From 5fceb3d600294cf2ceb153d3cbd3277e07dfe0ba Mon Sep 17 00:00:00 2001
 From: Haiyue Wang <haiyue.wang at intel.com>
 Date: Fri, 31 Jul 2020 13:59:40 +0800
 Subject: [PATCH] net/ice: revert fake TSO fixes
 
+[ upstream commit 4339ea2979b06ad6e1ce2582a7b15faedebbd838 ]
+
 The two fixes are not the real root cause for MDD event, it mitigates
 the failure rate when different test mode, so revert them.
 
 Fixes: 2a0c9ae4f646 ("net/ice: fix TCP checksum offload")
 Fixes: 7365a3cee51f ("net/ice: calculate TCP header size for offload")
-Cc: stable at dpdk.org
 
 Signed-off-by: Haiyue Wang <haiyue.wang at intel.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -17,10 +18,10 @@
  1 file changed, 2 insertions(+), 30 deletions(-)
 
 diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
-index b83c5c862..2e1f06d2c 100644
+index 3d8280bb3..3030550bd 100644
 --- a/drivers/net/ice/ice_rxtx.c
 +++ b/drivers/net/ice/ice_rxtx.c
-@@ -2234,7 +2234,7 @@ ice_txd_enable_checksum(uint64_t ol_flags,
+@@ -2261,7 +2261,7 @@ ice_txd_enable_checksum(uint64_t ol_flags,
  	switch (ol_flags & PKT_TX_L4_MASK) {
  	case PKT_TX_TCP_CKSUM:
  		*td_cmd |= ICE_TX_DESC_CMD_L4T_EOFT_TCP;
@@ -29,7 +30,7 @@
  			      ICE_TX_DESC_LEN_L4_LEN_S;
  		break;
  	case PKT_TX_SCTP_CKSUM:
-@@ -2371,28 +2371,6 @@ ice_calc_pkt_desc(struct rte_mbuf *tx_pkt)
+@@ -2398,28 +2398,6 @@ ice_calc_pkt_desc(struct rte_mbuf *tx_pkt)
  	return count;
  }
  
@@ -58,7 +59,7 @@
  uint16_t
  ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
  {
-@@ -2491,15 +2469,9 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
+@@ -2518,15 +2496,9 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
  						   &cd_tunneling_params);
  
  		/* Enable checksum offloading */