[dpdk-stable] patch 'net/sfc: fix Rx queue start failure path' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

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

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

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

Thanks.

Kevin.

---
>From bc2e943cd0832eff0c43e37a7119b978c408f952 Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov at oktetlabs.ru>
Date: Thu, 5 Mar 2020 15:48:55 +0000
Subject: [PATCH] net/sfc: fix Rx queue start failure path

[ upstream commit a8bcd99de4a2cf5d52ea24506dbca20a26d5ba0b ]

Call correct cleanup operations on failure in Rx queue start function.

Fixes: df1bfde4ff0d ("net/sfc: factor out libefx-based Rx datapath")
Fixes: 28944ac098aa ("net/sfc: implement Rx queue start and stop operations")

Signed-off-by: Igor Romanov <igor.romanov at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/net/sfc/sfc_rx.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c
index 984914b4e1..2d506c3860 100644
--- a/drivers/net/sfc/sfc_rx.c
+++ b/drivers/net/sfc/sfc_rx.c
@@ -751,8 +751,10 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
 
 fail_mac_filter_default_rxq_set:
+	sfc_rx_qflush(sa, sw_index);
 	sa->dp_rx->qstop(rxq->dp, &rxq->evq->read_ptr);
+	rxq->state = SFC_RXQ_INITIALIZED;
 
 fail_dp_qstart:
-	sfc_rx_qflush(sa, sw_index);
+	efx_rx_qdestroy(rxq->common);
 
 fail_rx_qcreate:
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:12:59.849699186 +0100
+++ 0013-net-sfc-fix-Rx-queue-start-failure-path.patch	2020-05-28 17:12:59.052557509 +0100
@@ -1 +1 @@
-From a8bcd99de4a2cf5d52ea24506dbca20a26d5ba0b Mon Sep 17 00:00:00 2001
+From bc2e943cd0832eff0c43e37a7119b978c408f952 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a8bcd99de4a2cf5d52ea24506dbca20a26d5ba0b ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index f589ece757..891709fd04 100644
+index 984914b4e1..2d506c3860 100644
@@ -22 +23 @@
-@@ -823,8 +823,10 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
+@@ -751,8 +751,10 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
@@ -26,2 +27,2 @@
- 	sa->priv.dp_rx->qstop(rxq_info->dp, &rxq->evq->read_ptr);
-+	rxq_info->state = SFC_RXQ_INITIALIZED;
+ 	sa->dp_rx->qstop(rxq->dp, &rxq->evq->read_ptr);
++	rxq->state = SFC_RXQ_INITIALIZED;