[dpdk-stable] patch 'net/ice: fix Tx hang with TSO' 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 9a3ce8a48c35adbf7046bac466b012bf719541ce Mon Sep 17 00:00:00 2001
From: Haiyue Wang <haiyue.wang at intel.com>
Date: Fri, 31 Jul 2020 12:27:13 +0800
Subject: [PATCH] net/ice: fix Tx hang with TSO

[ upstream commit 8a72edd9cb232b868c38373e041b03db1220e779 ]

The variables 'td_offset' and 'td_tag' should be reset to 0 for every
burst packet, otherwise the fields of Tx Descriptor will be set wrong,
this will cause the MDD event error, and Tx will hang.

Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx")

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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index eb27a66cd..3d8280bb3 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -2458,6 +2458,8 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 		tx_pkt = *tx_pkts++;
 
 		td_cmd = 0;
+		td_tag = 0;
+		td_offset = 0;
 		ol_flags = tx_pkt->ol_flags;
 		tx_offload.l2_len = tx_pkt->l2_len;
 		tx_offload.l3_len = tx_pkt->l3_len;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:17.406844946 +0100
+++ 0042-net-ice-fix-Tx-hang-with-TSO.patch	2020-08-06 10:53:15.840598193 +0100
@@ -1,14 +1,15 @@
-From 8a72edd9cb232b868c38373e041b03db1220e779 Mon Sep 17 00:00:00 2001
+From 9a3ce8a48c35adbf7046bac466b012bf719541ce Mon Sep 17 00:00:00 2001
 From: Haiyue Wang <haiyue.wang at intel.com>
 Date: Fri, 31 Jul 2020 12:27:13 +0800
 Subject: [PATCH] net/ice: fix Tx hang with TSO
 
+[ upstream commit 8a72edd9cb232b868c38373e041b03db1220e779 ]
+
 The variables 'td_offset' and 'td_tag' should be reset to 0 for every
 burst packet, otherwise the fields of Tx Descriptor will be set wrong,
 this will cause the MDD event error, and Tx will hang.
 
 Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx")
-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(+)
 
 diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
-index bcb67ec25..b83c5c862 100644
+index eb27a66cd..3d8280bb3 100644
 --- a/drivers/net/ice/ice_rxtx.c
 +++ b/drivers/net/ice/ice_rxtx.c
-@@ -2431,6 +2431,8 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
+@@ -2458,6 +2458,8 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
  		tx_pkt = *tx_pkts++;
  
  		td_cmd = 0;