The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 59d395ed606d8df14615712b0cdcdadb2d962175 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2023120339-facing-absentee-ae63@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 59d395ed606d ("r8169: fix deadlock on RTL8125 in jumbo mtu mode") 621735f59064 ("r8169: fix rare issue with broken rx after link-down on RTL8125") 80c0576ef179 ("r8169: disable ASPM in case of tx timeout") 4b6c6065fca1 ("r8169: use tp_to_dev instead of open code") 476c4f5de368 ("r8169: mark device as not present when in PCI D3") 0c28a63a47bf ("r8169: move napi_disable call and rename rtl8169_hw_reset") 120068481405 ("r8169: fix failing WoL") 8ac8e8c64b53 ("r8169: make rtl8169_down central chip quiesce function") bac75d8565e8 ("r8169: move some calls to rtl8169_hw_reset") 27dc36aefc73 ("r8169: change driver data type") 12b1bc75cd46 ("r8169: improve rtl_remove_one") 13f15b59ad70 ("r8169: remove remaining call to mdiobus_unregister") ce740c5f6f7a ("r8169: improve reset handling for chips from RTL8168g") 9617886fa65d ("r8169: add helper rtl_enable_rxdvgate") d6836ef02c17 ("r8169: use fsleep in polling functions") 93882c6f210a ("r8169: switch from netif_xxx message functions to netdev_xxx") d56f58cec90d ("r8169: simplify counter handling") 0360c046ca18 ("r8169: move setting OCP base to generic init code") b8447abc4c8f ("r8169: factor out rtl8169_tx_map") e18958c6a204 ("r8169: simplify rtl_task") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 59d395ed606d8df14615712b0cdcdadb2d962175 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit <hkallweit1@xxxxxxxxx> Date: Sun, 26 Nov 2023 19:36:46 +0100 Subject: [PATCH] r8169: fix deadlock on RTL8125 in jumbo mtu mode The original change results in a deadlock if jumbo mtu mode is used. Reason is that the phydev lock is held when rtl_reset_work() is called here, and rtl_jumbo_config() calls phy_start_aneg() which also tries to acquire the phydev lock. Fix this by calling rtl_reset_work() asynchronously. Fixes: 621735f59064 ("r8169: fix rare issue with broken rx after link-down on RTL8125") Reported-by: Ian Chen <free122448@xxxxxxxxxxx> Tested-by: Ian Chen <free122448@xxxxxxxxxxx> Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Heiner Kallweit <hkallweit1@xxxxxxxxx> Link: https://lore.kernel.org/r/caf6a487-ef8c-4570-88f9-f47a659faf33@xxxxxxxxx Signed-off-by: Paolo Abeni <pabeni@xxxxxxxxxx> diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 295366a85c63..a43e33e4b25e 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -579,6 +579,7 @@ struct rtl8169_tc_offsets { enum rtl_flag { RTL_FLAG_TASK_ENABLED = 0, RTL_FLAG_TASK_RESET_PENDING, + RTL_FLAG_TASK_RESET_NO_QUEUE_WAKE, RTL_FLAG_TASK_TX_TIMEOUT, RTL_FLAG_MAX }; @@ -4582,6 +4583,8 @@ static void rtl_task(struct work_struct *work) reset: rtl_reset_work(tp); netif_wake_queue(tp->dev); + } else if (test_and_clear_bit(RTL_FLAG_TASK_RESET_NO_QUEUE_WAKE, tp->wk.flags)) { + rtl_reset_work(tp); } out_unlock: rtnl_unlock(); @@ -4615,7 +4618,7 @@ static void r8169_phylink_handler(struct net_device *ndev) } else { /* In few cases rx is broken after link-down otherwise */ if (rtl_is_8125(tp)) - rtl_reset_work(tp); + rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_NO_QUEUE_WAKE); pm_runtime_idle(d); }
