From: Mateusz Pacuszka mateuszx.pacuszka@intel.com
[ Upstream commit a808691df39b52cd9db861b118e88e18b63e2299 ]
In case the rule already exists and another VSI wants to subscribe to it 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.
Signed-off-by: Mateusz Pacuszka mateuszx.pacuszka@intel.com Reviewed-by: Przemek Kitszel przemyslaw.kitszel@intel.com Reviewed-by: Michal Swiatkowski michal.swiatkowski@linux.intel.com Signed-off-by: Larysa Zaremba larysa.zaremba@intel.com Reviewed-by: Simon Horman horms@kernel.org Tested-by: Rafal Romanowski rafal.romanowski@intel.com Signed-off-by: Tony Nguyen anthony.l.nguyen@intel.com Signed-off-by: Sasha Levin sashal@kernel.org ---
**YES** This commit should be backported to stable kernel trees. Here's my detailed analysis: ## Bug Fix Nature This commit fixes a legitimate bug in the Intel ice driver's switch rule handling logic. The issue involves incorrect VSI (Virtual Station Interface) identification when checking for existing switch rules, which can lead to: 1. **Incorrect duplicate detection**: Using `fwd_id.hw_vsi_id` instead of `vsi_handle` for comparison 2. **Inconsistent error handling**: Returning `0` instead of `-EEXIST` when a VSI already exists in the VSI map ## Code Analysis ### Primary Fix (Line 3149): ```c -if (cur_fltr->fwd_id.hw_vsi_id == new_fltr->fwd_id.hw_vsi_id) +if (cur_fltr->vsi_handle == new_fltr->vsi_handle) ``` This change fixes the comparison logic to use `vsi_handle` (software VSI ID) instead of `hw_vsi_id` (hardware VSI ID). The commit message explains that `hw_vsi_id` only applies to `LOOKUP_RX` flag, while `vsi_handle` is the correct identifier since `vsi_map` is based on it. ### Secondary Fix (Line 5981): ```c -return 0; +return -EEXIST; ``` This change ensures consistent error reporting when a VSI already exists in the VSI map, allowing callers to handle this case appropriately. ## Comparison with Similar Commits Looking at the provided similar commits: - **Similar Commit #2** (Status: YES): Also fixes switchdev rules book keeping with proper VSI handling - **Similar Commit #5** (Status: YES): Removes unnecessary duplicate VSI ID checks Both approved commits deal with VSI identification and handling issues, similar to this commit. ## Backport Suitability Criteria ✅ **Fixes a bug affecting users**: VSI rule management is critical for network functionality ✅ **Small and contained**: Only 4 lines changed across 2 functions ✅ **No architectural changes**: Simply corrects existing logic ✅ **Minimal regression risk**: Changes are targeted and well-understood ✅ **Critical subsystem**: Network drivers are important for system stability ✅ **Clear side effects**: The changes have predictable behavior improvements ## Risk Assessment - **Low risk**: The changes are surgical fixes to specific comparison logic - **Well-tested**: The commit includes "Tested-by" tag from Intel QA - **Subsystem-confined**: Changes are isolated to ice driver switch handling - **Backwards compatible**: No API or behavioral changes for users The commit follows stable tree rules perfectly: it's an important bugfix with minimal risk that improves the reliability of network switch rule handling in the Intel ice driver.
drivers/net/ethernet/intel/ice/ice_switch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c index 3a29ae46fb397..11dda98e70e5a 100644 --- a/drivers/net/ethernet/intel/ice/ice_switch.c +++ b/drivers/net/ethernet/intel/ice/ice_switch.c @@ -3013,7 +3013,7 @@ ice_add_update_vsi_list(struct ice_hw *hw, u16 vsi_handle_arr[2];
/* 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 -EEXIST;
vsi_handle_arr[0] = cur_fltr->vsi_handle; @@ -6014,7 +6014,7 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,
/* A rule already exists with the new VSI being added */ if (test_bit(vsi_handle, m_entry->vsi_list_info->vsi_map)) - return 0; + return -EEXIST;
/* Update the previously created VSI list set with * the new VSI ID passed in