[dpdk-stable] patch 'net/ice/base: fix memory leak on GTPU RSS' 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 e9d4b11347fe6f5e875bc3b0e0c7974721dbc597 Mon Sep 17 00:00:00 2001
From: Junfeng Guo <junfeng.guo at intel.com>
Date: Mon, 20 Jul 2020 15:09:55 +0800
Subject: [PATCH] net/ice/base: fix memory leak on GTPU RSS

[ upstream commit c7b545fc91137803a2c42bff512e9a6b7254c936 ]

Add memory space free logic for adding and removing GTP-U before return
success status, to avoid memory leak issue.

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

Signed-off-by: Junfeng Guo <junfeng.guo at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/base/ice_flow.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
index 83432bd20..277bb4a27 100644
--- a/drivers/net/ice/base/ice_flow.c
+++ b/drivers/net/ice/base/ice_flow.c
@@ -2126,8 +2126,10 @@ 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)
-		return ICE_SUCCESS;
+	    segs[segs_cnt - 1].hdrs & ICE_FLOW_SEG_HDR_GTPU) {
+		status = ICE_SUCCESS;
+		goto exit;
+	}
 
 	/* Search for a flow profile that has matching headers, hash fields
 	 * and has the input VSI associated to it. If found, no further
@@ -2286,8 +2288,10 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,
 		goto out;
 
 	if (segs_cnt == ICE_RSS_OUTER_HEADERS &&
-	    segs[segs_cnt - 1].hdrs & ICE_FLOW_SEG_HDR_GTPU)
-		return ICE_SUCCESS;
+	    segs[segs_cnt - 1].hdrs & ICE_FLOW_SEG_HDR_GTPU) {
+		status = ICE_SUCCESS;
+		goto out;
+	}
 
 	prof = ice_flow_find_prof_conds(hw, blk, ICE_FLOW_RX, segs, segs_cnt,
 					vsi_handle,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:54.853066544 +0100
+++ 0163-net-ice-base-fix-memory-leak-on-GTPU-RSS.patch	2020-07-24 12:53:48.543011229 +0100
@@ -1,13 +1,14 @@
-From c7b545fc91137803a2c42bff512e9a6b7254c936 Mon Sep 17 00:00:00 2001
+From e9d4b11347fe6f5e875bc3b0e0c7974721dbc597 Mon Sep 17 00:00:00 2001
 From: Junfeng Guo <junfeng.guo at intel.com>
 Date: Mon, 20 Jul 2020 15:09:55 +0800
 Subject: [PATCH] net/ice/base: fix memory leak on GTPU RSS
 
+[ upstream commit c7b545fc91137803a2c42bff512e9a6b7254c936 ]
+
 Add memory space free logic for adding and removing GTP-U before return
 success status, to avoid memory leak issue.
 
 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>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -16,10 +17,10 @@
  1 file changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c
-index 094f5370a..6035bdfcf 100644
+index 83432bd20..277bb4a27 100644
 --- a/drivers/net/ice/base/ice_flow.c
 +++ b/drivers/net/ice/base/ice_flow.c
-@@ -3586,8 +3586,10 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,
+@@ -2126,8 +2126,10 @@ 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 &&
@@ -32,7 +33,7 @@
  
  	/* Search for a flow profile that has matching headers, hash fields
  	 * and has the input VSI associated to it. If found, no further
-@@ -3746,8 +3748,10 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,
+@@ -2286,8 +2288,10 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,
  		goto out;
  
  	if (segs_cnt == ICE_RSS_OUTER_HEADERS &&