patch 'net/ice/base: fix duplicate flow rules' has been queued to stable release 21.11.3

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 21.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 11/28/22. 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

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

Thanks.

Kevin

---
From 59f67d1041ec6f26a6a94b263781e3fa42fddc35 Mon Sep 17 00:00:00 2001
From: Yiding Zhou <yidingx.zhou@intel.com>
Date: Thu, 13 Oct 2022 14:21:13 +0800
Subject: [PATCH] net/ice/base: fix duplicate flow rules

[ upstream commit 43d30256b215937d9d8b554d39ac91f1866b0e5a ]

When a vsi that already exists in the created vsi_list subscribes to the
same filter again, the return value ICE_SUCCESS results in duplicate flow
rules to be stored, which will cause 'flush' and 'destroy' errors.

Fixes: fed0c5ca5f19 ("net/ice/base: support programming a new switch recipe")

Signed-off-by: Yiding Zhou <yidingx.zhou@intel.com>
Tested-by: Ke Xu <ke1.xu@intel.com>
---
 drivers/net/ice/base/ice_switch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c
index c94d15934b..7c6a258255 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -8806,5 +8806,5 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,
 		/* A rule already exists with the new VSI being added */
 		if (ice_is_bit_set(m_entry->vsi_list_info->vsi_map, vsi_handle))
-			return ICE_SUCCESS;
+			return ICE_ERR_ALREADY_EXISTS;
 
 		/* Update the previously created VSI list set with
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.581374246 +0000
+++ 0020-net-ice-base-fix-duplicate-flow-rules.patch	2022-11-23 09:55:57.055149272 +0000
@@ -1 +1 @@
-From 43d30256b215937d9d8b554d39ac91f1866b0e5a Mon Sep 17 00:00:00 2001
+From 59f67d1041ec6f26a6a94b263781e3fa42fddc35 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 43d30256b215937d9d8b554d39ac91f1866b0e5a ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 4b115ce660..a2581f404d 100644
+index c94d15934b..7c6a258255 100644
@@ -23 +24 @@
-@@ -8787,5 +8787,5 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,
+@@ -8806,5 +8806,5 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,