From: Heiner Kallweit <hkallweit1@gmail.com>
To: Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>, Jakub Kicinski <kuba@kernel.org>,
David Miller <davem@davemloft.net>,
Realtek linux nic maintainers <nic_swsd@realtek.com>
Cc: Lukas Wunner <lukas@wunner.de>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH net] r8169: fix LED-related deadlock on module removal
Date: Fri, 5 Apr 2024 22:29:15 +0200 [thread overview]
Message-ID: <bbcdbc1b-44bc-4cf8-86ef-6e6af2b009c3@gmail.com> (raw)
Binding devm_led_classdev_register() to the netdev is problematic
because on module removal we get a RTNL-related deadlock. Fix this
by using the parent device instead for device-managed resources.
This is cleaner anyway because then all device-managed resources in
the driver use the same device (the one belonging to the PCI device).
Fixes: 18764b883e15 ("r8169: add support for LED's on RTL8168/RTL8101")
Cc: stable@vger.kernel.org
Reported-by: Lukas Wunner <lukas@wunner.de>
Suggested-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169_leds.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169_leds.c b/drivers/net/ethernet/realtek/r8169_leds.c
index 7c5dc9d0d..7f2b8a361 100644
--- a/drivers/net/ethernet/realtek/r8169_leds.c
+++ b/drivers/net/ethernet/realtek/r8169_leds.c
@@ -146,13 +146,12 @@ static void rtl8168_setup_ldev(struct r8169_led_classdev *ldev,
led_cdev->hw_control_get_device = r8169_led_hw_control_get_device;
/* ignore errors */
- devm_led_classdev_register(&ndev->dev, led_cdev);
+ devm_led_classdev_register(ndev->dev.parent, led_cdev);
}
void rtl8168_init_leds(struct net_device *ndev)
{
- /* bind resource mgmt to netdev */
- struct device *dev = &ndev->dev;
+ struct device *dev = ndev->dev.parent;
struct r8169_led_classdev *leds;
int i;
@@ -245,13 +244,12 @@ static void rtl8125_setup_led_ldev(struct r8169_led_classdev *ldev,
led_cdev->hw_control_get_device = r8169_led_hw_control_get_device;
/* ignore errors */
- devm_led_classdev_register(&ndev->dev, led_cdev);
+ devm_led_classdev_register(ndev->dev.parent, led_cdev);
}
void rtl8125_init_leds(struct net_device *ndev)
{
- /* bind resource mgmt to netdev */
- struct device *dev = &ndev->dev;
+ struct device *dev = ndev->dev.parent;
struct r8169_led_classdev *leds;
int i;
--
2.44.0
next reply other threads:[~2024-04-05 20:29 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-05 20:29 Heiner Kallweit [this message]
2024-04-05 20:50 ` [PATCH net] r8169: fix LED-related deadlock on module removal Andrew Lunn
2024-04-05 20:59 ` Lukas Wunner
-- strict thread matches above, loose matches on Subject: below --
2024-04-15 6:44 Heiner Kallweit
2024-04-15 8:49 ` Lukas Wunner
2024-04-15 11:54 ` Heiner Kallweit
2024-04-16 23:41 ` Jakub Kicinski
2024-04-17 7:26 ` Lukas Wunner
2024-04-15 11:57 Heiner Kallweit
2024-04-17 2:34 ` Jakub Kicinski
2024-04-17 6:02 ` Heiner Kallweit
2024-04-17 7:04 ` Greg KH
2024-04-17 7:16 ` Heiner Kallweit
2024-04-17 7:43 ` Greg KH
2024-04-17 22:33 ` Lukas Wunner
2024-04-18 9:55 ` Greg KH
2024-04-18 14:33 ` Heiner Kallweit
2024-04-18 14:44 ` Greg KH
2024-04-17 13:45 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bbcdbc1b-44bc-4cf8-86ef-6e6af2b009c3@gmail.com \
--to=hkallweit1@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=lukas@wunner.de \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).