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 02661470E5 for ; Thu, 25 Dec 2025 10:24:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2FD4F402B2; Thu, 25 Dec 2025 10:24:56 +0100 (CET) Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010036.outbound.protection.outlook.com [52.101.46.36]) by mails.dpdk.org (Postfix) with ESMTP id B16D0402B2 for ; Thu, 25 Dec 2025 10:24:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZvIZCXXQujIkAAkFtGbYk721wf9LwWa4kMeqoIUgCc0R79TOajtwRxXKO9h/KE6aTiJVOhzDvx6hO2xoKw7FhG94tKPdEieVAP184ElDM1PenVL84lbrYeVdxGpn8iAkWObMdRTEVvXxuV7fOcyYcNFhK7xZmjbLqo3FwkkF7v9kHKiXjl8tt0XjJ7DnYgos1OPhKw3dpOCIUVUPUreTPlltXG2O6gULY1JPL8y8TwaD4QEvM+Wg8If4fCyPu3BW8thoLdSbPhqGSZJyzqblkIm6+peM/3NeGMU6oil+PkV/GEdcdv74ysP3NnT2IHgiR6JUkRVaQyAN9t6A5xF3dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=w56Yf86B6U7vsnLSqIGzbeFpYVMRTaT33ylYcRZm1rI=; b=QD1DaDEw9M+UaNy3n73ak+5JzmJrlL6sasHOag+JuA491TbVoHnpm06Xyj8DordZLJn4zMLWVc260QV9KR1BwUWmi3YjIi7O6Cij1mmaAJBJOy8GdSb6jxD+WVSNBrq8bRW7ngEkKa9+gWgT+k2cv3ezt/M5eDhRxhJtw3wwA3nnlTG4fWFJRk75u5n4gEtBm/K80ymk4pOvhLUaEBA6WXbSzo6LDpbSYkNLrijF++zSOi400qRHpyeRA/q7r9HflQztC7aK3PWJhSOH4tfw05gbV0eFRi4LAQD7UCoPIJDtwI081yiw+KMapvqa4uvkimwXPEv91bst10pLc3eyPA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=nxp.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=w56Yf86B6U7vsnLSqIGzbeFpYVMRTaT33ylYcRZm1rI=; b=gJYTdywA2omuC5VloEwgd5FG83fJw9Ch/yN+tA/URrhHWUrBfdk//SP6BWPUIS+Umcfm+paR7nRCb2ayGlnrgI4bXHwNn06c98TCyHwYB+3RMtCD55rgpYs/KEOIa9QUMteN4A0FUXvCuvarOTh8pGUV17Papq3YeqTma+SzALqAetqpiyP7yJh+kGdQqgrZ8k0FgchBz+Bv5BzqwabjLUezeT8ii/7vUz+c8Veu4CxT3kd567dUOc1z10w2vAPfrAOlSv4WYficIshRdNgHdaOksdZOxghL34DwW7QjZL2ITWLPsNor+kMVftE4/93ww1fwkJye5chSD1aW6nEH/w== Received: from CH2PR03CA0030.namprd03.prod.outlook.com (2603:10b6:610:59::40) by DS2PR12MB9821.namprd12.prod.outlook.com (2603:10b6:8:270::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Thu, 25 Dec 2025 09:24:50 +0000 Received: from CH2PEPF0000013D.namprd02.prod.outlook.com (2603:10b6:610:59:cafe::ca) by CH2PR03CA0030.outlook.office365.com (2603:10b6:610:59::40) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.11 via Frontend Transport; Thu, 25 Dec 2025 09:24:46 +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 CH2PEPF0000013D.mail.protection.outlook.com (10.167.244.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 09:24:50 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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.2562.20; Thu, 25 Dec 2025 01:24:41 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:24:41 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 01:24:39 -0800 From: Shani Peretz To: Hemant Agrawal CC: Maxime Leroy , dpdk stable Subject: patch 'net/dpaa2: fix duplicate call of close' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:18:35 +0200 Message-ID: <20251225091938.345892-74-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251225091938.345892-1-shperetz@nvidia.com> References: <20251221145746.763179-93-shperetz@nvidia.com> <20251225091938.345892-1-shperetz@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF0000013D:EE_|DS2PR12MB9821:EE_ X-MS-Office365-Filtering-Correlation-Id: a11a08fd-7a2b-4e6a-153d-08de4397749b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|82310400026|36860700013|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?utf-8?B?N3lOZXp2czhpYThiQUZKTmxxeGkxY1lLYTdTU25QVEw3ZGVuUGVnTmo1Tjho?= =?utf-8?B?ZFdCbk1Jc3RLb2tFdU10bGp1QUU5bGZiejg1TVdXQ2pJYWFocHFFVWFHOUJY?= =?utf-8?B?VTliMzVRdGk1NnlWQVRuV1F3bnNCWDRPaVd4NzZNcXVYZStBUjc0VEoxeXZN?= =?utf-8?B?TTZ6eWl2NUpBUnIyTmhQQlNZa0F0M0ltSEs2aGlEd212Uy9VMWlFMFZ5aTlj?= =?utf-8?B?QzZabkZhZENNQWVmUEVHVTBPb3kyQWY4dUFRU0hnYnRRdER4SmJoUDc5eXUy?= =?utf-8?B?N3FITjNxZVo3Wm1iR3Vkc0E2dWdjVHRkYXVIVkRDQ1hWbnIvWlNBSjFESDVy?= =?utf-8?B?YU5hQklwWUlRNG1helIxZ0REQ3h1NjFOR1JwMFAvS0U2RVMzajRDdWZXb0Vw?= =?utf-8?B?bjNDV0wyazdwTStWZDgvK09NeVFIaSthR3RXVDEzcXRrQURIRTRzbmM1c05m?= =?utf-8?B?VG14K2hhZ2lsVVJ4aEdiWHNTS1kyUDljVzNwS2dVazN6Wm9YTVhKN1pFK1FM?= =?utf-8?B?YmFFZnBZY3BjUWt2Y1psZmhzUksyck1NdUV2SitQblh6cDZ4cDEyL2R6WWlE?= =?utf-8?B?UWUreWVDV2orbmo4VXFKZkxHTUZSNzdZbDJySHpTZHN2c3FzZE1UYU11UUVk?= =?utf-8?B?RmJxZ05mSlRVWHdLWWM4UXoxUXlKWi9nTXZ4Q3g5U1BtWE51SUlRMnpzb2lV?= =?utf-8?B?UVVuRGJQR3g0SWFJYWFhalU5dTJIZm1hNnNnQkZ4WEZHODlVK1NUL2Y4K2lu?= =?utf-8?B?aUhxQ0hjTmhNaVVkNHl0OEE1Q2Y3R2tUQnR6NEpYelhxN0MrVG8zS1k1clNG?= =?utf-8?B?SnMvdTZMTFcydWFxelYyM1NCOGRGd1F3N21ZazRzUW9oeUg1TG5zVEJZbWJo?= =?utf-8?B?Tm5nV1RKR0pSTGlPMHhDb28xRjBydnM2bWZ2Y3ZlQVlidlpaNDJPTTlNUmk0?= =?utf-8?B?N29FUENKUWh4UEdoZ21oUjdZN2VPNTlKOWl4OWpqVllDU29lQ01yWEVVOSs4?= =?utf-8?B?K0t5SVdvY1NhRTlWVng1d3VFUDVQenMzRHg0Q2xQZStma1NITW1Zd0VJTCtG?= =?utf-8?B?NWIyZzlWbmdrSTdYRFBLc1NHVFZuOTVDZ0x0MGpjZ05Pa1l2RCtvZmtZL3lB?= =?utf-8?B?K2pmYlBLb3pibVpYV2s2azU4TDNtNFVKSTB3REJtdDVyRUxLVDgzdU1aM1g3?= =?utf-8?B?RWtsZ3NpVmIvc2RxbjR4YldWYjlzcXlWYjUrYnVkOGVSdW9oWmNxZTRtdGlP?= =?utf-8?B?VVRtZTF5WmJEa1hsNlNTZDZxVlRjUXhnYi9oOXJJM0lsV01GMEdNcE02WEtl?= =?utf-8?B?QlhXc2dUZmtGakQ2YVlCaTN2VjJUN0IyYy9sbEVNbTNPMkE2di95OTk4TGMv?= =?utf-8?B?bUU3R2puMGpVMlZQSDZBSm1WTCt0Z1RVTjEzbkVNQi9LUS9JM2ZzZkpCajlP?= =?utf-8?B?OGFPZ1MwbUZUTmMwbUVCTmZEaGNzQ3l5a0l4UmlxaThUeVJCS2U0SnBsb1RO?= =?utf-8?B?enpSbmF2ODlyOXV5b2RoRFFIQlRQOExQOGh2eXJzbEdEUXlNUktaOU5UUld4?= =?utf-8?B?c1NvaENqM0VKaEs5b0FvK3dRcWRVMTRxbjZkZXFCcnBUMWhYQW4xMFlsUTdq?= =?utf-8?B?YWE5VEo0U210WHFPVFBGMHZqQmgrUndyNEJvbUllUnM2RWQ5UlpvN1pPT1pU?= =?utf-8?B?ek1Jc1A3YWR6UkNYeGFhZ0NVQ1E4N1gwdTNNR2FucVA2VVpOeStGZWRmdG5K?= =?utf-8?B?UGdFa2I3K0RyOHRXR0VvTy9zWG41dlpmdWYxc1E1ZmMxN2FHbnhMMXU5YWtj?= =?utf-8?B?UHQ4djZGdk9IdUxwMjdMTmg0L2EvUGpWTUVSSlphVVdxaHdKNGp3YWYvdy9r?= =?utf-8?B?Nm0rTmVqZEpLN2hFQWx5aFpHZ3g3NlJRWkhuRDBTQkFzRWYybHJieWk4SFVp?= =?utf-8?B?eTVmZHd2bW14VitwU1ZuQ2hlV2hxSDA1SXZFclRpTDgyOXN1d25SLy9ucHp1?= =?utf-8?B?Q1dMZ3FYR241WHNoWHR0bXVkTzVuajl1V2VjNVhoRm9QdEtNOVByQm5tNHg1?= =?utf-8?B?RDk4Q21uZi80eGlVcmUxSGZHNEJzWmY1RUJYSWgwd1lFRktCWXlicU9JMXZE?= =?utf-8?Q?M6gvrSw+9FJfrga3t7zZwWMs9?= 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:(13230040)(376014)(1800799024)(82310400026)(36860700013)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:24:50.6879 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a11a08fd-7a2b-4e6a-153d-08de4397749b 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: CH2PEPF0000013D.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS2PR12MB9821 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.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 12/30/25. 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/shanipr/dpdk-stable This queued commit can be viewed at: https://github.com/shanipr/dpdk-stable/commit/a62ab6ec9095c5656155d16620ded958b60317a8 Thanks. Shani --- >From a62ab6ec9095c5656155d16620ded958b60317a8 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Fri, 14 Nov 2025 11:54:51 +0530 Subject: [PATCH] net/dpaa2: fix duplicate call of close MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 3b8225353ea3b9eb03df5dee94a037582d0d6748 ] When rte_eth_dev_close() is called, it performs the following actions: Calls dev->dev_ops->dev_close(), which in this case is dpaa2_dev_close(). Then calls rte_eth_dev_release_port(), which releases all device data and sets dev->data to NULL. Later, when rte_dev_remove() is called, the FSLMC bus invokes dev->remove() — that is, rte_dpaa2_remove(). However, rte_dpaa2_remove() calls dpaa2_dev_close() again. Since dev->data was already set to NULL by the previous call, this second invocation causes a crash. Fixes: 5964d36a2904 ("net/dpaa2: release port upon close") Signed-off-by: Hemant Agrawal Tested-by: Maxime Leroy --- drivers/net/dpaa2/dpaa2_ethdev.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index da3719a373..a195c6f2ad 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -2945,14 +2945,22 @@ static int rte_dpaa2_remove(struct rte_dpaa2_device *dpaa2_dev) { struct rte_eth_dev *eth_dev; - int ret; + int ret = 0; + + eth_dev = rte_eth_dev_allocated(dpaa2_dev->device.name); + if (eth_dev) { + ret = dpaa2_dev_close(eth_dev); + if (ret) + DPAA2_PMD_ERR("dpaa2_dev_close ret= %d", ret); + + ret = rte_eth_dev_release_port(eth_dev); + } - eth_dev = dpaa2_dev->eth_dev; - dpaa2_dev_close(eth_dev); dpaa2_valid_dev--; - if (!dpaa2_valid_dev) + if (!dpaa2_valid_dev) { rte_mempool_free(dpaa2_tx_sg_pool); - ret = rte_eth_dev_release_port(eth_dev); + dpaa2_tx_sg_pool = NULL; + } return ret; } -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:40.034835345 +0200 +++ 0074-net-dpaa2-fix-duplicate-call-of-close.patch 2025-12-25 11:16:36.099943000 +0200 @@ -1 +1 @@ -From 3b8225353ea3b9eb03df5dee94a037582d0d6748 Mon Sep 17 00:00:00 2001 +From a62ab6ec9095c5656155d16620ded958b60317a8 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 3b8225353ea3b9eb03df5dee94a037582d0d6748 ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index 7da32ce856..fcda267e0b 100644 +index da3719a373..a195c6f2ad 100644 @@ -34 +35 @@ -@@ -3347,14 +3347,22 @@ static int +@@ -2945,14 +2945,22 @@ static int