patch 'net/sfc: add missing error code indication to MAE init path' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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

Thanks.

Kevin

---
>From 2a40eeaf9a135861410dda10589bf90372ba094d Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov at arknetworks.am>
Date: Thu, 10 Aug 2023 21:36:14 +0400
Subject: [PATCH] net/sfc: add missing error code indication to MAE init path

[ upstream commit 1f5e6bb633cafc2789ec74e80bf90fa54ef5b788 ]

A failure to allocate a bounce buffer for encap. header
parsing results in falling to the error path but does
not set an appropriate error code. Fix this.

Fixes: 1bbd1ec2348a ("net/sfc: support action VXLAN encap in MAE backend")

Signed-off-by: Ivan Malov <ivan.malov at arknetworks.am>
Reviewed-by: Andy Moreton <andy.moreton at amd.com>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 .mailmap                  | 2 +-
 drivers/net/sfc/sfc_mae.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 7de8dbf81d..eddb8a2c4f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -104,5 +104,5 @@ Andrzej Ostruszka <amo at semihalf.com> <aostruszka at marvell.com>
 Andy Gospodarek <andrew.gospodarek at broadcom.com> <gospo at broadcom.com>
 Andy Green <andy at warmcat.com>
-Andy Moreton <amoreton at xilinx.com> <amoreton at solarflare.com>
+Andy Moreton <andy.moreton at amd.com> <amoreton at xilinx.com> <amoreton at solarflare.com>
 Andy Pei <andy.pei at intel.com>
 Anirudh Venkataramanan <anirudh.venkataramanan at intel.com>
diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c
index 76b7c59ac0..eb97524dc3 100644
--- a/drivers/net/sfc/sfc_mae.c
+++ b/drivers/net/sfc/sfc_mae.c
@@ -282,6 +282,8 @@ sfc_mae_attach(struct sfc_adapter *sa)
 		bounce_eh->buf = rte_malloc("sfc_mae_bounce_eh",
 					    bounce_eh->buf_size, 0);
-		if (bounce_eh->buf == NULL)
+		if (bounce_eh->buf == NULL) {
+			rc = ENOMEM;
 			goto fail_mae_alloc_bounce_eh;
+		}
 
 		mae->nb_outer_rule_prios_max = limits.eml_max_n_outer_prios;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.075448187 +0000
+++ 0007-net-sfc-add-missing-error-code-indication-to-MAE-ini.patch	2023-11-02 13:09:40.776163217 +0000
@@ -1 +1 @@
-From 1f5e6bb633cafc2789ec74e80bf90fa54ef5b788 Mon Sep 17 00:00:00 2001
+From 2a40eeaf9a135861410dda10589bf90372ba094d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1f5e6bb633cafc2789ec74e80bf90fa54ef5b788 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 864d33ee46..ec31ab8bd0 100644
+index 7de8dbf81d..eddb8a2c4f 100644
@@ -25 +26 @@
-@@ -107,5 +107,5 @@ Andrzej Ostruszka <amo at semihalf.com> <aostruszka at marvell.com>
+@@ -104,5 +104,5 @@ Andrzej Ostruszka <amo at semihalf.com> <aostruszka at marvell.com>
@@ -33 +34 @@
-index f5fe55b46f..bf1c2f60c2 100644
+index 76b7c59ac0..eb97524dc3 100644
@@ -36 +37 @@
-@@ -216,6 +216,8 @@ sfc_mae_attach(struct sfc_adapter *sa)
+@@ -282,6 +282,8 @@ sfc_mae_attach(struct sfc_adapter *sa)