Commit 59d395ed authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Paolo Abeni

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: 621735f5 ("r8169: fix rare issue with broken rx after link-down on RTL8125")
Reported-by: default avatarIan Chen <free122448@hotmail.com>
Tested-by: default avatarIan Chen <free122448@hotmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/caf6a487-ef8c-4570-88f9-f47a659faf33@gmail.comSigned-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 45b3fae4
...@@ -579,6 +579,7 @@ struct rtl8169_tc_offsets { ...@@ -579,6 +579,7 @@ struct rtl8169_tc_offsets {
enum rtl_flag { enum rtl_flag {
RTL_FLAG_TASK_ENABLED = 0, RTL_FLAG_TASK_ENABLED = 0,
RTL_FLAG_TASK_RESET_PENDING, RTL_FLAG_TASK_RESET_PENDING,
RTL_FLAG_TASK_RESET_NO_QUEUE_WAKE,
RTL_FLAG_TASK_TX_TIMEOUT, RTL_FLAG_TASK_TX_TIMEOUT,
RTL_FLAG_MAX RTL_FLAG_MAX
}; };
...@@ -4582,6 +4583,8 @@ static void rtl_task(struct work_struct *work) ...@@ -4582,6 +4583,8 @@ static void rtl_task(struct work_struct *work)
reset: reset:
rtl_reset_work(tp); rtl_reset_work(tp);
netif_wake_queue(tp->dev); 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: out_unlock:
rtnl_unlock(); rtnl_unlock();
...@@ -4615,7 +4618,7 @@ static void r8169_phylink_handler(struct net_device *ndev) ...@@ -4615,7 +4618,7 @@ static void r8169_phylink_handler(struct net_device *ndev)
} else { } else {
/* In few cases rx is broken after link-down otherwise */ /* In few cases rx is broken after link-down otherwise */
if (rtl_is_8125(tp)) if (rtl_is_8125(tp))
rtl_reset_work(tp); rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_NO_QUEUE_WAKE);
pm_runtime_idle(d); pm_runtime_idle(d);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment