patch 'net/nfp: fix flow mask table entry' has been queued to stable release 23.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/14/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=2e84f93745cb6f5bc3875d193245f58993674613

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 2e84f93745cb6f5bc3875d193245f58993674613 Mon Sep 17 00:00:00 2001
From: Chaoyong He <chaoyong.he at corigine.com>
Date: Wed, 19 Jun 2024 17:53:36 +0800
Subject: [PATCH] net/nfp: fix flow mask table entry
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit dbb29b4685912b7df4332d49d4037f282803eb9a ]

The mask table entry using reference count to manage the flow rules
which have the same mask, and the new mask table entry will indicated by
flag 'NFP_FL_META_FLAG_MANAGE_MASK'.

The abuse of 'NFP_FL_META_FLAG_MANAGE_MASK' will cause the firmware
abnormal and the flow offload will not work.

Fixes: 7d18af7f6fdc ("net/nfp: support merged flows and conntrack stats")

Signed-off-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Long Wu <long.wu at corigine.com>
Reviewed-by: Peng Zhang <peng.zhang at corigine.com>
---
 drivers/net/nfp/nfp_flow.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index 942301f855..9ad434affb 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -312,14 +312,14 @@ nfp_check_mask_add(struct nfp_flow_priv *priv,
 		ret = nfp_mask_table_add(priv, mask_data, mask_len, mask_id);
 		if (ret != 0)
 			return false;
+
+		*meta_flags |= NFP_FL_META_FLAG_MANAGE_MASK;
 	} else {
 		/* Mask entry already exist */
 		mask_entry->ref_cnt++;
 		*mask_id = mask_entry->mask_id;
 	}
 
-	*meta_flags |= NFP_FL_META_FLAG_MANAGE_MASK;
-
 	return true;
 }
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-08-12 20:44:05.426913668 +0800
+++ 0089-net-nfp-fix-flow-mask-table-entry.patch	2024-08-12 20:44:02.355069346 +0800
@@ -1 +1 @@
-From dbb29b4685912b7df4332d49d4037f282803eb9a Mon Sep 17 00:00:00 2001
+From 2e84f93745cb6f5bc3875d193245f58993674613 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit dbb29b4685912b7df4332d49d4037f282803eb9a ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
- drivers/net/nfp/flower/nfp_flower_flow.c | 4 ++--
+ drivers/net/nfp/nfp_flow.c | 4 ++--
@@ -23,5 +25,5 @@
-diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c
-index af2c824ff2..980eabee93 100644
---- a/drivers/net/nfp/flower/nfp_flower_flow.c
-+++ b/drivers/net/nfp/flower/nfp_flower_flow.c
-@@ -317,14 +317,14 @@ nfp_check_mask_add(struct nfp_flow_priv *priv,
+diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
+index 942301f855..9ad434affb 100644
+--- a/drivers/net/nfp/nfp_flow.c
++++ b/drivers/net/nfp/nfp_flow.c
+@@ -312,14 +312,14 @@ nfp_check_mask_add(struct nfp_flow_priv *priv,