From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1767619AbXCIXGw (ORCPT ); Fri, 9 Mar 2007 18:06:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1767621AbXCIXGv (ORCPT ); Fri, 9 Mar 2007 18:06:51 -0500 Received: from mga01.intel.com ([192.55.52.88]:3845 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1767619AbXCIXGu (ORCPT ); Fri, 9 Mar 2007 18:06:50 -0500 X-ExtLoop1: 1 X-IronPort-AV: i="4.14,268,1170662400"; d="scan'208"; a="209774395:sNHT2737556843" Message-ID: <45F1E876.5090102@intel.com> Date: Fri, 09 Mar 2007 15:06:30 -0800 From: "Kok, Auke" User-Agent: Mail/News 1.5.0.9 (X11/20061228) MIME-Version: 1.0 To: "Eric W. Biederman" CC: Ingo Molnar , Jeff Garzik , Linus Torvalds , "Michael S. Tsirkin" , Pavel Machek , Jens Axboe , Adrian Bunk , Andrew Morton , Linux Kernel Mailing List , Thomas Gleixner , linux-pm@lists.osdl.org, Michal Piotrowski Subject: Re: SATA resume slowness, e1000 MSI warning References: <20070227103021.GA2250@kernel.dk> <20070227103407.GA17819@elte.hu> <20070227105922.GD2250@kernel.dk> <20070227111515.GA4271@kernel.dk> <20070301093450.GA8508@elte.hu> <20070302100704.GB2293@elf.ucw.cz> <20070305084257.GA4464@mellanox.co.il> <20070305101120.GA23032@elte.hu> <45ECFC5F.7000102@garzik.org> <45ED0BBF.1050000@intel.com> <20070306090444.GA25409@elte.hu> <45ED8A12.5040803@intel.com> <45EEE8CF.1060803@intel.com> <45EEEC2C.5090609@intel.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 09 Mar 2007 23:06:31.0710 (UTC) FILETIME=[937CCBE0:01C7629F] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Eric W. Biederman wrote: [CHOP] > Below is an additional set of warnings that should help debug this. > The old code just got lucky that it triggered a warning when this happens. I'm trying this patch together with the other 2 that you sent out a few days ago. I'm seeing some minor issues with this and lots of bogus warnings as far as I can see. If I suspend/resume and unload e1000, then reinsert e1000.ko, I immediately hit the WARN_ON at `msi.c:516: WARN_ON(!hlist_empty(&dev->saved_cap_space));` I'm not sure that's useful debugging information. even though saved state exists the module has been removed, so you might want to purge the state table when the driver gets removed? anyway, back to testing. Auke > > diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c > index 01869b1..5113913 100644 > --- a/drivers/pci/msi.c > +++ b/drivers/pci/msi.c > @@ -613,6 +613,7 @@ int pci_enable_msi(struct pci_dev* dev) > return -EINVAL; > > WARN_ON(!!dev->msi_enabled); > + WARN_ON(!hlist_empty(&dev->saved_cap_space)); > > /* Check whether driver already requested for MSI-X irqs */ > if (dev->msix_enabled) { > @@ -638,6 +639,8 @@ void pci_disable_msi(struct pci_dev* dev) > if (!dev->msi_enabled) > return; > > + WARN_ON(!hlist_empty(&dev->saved_cap_space)); > + > msi_set_enable(dev, 0); > pci_intx(dev, 1); /* enable intx */ > dev->msi_enabled = 0; > @@ -739,6 +742,7 @@ int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec) > } > } > WARN_ON(!!dev->msix_enabled); > + WARN_ON(!hlist_empty(&dev->saved_cap_space)); > > /* Check whether driver already requested for MSI irq */ > if (dev->msi_enabled) { > @@ -763,6 +767,8 @@ void pci_disable_msix(struct pci_dev* dev) > if (!dev->msix_enabled) > return; > > + WARN_ON(!hlist_empty(&dev->saved_cap_space)); > + > msix_set_enable(dev, 0); > pci_intx(dev, 1); /* enable intx */ > dev->msix_enabled = 0; > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index bd44a48..4418839 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -677,6 +677,7 @@ pci_restore_state(struct pci_dev *dev) > } > pci_restore_pcix_state(dev); > pci_restore_msi_state(dev); > + WARN_ON(!hlist_empty(&dev->saved_cap_space)); > > return 0; > }