[dpdk-stable] patch 'net/ice/base: fix reference count on VSI list update' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/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 c92e3b5e69b907b1739bde61184459e4e31301c6 Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Mon, 15 Jun 2020 10:05:09 +0800
Subject: [PATCH] net/ice/base: fix reference count on VSI list update

[ upstream commit fda75f4c409917112b1a9694ce9969187bcfb779 ]

The parameter ref_cnt is used for tracking how many
rules are reusing this VSI list, so it can only be
updated when a rule which using this list be deleted.

Fixes: f89aa3affa9e ("net/ice/base: support removing advanced rule")

Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr at intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Qiming Yang <qiming.yang at 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 72b04f84f..940e4ce40 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -6333,6 +6333,7 @@ ice_adv_rem_update_vsi_list(struct ice_hw *hw, u16 vsi_handle,
 				  tmp_fltr.fwd_id.hw_vsi_id, status);
 			return status;
 		}
+		fm_list->vsi_list_info->ref_cnt--;
 
 		/* Remove the VSI list since it is no longer used */
 		status = ice_remove_vsi_list_rule(hw, vsi_list_id, lkup_type);
@@ -6411,7 +6412,6 @@ ice_rem_adv_rule(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,
 	if (list_elem->rule_info.sw_act.fltr_act != ICE_FWD_TO_VSI_LIST) {
 		remove_rule = true;
 	} else if (list_elem->vsi_count > 1) {
-		list_elem->vsi_list_info->ref_cnt--;
 		remove_rule = false;
 		vsi_handle = rinfo->sw_act.vsi_handle;
 		status = ice_adv_rem_update_vsi_list(hw, vsi_handle, list_elem);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:50.044016631 +0100
+++ 0037-net-ice-base-fix-reference-count-on-VSI-list-update.patch	2020-07-24 12:53:48.247005714 +0100
@@ -1,14 +1,15 @@
-From fda75f4c409917112b1a9694ce9969187bcfb779 Mon Sep 17 00:00:00 2001
+From c92e3b5e69b907b1739bde61184459e4e31301c6 Mon Sep 17 00:00:00 2001
 From: Qi Zhang <qi.z.zhang at intel.com>
 Date: Mon, 15 Jun 2020 10:05:09 +0800
 Subject: [PATCH] net/ice/base: fix reference count on VSI list update
 
+[ upstream commit fda75f4c409917112b1a9694ce9969187bcfb779 ]
+
 The parameter ref_cnt is used for tracking how many
 rules are reusing this VSI list, so it can only be
 updated when a rule which using this list be deleted.
 
 Fixes: f89aa3affa9e ("net/ice/base: support removing advanced rule")
-Cc: stable at dpdk.org
 
 Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
 Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr at intel.com>
@@ -19,10 +20,10 @@
  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 84102368b..9c7e55ff9 100644
+index 72b04f84f..940e4ce40 100644
 --- a/drivers/net/ice/base/ice_switch.c
 +++ b/drivers/net/ice/base/ice_switch.c
-@@ -7488,6 +7488,7 @@ ice_adv_rem_update_vsi_list(struct ice_hw *hw, u16 vsi_handle,
+@@ -6333,6 +6333,7 @@ ice_adv_rem_update_vsi_list(struct ice_hw *hw, u16 vsi_handle,
  				  tmp_fltr.fwd_id.hw_vsi_id, status);
  			return status;
  		}
@@ -30,7 +31,7 @@
  
  		/* Remove the VSI list since it is no longer used */
  		status = ice_remove_vsi_list_rule(hw, vsi_list_id, lkup_type);
-@@ -7566,7 +7567,6 @@ ice_rem_adv_rule(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,
+@@ -6411,7 +6412,6 @@ ice_rem_adv_rule(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups,
  	if (list_elem->rule_info.sw_act.fltr_act != ICE_FWD_TO_VSI_LIST) {
  		remove_rule = true;
  	} else if (list_elem->vsi_count > 1) {