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 E934E45610 for ; Fri, 12 Jul 2024 12:47:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E263042E6A; Fri, 12 Jul 2024 12:47:07 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2056.outbound.protection.outlook.com [40.107.244.56]) by mails.dpdk.org (Postfix) with ESMTP id C08CE40261 for ; Fri, 12 Jul 2024 12:47:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RZ8YS0fKQHJ2yEqJE4P/dGXe4Sw+4641jDrJ9f+dYXFL+Ury6VlyGGOQmO2sk1UsFxpmWLUyIMUOwDYGI8A24NRebkflbv2+XjgtcamIUbVRhllVSMqCwXRtusmnQE9EveX33caONguRZzUzIxFFboMkuqQh3WhQ/VDrAUyyzoEv8YXNo27ZecN+CNJRusyfk/r/h7JjY7ygBlmQzADyskCH8XqrcNVmwG1KnCW++W4ct1/H3DklW8nhg6BdvQsOvA4E8scyNI8wRoi3UuTDWpLha3iqx2l/ok/ev9ep3OPSLgPBwz/QTQEpI/6iwHNSVlYxGrNm53H31KsyFa2oCg== 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=ZB1krHncwQELwg7Mu69TIH26OJCkOQhDnu96VoKa7Fs=; b=yTNYdzPC00i7Sjj4YGThzJsiJlYcJebYYIrkX+xqkL/0Ayylw0ARRp8VohzeEl1hO2feDJqz2YOY804d1TKGPkMpOgOiaz5cmHs+jnjlHnp2DJTQpnMOxWX815o+joE/70O2+mK4qpAorW1LdJRloDRrRNhhsriv9fR3f5dWwynYaI/Ta4NEMY2IWvLU75z7uqlCib4YGDpLaT0QKvg3Ks54FaFT61YpUWp6Fb18JO+AC9Sex9JtS2kQ6N39KHq2cjtMiL1Mv4gh6xpdHmPrANvMhc/Fb/lis+49xTpa0/KWUV8vW1RyfgLEQZTegqitkbD7BDQhWdyO2qKo4wmxAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.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=ZB1krHncwQELwg7Mu69TIH26OJCkOQhDnu96VoKa7Fs=; b=fPyP+ffyiwg8ab8ku+gZ/wIYDWt7nT106xrOPlgYvg3lcN5OFKRBJog3Fy/9GDjX9rDKMDMQ/PCZyf9fo9ea1dXL+8+NA38K/JF6i77muTNUQ48N4IunjO/eKQ+ra4DL16zTE4cX5DQG4hmzHXmOk3k7EPVM7Yq1Z/aiIbOaqUBCvHtswE6iJfAlSXOyCPdQeqqfANjnVYuo5Mq4X2WrnicJV87tQWJBpGXSM9R7C0UqVepXcJUMsr0vgA57oigr20nxA6w68kQ4E/AU2HNQSibTm89ZaIFm1eQHHfvb4uY8zIioUhxFJq+qLIl2GwESqeU7fsNTS6Y2ghG3eJGgGQ== Received: from DM6PR11CA0003.namprd11.prod.outlook.com (2603:10b6:5:190::16) by DS0PR12MB8294.namprd12.prod.outlook.com (2603:10b6:8:f4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.36; Fri, 12 Jul 2024 10:47:02 +0000 Received: from DS1PEPF0001709B.namprd05.prod.outlook.com (2603:10b6:5:190:cafe::f4) by DM6PR11CA0003.outlook.office365.com (2603:10b6:5:190::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:47:02 +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 DS1PEPF0001709B.mail.protection.outlook.com (10.167.18.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 10:47:01 +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.1544.4; Fri, 12 Jul 2024 03:46:48 -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.1544.4; Fri, 12 Jul 2024 03:46:46 -0700 From: Xueming Li To: Dengdui Huang CC: Jie Hai , dpdk stable Subject: patch 'net/hns3: fix double free for Rx/Tx queue' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:43:59 +0800 Message-ID: <20240712104528.308638-14-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-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: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0001709B:EE_|DS0PR12MB8294:EE_ X-MS-Office365-Filtering-Correlation-Id: 8e773adf-860c-493a-2611-08dca25ff67f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ATpULeb07oF9IU2XA/BCDEMQHwcRSshUwNJkNu+c+PpGgohhY8tW155Kp1pU?= =?us-ascii?Q?O62TIdqWD6HPCiVMPgqgdG5QWRpqmaXSorQlUa/mQ5GerPp/c2n98InHdSAk?= =?us-ascii?Q?ZKiV8WdeNDIbWef2qc/8eocxCzW7pmyAjtHW9ArKUOtHwtALu1+m+NhXq7O6?= =?us-ascii?Q?FCdiKtIUiQ6jXdj8gMJr8pd3H6mmPOj/+c+HWQrnYvUUNvImOlL+GrBUkmdD?= =?us-ascii?Q?/QZ8oOB61STqa4KRm6raAhxvS5/38zka1xxfKwiPeObwRen845BPi+Ccso75?= =?us-ascii?Q?xoK0p++qlYSdoukXxfSe5qjIJxi35v4x7QzOpif1r7YGKC8M1/Iy45RDDkTd?= =?us-ascii?Q?8YT8NjGVV/YR+d2QciBBAoYBQzUqk+xRR4jaSQqN9DSu/Eg4RU8lClmW9xXr?= =?us-ascii?Q?CmR7M6cSg7RpUOimwHEBgQc0/2X7cU6QJ8xRoQMIRWX4QPq+6wxvr54pwcXB?= =?us-ascii?Q?OXljGu6EwnYzgC0x41WjEzqZUxSHPtYJfAkcDrzvAZEWJNsDSIWPKffQ8cCr?= =?us-ascii?Q?4qn2Z846bu9n/3bYuzLGalY/QveJzxFUIviiHBxvu7yanJIrpPyop5mN5m+b?= =?us-ascii?Q?vAvGnkAecQ+3mv45sdEkMSZDvIUO6kZfn9qK8vmuPUSf3dzVJeoXT91jUtiK?= =?us-ascii?Q?I+MUmePApQtJV6RZTPuFszqzb71PCgX+AbvuZJIwTrON7OnL2sBjarZ40NFn?= =?us-ascii?Q?QTqkfhRQxVvq4nB/pvrUtZ6j60mYXEuQEV8ruTV0JVpRqRTzw29b0PWLsIQY?= =?us-ascii?Q?rpvwPVfPjyIkT6jZXxI1Zhkccjz+1IklGV8JSzGohFQkUNXAk8JbIu1pb3V1?= =?us-ascii?Q?mrwsMl1poPeqpbzbO4EQtmsXAgHW1Rbem/Ah2xL1IXzakNlnbbHPpQVOi9OS?= =?us-ascii?Q?00MM+KzidB007xnASBBaOmGf/ylfGaUfBNKCMBw6jy8Eu8FTLha2glGK/2G+?= =?us-ascii?Q?9K9zHlJr5n2keWEFNDqVuT0ZjOKA5t8Dg1OKMtf1guW/lYyLFIxPB73HZY3c?= =?us-ascii?Q?XgOgJPhhoqgRa2FJZrSjtLNlwpR2T9h/y/ZZSXVi3x1MiPiPxkeHCn9C1lPl?= =?us-ascii?Q?xCrLv9N5BS4J0EKQOI3+VIE0OeWPDdoGSrdltuVBpCRXuvHRg+dxbi7mjt9q?= =?us-ascii?Q?zvJmnBcbAy8O44JweYgaHG/+Kehn06I89YQS6tQIXfyhpc+rRPxrVh3e2D48?= =?us-ascii?Q?+Ccg/mCA6kZqfO+n0JKUW8zv5VUi+DM/9Nj0e8V/2141n/9Jyc1h2Zt9CfLk?= =?us-ascii?Q?aufehHPL4JUj5edD7W6iCZBk1iQ4LDX71odtjtfZGjamyw2rr0wXFLW8FNtc?= =?us-ascii?Q?/N+poeGMz4+emlGTSKXROAR2STs+N9HnoVZTJluDfmnJXXRONxwcW58tYwHP?= =?us-ascii?Q?L9HCd5bYAZchoJuduXCrOveunb0Pfv5/fKbDW03f6c8AwCB14NCdm1QKr28S?= =?us-ascii?Q?RnddRU8S4Ra4ipsQGjWH3a4K26yCeZjB?= 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:(13230040)(376014)(82310400026)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:47:01.9482 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8e773adf-860c-493a-2611-08dca25ff67f 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: DS1PEPF0001709B.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8294 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/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=36a750d9d0c56d0aa6ea719556011d364e3053db Thanks. Xueming Li --- >From 36a750d9d0c56d0aa6ea719556011d364e3053db Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Wed, 3 Apr 2024 18:16:21 +0800 Subject: [PATCH] net/hns3: fix double free for Rx/Tx queue Cc: Xueming Li [ upstream commit bbf6fcc0cc62031a26517608a471873339423d8c ] The Pointers to some resources on the Rx/Tx queue need to be set to NULL after free inside the hns3_rx/tx_queue_release(), as this function is called from multiple threads (reset thread, device config thread, etc), leading to double memory free error. Fixes: bba636698316 ("net/hns3: support Rx/Tx and related operations") Signed-off-by: Dengdui Huang Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_rxtx.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index 45012455b7..d20e03b103 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -86,9 +86,14 @@ hns3_rx_queue_release(void *queue) struct hns3_rx_queue *rxq = queue; if (rxq) { hns3_rx_queue_release_mbufs(rxq); - if (rxq->mz) + if (rxq->mz) { rte_memzone_free(rxq->mz); - rte_free(rxq->sw_ring); + rxq->mz = NULL; + } + if (rxq->sw_ring) { + rte_free(rxq->sw_ring); + rxq->sw_ring = NULL; + } rte_free(rxq); } } @@ -99,10 +104,18 @@ hns3_tx_queue_release(void *queue) struct hns3_tx_queue *txq = queue; if (txq) { hns3_tx_queue_release_mbufs(txq); - if (txq->mz) + if (txq->mz) { rte_memzone_free(txq->mz); - rte_free(txq->sw_ring); - rte_free(txq->free); + txq->mz = NULL; + } + if (txq->sw_ring) { + rte_free(txq->sw_ring); + txq->sw_ring = NULL; + } + if (txq->free) { + rte_free(txq->free); + txq->free = NULL; + } rte_free(txq); } } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:14.910785730 +0800 +++ 0013-net-hns3-fix-double-free-for-Rx-Tx-queue.patch 2024-07-12 18:40:13.936594247 +0800 @@ -1 +1 @@ -From bbf6fcc0cc62031a26517608a471873339423d8c Mon Sep 17 00:00:00 2001 +From 36a750d9d0c56d0aa6ea719556011d364e3053db Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit bbf6fcc0cc62031a26517608a471873339423d8c ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 55311402fe..bf10da1928 100644 +index 45012455b7..d20e03b103 100644