From patchwork Tue Oct 29 10:30:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Veaceslav Falico X-Patchwork-Id: 286777 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6DA622C0346 for ; Tue, 29 Oct 2013 21:30:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754160Ab3J2Kay (ORCPT ); Tue, 29 Oct 2013 06:30:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46825 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753616Ab3J2Kax (ORCPT ); Tue, 29 Oct 2013 06:30:53 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9TAUOO0012170 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 29 Oct 2013 06:30:28 -0400 Received: from darkmag.usersys.redhat.com (dhcp-27-102.brq.redhat.com [10.34.27.102]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9TATwJT009082; Tue, 29 Oct 2013 06:30:19 -0400 From: Veaceslav Falico To: linux-pci@vger.kernel.org Cc: torvalds@linux-foundation.org, tglx@linutronix.de, yinghai@kernel.org, Knut_Petersen@t-online.de, mingo@kernel.org, paulmck@linux.vnet.ibm.com, fweisbec@gmail.com, linux-kernel@vger.kernel.org, Veaceslav Falico , Bjorn Helgaas , Neil Horman , Greg Kroah-Hartman Subject: [PATCH v3 3/3] msi: always unregister ->msi_kset within free_msi_irqs() Date: Tue, 29 Oct 2013 11:30:32 +0100 Message-Id: <1383042632-7102-4-git-send-email-vfalico@redhat.com> In-Reply-To: <1383042632-7102-1-git-send-email-vfalico@redhat.com> References: <1383042632-7102-1-git-send-email-vfalico@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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 Acked-by: Neil Horman --- 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);