patch 'net/sfc: fix MAC address entry leak in transfer flow parsing' has been queued to stable release 21.11.4

[Kevin Traynor]

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 02/28/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/ef7d2f34a751b11df520655c6a29aa84ca7e8d71

Thanks.

Kevin

---
>From ef7d2f34a751b11df520655c6a29aa84ca7e8d71 Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov at arknetworks.am>
Date: Tue, 14 Feb 2023 17:06:59 +0400
Subject: [PATCH] net/sfc: fix MAC address entry leak in transfer flow parsing

[ upstream commit 97f7e36ad946986a14903db68b6770aacaf53ae1 ]

When the action parsing helper discovers it can "attach" to
an existing action set, it must invoke "delete" on the MAC
address(es) that it has "attached" to during parsing. That
is because the action set itself (i.e. not the flow rule
entry) holds a reference of the address(es).

Fixes: 4c6005999e41 ("net/sfc: support MAC address edits in transfer flows")

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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c
index b34c9afd5b..e8ef844427 100644
--- a/drivers/net/sfc/sfc_mae.c
+++ b/drivers/net/sfc/sfc_mae.c
@@ -4147,4 +4147,6 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,
 	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);
+		sfc_mae_mac_addr_del(sa, ctx.dst_mac);
 		sfc_mae_encap_header_del(sa, ctx.encap_header);
 		efx_mae_action_set_spec_fini(sa->nic, ctx.spec);
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 14:46:25.472971353 +0000
+++ 0069-net-sfc-fix-MAC-address-entry-leak-in-transfer-flow-.patch	2023-02-23 14:46:23.828236168 +0000
@@ -1 +1 @@
-From 97f7e36ad946986a14903db68b6770aacaf53ae1 Mon Sep 17 00:00:00 2001
+From ef7d2f34a751b11df520655c6a29aa84ca7e8d71 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 97f7e36ad946986a14903db68b6770aacaf53ae1 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index aab697b204..c254562696 100644
+index b34c9afd5b..e8ef844427 100644
@@ -27 +28 @@
-@@ -3913,4 +3913,6 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,
+@@ -4147,4 +4147,6 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,