patch 'net/txgbe: remove unsupported flow action mark' has been queued to stable release 24.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.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 11/26/25. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/922d72ef7fafde104ae2beadd74112636d098a8c

Thanks.

Kevin

---
>From 922d72ef7fafde104ae2beadd74112636d098a8c Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu at trustnetic.com>
Date: Mon, 27 Oct 2025 11:15:42 +0800
Subject: [PATCH] net/txgbe: remove unsupported flow action mark

[ upstream commit 7224536b051457ce2a9cfd6e433da9d4a7bc97ac ]

Flow action "mark" is not supported, just remove it.

Fixes: b973ee26747a ("net/txgbe: parse flow director filter")

Signed-off-by: Jiawen Wu <jiawenwu at trustnetic.com>
---
 doc/guides/nics/features/txgbe.ini |  1 -
 drivers/net/txgbe/txgbe_flow.c     | 23 ++---------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/doc/guides/nics/features/txgbe.ini b/doc/guides/nics/features/txgbe.ini
index ef9f0cfa0a..a9f043a04f 100644
--- a/doc/guides/nics/features/txgbe.ini
+++ b/doc/guides/nics/features/txgbe.ini
@@ -73,5 +73,4 @@ vxlan                = Y
 [rte_flow actions]
 drop                 = Y
-mark                 = Y
 pf                   = Y
 queue                = Y
diff --git a/drivers/net/txgbe/txgbe_flow.c b/drivers/net/txgbe/txgbe_flow.c
index c87bb4dd63..cdd13ff519 100644
--- a/drivers/net/txgbe/txgbe_flow.c
+++ b/drivers/net/txgbe/txgbe_flow.c
@@ -1338,5 +1338,4 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr,
 	const struct rte_flow_action *act;
 	const struct rte_flow_action_queue *act_q;
-	const struct rte_flow_action_mark *mark;
 
 	/* parse attr */
@@ -1403,8 +1402,7 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr,
 	}
 
-	/* check if the next not void item is MARK */
+	/* nothing else supported */
 	act = next_no_void_action(actions, act);
-	if (act->type != RTE_FLOW_ACTION_TYPE_MARK &&
-		act->type != RTE_FLOW_ACTION_TYPE_END) {
+	if (act->type != RTE_FLOW_ACTION_TYPE_END) {
 		memset(rule, 0, sizeof(struct txgbe_fdir_rule));
 		rte_flow_error_set(error, EINVAL,
@@ -1416,19 +1414,4 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr,
 	rule->soft_id = 0;
 
-	if (act->type == RTE_FLOW_ACTION_TYPE_MARK) {
-		mark = (const struct rte_flow_action_mark *)act->conf;
-		rule->soft_id = mark->id;
-		act = next_no_void_action(actions, act);
-	}
-
-	/* check if the next not void item is END */
-	if (act->type != RTE_FLOW_ACTION_TYPE_END) {
-		memset(rule, 0, sizeof(struct txgbe_fdir_rule));
-		rte_flow_error_set(error, EINVAL,
-			RTE_FLOW_ERROR_TYPE_ACTION,
-			act, "Not supported action.");
-		return -rte_errno;
-	}
-
 	return 0;
 }
@@ -1542,6 +1525,4 @@ txgbe_fdir_parse_flow_type(struct txgbe_atr_input *input, u8 ptid, bool tun)
  * ACTION:
  * The first not void action should be QUEUE or DROP.
- * The second not void optional action should be MARK,
- * mark_id is a uint32_t number.
  * The next not void action should be END.
  * UDP/TCP/SCTP pattern example:
-- 
2.51.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-11-21 11:05:10.751694094 +0000
+++ 0037-net-txgbe-remove-unsupported-flow-action-mark.patch	2025-11-21 11:05:09.433201041 +0000
@@ -1 +1 @@
-From 7224536b051457ce2a9cfd6e433da9d4a7bc97ac Mon Sep 17 00:00:00 2001
+From 922d72ef7fafde104ae2beadd74112636d098a8c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7224536b051457ce2a9cfd6e433da9d4a7bc97ac ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -28 +29 @@
-index 5647165d52..a97588e57a 100644
+index c87bb4dd63..cdd13ff519 100644
@@ -31 +32 @@
-@@ -1359,5 +1359,4 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr,
+@@ -1338,5 +1338,4 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr,
@@ -37 +38 @@
-@@ -1424,8 +1423,7 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr,
+@@ -1403,8 +1402,7 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr,
@@ -48 +49 @@
-@@ -1437,19 +1435,4 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr,
+@@ -1416,19 +1414,4 @@ txgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr,
@@ -68 +69 @@
-@@ -1563,6 +1546,4 @@ txgbe_fdir_parse_flow_type(struct txgbe_atr_input *input, u8 ptid, bool tun)
+@@ -1542,6 +1525,4 @@ txgbe_fdir_parse_flow_type(struct txgbe_atr_input *input, u8 ptid, bool tun)