From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com ([192.55.52.115]:25119 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751735AbbJWHlD (ORCPT ); Fri, 23 Oct 2015 03:41:03 -0400 Message-ID: <1445586058.22669.55.camel@linux.intel.com> Subject: Re: Applied "spi: dw: explicitly free IRQ handler in dw_spi_remove_host()" to the spi tree From: Andy Shevchenko To: Mark Brown , stable@vger.kernel.org Cc: linux-spi@vger.kernel.org Date: Fri, 23 Oct 2015 10:40:58 +0300 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: On Fri, 2015-10-23 at 08:11 +0900, Mark Brown wrote: > The patch > >    spi: dw: explicitly free IRQ handler in dw_spi_remove_host() This one seems incomplete. Yes, we already have a fix 02f20387e1bc in your tree. This makes free_irq() call duplicate. Please, remove it from your tree or do the revert. > > has been applied to the spi tree at > >    git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git > > All being well this means that it will be integrated into the linux- > next > tree (usually sometime in the next 24 hours) and sent to Linus during > the next merge window (or sooner if it is a bug fix), however if > problems are discovered then the patch may be dropped or reverted.   > > You may get further e-mails resulting from automated or manual > testing > and review of the tree, please engage with people reporting problems > and > send followup patches addressing any issues that are reported if > needed. > > If any updates are required or you are submitting further changes > they > should be sent as incremental updates against current git, existing > patches will not be replaced. > > Please add any relevant lists and maintainers to the CCs when > replying > to this mail. > > Thanks, > Mark > > From 9f89566dac9ad776ad4d919922e99d799731e513 Mon Sep 17 00:00:00 > 2001 > From: Andy Shevchenko > Date: Tue, 20 Oct 2015 11:39:36 +0300 > Subject: [PATCH] spi: dw: explicitly free IRQ handler in > dw_spi_remove_host() > > The following warning occurs when DW SPI is compiled as a module and > it's a PCI > device. On the removal stage pcibios_free_irq() is called earlier > than > free_irq() due to the latter is called at managed resources free > strage. > > ------------[ cut here ]------------ > WARNING: CPU: 1 PID: 1003 at > /home/andy/prj/linux/fs/proc/generic.c:575 > remove_proc_entry+0x118/0x150() > remove_proc_entry: removing non-empty directory 'irq/38', leaking at > least 'dw_spi1' > Modules linked in: spi_dw_midpci(-) spi_dw [last unloaded: > dw_dmac_core] > CPU: 1 PID: 1003 Comm: modprobe Not tainted 4.3.0-rc5-next-20151013+ > #32 >  00000000 00000000 f5535d70 c12dc220 f5535db0 f5535da0 c104e912 > c198a6bc >  f5535dcc 000003eb c198a638 0000023f c11b4098 c11b4098 f54f1ec8 > f54f1ea0 >  f642ba20 f5535db8 c104e96e 00000009 f5535db0 c198a6bc f5535dcc > f5535df0 > Call Trace: >  [] dump_stack+0x41/0x61 >  [] warn_slowpath_common+0x82/0xb0 >  [] ? remove_proc_entry+0x118/0x150 >  [] ? remove_proc_entry+0x118/0x150 >  [] warn_slowpath_fmt+0x2e/0x30 >  [] remove_proc_entry+0x118/0x150 >  [] unregister_irq_proc+0xaa/0xc0 >  [] free_desc+0x1e/0x60 >  [] irq_free_descs+0x32/0x70 >  [] irq_domain_free_irqs+0x120/0x150 >  [] mp_unmap_irq+0x5c/0x60 >  [] intel_mid_pci_irq_disable+0x20/0x40 >  [] pcibios_free_irq+0xf/0x20 >  [] pci_device_remove+0x52/0xb0 >  [] __device_release_driver+0x77/0x100 >  [] driver_detach+0x87/0x90 >  [] bus_remove_driver+0x4a/0xc0 >  [] ? selinux_capable+0xd/0x10 >  [] driver_unregister+0x23/0x60 >  [] ? find_module_all+0x5a/0x80 >  [] pci_unregister_driver+0x13/0x60 >  [] dw_spi_driver_exit+0xd/0xf [spi_dw_midpci] >  [] SyS_delete_module+0x17a/0x210 > > Explicitly call free_irq() at removal stage of the DW SPI driver. > > Fixes: 04f421e7b0b1 (spi: dw: use managed resources) > Cc: stable@vger.kernel.org > Signed-off-by: Andy Shevchenko > Signed-off-by: Mark Brown > --- >  drivers/spi/spi-dw.c | 2 ++ >  1 file changed, 2 insertions(+) > > diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c > index cc2e980..ad66bc5 100644 > --- a/drivers/spi/spi-dw.c > +++ b/drivers/spi/spi-dw.c > @@ -542,6 +542,8 @@ void dw_spi_remove_host(struct dw_spi *dws) >  { >   dw_spi_debugfs_remove(dws); >   > + free_irq(dws->irq, dws->master); > + >   if (dws->dma_ops && dws->dma_ops->dma_exit) >   dws->dma_ops->dma_exit(dws); >   -- Andy Shevchenko Intel Finland Oy