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 9B1AA43B86 for ; Tue, 5 Mar 2024 10:54:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 957484026B; Tue, 5 Mar 2024 10:54:00 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2070.outbound.protection.outlook.com [40.107.93.70]) by mails.dpdk.org (Postfix) with ESMTP id 441D04014F for ; Tue, 5 Mar 2024 10:53:59 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FF/fStOduCS6uj1TVlk5CuXIPiR/LMQR5kcjA4BAjMEdjNKDVSoL+PdC/jJDisnr9N57eyLYkGxCcX6c3DNzaIZV0ZyU0xqnGkDAeINjE453iJYUL9r2afr2nKimyboPWbIvoRfxLjOtY/jjAePHhavcZ6yzaKYkPfSpCjP8gxv2j8kmeV3KKyVICLbobtbg5SyH8UtwPqv5g5rP11WYsHSFQuugN1i8Vnq7EzYovHynEXRuBE0AGkUAIayBtYfoQYCS0IApGLwnqJlB3HzQGamPh/oONliU91DOlNsOdvqd7s+OGUdwXAwOBeChFFBEQJrXniE9874NN6RAxhBmxA== 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=yasvQWinDCwXdtgP7lxPC7M0ZhLwabXDWvZTaYBiygs=; b=WPH3Ss9HiWJzQf2/eNjB+PGu63IKFUg5gs2zlBtUnUKcTKb2T92nOCHLmtUYXoZNQ6GcU2TSLS3Pv3QT9BdzU9jsSmt5fDcQs+SiziAUc7QAs0akr06WY/ViBxO5r5Pmi190ze/t9GXzSWtvhV6By0nTdVE2ynDltvbKH/Ewkb0pbS+1RAWyWRs8Jo9b/++Du9hI35R5XrwwRcKbKmJUPAPPGHFNh7q1v6PDaebHP1291+zLxbmwcPaCMBaRiL2Cs57XbiTdUEMEaPcmZ2EsBTRtImQmSWLEZbqQ/0TYahzl2EJzqRFOGa9wgkj5d/K80qJBikdeAO7MpcqTN4DlOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=marvell.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=yasvQWinDCwXdtgP7lxPC7M0ZhLwabXDWvZTaYBiygs=; b=BBzp1oI7FIOIxwS5A0Zkktv961CRul4gKNXfhgMpCsO/7t2m9ef4xUIyFsrojF3/yiKXf+UqGpD6L497QB7fidnOWgEcOqQH7WKuPlnzffsIyMTmet3Lb6vrZU+g3WyopuuBxebnJI5udTEUl0TnBxwQIg/WiH6qOT41vQ4y1woWwQz2iXrS1/GOyW1dH/bNzCiGTj53/KmkqRw8TaQQWUz1uEqX6BvrUUSEiDQKgAuzfqJip2Dvq12fUqN+zHbuSZdL5thW19L+2mbHg6u52adiu36nrCGxqR8OazW2HVdT8T1Rx0+PWDibkwxQk+CPImiVnEjan9DNOSUrwj6Y+w== Received: from MW2PR2101CA0016.namprd21.prod.outlook.com (2603:10b6:302:1::29) by LV8PR12MB9333.namprd12.prod.outlook.com (2603:10b6:408:1fa::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:53:57 +0000 Received: from CO1PEPF000042AC.namprd03.prod.outlook.com (2603:10b6:302:1:cafe::46) by MW2PR2101CA0016.outlook.office365.com (2603:10b6:302:1::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.4 via Frontend Transport; Tue, 5 Mar 2024 09:53:56 +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 CO1PEPF000042AC.mail.protection.outlook.com (10.167.243.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:53:56 +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; Tue, 5 Mar 2024 01:53:40 -0800 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.1258.12; Tue, 5 Mar 2024 01:53:39 -0800 From: Xueming Li To: Akhil Goyal CC: dpdk stable Subject: patch 'common/cnxk: fix memory leak in CPT init' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:45 +0800 Message-ID: <20240305094757.439387-65-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042AC:EE_|LV8PR12MB9333:EE_ X-MS-Office365-Filtering-Correlation-Id: b5c27ff3-0cfe-4334-2be0-08dc3cfa2c71 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2uRmjUPXF1QHvq+U8sYuRdSXI0Ps7c4U2FM7HsHksmklTRr67AtwA5QpHU4+5VtZtQUNfpWFGpjAym7zDl2wXeDhQE8KoEFPEu4LryRffDmWfApcSQzOQXncVNlAUeALLJpPS4cIcq5L8tubJPkT/HRbIa+XARJg9ZhOayNsJkdECEsUVq6NPogi3JU28UqwbYVO0HuHq0H50eodiPuaEJpykGnU82OCmK/V3LR/hfSSgknuRXTFclb6QbwlAu0jwI9o2i4e8ZgtJ1wiTAA2D4O28+ZUPfTyYmIcwyIxKVgIqT8zkuXnXNYmAyrmMq7D+GXMcUE0S3jsoX4ysriLG6JYPpy3N0PmpAdcIrK47BNdCotRn7ji85lOqddGCwm5PEuPpCfqIb9Y+5BaAwE1lygGfZr8Pe9dMSHNKaK1Q2UPXmYja9wdln3b6L2FdyzTEeO7vRIQiX57evtfhxd9kd2uuNMUrIEet3nTMGOY+NsdWoGmxYtTM7Z84TA6BZ5RhO5v5zv/CO4MLVxbqg/R7E12Du5wJHYM9czSAqATM/1mbeT+4ffBQXQ7LmA5IsqopWFsGWjiM7O56yMqoP8bLBAtPq8mmeF0dfobfUP9xD4AWD2sD/GqBg371IsUIkVasGb685nK4p2Qhha4BK0gJYyR0E3CGDiHYdEZJP9ZYiDKraRZu6ACl/RDbZwvfiKmpIqCelae3Aiztqg90JUwyqbNX5KlZxxQWgrpU5R70NDq16k2ZYdC/+W2+tmboE2/ 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)(82310400014)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:53:56.3310 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b5c27ff3-0cfe-4334-2be0-08dc3cfa2c71 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: CO1PEPF000042AC.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9333 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 03/31/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=ea096d3e488957cb72e339e9822794e0f6bfd2a9 Thanks. Xueming Li --- >From ea096d3e488957cb72e339e9822794e0f6bfd2a9 Mon Sep 17 00:00:00 2001 From: Akhil Goyal Date: Wed, 17 Jan 2024 16:00:46 +0530 Subject: [PATCH] common/cnxk: fix memory leak in CPT init Cc: Xueming Li [ upstream commit ffe0b570cfd04a35b3a2f8f753efbbbe0225c38c ] dev_init() acquires some resources which need to be cleaned in case a failure is observed afterwards. Fixes: c045d2e5cbbc ("common/cnxk: add CPT configuration") Signed-off-by: Akhil Goyal --- drivers/common/cnxk/roc_cpt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/common/cnxk/roc_cpt.c b/drivers/common/cnxk/roc_cpt.c index 981e85a204..4e23d8c135 100644 --- a/drivers/common/cnxk/roc_cpt.c +++ b/drivers/common/cnxk/roc_cpt.c @@ -756,7 +756,7 @@ roc_cpt_dev_init(struct roc_cpt *roc_cpt) rc = dev_init(dev, pci_dev); if (rc) { plt_err("Failed to init roc device"); - goto fail; + return rc; } cpt->pci_dev = pci_dev; @@ -788,6 +788,7 @@ roc_cpt_dev_init(struct roc_cpt *roc_cpt) return 0; fail: + dev_fini(dev, pci_dev); return rc; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:32.877164463 +0800 +++ 0064-common-cnxk-fix-memory-leak-in-CPT-init.patch 2024-03-05 17:39:30.783566493 +0800 @@ -1 +1 @@ -From ffe0b570cfd04a35b3a2f8f753efbbbe0225c38c Mon Sep 17 00:00:00 2001 +From ea096d3e488957cb72e339e9822794e0f6bfd2a9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ffe0b570cfd04a35b3a2f8f753efbbbe0225c38c ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org