[PATCH] net/nfp: fix flow mask table entry problem

[PATCH] net/nfp: fix flow mask table entry problem

[Chaoyong He]

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")
Cc: stable@dpdk.org

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

diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c
index 9b144e41d0..fad65c1785 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,
 		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.39.1

Re: [PATCH] net/nfp: fix flow mask table entry problem

[Ferruh Yigit]

On 6/19/2024 10:53 AM, Chaoyong He wrote:
> 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")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
> Reviewed-by: Long Wu <long.wu@corigine.com>
> Reviewed-by: Peng Zhang <peng.zhang@corigine.com>
>

Applied to dpdk-next-net/main, thanks.