[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4B3CF2C4.5070203@gmail.com>
Date: Thu, 31 Dec 2009 19:51:48 +0100
From: Jarek Poplawski <jarkao2@...il.com>
To: Mike McCormack <mikem@...g3k.org>
CC: Stephen Hemminger <shemminger@...tta.com>, netdev@...r.kernel.org,
flyboy@...il.com, dhazelton@...er.net, mbreuer@...jas.com,
Linux Netdev List <netdev@...r.kernel.org>
Subject: Re: [PATCH] sky2: Lock transmit queue while disabling device
Mike McCormack wrote, On 12/31/2009 11:55 AM:
> netif_device_detach() does not take the tx_lock, so it's
> possible that a call to sky2_xmit_frame is still in
> progress after netif_device_detach() is complete.
>
> Take netif_tx_lock() to make sure all transmits have
> stopped while we're disabling the devices and that
> no other CPU is still transmitting a frame after
> we've disabling the device.
>
> Proposed fix for "sky2 panic under load" reported by Berck E. Nash.
Could you give some scenario of the oops/fix?
Btw, even if it worked, you should use netif_tx_lock_bh
version considering sky2_detach use contexts, I guess.
Jarek P.
>
> Signed-off-by: Mike McCormack <mikem@...g3k.org>
> ---
> drivers/net/sky2.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
> index faa4841..8ae8520 100644
> --- a/drivers/net/sky2.c
> +++ b/drivers/net/sky2.c
> @@ -3176,7 +3176,9 @@ static void sky2_reset(struct sky2_hw *hw)
> static void sky2_detach(struct net_device *dev)
> {
> if (netif_running(dev)) {
> + netif_tx_lock(dev);
> netif_device_detach(dev); /* stop txq */
> + netif_tx_unlock(dev);
> sky2_down(dev);
> }
> }
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists