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 D422546A63 for ; Thu, 26 Jun 2025 14:05:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CDB194026B; Thu, 26 Jun 2025 14:05:53 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2043.outbound.protection.outlook.com [40.107.93.43]) by mails.dpdk.org (Postfix) with ESMTP id 5C4F4400D6 for ; Thu, 26 Jun 2025 14:05:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WOdy9K5JtX8Aty5vM62hoW1Ypqwk67dxiuggiH0Ts/IOOhK7A5MEPMBRyu1ofK284jVbQKs1WO6kfWK3TtuciCno7lL+2Hv4NkDQd5q6wgtfhMaon/S3Im7crvc6RenLkZ9VObJjAX/g7jPCunvgs4vb6aiEG+BdNrhRScQe9t4Ho3/yzcnLgNBOjQtCcbKu0R0WCqmrheLrxiXCWujVSp/WFQF2gPVkCJwgYMQkeW1WgdqqaU2BlFBOh0a33gZdEI+HTx3isdqApS9RD0NqS9g44Ng9+aTCC3dIMxI3k3y2mSY4JuElGVW+FkDEztdHpg6bhszVGcyk2YlEdaNcxw== 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=Epdq6ObVjdW4VWR/2xbqfij136Nd8Xje3B7TzkqgodU=; b=v+SOo4HTO/lFMd0n9YYou6BiocCrkKznGUiYqyoYIL4UFV4qQkzBMVclVfLbOBad/K3E+fnXBjzGs4qQDKAsYo5A4jVfZsbF5p5efIrqgnGj5A8u9T6JouazMMLLfJ+mYIW7BDJe8ZD9cFAQd0fYSg5V2LZdzrk6B419xtHnoWpXdrDAYDM0YC4shPt0glCGQjwyya8YUT651XJBrRd0d6PkQbmk5yYRXMIT5cWEyRL/Sroab4gdTmJrVP6nQ2aKcGtUuDD2t+yjQwqICIPlVPUqddqkZAACKWXKlvPPkGU+PT/HpQ/OmPahsVKyJtZV9IAmvnBB6OCAu8nj/UK+0A== 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=Epdq6ObVjdW4VWR/2xbqfij136Nd8Xje3B7TzkqgodU=; b=pncSvMbp/TbUc/7oGyjXuhZtFHPHwFJRe5seVDAnpBA3wzr4Dhyi1ddbuVi5FyW04q2LXlfwNlvJkC3X7lESOBcQyHCS+xxxGu1dgZ5hQ9FBBGfG7z4azDaQ7jw1LooVMSe6CwDtPY9xCDJDqthnKqzM1oUcYSse6NQELfo4BS9cUuZu1Uq/mwcFOC8LHB0fYGOgjsNrGloUGc5OjA+yKub2RgzpDXZvS4YG44sJpeKPjPMx2DktIVb33RPR2FjfuYHlSoQGR8z4ScpSelGZpZEZa3YWUhAN2ZI4yQIVqel12KUxUEaieHDJaVNK0GiRjHrcqIFKZZ7dmtnmBuQyVA== Received: from MW4PR03CA0118.namprd03.prod.outlook.com (2603:10b6:303:b7::33) by CH3PR12MB8993.namprd12.prod.outlook.com (2603:10b6:610:17b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.29; Thu, 26 Jun 2025 12:05:50 +0000 Received: from SJ5PEPF000001D1.namprd05.prod.outlook.com (2603:10b6:303:b7:cafe::e8) by MW4PR03CA0118.outlook.office365.com (2603:10b6:303:b7::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8835.29 via Frontend Transport; Thu, 26 Jun 2025 12:05:49 +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 SJ5PEPF000001D1.mail.protection.outlook.com (10.167.242.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:05:49 +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; Thu, 26 Jun 2025 05:05:35 -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.1544.14; Thu, 26 Jun 2025 05:05:33 -0700 From: Xueming Li To: Dengdui Huang CC: Xueming Li , dpdk stable Subject: patch 'net/hns3: fix resources release on reset' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:00 +0800 Message-ID: <20250626120145.27369-41-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-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: SJ5PEPF000001D1:EE_|CH3PR12MB8993:EE_ X-MS-Office365-Filtering-Correlation-Id: 992b283e-31fb-442e-a110-08ddb4a9ca58 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|36860700013|376014|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?E2nm0vA3Jvwmr2O/Rlz+StHU3DjD2/M9+f0RqeCfb2vx18WN7h4JP9d+fDzi?= =?us-ascii?Q?U2u732oHr/E7LqNQkf8E6pOEkOq9GY+7QxzR3vX3a/AoZXai4pMp0QKEyFyA?= =?us-ascii?Q?O3H4bPOVcrl7bjsmS77fT41KH7wpfCijmyLz7bLt+uOc36BxxRc9WUEyIOTU?= =?us-ascii?Q?6gZE6pRyDVCeSEXckaUB7Cgncpk8yI0LBumnVpQr5ZlJCnKZH7U9hXyKMXLU?= =?us-ascii?Q?+GJB2hRRrK/xQDp3oPkpKkG8Tv/AFTecf4cvcrQpkdlTo32o7kxUwmO3lcTc?= =?us-ascii?Q?rkOt6jXgpXu8hGY5ahMpb1HY6YrIBQksMbvmlD+hzsZfCFbfsVjbc2kSmH32?= =?us-ascii?Q?E6LC5u2dGrWTFkyG++0oZmHpR5h4q5ASSqYFqz7GQB9S5Mpd2sDg3jja23ZI?= =?us-ascii?Q?f09PpCYBXQs0vo2i23B0hkDpnmwf6h+s5PlfN52OAnK8pla+o1Q1r2w4g2sP?= =?us-ascii?Q?POEDBlZJODLdJC51u2Uy7DXXzAOJ85+8t5gKOD1XL4FroliBjiteDMMp2Ye5?= =?us-ascii?Q?JFiZyBbojcr4qz1DohKJHjr2m5m1NgxGHrvSAV+uo9Tamc9s05v4tWA96gGW?= =?us-ascii?Q?hS6OC2qnhOGaC/TGHD5E+TDSZNsfnKkTYnSY81QSPvZJlasi3Im3CyATyxyh?= =?us-ascii?Q?8k43duwInp3ExanoE4yh0OUZEPCozn7WJYMdCy+Xu82GhjgPtCnI/mv3SC01?= =?us-ascii?Q?Mnfs3z2GRpflD6/zIcmKfRPhQZceEl1sYoR+6qumOsZfKj7da2RPLgDOheb1?= =?us-ascii?Q?sTWashf0iGfK95Zgr5h2rWpMXsFvz7rceqqJ8uP/QaZfcKEFpWh1Kn4/jang?= =?us-ascii?Q?FOAc1rUUGoM5fA9XSPQf/HrcjP1gGj3GxQ26wPNN+RYSKS66nw1+C8wrifrh?= =?us-ascii?Q?YSCjZtU9TXF/i0i9lwA9CBgns6KN2QbrFFVVAUSuHZ7mjAeKtEG8G7iNlWqM?= =?us-ascii?Q?O3E+T1SbSl4zKcgGKTZhkIIw7x0Hn02HTSyTkIdKyNUsj2DW15AaoNb9GBmQ?= =?us-ascii?Q?IgpDNmnkr3ZCYbe8TLs0sM5yKB7JYmNH2uLb4f9Q7jrExw/4/uXXHwO6Mgju?= =?us-ascii?Q?blSrrJ+Netk7K7lNIF9czLcBL5beps7KOo/VKqncv0q3cfm16gSVu5jDiw1n?= =?us-ascii?Q?QcDr3IFT1aVrbB2E2dcQ42d/5+cGoEJRU9eCX95HTWCmti08C6IbnUkHinsZ?= =?us-ascii?Q?HdJ+qP0l2DvEvruYyD7ry+iqoQfawpXaKGSLB76jxmHWL/t+OchE/iugV0bK?= =?us-ascii?Q?k6Oiv7V87lgQuYtOT9vvKwp5+NLdaYvlG60Jr6it5VgxP0nO0eDboxklYiGG?= =?us-ascii?Q?rMD9kyEXv6zFnY2o7Z+OHpdiMaC9EHL+zNm1ITA29rKoaLWdc4fk+nGJDQTh?= =?us-ascii?Q?xLfO3wwtCocHuft1DC3giVAkkz8ISPqKKwenLtEOUjjSc9RLJyRyG804dyql?= =?us-ascii?Q?1z19VoZ9N4Aw/O+fU24w+ji82CXHpuiDoG6jz01hSTqTU9kz6jNPSDPLVDq0?= =?us-ascii?Q?c6xigzCDF8kqGbR8l/AqcMx3atsTygA8QPH9EFNYbY9yg6DJRiNFgAEMYA?= =?us-ascii?Q?=3D=3D?= 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)(1800799024)(82310400026)(36860700013)(376014)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:05:49.3409 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 992b283e-31fb-442e-a110-08ddb4a9ca58 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: SJ5PEPF000001D1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8993 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/28/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://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=280d641cf8d867695326342bed4145c615d52912 Thanks. Xueming Li --- >From 280d641cf8d867695326342bed4145c615d52912 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Tue, 8 Apr 2025 16:31:00 +0800 Subject: [PATCH] net/hns3: fix resources release on reset Cc: Xueming Li [ upstream commit 361eab82df67c09cb84a9e2e66c0d93a84be610d ] Some resources, like, unmapping Rx interrupt, doesn't perform when execute dev_stop on reset. This will lead to other issues. Fixes: 2790c6464725 ("net/hns3: support device reset") Signed-off-by: Dengdui Huang --- drivers/net/hns3/hns3_ethdev.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 541f086443..99566375ea 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5219,20 +5219,23 @@ hns3_dev_stop(struct rte_eth_dev *dev) struct hns3_hw *hw = &hns->hw; PMD_INIT_FUNC_TRACE(); + if (rte_atomic_load_explicit(&hw->reset.resetting, rte_memory_order_relaxed) != 0) { + hns3_warn(hw, "device is resetting, stop operation is not allowed."); + return -EBUSY; + } + dev->data->dev_started = 0; hw->adapter_state = HNS3_NIC_STOPPING; hns3_stop_rxtx_datapath(dev); rte_spinlock_lock(&hw->lock); - if (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) == 0) { - hns3_tm_dev_stop_proc(hw); - hns3_config_mac_tnl_int(hw, false); - hns3_stop_tqps(hw); - hns3_do_stop(hns); - hns3_unmap_rx_interrupt(dev); - hw->adapter_state = HNS3_NIC_CONFIGURED; - } + hns3_tm_dev_stop_proc(hw); + hns3_config_mac_tnl_int(hw, false); + hns3_stop_tqps(hw); + hns3_do_stop(hns); + hns3_unmap_rx_interrupt(dev); + hw->adapter_state = HNS3_NIC_CONFIGURED; hns3_rx_scattered_reset(dev); rte_eal_alarm_cancel(hns3_service_handler, dev); hns3_stop_report_lse(dev); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:19.444092958 +0800 +++ 0040-net-hns3-fix-resources-release-on-reset.patch 2025-06-26 19:59:17.374418044 +0800 @@ -1 +1 @@ -From 361eab82df67c09cb84a9e2e66c0d93a84be610d Mon Sep 17 00:00:00 2001 +From 280d641cf8d867695326342bed4145c615d52912 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 361eab82df67c09cb84a9e2e66c0d93a84be610d ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 2d4e348442..9f99525e70 100644 +index 541f086443..99566375ea 100644 @@ -36 +38 @@ -- if (rte_atomic_load_explicit(&hw->reset.resetting, rte_memory_order_relaxed) == 0) { +- if (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) == 0) {