[dpdk-stable] patch 'net/ice/base: fix RSS removal for GTP-U' 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 8f9e2f8855833c56c41d2155440c3362467fb8da Mon Sep 17 00:00:00 2001
From: Junfeng Guo <junfeng.guo at intel.com>
Date: Mon, 13 Jul 2020 19:05:40 +0800
Subject: [PATCH] net/ice/base: fix RSS removal for GTP-U

[ upstream commit 27dc00646f54c5fd885ecbd7498d3158ed2fc458 ]

Previous logic in removing RSS for GTPU was added in incorrect lines.
The adjustment in this patch will correct the code order so that RSS
for GTPU can be removed successfully.

We also delete the redundant print statement and cleanup the coding
style in this patch.

Fixes: bed9bb3139ef ("net/ice/base: fix GTP-U inner RSS IPv4 IPv6 co-exist")

Signed-off-by: Junfeng Guo <junfeng.guo at intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/ice/base/ice_flow.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
index 9d958b329..83432bd20 100644
--- a/drivers/net/ice/base/ice_flow.c
+++ b/drivers/net/ice/base/ice_flow.c
@@ -2126,10 +2126,8 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,
 
 	/* don't do RSS for GTPU outer */
 	if (segs_cnt == ICE_RSS_OUTER_HEADERS &&
-	    (segs[segs_cnt - 1].hdrs & ICE_FLOW_SEG_HDR_GTPU)) {
-		printf("ignore gtpu\n");
+	    segs[segs_cnt - 1].hdrs & ICE_FLOW_SEG_HDR_GTPU)
 		return ICE_SUCCESS;
-	}
 
 	/* Search for a flow profile that has matching headers, hash fields
 	 * and has the input VSI associated to it. If found, no further
@@ -2281,16 +2279,16 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,
 	if (!segs)
 		return ICE_ERR_NO_MEMORY;
 
-	if (segs_cnt == ICE_RSS_OUTER_HEADERS &&
-	    segs[segs_cnt - 1].hdrs & ICE_FLOW_SEG_HDR_GTPU)
-		return ICE_SUCCESS;
-
 	/* Construct the packet segment info from the hashed fields */
 	status = ice_flow_set_rss_seg_info(&segs[segs_cnt - 1], hashed_flds,
 					   addl_hdrs);
 	if (status)
 		goto out;
 
+	if (segs_cnt == ICE_RSS_OUTER_HEADERS &&
+	    segs[segs_cnt - 1].hdrs & ICE_FLOW_SEG_HDR_GTPU)
+		return ICE_SUCCESS;
+
 	prof = ice_flow_find_prof_conds(hw, blk, ICE_FLOW_RX, segs, segs_cnt,
 					vsi_handle,
 					ICE_FLOW_FIND_PROF_CHK_FLDS);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:54.427909564 +0100
+++ 0152-net-ice-base-fix-RSS-removal-for-GTP-U.patch	2020-07-24 12:53:48.515010708 +0100
@@ -1,8 +1,10 @@
-From 27dc00646f54c5fd885ecbd7498d3158ed2fc458 Mon Sep 17 00:00:00 2001
+From 8f9e2f8855833c56c41d2155440c3362467fb8da Mon Sep 17 00:00:00 2001
 From: Junfeng Guo <junfeng.guo at intel.com>
 Date: Mon, 13 Jul 2020 19:05:40 +0800
 Subject: [PATCH] net/ice/base: fix RSS removal for GTP-U
 
+[ upstream commit 27dc00646f54c5fd885ecbd7498d3158ed2fc458 ]
+
 Previous logic in removing RSS for GTPU was added in incorrect lines.
 The adjustment in this patch will correct the code order so that RSS
 for GTPU can be removed successfully.
@@ -11,7 +13,6 @@
 style in this patch.
 
 Fixes: bed9bb3139ef ("net/ice/base: fix GTP-U inner RSS IPv4 IPv6 co-exist")
-Cc: stable at dpdk.org
 
 Signed-off-by: Junfeng Guo <junfeng.guo at intel.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
@@ -20,10 +21,10 @@
  1 file changed, 5 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
-index d1b8a0534..9a17d956b 100644
+index 9d958b329..83432bd20 100644
 --- a/drivers/net/ice/base/ice_flow.c
 +++ b/drivers/net/ice/base/ice_flow.c
-@@ -3559,10 +3559,8 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,
+@@ -2126,10 +2126,8 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,
  
  	/* don't do RSS for GTPU outer */
  	if (segs_cnt == ICE_RSS_OUTER_HEADERS &&
@@ -35,7 +36,7 @@
  
  	/* Search for a flow profile that has matching headers, hash fields
  	 * and has the input VSI associated to it. If found, no further
-@@ -3714,16 +3712,16 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,
+@@ -2281,16 +2279,16 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,
  	if (!segs)
  		return ICE_ERR_NO_MEMORY;