patch 'net/sfc: fix resetting mark in tunnel offload switch rules' has been queued to stable release 22.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.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 04/11/23. 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=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/993c0d08eb60e70a8e52ca5cb9b6a65a6829c819

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 993c0d08eb60e70a8e52ca5cb9b6a65a6829c819 Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov at arknetworks.am>
Date: Thu, 9 Mar 2023 08:28:42 +0400
Subject: [PATCH] net/sfc: fix resetting mark in tunnel offload switch rules
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit dfa00c456adb6f4214b581a5e82e601e963248d2 ]

The currently used API is unfit for the purpose as it
checks the order in which the action is being added.
Use a dedicated API to request the reset.

Fixes: 012bf708c20f ("net/sfc: support group flows in tunnel offload")

Signed-off-by: Ivan Malov <ivan.malov at arknetworks.am>
Reviewed-by: Andy Moreton <amoreton at xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
---
 drivers/net/sfc/sfc_mae.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c
index 82d5a95ec4..29b8bb9e25 100644
--- a/drivers/net/sfc/sfc_mae.c
+++ b/drivers/net/sfc/sfc_mae.c
@@ -3896,12 +3896,10 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,
 		break;
 	case SFC_FT_RULE_SWITCH:
 		/*
-		 * Packets that go to the rule's AR have FT mark set (from the
-		 * TUNNEL rule OR's RECIRC_ID). Remove this mark in matching
-		 * packets. The user may have provided their own action
-		 * MARK above, so don't check the return value here.
+		 * Packets that go to the rule's AR have FT mark set (from
+		 * the TUNNEL rule OR's RECIRC_ID). Reset the mark to zero.
 		 */
-		(void)efx_mae_action_set_populate_mark(ctx.spec, 0);
+		efx_mae_action_set_populate_mark_reset(ctx.spec);
 
 		ctx.ft_switch_hit_counter =
 			&spec_mae->ft_ctx->switch_hit_counter;
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-04-09 21:45:40.470520000 +0800
+++ 0066-net-sfc-fix-resetting-mark-in-tunnel-offload-switch-.patch	2023-04-09 21:45:38.669042200 +0800
@@ -1 +1 @@
-From dfa00c456adb6f4214b581a5e82e601e963248d2 Mon Sep 17 00:00:00 2001
+From 993c0d08eb60e70a8e52ca5cb9b6a65a6829c819 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit dfa00c456adb6f4214b581a5e82e601e963248d2 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
-index 3daeed81b9..e5e9257998 100644
+index 82d5a95ec4..29b8bb9e25 100644