* [PATCH] sky2: recovery deadlock fix
@ 2007-12-04 1:02 Stephen Hemminger
2007-12-04 19:54 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Hemminger @ 2007-12-04 1:02 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
Prevent deadlock in sky2 recovery logic. sky2_down calls napi_synchronize
which gets stuck if napi was already disabled.
Fix by rearranging slightly and not calling napi_disable until after
both ports are stopped. The napi_disable probably is being overly
paranoid, but it is safe now.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
---
Please apply for 2.6.24 (upstream-fixes)
--- a/drivers/net/sky2.c 2007-11-30 16:51:50.000000000 -0800
+++ b/drivers/net/sky2.c 2007-11-30 16:54:52.000000000 -0800
@@ -2906,16 +2906,14 @@ static void sky2_restart(struct work_str
int i, err;
rtnl_lock();
- sky2_write32(hw, B0_IMSK, 0);
- sky2_read32(hw, B0_IMSK);
- napi_disable(&hw->napi);
-
for (i = 0; i < hw->ports; i++) {
dev = hw->dev[i];
if (netif_running(dev))
sky2_down(dev);
}
+ napi_disable(&hw->napi);
+ sky2_write32(hw, B0_IMSK, 0);
sky2_reset(hw);
sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
napi_enable(&hw->napi);
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] sky2: recovery deadlock fix
2007-12-04 1:02 [PATCH] sky2: recovery deadlock fix Stephen Hemminger
@ 2007-12-04 19:54 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-12-04 19:54 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
Stephen Hemminger wrote:
> Prevent deadlock in sky2 recovery logic. sky2_down calls napi_synchronize
> which gets stuck if napi was already disabled.
>
> Fix by rearranging slightly and not calling napi_disable until after
> both ports are stopped. The napi_disable probably is being overly
> paranoid, but it is safe now.
>
> Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
>
> ---
> Please apply for 2.6.24 (upstream-fixes)
>
> --- a/drivers/net/sky2.c 2007-11-30 16:51:50.000000000 -0800
> +++ b/drivers/net/sky2.c 2007-11-30 16:54:52.000000000 -0800
> @@ -2906,16 +2906,14 @@ static void sky2_restart(struct work_str
> int i, err;
>
> rtnl_lock();
> - sky2_write32(hw, B0_IMSK, 0);
> - sky2_read32(hw, B0_IMSK);
> - napi_disable(&hw->napi);
> -
> for (i = 0; i < hw->ports; i++) {
> dev = hw->dev[i];
> if (netif_running(dev))
> sky2_down(dev);
> }
>
> + napi_disable(&hw->napi);
> + sky2_write32(hw, B0_IMSK, 0);
> sky2_reset(hw);
> sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
> napi_enable(&hw->napi);
applied #upstream-fixes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-12-04 19:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-04 1:02 [PATCH] sky2: recovery deadlock fix Stephen Hemminger
2007-12-04 19:54 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).