Skip to content

Commit

Permalink
r8169: use RTNL to protect critical sections
Browse files Browse the repository at this point in the history
Most relevant ops (open, close, ethtool ops) are protected with RTNL
lock by net core. Make sure that such ops can't be interrupted by
e.g. (runtime-)suspending by taking the RTNL lock in suspend ops
and the PCI error handler.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Heiner Kallweit authored and David S. Miller committed Jun 22, 2020
1 parent 567ca57 commit abe5fc4
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/net/ethernet/realtek/r8169_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4524,6 +4524,7 @@ static void rtl_task(struct work_struct *work)
struct rtl8169_private *tp =
container_of(work, struct rtl8169_private, wk.work);

rtnl_lock();
rtl_lock_work(tp);

if (!netif_running(tp->dev) ||
Expand All @@ -4536,6 +4537,7 @@ static void rtl_task(struct work_struct *work)
}
out_unlock:
rtl_unlock_work(tp);
rtnl_unlock();
}

static int rtl8169_poll(struct napi_struct *napi, int budget)
Expand Down Expand Up @@ -4788,7 +4790,9 @@ static int __maybe_unused rtl8169_suspend(struct device *device)
{
struct rtl8169_private *tp = dev_get_drvdata(device);

rtnl_lock();
rtl8169_net_suspend(tp);
rtnl_unlock();

return 0;
}
Expand Down Expand Up @@ -4816,11 +4820,13 @@ static int rtl8169_runtime_suspend(struct device *device)
return 0;
}

rtnl_lock();
rtl_lock_work(tp);
__rtl8169_set_wol(tp, WAKE_PHY);
rtl_unlock_work(tp);

rtl8169_net_suspend(tp);
rtnl_unlock();

return 0;
}
Expand Down Expand Up @@ -4882,7 +4888,9 @@ static void rtl_shutdown(struct pci_dev *pdev)
{
struct rtl8169_private *tp = pci_get_drvdata(pdev);

rtnl_lock();
rtl8169_net_suspend(tp);
rtnl_unlock();

/* Restore original MAC address */
rtl_rar_set(tp, tp->dev->perm_addr);
Expand Down

0 comments on commit abe5fc4

Please sign in to comment.