From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:44192 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750809Ab3IZOK6 (ORCPT ); Thu, 26 Sep 2013 10:10:58 -0400 From: Veaceslav Falico To: linux-pci@vger.kernel.org Cc: Veaceslav Falico , Bjorn Helgaas , Neil Horman , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] msi: always unregister ->msi_kset within free_msi_irqs() Date: Thu, 26 Sep 2013 16:11:14 +0200 Message-Id: <1380204675-18238-2-git-send-email-vfalico@redhat.com> In-Reply-To: <1380204675-18238-1-git-send-email-vfalico@redhat.com> References: <1380204675-18238-1-git-send-email-vfalico@redhat.com> Sender: linux-pci-owner@vger.kernel.org List-ID: 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 CC: Neil Horman CC: Greg Kroah-Hartman CC: linux-pci@vger.kernel.org CC: linux-kernel@vger.kernel.org Signed-off-by: Veaceslav Falico --- Notes: v1 -> v2: Verify if the kset was actually register before unregistering. drivers/pci/msi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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); -- 1.8.4