netconsole: don't call __netpoll_cleanup() while atomic
Subsystems (3)
PATCH 1/1 netconsole: don't call __netpoll_cleanup() while atomic
__netpoll_cleanup() is called in netconsole_netdev_event() while holding a spinlock. Release/acquire the spinlock before/after it and restart the loop. Also, disable the netconsole completely, because we won't have chance after the restart of the loop, and might end up in a situation where nt->enabled == 1 and nt->np.dev == NULL.
--- drivers/net/netconsole.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)
drivers/net/netconsole.c +9 -6
@@ -666,6 +666,7 @@ static int netconsole_netdev_event(struct notifier_block *this, goto done;spin_lock_irqsave (&target_list_lock, flags); +restart:list_for_each_entry (nt, &target_list, list) {netconsole_target_get (nt);if (nt->np.dev == dev) {
@@ -678,15 +679,17 @@ static int netconsole_netdev_event(struct notifier_block *this,case NETDEV_UNREGISTER :/* * rtnl_lock already held +* we might sleep in __netpoll_cleanup() */ -if (nt->np.dev) { -__netpoll_cleanup (&nt->np); -dev_put (nt->np.dev); - nt->np.dev =NULL ; - } +spin_unlock_irqrestore (&target_list_lock, flags); +__netpoll_cleanup (&nt->np); +spin_lock_irqsave (&target_list_lock, flags); +dev_put (nt->np.dev); + nt->np.dev =NULL ; nt->enabled =0 ; stopped = true; -break ; +netconsole_target_put (nt); + goto restart; } }netconsole_target_put (nt);
Signature · 1 line
1.7.1
Quoted 51 lines · Veaceslav Falico
__netpoll_cleanup()is called innetconsole_netdev_event()while holding a spinlock. Release/acquire the spinlock before/after it and restart the loop. Also, disable the netconsole completely, because we won't have chance after the restart of the loop, and might end up in a situation wherent->enabled== 1 andnt->np.dev== NULL.Signed-off-by Veaceslav Falico <[email protected]>--- drivers/net/netconsole.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)drivers/net/netconsole.c +9
-6@@ -666,6 +666,7 @@ static int netconsole_netdev_event(struct notifier_block *this, goto done;spin_lock_irqsave (&target_list_lock, flags); +restart:list_for_each_entry (nt, &target_list, list) {netconsole_target_get (nt);if (nt->np.dev == dev) {@@ -678,15 +679,17 @@ static int netconsole_netdev_event(struct notifier_block *this,case NETDEV_UNREGISTER :/* * rtnl_lock already held +* we might sleep in __netpoll_cleanup() */ -if (nt->np.dev) { -__netpoll_cleanup (&nt->np); -dev_put (nt->np.dev); - nt->np.dev =NULL ; - } +spin_unlock_irqrestore (&target_list_lock, flags); +__netpoll_cleanup (&nt->np); +spin_lock_irqsave (&target_list_lock, flags); +dev_put (nt->np.dev); + nt->np.dev =NULL ; nt->enabled =0 ; stopped = true; -break ; +netconsole_target_put (nt); + goto restart; } }netconsole_target_put (nt);Signature · 1 line
1.7.1
David Miller
AppliedFrom: Neil Horman <[email protected]>
Date: Mon, 11 Mar 2013 07:38:56 -0400
Quoted 8 lines · Veaceslav Falico
Quoted 7 lines
__netpoll_cleanup()is called innetconsole_netdev_event()while holding a spinlock. Release/acquire the spinlock before/after it and restart the loop. Also, disable the netconsole completely, because we won't have chance after the restart of the loop, and might end up in a situation wherent->enabled== 1 andnt->np.dev== NULL.Signed-off-by Veaceslav Falico <[email protected]>
...
Quoted 1 line
Acked-by Neil Horman <[email protected]>
Applied.