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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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 a42ef6f777cf507e8ce502a6e971ef906a1bdf2e 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 f589ece757..891709fd04 100644
--- a/drivers/net/sfc/sfc_rx.c
+++ b/drivers/net/sfc/sfc_rx.c
@@ -822,10 +822,12 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
 	return 0;
 
 fail_mac_filter_default_rxq_set:
+	sfc_rx_qflush(sa, sw_index);
 	sa->priv.dp_rx->qstop(rxq_info->dp, &rxq->evq->read_ptr);
+	rxq_info->state = SFC_RXQ_INITIALIZED;
 
 fail_dp_qstart:
-	sfc_rx_qflush(sa, sw_index);
+	efx_rx_qdestroy(rxq->common);
 
 fail_rx_qcreate:
 fail_bad_contig_block_size:
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:19.994701028 +0100
+++ 0029-net-sfc-fix-Rx-queue-start-failure-path.patch	2020-05-19 13:56:18.215501747 +0100
@@ -1,13 +1,14 @@
-From a8bcd99de4a2cf5d52ea24506dbca20a26d5ba0b Mon Sep 17 00:00:00 2001
+From a42ef6f777cf507e8ce502a6e971ef906a1bdf2e 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")
-Cc: stable at dpdk.org
 
 Signed-off-by: Igor Romanov <igor.romanov at oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>