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 471B3431D5 for ; Sun, 22 Oct 2023 16:24:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4125C402C0; Sun, 22 Oct 2023 16:24:01 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2060.outbound.protection.outlook.com [40.107.93.60]) by mails.dpdk.org (Postfix) with ESMTP id 2B7754027E for ; Sun, 22 Oct 2023 16:24:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CYJfunrBeIyUL9147SzHAdMNm+4f3zu9WiTm3Aux4g7/5Icxh7iKYFlXIp4whISRC9hZXVYkWKe0QjoZREb8eCQ8nOTN9YiXFViTnAybaO+8+eHiAYH6/oGUeJiOUQLJkIXBlqoBYll/dzB+kV+kNpB3mE0nmsD4eIqJIpOre0C48fk85miZzxgV1tPxofqwaVUwW1fLf+V/6f1lx7vVcBCfBV7BTatggmLOYKsKIN3uqDdgpILk9cQdDTZ69SWHCAji8/00G6xkxnzKBBOuek6INn8VmvgaolEgb967F0p57oow09nwsUtO7sNnn9TRZn05RCw/Kz7Pf5ZmMoXQdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NX690wn771YCiDdzai9V10eMFPiVu/CuiFEfmAYGhGA=; b=DvqcYpJZtnynEiHp7t3aLe/LcPH1ifDdj3I8ksmperd+mC+iRHEEyK1gGo7QsSZ2AQ16f9S2bbiQ/crXdBtbBXdu2qrnTxOpzxngPaMMHosBL+Cmvvs6G1poLZyRxF69QEf6eDSxRXNsBiKhnFxXOodOu1RxTmO7Q0pM5MSj1TnIQ6zcBAwkLJHSJomA7CLjhDO08Zc6Iw6WXaSHJ+xgrSjp4C03y8G72W1Wi5rbo+pgkvTzWcWAGcUX+Zf7hqxPCZfFmcecJ3CiFqkCbbnjjkAxxniabAmDnOUUJMWlJQi0qBRy/RdYAfIOtye2DG3S9x1Xa21VRoO1LzJg9I2Uiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=arknetworks.am smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NX690wn771YCiDdzai9V10eMFPiVu/CuiFEfmAYGhGA=; b=oKh6p0cdttD8aPMOMr4kZIpThn3wrzoUhfZ1kX+Y6/k55xPI48oK62OvQ82ucp44Y3UR7Dy9rPRPHvOiUTasQPyoruv2wwsfWj9NNAp/sde9a6EYw27QUWLOnMfeqOIuHoLkXIMAZL0VpsicP+bRLGDgtXNcRWkINnetPWZvUw+BUl2UCCbYWLO9EAIbUrrVSIQyMG3G1fZDfi/JySv5GEz3t9rOPXL7n12LuhgJ6bpkfDfNF2jXJhfraUY/sQWxDkSAVo+ELwR/thjJ+r7jry1BT9kKRSPZyPe0KjNtdhZ0Wbx+lhb0H+Ijpq/+cJuObpGm+nYv4JIbP2FxNJWdbw== Received: from BYAPR11CA0045.namprd11.prod.outlook.com (2603:10b6:a03:80::22) by LV8PR12MB9206.namprd12.prod.outlook.com (2603:10b6:408:186::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.46; Sun, 22 Oct 2023 14:23:51 +0000 Received: from CO1PEPF000042A9.namprd03.prod.outlook.com (2603:10b6:a03:80:cafe::9a) by BYAPR11CA0045.outlook.office365.com (2603:10b6:a03:80::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.29 via Frontend Transport; Sun, 22 Oct 2023 14:23:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000042A9.mail.protection.outlook.com (10.167.243.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:23:50 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:23:40 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:23:39 -0700 From: Xueming Li 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 22.11.4 Date: Sun, 22 Oct 2023 22:20:37 +0800 Message-ID: <20231022142250.10324-9-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042A9:EE_|LV8PR12MB9206:EE_ X-MS-Office365-Filtering-Correlation-Id: ad9871a2-fe14-4103-aa3a-08dbd30a8305 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w7KYK4esWG7cGRBrSfOJdX+qzv8FplsrgKrCjWdqUqkFc8nOGt1pZX9NHjvozpZy/iGjNMhrS5VYaslh1cspzDrOJNU17T9DLRQ4lo4VEw0FrFkGKLK0YXXge/1MEF6IUzy4rQRGPcW7o9L2Vggu6zX/TehlglXdmXa4GV/lnKZswA3l3mLLbxsFTyCMId5DHFs2FWVPAyBVyZFNQRuo3v6cTcJtUhw8bkWIlcDGHj3rgSO5LWCzpVyrFCOfIrpYqoBZhc2M31Ugmx5cygxbtla2zx35TR643bpaFLPRYzrSMairaiiRxX/bgG7e3ODkwruAoY+a7sySRHwGp9/eDFJQ5sQZbHAmSbamobBqdHcb45vblIALx//H+6HDcTS2uZV3n3C5//s8qNPCBjN3YGT7Sh49NnrWPEWZfUejs+scnEIxT9MuUXeT6BFJAERbg+rNw3UofbEN4J066bgO7J48QNNsabc63h9SXMsUaynugV9U/kKLVJtiIVMaaGgwZi7s9Kh1j/empm2u36bRtiZ2GZpgQXhjJfsTUO5GiI5MFA5CWgC9m/Abf7QtnNYQiYJkx19zrfHOywWoYUAVUUziUMKjkDMlR4+df3eJJSCtvzIvNmEuDFRbc4ppIT7HjNB3ctVe+KCDP4s7Q0pn4xaXvQlRpv/f7aizJ0UyvTK+W7pZuq2ewmMJLkiDlGecTlPpDg4crwhfjYij3j3cDpzhi7IpAg5/cOCIIUaYZEe0TFl0xwG0444w63xIiUWDUaEHkt4f43ZwPqMqfNWmtc81g/FwN41CDiNG4bdH5KQ= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(39860400002)(396003)(136003)(376002)(346002)(230922051799003)(82310400011)(186009)(64100799003)(1800799009)(451199024)(46966006)(36840700001)(40470700004)(6286002)(16526019)(53546011)(478600001)(7696005)(47076005)(966005)(426003)(26005)(2616005)(83380400001)(336012)(86362001)(4001150100001)(41300700001)(70586007)(5660300002)(54906003)(6916009)(8936002)(70206006)(4326008)(2906002)(7636003)(36756003)(36860700001)(356005)(82740400003)(1076003)(8676002)(316002)(55016003)(40480700001)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:23:50.2814 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad9871a2-fe14-4103-aa3a-08dbd30a8305 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042A9.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9206 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 22.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 11/15/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=de4785693612482884881d5ba1ce189876b46613 Thanks. Xueming Li --- >From de4785693612482884881d5ba1ce189876b46613 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 Cc: Xueming Li [ 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 6032ae9ea2..244b8d2544 100644 --- a/.mailmap +++ b/.mailmap @@ -103,7 +103,7 @@ Andriy Berestovskyy Andrzej Ostruszka Andy Gospodarek Andy Green -Andy Moreton +Andy Moreton Andy Pei Anirudh Venkataramanan Ankur Dwivedi diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c index c7d28eae71..b61b9658e3 100644 --- a/drivers/net/sfc/sfc_mae.c +++ b/drivers/net/sfc/sfc_mae.c @@ -281,8 +281,10 @@ sfc_mae_attach(struct sfc_adapter *sa) bounce_eh->buf_size = limits.eml_encap_header_size_limit; 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; mae->nb_action_rule_prios_max = limits.eml_max_n_action_prios; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:34.775545900 +0800 +++ 0008-net-sfc-add-missing-error-code-indication-to-MAE-ini.patch 2023-10-22 22:17:34.136723700 +0800 @@ -1 +1 @@ -From 1f5e6bb633cafc2789ec74e80bf90fa54ef5b788 Mon Sep 17 00:00:00 2001 +From de4785693612482884881d5ba1ce189876b46613 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1f5e6bb633cafc2789ec74e80bf90fa54ef5b788 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 864d33ee46..ec31ab8bd0 100644 +index 6032ae9ea2..244b8d2544 100644 @@ -25 +27 @@ -@@ -106,7 +106,7 @@ Andriy Berestovskyy +@@ -103,7 +103,7 @@ Andriy Berestovskyy @@ -35 +37 @@ -index f5fe55b46f..bf1c2f60c2 100644 +index c7d28eae71..b61b9658e3 100644 @@ -38 +40 @@ -@@ -215,8 +215,10 @@ sfc_mae_attach(struct sfc_adapter *sa) +@@ -281,8 +281,10 @@ sfc_mae_attach(struct sfc_adapter *sa)