From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 39B174326F for ; Thu, 2 Nov 2023 14:13:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 34241427DA; Thu, 2 Nov 2023 14:13:29 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 2B5AD427DA for ; Thu, 2 Nov 2023 14:13:27 +0100 (CET) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-376-ujDWf9ZJPKm-rEKp7oMjbA-1; Thu, 02 Nov 2023 09:13:23 -0400 X-MC-Unique: ujDWf9ZJPKm-rEKp7oMjbA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4A7E13816D88; Thu, 2 Nov 2023 13:13:23 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2788C492BFA; Thu, 2 Nov 2023 13:13:21 +0000 (UTC) From: Kevin Traynor To: Ivan Malov Cc: Andy Moreton , Ferruh Yigit , dpdk stable Subject: patch 'net/sfc: add missing error code indication to MAE init path' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:13 +0000 Message-ID: <20231102131254.315947-7-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 Reviewed-by: Andy Moreton Acked-by: Ferruh Yigit --- .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 Andy Gospodarek Andy Green -Andy Moreton +Andy Moreton Andy Pei Anirudh Venkataramanan 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@dpdk.org @@ -22 +23 @@ -index 864d33ee46..ec31ab8bd0 100644 +index 7de8dbf81d..eddb8a2c4f 100644 @@ -25 +26 @@ -@@ -107,5 +107,5 @@ Andrzej Ostruszka +@@ -104,5 +104,5 @@ Andrzej Ostruszka @@ -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)