patch 'net/sfc: enforce fate action in transfer flow rules' has been queued to stable release 20.11.8

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.8

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

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/3098cd7566794ad7c3770231dd52be532ea032fc

Thanks.

Luca Boccassi

---
>From 3098cd7566794ad7c3770231dd52be532ea032fc Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov at arknetworks.am>
Date: Tue, 14 Feb 2023 17:12:47 +0400
Subject: [PATCH] net/sfc: enforce fate action in transfer flow rules

[ upstream commit 3b8e8f046b6754dfa7157675699ea0f5c65bba36 ]

According to DPDK documentation, not specifying a
fate action in a flow rule results in undefined
behaviour. Define right behaviour in the driver.

Fixes: 0839236d0391 ("net/sfc: support flow action drop in transfer rules")

Signed-off-by: Ivan Malov <ivan.malov at arknetworks.am>
Reviewed-by: Viacheslav Galaktionov <viacheslav.galaktionov 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 | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c
index 02f189eca5..45431f9cd2 100644
--- a/drivers/net/sfc/sfc_mae.c
+++ b/drivers/net/sfc/sfc_mae.c
@@ -2136,6 +2136,21 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,
 	if (rc != 0)
 		goto fail_rule_parse_action;
 
+	/*
+	 * A DPDK flow entry must specify a fate action, which the parser
+	 * converts into a DELIVER action in a libefx action set. An
+	 * attempt to replace the action in the action set should
+	 * fail. If it succeeds then report an error, as the
+	 * parsed flow entry did not contain a fate action.
+	 */
+	rc = efx_mae_action_set_populate_drop(spec);
+	if (rc == 0) {
+		rc = rte_flow_error_set(error, EINVAL,
+					RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+					"no fate action found");
+		goto fail_check_fate_action;
+	}
+
 	*action_setp = sfc_mae_action_set_attach(sa, spec);
 	if (*action_setp != NULL) {
 		efx_mae_action_set_spec_fini(sa->nic, spec);
@@ -2149,6 +2164,7 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,
 	return 0;
 
 fail_action_set_add:
+fail_check_fate_action:
 fail_rule_parse_action:
 	efx_mae_action_set_spec_fini(sa->nic, spec);
 
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 09:36:30.189456956 +0000
+++ 0049-net-sfc-enforce-fate-action-in-transfer-flow-rules.patch	2023-02-23 09:36:28.294171192 +0000
@@ -1 +1 @@
-From 3b8e8f046b6754dfa7157675699ea0f5c65bba36 Mon Sep 17 00:00:00 2001
+From 3098cd7566794ad7c3770231dd52be532ea032fc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3b8e8f046b6754dfa7157675699ea0f5c65bba36 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index c254562696..3daeed81b9 100644
+index 02f189eca5..45431f9cd2 100644
@@ -25,3 +26,3 @@
-@@ -3910,6 +3910,21 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,
- 		SFC_ASSERT(B_FALSE);
- 	}
+@@ -2136,6 +2136,21 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,
+ 	if (rc != 0)
+ 		goto fail_rule_parse_action;
@@ -36 +37 @@
-+	rc = efx_mae_action_set_populate_drop(ctx.spec);
++	rc = efx_mae_action_set_populate_drop(spec);
@@ -44,4 +45,4 @@
- 	spec_mae->action_set = sfc_mae_action_set_attach(sa, &ctx);
- 	if (spec_mae->action_set != NULL) {
- 		sfc_mae_mac_addr_del(sa, ctx.src_mac);
-@@ -3926,6 +3941,7 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,
+ 	*action_setp = sfc_mae_action_set_attach(sa, spec);
+ 	if (*action_setp != NULL) {
+ 		efx_mae_action_set_spec_fini(sa->nic, spec);
+@@ -2149,6 +2164,7 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,
@@ -52,3 +53,3 @@
- fail_workaround_tunnel_delivery:
- fail_nb_count:
- 	sfc_mae_encap_header_del(sa, ctx.encap_header);
+ fail_rule_parse_action:
+ 	efx_mae_action_set_spec_fini(sa->nic, spec);
+