From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH] sky2: Lock transmit queue while disabling device Date: Thu, 07 Jan 2010 00:01:11 -0800 (PST) Message-ID: <20100107.000111.205787691.davem@davemloft.net> References: <20100106.202701.161194890.davem@davemloft.net> <20100107063545.GA6258@ff.dom.local> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: mikem@ring3k.org, shemminger@vyatta.com, netdev@vger.kernel.org, flyboy@gmail.com, dhazelton@enter.net, mbreuer@majjas.com To: jarkao2@gmail.com Return-path: Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:53709 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932362Ab0AGIBE (ORCPT ); Thu, 7 Jan 2010 03:01:04 -0500 In-Reply-To: <20100107063545.GA6258@ff.dom.local> Sender: netdev-owner@vger.kernel.org List-ID: From: Jarek Poplawski Date: Thu, 7 Jan 2010 06:35:46 +0000 > On 07-01-2010 05:27, David Miller wrote: >> From: Mike McCormack >> Date: Thu, 31 Dec 2009 19:55:31 +0900 >> >>> 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 >> >> Applied to net-next-2.6 >> >> Stephen has asked for some further refinements, once that is >> all sorted we can think about backporting this to net-2.6 >> and -stable if necessary. >> > > David, I'm not sure you chose the right (working) patch from this > thread. Please, reconsider this: > Subject: [PATCH v2] sky2: Fix oops in sky2_xmit_frame() after TX timeout > Date: Mon, 4 Jan 2010 19:48:41 +0100 > http://permalink.gmane.org/gmane.linux.network/148160 These are two seperate crashes and two seperate sets of patches. Mike's patch fixes crashes due to races when bringing the device down or suspending it. The other patch you reference is handling something different, a crash that happens while the device is staying up. Right?