From patchwork Sat Jan 15 00:59:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyas Bhatewara X-Patchwork-Id: 79026 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 63C20B70AF for ; Sat, 15 Jan 2011 12:00:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752422Ab1AOA7x (ORCPT ); Fri, 14 Jan 2011 19:59:53 -0500 Received: from smtp-outbound-2.vmware.com ([65.115.85.73]:4722 "EHLO smtp-outbound-2.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753194Ab1AOA7v (ORCPT ); Fri, 14 Jan 2011 19:59:51 -0500 Received: from mailhost2.vmware.com (mailhost2.vmware.com [10.16.67.167]) by smtp-outbound-2.vmware.com (Postfix) with ESMTP id 486D34B004; Fri, 14 Jan 2011 16:59:51 -0800 (PST) Received: from localhost.localdomain (unknown [10.20.112.215]) by mailhost2.vmware.com (Postfix) with ESMTP id 2188F8E901; Fri, 14 Jan 2011 16:59:51 -0800 (PST) Received: from sbhatewara-dev1.eng.vmware.com (eng-rhel5-64 [127.0.0.1]) by localhost.localdomain (8.13.8/8.13.8) with ESMTP id p0F0xqwi001517; Fri, 14 Jan 2011 16:59:52 -0800 Subject: [PATCH net-next 6/8] vmxnet3: Disable napi in suspend, reenable in resume. To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org From: Shreyas N Bhatewara Cc: pv-drivers@vmware.com, Dmitry Torokhov Date: Fri, 14 Jan 2011 16:59:52 -0800 Message-ID: <20110115005952.1064.9985.stgit@sbhatewara-dev1.eng.vmware.com> In-Reply-To: <20110115005701.1064.67435.stgit@sbhatewara-dev1.eng.vmware.com> References: <20110115005701.1064.67435.stgit@sbhatewara-dev1.eng.vmware.com> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is a small possibility of a race where the suspend routine gets called, while a napi callback is still pending and when that comes up, it enables interrupts which just got disabled in the suspend routine. This change adds napi disable call in suspend and enable in resume to avoid race. Signed-off-by: Shreyas N Bhatewara Acked-by: Dmitry Torokhov --- drivers/net/vmxnet3/vmxnet3_drv.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 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/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index a1632a9..20ef4f3 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c @@ -3101,6 +3101,9 @@ vmxnet3_suspend(struct device *device) if (!netif_running(netdev)) return 0; + for (i = 0; i < adapter->num_rx_queues; i++) + napi_disable(&adapter->rx_queue[i].napi); + vmxnet3_disable_all_intrs(adapter); vmxnet3_free_irqs(adapter); vmxnet3_free_intr_resources(adapter); @@ -3192,7 +3195,7 @@ skip_arp: static int vmxnet3_resume(struct device *device) { - int err; + int err, i = 0; struct pci_dev *pdev = to_pci_dev(device); struct net_device *netdev = pci_get_drvdata(pdev); struct vmxnet3_adapter *adapter = netdev_priv(netdev); @@ -3224,6 +3227,8 @@ vmxnet3_resume(struct device *device) VMXNET3_CMD_UPDATE_PMCFG); vmxnet3_alloc_intr_resources(adapter); vmxnet3_request_irqs(adapter); + for (i = 0; i < adapter->num_rx_queues; i++) + napi_enable(&adapter->rx_queue[i].napi); vmxnet3_enable_all_intrs(adapter); return 0;