r8169: fix LED-related deadlock on module removal
Heiner Kallweit
maintainerPATCH v2 1/1 r8169: fix LED-related deadlock on module removal
Binding devm_led_classdev_register() to the netdev is problematic because on module removal we get a RTNL-related deadlock. Fix this by avoiding the device-managed LED functions.
Note: We can safely call led_classdev_unregister() for a LED even if registering it failed, because led_classdev_unregister() detects this and is a no-op in this case.
---
v2:
- avoid using device-managed functions
--- drivers/net/ethernet/realtek/r8169.h | 6 ++-- drivers/net/ethernet/realtek/r8169_leds.c | 35 +++++++++++++++-------- drivers/net/ethernet/realtek/r8169_main.c | 8 ++++-- 3 files changed, 33 insertions(+), 16 deletions(-)
drivers/net/ethernet/realtek/r8169.h +4 -2
@@ -73,6 +73,7 @@ enum mac_version { };struct rtl8169_private ; +struct r8169_led_classdev ;void r8169_apply_firmware (struct rtl8169_private *tp);u16 rtl8168h_2_get_adc_bias_ioffset (struct rtl8169_private *tp);
@@ -84,7 +85,8 @@ void r8169_get_led_name(struct rtl8169_private *tp, int idx, char *buf, int buf_len);int rtl8168_get_led_mode (struct rtl8169_private *tp);int rtl8168_led_mod_ctrl (struct rtl8169_private *tp,u16 mask,u16 val); -void rtl8168_init_leds (struct net_device *ndev); +struct r8169_led_classdev *rtl8168_init_leds (struct net_device *ndev);int rtl8125_get_led_mode (struct rtl8169_private *tp,int index);int rtl8125_set_led_mode (struct rtl8169_private *tp,int index,u16 mode); -void rtl8125_init_leds (struct net_device *ndev); +struct r8169_led_classdev *rtl8125_init_leds (struct net_device *ndev); +void r8169_remove_leds (struct r8169_led_classdev *leds);
drivers/net/ethernet/realtek/r8169_leds.c +23 -12
@@ -146,22 +146,22 @@ 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); +led_classdev_register (&ndev->dev, led_cdev); } -void rtl8168_init_leds (struct net_device *ndev) +struct r8169_led_classdev *rtl8168_init_leds (struct net_device *ndev) { -/* bind resource mgmt to netdev */ -struct device *dev = &ndev->dev;struct r8169_led_classdev *leds;int i; - leds =devm_kcalloc (dev,RTL8168_NUM_LEDS ,sizeof (*leds),GFP_KERNEL ); + leds =kcalloc (RTL8168_NUM_LEDS +1 ,sizeof (*leds),GFP_KERNEL );if (!leds) -return ; +return NULL ;for (i =0 ; i <RTL8168_NUM_LEDS ; i++)rtl8168_setup_ldev (leds + i, ndev, i); + +return leds; } static int rtl8125_led_hw_control_is_supported(struct led_classdev *led_cdev,
@@ -245,20 +245,31 @@ 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); +led_classdev_register (&ndev->dev, led_cdev); } -void rtl8125_init_leds (struct net_device *ndev) +struct r8169_led_classdev *rtl8125_init_leds (struct net_device *ndev) { -/* bind resource mgmt to netdev */ -struct device *dev = &ndev->dev;struct r8169_led_classdev *leds;int i; - leds =devm_kcalloc (dev,RTL8125_NUM_LEDS ,sizeof (*leds),GFP_KERNEL ); + leds =kcalloc (RTL8125_NUM_LEDS +1 ,sizeof (*leds),GFP_KERNEL );if (!leds) -return ; +return NULL ;for (i =0 ; i <RTL8125_NUM_LEDS ; i++)rtl8125_setup_led_ldev (leds + i, ndev, i); + +return leds; +} + +void r8169_remove_leds (struct r8169_led_classdev *leds) +{ +if (!leds) +return ; + +for (struct r8169_led_classdev *l = leds; l->ndev; l++) +led_classdev_unregister (&l->led); + +kfree (leds); }
drivers/net/ethernet/realtek/r8169_main.c +6 -2
@@ -647,6 +647,8 @@ struct rtl8169_private {const char *fw_name;struct rtl_fw *rtl_fw; +struct r8169_led_classdev *leds; +u32 ocp_base; };
@@ -5044,6 +5046,8 @@ static void rtl_remove_one(struct pci_dev *pdev)cancel_work_sync (&tp->wk.work); +r8169_remove_leds (tp->leds); +unregister_netdev (tp->dev);if (tp->dash_type !=RTL_DASH_NONE )
@@ -5501,9 +5505,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (IS_ENABLED (CONFIG_R8169_LEDS )) {if (rtl_is_8125 (tp)) -rtl8125_init_leds (dev); + tp->leds =rtl8125_init_leds (dev);else if (tp->mac_version >RTL_GIGA_MAC_VER_06 ) -rtl8168_init_leds (dev); + tp->leds =rtl8168_init_leds (dev); } netdev_info(dev, "%s, %pM, XID %03x, IRQ %d\n",
Signature · 1 line
2.44.0
Quoted 4 lines · Heiner Kallweit
Binding
devm_led_classdev_register()to the netdev is problematic because on module removal we get a RTNL-related deadlock. Fix this by avoiding the device-managed LED functions.
Quoted 8 lines
Note: We can safely call
led_classdev_unregister()for a LED even if registering it failed, becauseled_classdev_unregister()detects this and is a no-op in this case.Fixes 18764b883e15 ("r8169: add support for LED's on RTL8168/RTL8101")Reported-by Lukas Wunner <[email protected]>Signed-off-by Heiner Kallweit <[email protected]>
Andrew
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 9 lines · On Mon, 8 Apr 2024 20:47:40 +0200 you wrote:
Binding
devm_led_classdev_register()to the netdev is problematic because on module removal we get a RTNL-related deadlock. Fix this by avoiding the device-managed LED functions.Note: We can safely call
led_classdev_unregister()for a LED even if registering it failed, becauseled_classdev_unregister()detects this and is a no-op in this case.[...]
Here is the summary with links:
- [v2,net] r8169: fix LED-related deadlock on module removal
https://git.kernel.org/netdev/net/c/19fa4f2a85d7
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html