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 EC50F43E57 for ; Sat, 13 Apr 2024 14:58:11 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E6A64402CB; Sat, 13 Apr 2024 14:58:11 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2060.outbound.protection.outlook.com [40.107.243.60]) by mails.dpdk.org (Postfix) with ESMTP id 34AE6400D6 for ; Sat, 13 Apr 2024 14:58:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V4flIKaIaoOa6rfZ+hsHvss0Wb5Ul9qABq6ivnHiZp/m2XKlYqiWFcEXZEAnQcOmR51H7xCxOvEjhXpYyBGK023hj3Y03mT123+Iuwaa4dJ08khUfdZYh88eHRrXTDj3NBPSHJOJHHpfN0smN3SzVdtdrMTUmmgvZUWqprxfWPzYZamRjx4nS1g9sTTd/cDEhBFdHW3twGnw8jDN/IIOCoVxt76WUDqiOA+EcI/bOPPIXXWU12PT3k6fk7zZ0XheMhvdL0JOWC7SeqmALrryRSZOAPA2fLZfaiSYSBToM7CP6skuXNY+h8U2Vn6JuMQqm7+AAbkhZhcfqCC8F7u7AQ== 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=X+TqX3r9IeZISmBzpGcMGhr+O7yZsXDm6zASgRpttAM=; b=M0HJ4qEeeZTVLKJueyVxf6o61JoEgNLVyFXvJYNzHm0/Xcve9vQum6eHRMUanx2v5DBwPVHySoY7ki59PbhysrigD0HW4uUIowQAe1UTxu4HEDLvOKdIR0rWyOjbFZsu/VjRRvhRd4JnbMRMBdaSG77+jGk/hye403JxJEzbRJaaP16rOKrHDX5JduVahtfq1FiUJTYlOD936WJpfYYiCAO3hRH39m66N0WSC5HeCulQyNcqDGVPtobcPeO/MBLPB4ngdidkb5xLJNnqS0QAXOIHURz/LL3EhJzzxtYH3K5bfHz/uMi2GNOPcJmW2TDQPxD+9Tfl6LY/QfR4uUkcgA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.com 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 (0) 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=X+TqX3r9IeZISmBzpGcMGhr+O7yZsXDm6zASgRpttAM=; b=O0+l9Q9X2BhSYtCwfK7xSzNTxvoRopEN55GSDxap2lDtsrZPU4D8jAdk3Y2NoTEvyZaCJd55CugFDP6aWrFtoHPhVsc9CvQ+nNfv170Ul9e+7Ny0aFttzbVj1JT58cqr3eUqgRcR5Dn7FYURy0J+4ik26gWOlLeOdI+LUeU52tzydOpG+uSLabek0vMWd+B58ZQfEW7pE1n+QTFzV4/8fmAOah09aeu/5ILGqxli5ShyWw+CI6fEME/4LHQjCH1c4M0YCf3Tt4Pz5iazFW6PgnI07HMenw56rkTB+gwjbAbspv0poCNBg73k5Ug7J9eM4AJTF5UatBEGHwGLpCkvVA== Received: from MW4P222CA0016.NAMP222.PROD.OUTLOOK.COM (2603:10b6:303:114::21) by DM4PR12MB5988.namprd12.prod.outlook.com (2603:10b6:8:6b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Sat, 13 Apr 2024 12:58:08 +0000 Received: from MWH0EPF000A6735.namprd04.prod.outlook.com (2603:10b6:303:114:cafe::b7) by MW4P222CA0016.outlook.office365.com (2603:10b6:303:114::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.29 via Frontend Transport; Sat, 13 Apr 2024 12:58:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MWH0EPF000A6735.mail.protection.outlook.com (10.167.249.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:58:08 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sat, 13 Apr 2024 05:58:02 -0700 Received: from nvidia.com (10.126.230.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.1258.12; Sat, 13 Apr 2024 05:58:01 -0700 From: Xueming Li To: Chaoyong He CC: Long Wu , Peng Zhang , "dpdk stable" Subject: patch 'net/nfp: fix initialization failure flow' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:49:27 +0800 Message-ID: <20240413125005.725659-87-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: MWH0EPF000A6735:EE_|DM4PR12MB5988:EE_ X-MS-Office365-Filtering-Correlation-Id: b2a977f5-cbda-426e-1195-08dc5bb95de0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jBv5zvDiW1KzaNSU664AAiCTAPdKMgxZosIssEhZyHoToXN72C43fBBDCuPz?= =?us-ascii?Q?od9YwzESqsE9jDaQCIa1fjCvGutWePgxiqh+kp1u5k9q30Cys9YVjnE4vN3z?= =?us-ascii?Q?rxOX0Q54l2TbTYbMUEK1M8sPPGp31X3WE4eMvn6PPrwqvrVyTyejgFTIVHNA?= =?us-ascii?Q?cCzpWR3WFDckvsHf0PUbvWH0XnUkAQ7q1TsimJ7cswA0kBt7Oca6f1RKy/ZY?= =?us-ascii?Q?2cKKk9xfq8wOy4XMBNK2b+iWLZdpXGOj/cicYPxcxnes64A+NMqfPgVlyDbz?= =?us-ascii?Q?u+cMjeKzO2CWUQEuIjAWYANv2uASTVZE5jEXTXRb0PSbH31NCzt5R4DbOhRM?= =?us-ascii?Q?Wre9GIuzB/jAtk2lnZTKHnvxp+wvTcxjG147/xNcl3Tw8E0xC2TS/hFYAzxB?= =?us-ascii?Q?UOj60wKxvQ+VGLqju7kkf7uzR4uGdlBtGuDPCreFNY7R/LC9WWeOsYaNILOO?= =?us-ascii?Q?wOIhfR8W9edYk7ge4/sSbloLXz2r/jC9ECB4+lvGu6KXe30ZctCkIxavqFVr?= =?us-ascii?Q?3Mq/AUG+bnGrMGDVehAVSpx/8t/PDezUIxSAzyYnqpr/bPpjCeinS0zSJWwq?= =?us-ascii?Q?jCv67nIKjFB3Ma74WG/WNNeIcfzaCiSwgYktU0fbBpqgYMQDxtkjf4kVKTfB?= =?us-ascii?Q?Dtnlxsr1nHxL9WxLoZLbUcvEM4Psb2B8PvT3RXPT75QRiuQiBwk8TTt6YNUa?= =?us-ascii?Q?sgIWP/PMaNFwSlCk7PcxZC3LKa0FYM+AH/CeBx8r6nF7Xd2GexWLAIlIRTzY?= =?us-ascii?Q?scfc39S1GxnRyJtPh34qqoKaUHx3G2VEOitgzW7xSRaGiKZrtDVh87sEY6Av?= =?us-ascii?Q?Fs2Wrelep6PnqmrXgJZpbypTPi/VmG8HPmce+s0r6V/VDzByYuKy4F6d9Osq?= =?us-ascii?Q?nNFCPSyRPbWq+rNplgnjfdnpb3r2OfOU578iOm7Oba8Rplzd8sP4+mxfV5Tu?= =?us-ascii?Q?YZh/WEMJ6mk+khSsdY0VsqzlDYx/MhM/1yPvCMHRljKA61FscQFTSVxiZeOf?= =?us-ascii?Q?+14u4wgQvALGJQabnMXzCtqmris1KXcRNdsP8kV/8VxBMaO6lW7d2WPGX/2i?= =?us-ascii?Q?vWNc8vu90LaZ0BIad2g+zmRuCWU+jnMeyWTHfB3gYvNKI0IfRLVWZXoUV59F?= =?us-ascii?Q?h7916TFxFXrdG9zlIYq+qdFU5SM4nh8/Dm+Q/Eb8no96NaR8EwyJtPIV9JNo?= =?us-ascii?Q?6872iDoou1qxKG/26qDaRpY+tVScvxWy2IF3koTvcpK8o5RHXyQtpemDLp2c?= =?us-ascii?Q?T16AoeSQIfzTVLQ7LoDtRC2IL/mNSd2646Uj41rz88007OFwLWFI2Unx1N/g?= =?us-ascii?Q?G1D9keRqhqHnM3lA0D9L03jsUR8QAFaA9lSeYS1cT6Is7asteJiBO1h+Ce0O?= =?us-ascii?Q?YNSInGbyPDkpaIVLgP94+3YbxAJU?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(36860700004)(82310400014)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:58:08.0873 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b2a977f5-cbda-426e-1195-08dc5bb95de0 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000A6735.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5988 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 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/15/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=0884b3bd36a9880955f5b7d9a59c5a71619e3c0f Thanks. Xueming Li --- >From 0884b3bd36a9880955f5b7d9a59c5a71619e3c0f Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Thu, 14 Mar 2024 15:40:19 +0800 Subject: [PATCH] net/nfp: fix initialization failure flow Cc: Xueming Li [ upstream commit fdaa8f98d754a704e00c7738c177efd43b669081 ] CI found there has unreachable control flow, fix it by remove the missing delete 'return' statement. Coverity issue: 414938 Fixes: 369945667251 ("net/nfp: fix resource leak for device initialization") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 5e473d9c16..7baacd18b0 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -669,7 +669,6 @@ nfp_net_init(struct rte_eth_dev *eth_dev) err = nfp_net_tlv_caps_parse(eth_dev); if (err != 0) { PMD_INIT_LOG(ERR, "Failed to parser TLV caps"); - return err; goto free_area; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:07.672265038 +0800 +++ 0087-net-nfp-fix-initialization-failure-flow.patch 2024-04-13 20:43:05.037753879 +0800 @@ -1 +1 @@ -From fdaa8f98d754a704e00c7738c177efd43b669081 Mon Sep 17 00:00:00 2001 +From 0884b3bd36a9880955f5b7d9a59c5a71619e3c0f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit fdaa8f98d754a704e00c7738c177efd43b669081 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 31c54a595c..568de1d024 100644 +index 5e473d9c16..7baacd18b0 100644 @@ -24 +26 @@ -@@ -936,7 +936,6 @@ nfp_net_init(struct rte_eth_dev *eth_dev) +@@ -669,7 +669,6 @@ nfp_net_init(struct rte_eth_dev *eth_dev)