| Message ID | 1383042632-7102-4-git-send-email-vfalico@redhat.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Tue, Oct 29, 2013 at 11:30:32AM +0100, Veaceslav Falico wrote: > Currently we create and populate ->msi_kset while allocating irqs in > populate_msi_sysfs(), however if it fails and/or we want to free the > entries - we don't always remove it, and we might have problems if we've > failed to allocate irqs and try it again. > > To fix that, move the unregister part to free_msi_irqs() and remove already > existing ones. Also, verify if it was actually created - we don't always > call free_msi_irqs() after populate_msi_sysfs(). > > CC: Bjorn Helgaas <bhelgaas@google.com> > CC: Neil Horman <nhorman@tuxdriver.com> > CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > CC: linux-pci@vger.kernel.org > CC: linux-kernel@vger.kernel.org > Signed-off-by: Veaceslav Falico <vfalico@redhat.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" 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/pci/msi.c b/drivers/pci/msi.c index 0771508..dafda2b 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -391,6 +391,11 @@ static void free_msi_irqs(struct pci_dev *dev) kfree(entry); } } + + if (dev->msi_kset) { + kset_unregister(dev->msi_kset); + dev->msi_kset = NULL; + } } static struct msi_desc *alloc_msi_entry(struct pci_dev *dev) @@ -904,8 +909,6 @@ void pci_disable_msi(struct pci_dev *dev) pci_msi_shutdown(dev); free_msi_irqs(dev); - kset_unregister(dev->msi_kset); - dev->msi_kset = NULL; } EXPORT_SYMBOL(pci_disable_msi); @@ -1002,8 +1005,6 @@ void pci_disable_msix(struct pci_dev *dev) pci_msix_shutdown(dev); free_msi_irqs(dev); - kset_unregister(dev->msi_kset); - dev->msi_kset = NULL; } EXPORT_SYMBOL(pci_disable_msix);
Currently we create and populate ->msi_kset while allocating irqs in populate_msi_sysfs(), however if it fails and/or we want to free the entries - we don't always remove it, and we might have problems if we've failed to allocate irqs and try it again. To fix that, move the unregister part to free_msi_irqs() and remove already existing ones. Also, verify if it was actually created - we don't always call free_msi_irqs() after populate_msi_sysfs(). CC: Bjorn Helgaas <bhelgaas@google.com> CC: Neil Horman <nhorman@tuxdriver.com> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> CC: linux-pci@vger.kernel.org CC: linux-kernel@vger.kernel.org Signed-off-by: Veaceslav Falico <vfalico@redhat.com> --- drivers/pci/msi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)