patch 'net/ice/base: fix check for existing switch rule' has been queued to stable release 21.11.8

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.8

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/28/24. 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/6ad78e90aaecf9871c7008f1e4cfe0b4b8ed8747

Thanks.

Kevin

---
>From 6ad78e90aaecf9871c7008f1e4cfe0b4b8ed8747 Mon Sep 17 00:00:00 2001
From: Mateusz Pacuszka <mateuszx.pacuszka at intel.com>
Date: Wed, 26 Jun 2024 12:41:20 +0100
Subject: [PATCH] net/ice/base: fix check for existing switch rule

[ upstream commit 771db7d9466488135a2899f8809d6e61bc685ed5 ]

In case the rule already exists and another VSI wants to subscribe to
it, a new VSI list is being created and both VSIs are moved to it.
Currently, the check for already existing VSI with the same rule is done
based on fdw_id.hw_vsi_id, which applies only to LOOKUP_RX flag. Change
it to vsi_handle. This is software VSI ID, but it can be applied here,
because vsi_map itself is also based on it.

Additionally change return status in case the VSI already exists in the
VSI map to "Already exists". Such case should be handled by the caller.

Fixes: c7dd15931183 ("net/ice/base: add virtual switch code")

Signed-off-by: Mateusz Pacuszka <mateuszx.pacuszka at intel.com>
Signed-off-by: Ian Stokes <ian.stokes at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/ice/base/ice_switch.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c
index 468d58cdb9..dd21ef4bd1 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -4335,5 +4335,5 @@ ice_add_update_vsi_list(struct ice_hw *hw,
 
 		/* A rule already exists with the new VSI being added */
-		if (cur_fltr->fwd_id.hw_vsi_id == new_fltr->fwd_id.hw_vsi_id)
+		if (cur_fltr->vsi_handle == new_fltr->vsi_handle)
 			return ICE_ERR_ALREADY_EXISTS;
 
@@ -4383,5 +4383,5 @@ ice_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.46.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-08-23 17:18:12.329370004 +0100
+++ 0088-net-ice-base-fix-check-for-existing-switch-rule.patch	2024-08-23 17:18:09.783430325 +0100
@@ -1 +1 @@
-From 771db7d9466488135a2899f8809d6e61bc685ed5 Mon Sep 17 00:00:00 2001
+From 6ad78e90aaecf9871c7008f1e4cfe0b4b8ed8747 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 771db7d9466488135a2899f8809d6e61bc685ed5 ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index fa5bd94c58..f8d98d8a9e 100644
+index 468d58cdb9..dd21ef4bd1 100644
@@ -30 +31 @@
-@@ -4625,5 +4625,5 @@ ice_add_update_vsi_list(struct ice_hw *hw,
+@@ -4335,5 +4335,5 @@ ice_add_update_vsi_list(struct ice_hw *hw,
@@ -37 +38 @@
-@@ -4673,5 +4673,5 @@ ice_add_update_vsi_list(struct ice_hw *hw,
+@@ -4383,5 +4383,5 @@ ice_add_update_vsi_list(struct ice_hw *hw,
@@ -40 +41 @@
--			return 0;
+-			return ICE_SUCCESS;