[PATCH 1/2] common/sfc_efx/base: allow to request MAE mark reset action

[Ivan Malov <ivan.malov@arknetworks.am>]

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

Signed-off-by: Ivan Malov <ivan.malov@arknetworks.am>
Reviewed-by: Andy Moreton <amoreton@xilinx.com>
---
 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 92ec18761b..f4fa88f169 100644
--- a/drivers/common/sfc_efx/base/efx.h
+++ b/drivers/common/sfc_efx/base/efx.h
@@ -4582,6 +4582,24 @@ efx_mae_action_set_populate_mark(
 	__in				efx_mae_actions_t *spec,
 	__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
 efx_mae_action_set_populate_deliver(
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
@@ -1916,6 +1916,18 @@ efx_mae_action_set_populate_mark(
 	    EFX_MAE_ACTION_MARK, sizeof (mark_value), arg));
 }
 
+					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(
 	__in				efx_mae_actions_t *spec,
diff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map
index a54aab0a08..aabc354118 100644
--- a/drivers/common/sfc_efx/version.map
+++ b/drivers/common/sfc_efx/version.map
@@ -103,6 +103,7 @@ INTERNAL {
 	efx_mae_action_set_populate_encap;
 	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;
 	efx_mae_action_set_populate_vlan_pop;
-- 
2.17.1