From patchwork Fri Apr 23 14:34:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 50816 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 15035B7D1D for ; Sat, 24 Apr 2010 01:10:04 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755622Ab0DWPJ4 (ORCPT ); Fri, 23 Apr 2010 11:09:56 -0400 Received: from earthlight.etchedpixels.co.uk ([81.2.110.250]:34460 "EHLO bob.linux.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753473Ab0DWPJy (ORCPT ); Fri, 23 Apr 2010 11:09:54 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by bob.linux.org.uk (8.14.3/8.14.3) with ESMTP id o3NEYhbZ007179; Fri, 23 Apr 2010 15:34:43 +0100 From: Alan Cox Subject: [PATCH] e100: Fix the TX workqueue race To: netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net Date: Fri, 23 Apr 2010 15:34:43 +0100 Message-ID: <20100423143356.7092.45260.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org I'd assumed someone would have picked up on this and fixed it using rtnl_lock as was suggested but it seems to have fallen through the cracks ? Anyway this is I assume what was meant ? Acked-by: Jeff Garzik --- Nothing stops the workqueue being left to run in parallel with close or a few other operations. This causes double unmaps and the like. See kerneloops.org #1041230 for an example Signed-off-by: Alan Cox --- drivers/net/e100.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 3e8d000..859e833 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -2280,8 +2280,13 @@ static void e100_tx_timeout_task(struct work_struct *work) netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev, "scb.status=0x%02X\n", ioread8(&nic->csr->scb.status)); - e100_down(netdev_priv(netdev)); - e100_up(netdev_priv(netdev)); + + rtnl_lock(); + if (netif_running(dev)) { + e100_down(netdev_priv(netdev)); + e100_up(netdev_priv(netdev)); + } + rtnl_unlock(); } static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)