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 9BBD54625C for ; Tue, 18 Feb 2025 13:40:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 97427402A0; Tue, 18 Feb 2025 13:40:28 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2042.outbound.protection.outlook.com [40.107.243.42]) by mails.dpdk.org (Postfix) with ESMTP id A77BD402A0 for ; Tue, 18 Feb 2025 13:40:27 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=w1uVOB4F7ff7biA2ptkxINNE2kEftriUGX0oqTgCUvqmbAnxQRZdLQuiiYD9LIQUIHXboRNhuzzRqSIHX0P9aVS5RKCf/QDreH/rx9pGy7FTrVehWM062nowCEAySUp+Yv1w6KnTDN81ACluYUz2Iuod17YmqzP/UV9z/CIuYS4cUg039UzNwEqrY4mby7L/VS0ZDR0uZFzRW8MU1Q1QZ+vLjMLDdq6P0hU6Gup+HUe4eYi/llpQe4DNyL6ykERBt94D3hbaWMJv+s6WRJYqFQBBChSY5uveIGOtFvI9uk+CyQqefNa91msTmXrdLBCrTltx7C6kwthHHQ5geZxCmA== 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=teJLRUHsig9V1ZX/FSOaKWkvIVcKT9b164tYxJq8+Yk=; b=xa3zCyDjKZGuZugAex/10tDJLMOxWZpkRNCJ5YSDrc2DCD31uzO193LpZDWEcR0bvthBNTJIadnjuvq24VLMmwx/DEv8b4iJu8vlJJgMjvjhQ7f2NpSvWtBwmb6dM2ODooDzVfI+ZnUGBjkQ6+aeyCvPav4qoKMxurfPj3Tv+Sv56Gaib79PugtCW5TSsose5jc76o7LMq0u2z9cob8hN91xHoZaep3sc3T1RSEsziJOWmkvTetPcMtB9zhIAAXNu50DpYpjL2+1hQ9Haf8CwyXDgm9PBwHOvuK5t9eFnksT6qPNNqTsSuC6I6HZ7xymEA6k4d4L3Um9/zTc3V/2Ew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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=teJLRUHsig9V1ZX/FSOaKWkvIVcKT9b164tYxJq8+Yk=; b=GNSM+kXcSoV34dqbpc7BliouRMY7lv4+eTyf5MJS2Q/qMHezmyEsUjAZ+p/oEWnJFJBIXY0xKjuEQhevMx5svIyKyJ/SQ6oHUN1RRABPdwnsrWn8KhNeWUBtqxuBm7uIx3SlegXeG2Da8vsHfEFbEhfFAt9zT78Rv3R91qedxuwNps1/oeWQXYILWZKZz7NPjGoSBg0/OwR1hyizrqIQXEzUjPMdGP6ZJg7PQoNGjAFtFm0o9VMsThJTgvq0Hte10gqOcLnp8lTra7fIDFKvtfv47/64hnpyb3ueADEq2Rm7jwS2jh5srV43Tkj1P26mZ7+ryJtkkx5bvzQZDF5McQ== Received: from SJ0PR03CA0225.namprd03.prod.outlook.com (2603:10b6:a03:39f::20) by DS0PR12MB6583.namprd12.prod.outlook.com (2603:10b6:8:d1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Tue, 18 Feb 2025 12:40:24 +0000 Received: from SJ1PEPF00002325.namprd03.prod.outlook.com (2603:10b6:a03:39f:cafe::ac) by SJ0PR03CA0225.outlook.office365.com (2603:10b6:a03:39f::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.18 via Frontend Transport; Tue, 18 Feb 2025 12:40:23 +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 SJ1PEPF00002325.mail.protection.outlook.com (10.167.242.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:40:23 +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.1544.4; Tue, 18 Feb 2025 04:40:13 -0800 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; Tue, 18 Feb 2025 04:40:11 -0800 From: Xueming Li To: Dima Ruinskiy CC: , Anatoly Burakov , "Bruce Richardson" , dpdk stable Subject: patch 'net/igc/base: fix deadlock when writing i225 register' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:40 +0800 Message-ID: <20250218123523.36836-46-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-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: SJ1PEPF00002325:EE_|DS0PR12MB6583:EE_ X-MS-Office365-Filtering-Correlation-Id: 868a4ace-bf32-4e9a-d3b6-08dd501969e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?mut6wrYOaMfZM5XfWmhQXUav2z1lIV84ByWCqi2xoyVRsK7Z6ceruPBX8tTE?= =?us-ascii?Q?Fp9Fg5uRdedt9glEyEqgM1/BoWgf8MbewynwRhxAGY6A53hn56pvB8tJty2P?= =?us-ascii?Q?BuGfY4ZfftDEZ+KvtpTgVD84K9ZNEN9JRceWrw1uskZcJeYQkwMJJuZdg0Av?= =?us-ascii?Q?CpYGSvSiKG6/KiEojH3ApLMYWFFqxR/84CpC1KHYKEteEyjSs7suQfShVvWj?= =?us-ascii?Q?a+XMTXo5E66qqE7cHnRZf0XUkDHgjxU6sQB3XEjkxcAvw7+ssillRVw3T09M?= =?us-ascii?Q?KlBmJwOdSEVH+yPX5TwXSNpoIxUfbW/XMiOY553lSvGUBXMv9l119HHmhRru?= =?us-ascii?Q?oBQ7mUc72P4Emt3HCjK00bKUKpzqGxX1MID54Hp77pUUMS1XuM2PiHVbyY4A?= =?us-ascii?Q?GINSNjYAuMwUnNcXJ6SJ5AyCsAxESRjGpRscJtMCIKuhW5gbTUime2yCQh6G?= =?us-ascii?Q?V27H0XubwjUKaRCT89YCKK0AoMykRR4KRz6vVfMtfcLh8G0c5ig+AUrm0GjG?= =?us-ascii?Q?Fyzbi2SsZiG5rM1KGYIf26JvQwCQHzKGOvuZSKXj9OHj18LaHwSIG/qJBVu+?= =?us-ascii?Q?Guj7UoD2EymRI1VVJ+7K2Io4NqX04Ch4kZC1IqovMt+mcS6k1/APkDQDt+mC?= =?us-ascii?Q?3FTW1903qyRKAUr8WojDp2QcOspcvQIqsfuTPPSZXCFYB1JJlMsTejRC35iZ?= =?us-ascii?Q?RUVsMAjcLSZIbQ4dPawET4a6p8z+hiJGVIX2I87pYHdcSkP74mkW4ZE0dWMk?= =?us-ascii?Q?osUeyugB565Ks2+NUw7uiDbmBO7fS6F4YUvB1EgKk/IRyrfmVAlyqs4bFT1d?= =?us-ascii?Q?ewX2TBw0A5hKArxyKAGC6FrTHJFzVEXUG39VJyxGfm4aQn86C9N8aiZJgZPK?= =?us-ascii?Q?bwsXfcgbl8V4ut9dEhCjJ7IY11d38mgqZrxgJ1mXGV703DuOuYVhfuzcKtlP?= =?us-ascii?Q?FacS8ZUqSkreab/z/3IeWj/d/lS3yceZPlV7xVHRQ3bDoLKiompasDPNDqqY?= =?us-ascii?Q?yMmFj0/wla9OrOasp07Gj6nKjsNBdnqaEaGYTonjbhBM6K+LMp4XAZNXOX4T?= =?us-ascii?Q?nphxu4qr1lh8BcYj7L25bjB2aAQximThnHO5cfWLjdAj21nF9cQxBcwtzGT8?= =?us-ascii?Q?9w4obCMCArmHa9tx9/EZua5mo8qYNvGgbrj15UsDobEOFcXyE7FmMtl6iIxg?= =?us-ascii?Q?qxrdsFK0jwnqx3AbcPig2KRofmnHu6Q8UtOYMX/TZjA78xBGEsPySu7gRDpP?= =?us-ascii?Q?/b9tWe+n3Ok3Pe4AVr07NJ2pvt18vFn+e/eygGR32tMJ69lLo/vkKZq/F1UU?= =?us-ascii?Q?KYDY72TZ2hPN4KGRJYCEa4nzqxWwEh7KZ0NWU/ohayULa4WJncKjtGUDonta?= =?us-ascii?Q?f8DwdDFX+I0C1CQk/H2PSwykq/ib6wGowNhz9Tdi5F6K+5qRuAIf8MsMUogN?= =?us-ascii?Q?gykFZvTXM0w76d3AqpCFfFjSvX5nFREPtZHltJIulcCnik1UNjHArSXaazZK?= =?us-ascii?Q?Fp+YOmvbpeltJuo=3D?= 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)(1800799024)(376014)(82310400026)(36860700013)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:40:23.7371 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 868a4ace-bf32-4e9a-d3b6-08dd501969e7 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: SJ1PEPF00002325.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6583 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=c18541adee3de649ebd672acc4166fcb499ab608 Thanks. Xueming Li --- >From c18541adee3de649ebd672acc4166fcb499ab608 Mon Sep 17 00:00:00 2001 From: Dima Ruinskiy Date: Thu, 6 Feb 2025 16:08:24 +0000 Subject: [PATCH] net/igc/base: fix deadlock when writing i225 register Cc: Xueming Li [ upstream commit f05363dceac78694638f86a8af1acd173ca9e3e0 ] Currently, when writing GPY PHY registers, semaphore is acquired before writing. However, if writing fails, semaphore is not released, causing a deadlock down the line. Fix the issue by removing the premature return. Fixes: 8cb7c57d9b3c ("net/igc: support device initialization") Signed-off-by: Dima Ruinskiy Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- .mailmap | 1 + drivers/net/igc/base/igc_phy.c | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.mailmap b/.mailmap index 6984cb9940..acf910ab3b 100644 --- a/.mailmap +++ b/.mailmap @@ -337,6 +337,7 @@ Dheemanth Mallikarjun Diana Wang Didier Pallard Dilshod Urazov +Dima Ruinskiy Ding Zhi Diogo Behrens Dirk-Holger Lenz diff --git a/drivers/net/igc/base/igc_phy.c b/drivers/net/igc/base/igc_phy.c index 2906bae21a..ddc2b6ecc1 100644 --- a/drivers/net/igc/base/igc_phy.c +++ b/drivers/net/igc/base/igc_phy.c @@ -4148,8 +4148,6 @@ s32 igc_write_phy_reg_gpy(struct igc_hw *hw, u32 offset, u16 data) if (ret_val) return ret_val; ret_val = igc_write_phy_reg_mdic(hw, offset, data); - if (ret_val) - return ret_val; hw->phy.ops.release(hw); } else { ret_val = igc_write_xmdio_reg(hw, (u16)offset, dev_addr, @@ -4182,8 +4180,6 @@ s32 igc_read_phy_reg_gpy(struct igc_hw *hw, u32 offset, u16 *data) if (ret_val) return ret_val; ret_val = igc_read_phy_reg_mdic(hw, offset, data); - if (ret_val) - return ret_val; hw->phy.ops.release(hw); } else { ret_val = igc_read_xmdio_reg(hw, (u16)offset, dev_addr, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:02.350614651 +0800 +++ 0045-net-igc-base-fix-deadlock-when-writing-i225-register.patch 2025-02-18 19:39:00.618244049 +0800 @@ -1 +1 @@ -From f05363dceac78694638f86a8af1acd173ca9e3e0 Mon Sep 17 00:00:00 2001 +From c18541adee3de649ebd672acc4166fcb499ab608 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit f05363dceac78694638f86a8af1acd173ca9e3e0 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -17,2 +19,2 @@ - .mailmap | 1 + - drivers/net/intel/igc/base/igc_phy.c | 4 ---- + .mailmap | 1 + + drivers/net/igc/base/igc_phy.c | 4 ---- @@ -22 +24 @@ -index dc3dd9e5a2..9ea6bd1df3 100644 +index 6984cb9940..acf910ab3b 100644 @@ -25 +27 @@ -@@ -358,6 +358,7 @@ Dhruv Tripathi +@@ -337,6 +337,7 @@ Dheemanth Mallikarjun @@ -33 +35 @@ -diff --git a/drivers/net/intel/igc/base/igc_phy.c b/drivers/net/intel/igc/base/igc_phy.c +diff --git a/drivers/net/igc/base/igc_phy.c b/drivers/net/igc/base/igc_phy.c @@ -35,2 +37,2 @@ ---- a/drivers/net/intel/igc/base/igc_phy.c -+++ b/drivers/net/intel/igc/base/igc_phy.c +--- a/drivers/net/igc/base/igc_phy.c ++++ b/drivers/net/igc/base/igc_phy.c