From patchwork Sun Mar 29 16:54:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Chiang X-Patchwork-Id: 15024 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2TGuEqr005591 for ; Sun, 29 Mar 2009 16:56:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759111AbZC2Qy6 (ORCPT ); Sun, 29 Mar 2009 12:54:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754932AbZC2Qy6 (ORCPT ); Sun, 29 Mar 2009 12:54:58 -0400 Received: from g1t0027.austin.hp.com ([15.216.28.34]:46905 "EHLO g1t0027.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759060AbZC2Qy4 (ORCPT ); Sun, 29 Mar 2009 12:54:56 -0400 Received: from smtp1.fc.hp.com (smtp.fc.hp.com [15.15.136.127]) by g1t0027.austin.hp.com (Postfix) with ESMTP id 721A83802C; Sun, 29 Mar 2009 16:54:54 +0000 (UTC) Received: from localhost.localdomain (lart.fc.hp.com [15.11.146.31]) by smtp1.fc.hp.com (Postfix) with ESMTP id 702B22365B7; Sun, 29 Mar 2009 16:25:34 +0000 (UTC) Received: from bob.kio (localhost [127.0.0.1]) by localhost.localdomain (Postfix) with ESMTP id 3D52B26145; Sun, 29 Mar 2009 10:54:54 -0600 (MDT) Subject: [PATCH 3/3] PCI: pci_slot: grab refcount on slot's bus To: jbarnes@virtuousgeek.org From: Alex Chiang Cc: linux-pci@vger.kernel.org, Kenji Kaneshige , linux-kernel@vger.kernel.org, lenb@kernel.org Date: Sun, 29 Mar 2009 10:54:54 -0600 Message-ID: <20090329165454.29073.1180.stgit@bob.kio> In-Reply-To: <20090329165352.29073.5159.stgit@bob.kio> References: <20090329165352.29073.5159.stgit@bob.kio> User-Agent: StGit/0.14.3.347.g594a MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org If a logical hot unplug (remove) is performed on a physical PCI slot's parent bridge, and then pci_slot is unloaded, we will encounter an oops: [] kobject_release+0x9a/0x290 [] ? kobject_release+0x0/0x290 [] kref_put+0x37/0x80 [] kobject_put+0x27/0x60 [] ? pci_destroy_slot+0x3c/0xc0 [] pci_destroy_slot+0x45/0xc0 [] acpi_pci_slot_remove+0x5c/0x91 [pci_slot] [] acpi_pci_unregister_driver+0x4b/0x62 [] acpi_pci_slot_exit+0x10/0x12 [pci_slot] [] sys_delete_module+0x161/0x250 We need to grab a reference to the parent PCI bus, which will pin the bus and prevent it from being released until pci_slot is unloaded. Cc: lenb@kernel.org Reported-by: Kenji Kaneshige Signed-off-by: Alex Chiang --- drivers/acpi/pci_slot.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) -- 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/acpi/pci_slot.c b/drivers/acpi/pci_slot.c index cd1f446..c7ad9f2 100644 --- a/drivers/acpi/pci_slot.c +++ b/drivers/acpi/pci_slot.c @@ -63,6 +63,7 @@ struct acpi_pci_slot { acpi_handle root_handle; /* handle of the root bridge */ struct pci_slot *pci_slot; /* corresponding pci_slot */ struct list_head list; /* node in the list of slots */ + struct pci_bus *bus; /* bus the slot is on */ }; static int acpi_pci_slot_add(acpi_handle handle); @@ -159,11 +160,14 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) slot->root_handle = parent_context->root_handle; slot->pci_slot = pci_slot; + slot->bus = pci_bus; INIT_LIST_HEAD(&slot->list); mutex_lock(&slot_list_lock); list_add(&slot->list, &slot_list); mutex_unlock(&slot_list_lock); + get_device(&pci_bus->dev); + dbg("pci_slot: %p, pci_bus: %x, device: %d, name: %s\n", pci_slot, pci_bus->number, device, name); @@ -316,6 +320,7 @@ acpi_pci_slot_remove(acpi_handle handle) if (slot->root_handle == handle) { list_del(&slot->list); pci_destroy_slot(slot->pci_slot); + put_device(&slot->bus->dev); kfree(slot); } }