[dpdk-stable] patch 'net/ice/base: fix first profile mask' has been queued to stable release 20.11.3

[Wu, Wenjun1]

Hi Luca,

Please do not apply this patch to stable branch. Since this fix may have some side effects, and the problem mentioned in this patch is also related to hardware issue.
I will submit a revert patch to dev later.

Regards,
Wenjun

-----Original Message-----
From: luca.boccassi at gmail.com <luca.boccassi at gmail.com> 
Sent: Monday, July 12, 2021 9:05 PM
To: Wu, Wenjun1 <wenjun1.wu at intel.com>
Cc: Zhang, Qi Z <qi.z.zhang at intel.com>; dpdk stable <stable at dpdk.org>
Subject: patch 'net/ice/base: fix first profile mask' has been queued to stable release 20.11.3

Hi,

FYI, your patch has been queued to stable release 20.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 07/14/21. 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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/d2db814c040ba66f20e6e3e411b4f7e6f418610b

Thanks.

Luca Boccassi

---
>From d2db814c040ba66f20e6e3e411b4f7e6f418610b Mon Sep 17 00:00:00 2001
From: Wenjun Wu <wenjun1.wu at intel.com>
Date: Mon, 21 Jun 2021 16:59:23 +0800
Subject: [PATCH] net/ice/base: fix first profile mask

[ upstream commit 148fdf2d3537cfbb912e9c619ace7205741d9a25 ]

Since each PF does not share the same structure space, the first mask value should start at 0 instead of hw->pf_id * per_pf to avoid address overflow. Otherwise, address space will overlap when masks.first + masks.count > ICE_PROF_MASK_COUNT, and it may lead to unexpected variable assignment, which causes segmentation fault.

Fixes: 9467486f179f ("net/ice/base: enable masking for RSS and FD field vectors")

Signed-off-by: Wenjun Wu <wenjun1.wu at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/base/ice_flex_pipe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c
index d74fecbf5b..de2c696477 100644
--- a/drivers/net/ice/base/ice_flex_pipe.c
+++ b/drivers/net/ice/base/ice_flex_pipe.c
@@ -3125,7 +3125,7 @@ static void ice_init_prof_masks(struct ice_hw *hw, enum ice_block blk)
 	per_pf = ICE_PROF_MASK_COUNT / hw->dev_caps.num_funcs;
 
 	hw->blk[blk].masks.count = per_pf;
-	hw->blk[blk].masks.first = hw->pf_id * per_pf;
+	hw->blk[blk].masks.first = 0;
 
 	ice_memset(hw->blk[blk].masks.masks, 0,
 		   sizeof(hw->blk[blk].masks.masks), ICE_NONDMA_MEM);
--
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-07-12 13:41:39.174969941 +0100
+++ 0049-net-ice-base-fix-first-profile-mask.patch	2021-07-12 13:41:36.370120111 +0100
@@ -1 +1 @@
-From 148fdf2d3537cfbb912e9c619ace7205741d9a25 Mon Sep 17 00:00:00 2001
+From d2db814c040ba66f20e6e3e411b4f7e6f418610b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 148fdf2d3537cfbb912e9c619ace7205741d9a25 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index b3cea731f3..829d88bba6 100644
+index d74fecbf5b..de2c696477 100644
@@ -25 +26 @@
-@@ -3432,7 +3432,7 @@ static void ice_init_prof_masks(struct ice_hw *hw, enum ice_block blk)
+@@ -3125,7 +3125,7 @@ static void ice_init_prof_masks(struct ice_hw 
+*hw, enum ice_block blk)