patch 'common/sfc_efx/base: add MAE mark reset action' has been queued to stable release 21.11.4

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 21.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 03/20/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://github.com/kevintraynor/dpdk-stable

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

Thanks.

Kevin

---
From b7c5365796413260082738db9dcb0f1eb7f0777d Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov@arknetworks.am>
Date: Thu, 9 Mar 2023 08:28:41 +0400
Subject: [PATCH] common/sfc_efx/base: add MAE mark reset action

[ upstream commit 13d3f0d2ffeac7308f72fed56b2c8c545ac73fa5 ]

Previously, DPDK sfc driver received support for tunnel
offload. In it, MAE needs to set intermediate mark from
an outer rule (OR) recirculation ID in order to help
the driver identify packets that hit the OR but miss
on action rule (AR) lookup. But, for packets that do
hit an AR, the driver wants to reset this mark so
that the end receiver of traffic does not see it.

The driver has a call to request such mark reset,
but it does not work as it comes via the regular
mark populate API, which must not be invoked
after final delivery action has been added.

Provide a suitable dedicated API for that.

Fixes: 3a73dcfdb255 ("common/sfc_efx/base: match on recirc ID in action rules")

Signed-off-by: Ivan Malov <ivan.malov@arknetworks.am>
Reviewed-by: Andy Moreton <amoreton@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
 drivers/common/sfc_efx/base/efx.h     | 18 ++++++++++++++++++
 drivers/common/sfc_efx/base/efx_mae.c | 12 ++++++++++++
 drivers/common/sfc_efx/version.map    |  1 +
 3 files changed, 31 insertions(+)

diff --git a/drivers/common/sfc_efx/base/efx.h b/drivers/common/sfc_efx/base/efx.h
index 96769935c0..d70060c18b 100644
--- a/drivers/common/sfc_efx/base/efx.h
+++ b/drivers/common/sfc_efx/base/efx.h
@@ -4536,4 +4536,22 @@ efx_mae_action_set_populate_mark(
 	__in				uint32_t mark_value);
 
+/*
+ * Whilst efx_mae_action_set_populate_mark() can be used to request setting
+ * a user mark in matching packets and demands that the request come before
+ * setting the final destination (deliver action), this API can be invoked
+ * after deliver action has been added in order to request mark reset if
+ * the user's own mark request has not been added as a result of parsing.
+ *
+ * It is useful when the driver chains an outer rule (OR) with an action
+ * rule (AR) by virtue of a recirculation ID. The OR may set mark from
+ * this ID to help the driver identify packets that hit the OR and do
+ * not hit the AR. But, for packets that do hit the AR, the driver
+ * wants to reset the mark value to avoid confusing recipients.
+ */
+LIBEFX_API
+extern					void
+efx_mae_action_set_populate_mark_reset(
+	__in				efx_mae_actions_t *spec);
+
 LIBEFX_API
 extern	__checkReturn			efx_rc_t
diff --git a/drivers/common/sfc_efx/base/efx_mae.c b/drivers/common/sfc_efx/base/efx_mae.c
index 31f51b5548..7732d99992 100644
--- a/drivers/common/sfc_efx/base/efx_mae.c
+++ b/drivers/common/sfc_efx/base/efx_mae.c
@@ -1917,4 +1917,16 @@ efx_mae_action_set_populate_mark(
 }
 
+					void
+efx_mae_action_set_populate_mark_reset(
+	__in				efx_mae_actions_t *spec)
+{
+	uint32_t action_mask = (1U << EFX_MAE_ACTION_MARK);
+
+	if ((spec->ema_actions & action_mask) == 0) {
+		spec->ema_actions |= action_mask;
+		spec->ema_mark_value = 0;
+	}
+}
+
 	__checkReturn			efx_rc_t
 efx_mae_action_set_populate_deliver(
diff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map
index 97dd943ec4..9ce76ea6e8 100644
--- a/drivers/common/sfc_efx/version.map
+++ b/drivers/common/sfc_efx/version.map
@@ -104,4 +104,5 @@ INTERNAL {
 	efx_mae_action_set_populate_flag;
 	efx_mae_action_set_populate_mark;
+	efx_mae_action_set_populate_mark_reset;
 	efx_mae_action_set_populate_set_dst_mac;
 	efx_mae_action_set_populate_set_src_mac;
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-15 14:30:21.417929852 +0000
+++ 0034-common-sfc_efx-base-add-MAE-mark-reset-action.patch	2023-03-15 14:30:20.604123766 +0000
@@ -1 +1 @@
-From 13d3f0d2ffeac7308f72fed56b2c8c545ac73fa5 Mon Sep 17 00:00:00 2001
+From b7c5365796413260082738db9dcb0f1eb7f0777d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 13d3f0d2ffeac7308f72fed56b2c8c545ac73fa5 ]
+
@@ -22 +23,0 @@
-Cc: stable@dpdk.org
@@ -34 +35 @@
-index 92ec18761b..f4fa88f169 100644
+index 96769935c0..d70060c18b 100644
@@ -37 +38 @@
-@@ -4583,4 +4583,22 @@ efx_mae_action_set_populate_mark(
+@@ -4536,4 +4536,22 @@ efx_mae_action_set_populate_mark(
@@ -82 +83 @@
-index a54aab0a08..aabc354118 100644
+index 97dd943ec4..9ce76ea6e8 100644