From: Michael Breuer <mbreuer@majjas•com>
To: Mike McCormack <mikem@ring3k•org>
Cc: Stephen Hemminger <shemminger@vyatta•com>,
netdev@vger•kernel.org, flyboy@gmail•com, dhazelton@enter•net
Subject: Re: [PATCH] sky2: Lock transmit queue while disabling device
Date: Thu, 31 Dec 2009 10:58:15 -0500 [thread overview]
Message-ID: <4B3CCA17.5020707@majjas.com> (raw)
In-Reply-To: <4B3C8323.1080301@ring3k.org>
This doesn't solve the issue on my system. Just ran a test - same
errors. I don't think that the under-load errors I'm seeing involve
sky2_detatch. I'm thinking it's related to the dhcp AF_INTERNET fix that
solved the lockup under load - that something outside of sky2 is
corrupting an skb.
On 12/31/2009 5:55 AM, Mike McCormack wrote:
> 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.
>
> Signed-off-by: Mike McCormack<mikem@ring3k•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);
> }
> }
>
next prev parent reply other threads:[~2009-12-31 15:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-31 10:55 [PATCH] sky2: Lock transmit queue while disabling device Mike McCormack
2009-12-31 15:58 ` Michael Breuer [this message]
2009-12-31 16:15 ` Daniel Hazelton
2009-12-31 16:33 ` Berck Nash
2009-12-31 18:51 ` Jarek Poplawski
2009-12-31 23:51 ` Mike McCormack
2010-01-01 3:06 ` Berck E. Nash
2010-01-01 6:42 ` Stephen Hemminger
2010-01-01 18:31 ` Jarek Poplawski
2010-01-04 2:44 ` Berck E. Nash
2010-01-04 13:49 ` [PATCH] sky2: Fix oops in sky2_xmit_frame() after TX timeout Jarek Poplawski
2010-01-04 18:26 ` Stephen Hemminger
2010-01-04 18:48 ` [PATCH v2] " Jarek Poplawski
2010-01-07 4:27 ` [PATCH] sky2: Lock transmit queue while disabling device David Miller
2010-01-07 6:35 ` Jarek Poplawski
2010-01-07 8:01 ` David Miller
2010-01-07 8:15 ` Jarek Poplawski
2010-01-07 8:19 ` David Miller
2010-01-07 13:48 ` Stephen Hemminger
2010-01-07 18:08 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B3CCA17.5020707@majjas.com \
--to=mbreuer@majjas$(echo .)com \
--cc=dhazelton@enter$(echo .)net \
--cc=flyboy@gmail$(echo .)com \
--cc=mikem@ring3k$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=shemminger@vyatta$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox