[dpdk-stable] patch 'net/ice: fix unchecked Tx cleanup error' has been queued to stable release 19.11.1

luca.boccassi at gmail.com luca.boccassi at gmail.com
Mon Feb 17 18:45:37 CET 2020


Hi,

FYI, your patch has been queued to stable release 19.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 02/19/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 6ecf6e42a2f142d6674c432d659f27e18e875ac6 Mon Sep 17 00:00:00 2001
From: Sunil Pai G <sunil.pai.g at intel.com>
Date: Wed, 12 Feb 2020 05:37:10 +0000
Subject: [PATCH] net/ice: fix unchecked Tx cleanup error

[ upstream commit fe38133c42d846613a41beff49ab0e1b9a3e0e61 ]

Coverity complains of unchecked return value warning of
ice_xmit_cleanup, while this cleanup is opportunistic and will not cause
problems if it fails. So instead of checking the return value of
ice_xmit_cleanup and return in case of cleanup failure, we directly cast
it to void function to make the Coverity happy.

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

Signed-off-by: Sunil Pai G <sunil.pai.g at intel.com>
Acked-by: Xiaolong Ye <xiaolong.ye at intel.com>
---
 drivers/net/ice/ice_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index ccc2c93398..37e792b05b 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -2471,7 +2471,7 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 
 	/* Check if the descriptor ring needs to be cleaned. */
 	if (txq->nb_tx_free < txq->tx_free_thresh)
-		ice_xmit_cleanup(txq);
+		(void)ice_xmit_cleanup(txq);
 
 	for (nb_tx = 0; nb_tx < nb_pkts; nb_tx++) {
 		tx_pkt = *tx_pkts++;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-17 17:00:16.566414530 +0000
+++ 0045-net-ice-fix-unchecked-Tx-cleanup-error.patch	2020-02-17 17:00:15.371951362 +0000
@@ -1,8 +1,10 @@
-From fe38133c42d846613a41beff49ab0e1b9a3e0e61 Mon Sep 17 00:00:00 2001
+From 6ecf6e42a2f142d6674c432d659f27e18e875ac6 Mon Sep 17 00:00:00 2001
 From: Sunil Pai G <sunil.pai.g at intel.com>
 Date: Wed, 12 Feb 2020 05:37:10 +0000
 Subject: [PATCH] net/ice: fix unchecked Tx cleanup error
 
+[ upstream commit fe38133c42d846613a41beff49ab0e1b9a3e0e61 ]
+
 Coverity complains of unchecked return value warning of
 ice_xmit_cleanup, while this cleanup is opportunistic and will not cause
 problems if it fails. So instead of checking the return value of
@@ -11,7 +13,6 @@
 
 Coverity issue: 353623
 Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx")
-Cc: stable at dpdk.org
 
 Signed-off-by: Sunil Pai G <sunil.pai.g at intel.com>
 Acked-by: Xiaolong Ye <xiaolong.ye at intel.com>
@@ -20,7 +21,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
-index ce5b8e6ca3..60c411bfad 100644
+index ccc2c93398..37e792b05b 100644
 --- a/drivers/net/ice/ice_rxtx.c
 +++ b/drivers/net/ice/ice_rxtx.c
 @@ -2471,7 +2471,7 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)


More information about the stable mailing list