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 1A0C446211 for ; Thu, 13 Feb 2025 11:02:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1593F42EE7; Thu, 13 Feb 2025 11:02:45 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C01B542EE7 for ; Thu, 13 Feb 2025 11:02:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=72gtwXbZiqXTr1or+AfY65wU5Lkl9hiZJ997NePU+44=; b=Wj7c0VExJn3us0oNuWa95Wh6IzlDbr7koZCKT+X+C6GxrEZED5PwyeVccTx9yzaHG8Idb2 aDups6fuu748CuUP/tUvIgyCydm9NHDs9swohk3ns8H5kuFOLO2IGkYOhZhgniCA6KZpnP pGQx7PCrRqlNfQcBUSW4xjF6w1I/OQA= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-690-UJG4aIXyO3GJ761iOTPPaA-1; Thu, 13 Feb 2025 05:02:39 -0500 X-MC-Unique: UJG4aIXyO3GJ761iOTPPaA-1 X-Mimecast-MFC-AGG-ID: UJG4aIXyO3GJ761iOTPPaA Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A63E61800876; Thu, 13 Feb 2025 10:02:38 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C6DC71800360; Thu, 13 Feb 2025 10:02:36 +0000 (UTC) From: Kevin Traynor 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 24.11.2 Date: Thu, 13 Feb 2025 09:58:43 +0000 Message-ID: <20250213095933.362078-76-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 3eQMfAnOztnuaiPZugULFBKLCJqzKhpF9rZiKMVCtIY_1739440958 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.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 02/17/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/76752353f74e08d3b6d101c1170d94bd2bfd640c Thanks. Kevin --- >From 76752353f74e08d3b6d101c1170d94bd2bfd640c 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 [ 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 eb4c65d194..45721bdf0f 100644 --- a/.mailmap +++ b/.mailmap @@ -359,4 +359,5 @@ Diana Wang Didier Pallard Dilshod Urazov +Dima Ruinskiy Ding Zhi Diogo Behrens 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 @@ -4149,6 +4149,4 @@ s32 igc_write_phy_reg_gpy(struct igc_hw *hw, u32 offset, u16 data) 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 { @@ -4183,6 +4181,4 @@ s32 igc_read_phy_reg_gpy(struct igc_hw *hw, u32 offset, u16 *data) 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 { -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:42.711342333 +0000 +++ 0076-net-igc-base-fix-deadlock-when-writing-i225-register.patch 2025-02-12 17:29:34.509946878 +0000 @@ -1 +1 @@ -From f05363dceac78694638f86a8af1acd173ca9e3e0 Mon Sep 17 00:00:00 2001 +From 76752353f74e08d3b6d101c1170d94bd2bfd640c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f05363dceac78694638f86a8af1acd173ca9e3e0 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - .mailmap | 1 + - drivers/net/intel/igc/base/igc_phy.c | 4 ---- + .mailmap | 1 + + drivers/net/igc/base/igc_phy.c | 4 ---- @@ -22 +23 @@ -index dc3dd9e5a2..9ea6bd1df3 100644 +index eb4c65d194..45721bdf0f 100644 @@ -31 +32 @@ -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 @@ -33,2 +34,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