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 067064624E for ; Mon, 17 Feb 2025 18:06:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 02129402D5; Mon, 17 Feb 2025 18:06:44 +0100 (CET) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mails.dpdk.org (Postfix) with ESMTP id 7EA6C400D6 for ; Mon, 17 Feb 2025 18:06:43 +0100 (CET) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-38f31f7731fso1471871f8f.0 for ; Mon, 17 Feb 2025 09:06:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812003; x=1740416803; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mP0HNDegOI4Z+9EUOrlyVSn+dOgWouji73Arb5ikuug=; b=fILGF2ADTTpbprcNzm6ZuWjknV7rl/VLeUL0yPngeYkKNWiZ40noy1o4oiDXLMxdxG 1jXZ7ysizrfjUL6jsT1NKUBytkH90plyPRm5fPhNE+y6rldrdl/7JS/TaMgUZgNdyATX wQCZ0jaQUfMlC7AqgCkNrvJPZ/dKxD1//TICW0wff+KM7NLQjPOIDUil3aqvNY2oRNip 5QoAn0emZ9NVrDI4DkywsTGmdxC/j9+WqewKZSuJLTXEbD1NhqZKleyweEmsOJ7jujg0 XeiLdXM3TxtBvbcbtT1Ika6wvUduxVwP+Mh8/YlK6EOJsV/1MZo5pVDoW+1gudC/AZtG +XRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812003; x=1740416803; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mP0HNDegOI4Z+9EUOrlyVSn+dOgWouji73Arb5ikuug=; b=CpSvwyCHNPmAmllgJcAVz+T2vDdnzJVqSpSlgs8ppwHrigwsSdz4uAM63TH2pIjCUn +nCsVvq9PwGd5epOQFvGzconRYNhjMVNNCYYH8oIoYEkYaHWk8Pmv2Emyf2TGPGU4hTY adc990yjDBR6a+Xdc3d04tSpSjouPybd1GDz6Mxym/M7wj6tdtAO8mBwpTyZkBErlqe4 sxJYOyee7XfK2MUEka4RUcTFPXWJU9aCgSgYAP66C9H7ex0PILbUfQT80RrSzMclD+6p KrQvhJkzU5zUWiQMNnKhi3nrkJ+JRFyN4cYN+hVCP3VTr6LfBsIMvKUtiyQMXQtp0qnG 4CrA== X-Forwarded-Encrypted: i=1; AJvYcCU68nwF7fzQd8h5fHbPABs08AnhJqym8dWrFKcoveEoRKsnqawFSEA+7+24sPqdSOs6x3oU2Bg=@dpdk.org X-Gm-Message-State: AOJu0YxDtRutXlwV0Rec0RX6bXIt2YYbwYDaBNPnvXnhyM/bSFSqIaua 1daVl9sSCcNRISfSGSXNcVOKVMJ3VhPWkkeW22A19VroPhw6d19rNi5hOGXysEg7+Q== X-Gm-Gg: ASbGnct1pl66odqW22cbfDF+aaY1zuGDiS6JbyqFnvvCqKIJGlxPvlAUe5AbqcbIsIE 5HqCDapY6M/u5FtviK6q/4R3EA6Mw8wKOx6MAwaxZ8Jp1OKdldHPeVpSHkteAkngLA/i+7oBNYW HK1YTy8jTUtnTPJrpcmPwn7i2howwx1iv1+sjrCZ1duKaoob3OPbsAEx5ojvEpOAhccclZwsRIP 4HWYtzvceD/kXxnL7j1qWkciVGvTtHOaLeuoPVYSq9hnkusj687C3X+RAcTl6ExIAkI27u4UJUQ XTsAqmUhISTlJjA8PAFSpA== X-Google-Smtp-Source: AGHT+IHUlEB8jQlm8nbgGVNYNjadqVANNwcue7Y8M8ngCmhh1DQzJXxU+uPpXSzD6Jxr3AruLUHsxg== X-Received: by 2002:a5d:598c:0:b0:38d:c2d4:2399 with SMTP id ffacd0b85a97d-38f33f53463mr11469477f8f.41.1739812002997; Mon, 17 Feb 2025 09:06:42 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f25913f5asm12935343f8f.52.2025.02.17.09.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:06:42 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.8 Date: Mon, 17 Feb 2025 17:04:07 +0000 Message-ID: <20250217170456.1068278-34-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.8 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/19/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/b185b0deb41d05365fa760a63fa4012eb25ab09c Thanks. Luca Boccassi --- >From b185b0deb41d05365fa760a63fa4012eb25ab09c 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 dc5cb75b71..5338abcc05 100644 --- a/.mailmap +++ b/.mailmap @@ -323,6 +323,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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:18.084616291 +0000 +++ 0034-net-igc-base-fix-deadlock-when-writing-i225-register.patch 2025-02-17 16:13:16.838441592 +0000 @@ -1 +1 @@ -From f05363dceac78694638f86a8af1acd173ca9e3e0 Mon Sep 17 00:00:00 2001 +From b185b0deb41d05365fa760a63fa4012eb25ab09c 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 dc5cb75b71..5338abcc05 100644 @@ -25 +26 @@ -@@ -358,6 +358,7 @@ Dhruv Tripathi +@@ -323,6 +323,7 @@ Dheemanth Mallikarjun @@ -33 +34 @@ -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 +36,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