patch 'net/ice: fix inconsistent state on FDIR failure' has been queued to stable release 24.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 24.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/07/26. 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/d0591965f1bf86aca369bebadcfc6c1a01feea69

Thanks.

Luca Boccassi

---
>From d0591965f1bf86aca369bebadcfc6c1a01feea69 Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov at intel.com>
Date: Tue, 20 Oct 2026 13:11:05 +0100
Subject: [PATCH] net/ice: fix inconsistent state on FDIR failure

[ upstream commit a403c7f7fc88350e6b0427f6c9bf5066c87fd997 ]

FDIR creation programs the hardware rule before inserting its software
hash entry. If insertion fails, creation returns without removing the
hardware rule or releasing its counter, and MARK parsing may remain
enabled despite no flow handle being returned.

Reserve the hash entry before programming the rule, and release the
counter if reservation fails. Remove the reserved entry if hardware
programming fails. Enable MARK parsing only after both steps succeed.

Fixes: 1a2fc1799f09 ("net/ice: reject duplicated flow for flow director")

Signed-off-by: Anatoly Burakov <anatoly.burakov at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/ice/ice_fdir_filter.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c
index d6e6bd2d5d6..48895eea558 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -1413,8 +1413,18 @@ ice_fdir_create_filter(struct ice_adapter *ad,
 		filter->input.cnt_index = filter->counter->hw_index;
 	}
 
+	/* Reserve the software entry before installing the hardware rule. */
+	ret = ice_fdir_entry_insert(pf, entry, &key);
+	if (ret) {
+		rte_flow_error_set(error, -ret,
+				   RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+				   "Insert entry to table failed.");
+		goto free_counter;
+	}
+
 	ret = ice_fdir_add_del_filter(pf, filter, true);
 	if (ret) {
+		ice_fdir_entry_del(pf, &key);
 		rte_flow_error_set(error, -ret,
 				   RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
 				   "Add filter rule failed.");
@@ -1425,14 +1435,6 @@ ice_fdir_create_filter(struct ice_adapter *ad,
 		ice_fdir_rx_parsing_enable(ad, 1);
 
 	rte_memcpy(entry, filter, sizeof(*entry));
-	ret = ice_fdir_entry_insert(pf, entry, &key);
-	if (ret) {
-		rte_flow_error_set(error, -ret,
-				   RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
-				   "Insert entry to table failed.");
-		goto free_entry;
-	}
-
 	flow->rule = entry;
 	ice_fdir_cnt_update(pf, filter->input.flow_type, is_tun, true);
 
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-11-05 16:42:46.766582272 +0000
+++ 0046-net-ice-fix-inconsistent-state-on-FDIR-failure.patch	2026-11-05 16:42:44.953061742 +0000
@@ -1 +1 @@
-From a403c7f7fc88350e6b0427f6c9bf5066c87fd997 Mon Sep 17 00:00:00 2001
+From d0591965f1bf86aca369bebadcfc6c1a01feea69 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a403c7f7fc88350e6b0427f6c9bf5066c87fd997 ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
- drivers/net/intel/ice/ice_fdir_filter.c | 18 ++++++++++--------
+ drivers/net/ice/ice_fdir_filter.c | 18 ++++++++++--------
@@ -24,5 +25,5 @@
-diff --git a/drivers/net/intel/ice/ice_fdir_filter.c b/drivers/net/intel/ice/ice_fdir_filter.c
-index 517c32cecf..63a0d9fb1f 100644
---- a/drivers/net/intel/ice/ice_fdir_filter.c
-+++ b/drivers/net/intel/ice/ice_fdir_filter.c
-@@ -1654,8 +1654,18 @@ ice_fdir_create_filter(struct ice_adapter *ad,
+diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c
+index d6e6bd2d5d6..48895eea558 100644
+--- a/drivers/net/ice/ice_fdir_filter.c
++++ b/drivers/net/ice/ice_fdir_filter.c
+@@ -1413,8 +1413,18 @@ ice_fdir_create_filter(struct ice_adapter *ad,
@@ -47 +48 @@
-@@ -1666,14 +1676,6 @@ ice_fdir_create_filter(struct ice_adapter *ad,
+@@ -1425,14 +1435,6 @@ ice_fdir_create_filter(struct ice_adapter *ad,
@@ -50 +51 @@
- 	memcpy(entry, filter, sizeof(*entry));
+ 	rte_memcpy(entry, filter, sizeof(*entry));