From patchwork Tue Sep 25 14:29:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 186830 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 C85712C007D for ; Wed, 26 Sep 2012 00:34:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754669Ab2IYOeG (ORCPT ); Tue, 25 Sep 2012 10:34:06 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:63709 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754818Ab2IYOeB (ORCPT ); Tue, 25 Sep 2012 10:34:01 -0400 Received: by mail-pb0-f46.google.com with SMTP id rr4so203970pbb.19 for ; Tue, 25 Sep 2012 07:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=xNScT14g4G93kU7hrrUjzGjuVEvJqxwWQFYpPKhbF28=; b=cmSH1df50frkDa9/4ZuM9SV4tt1DJMktVa1Tn3dTOc3GsAGFui6ROlnst70JI8N6Sd mbwkuW31uEBfxkUGIE1YsVtPOqI5hJgEg6uLHwhI5wrc4SebT39Hp3wTHwUCRNtfqK9p 6zQ7LIIHqikt3mXvYdH2IXto06Df6LgbH7Ku6Z9Se6n9LdJ4EBhIrR/WCSJB7LEv2hGY zf3CGrreRoN/sVAr0X93rM1wgsQZFM/zxNJKjx1BiNSLmMo7VEicg1Hu17J0l6VG8Sv/ Nxqfmld8Ek9bYGcfvoJuk/rwtC4hpRbvsJR0f7SSxT2BTpiUUGfwcCCn41PfgNDoanCZ j8KA== Received: by 10.66.75.74 with SMTP id a10mr41420808paw.46.1348583640963; Tue, 25 Sep 2012 07:34:00 -0700 (PDT) Received: from localhost.localdomain ([221.221.22.12]) by mx.google.com with ESMTPS id nu8sm415218pbc.45.2012.09.25.07.33.51 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 25 Sep 2012 07:34:00 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas Cc: Jiang Liu , Yinghai Lu , Kenji Kaneshige , Yijing Wang , Jiang Liu , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v3 5/7] ACPI/pci_slot: update PCI slot information when PCI hotplug event happens Date: Tue, 25 Sep 2012 22:29:28 +0800 Message-Id: <1348583370-11006-5-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348583370-11006-1-git-send-email-jiang.liu@huawei.com> References: <1348583370-11006-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Jiang Liu Currently the pci_slot driver doesn't update PCI slot information when PCI device hotplug event happens, which may cause memory leak and returning stale information to user. So hook the BUS_NOTIFY_ADD_DEVICE/BUS_NOTIFY_DEL_DEVICE events to update PCI slot information when PCI hotplug event happens. Signed-off-by: Jiang Liu Signed-off-by: Yijing Wang --- drivers/acpi/pci_slot.c | 86 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 78 insertions(+), 8 deletions(-) diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c index e50e31a..96dcc19 100644 --- a/drivers/acpi/pci_slot.c +++ b/drivers/acpi/pci_slot.c @@ -32,6 +32,7 @@ #include #include #include +#include #include static bool debug; @@ -123,12 +124,7 @@ struct callback_args { /* * register_slot * - * Called once for each SxFy object in the namespace. Don't worry about - * calling pci_create_slot multiple times for the same pci_bus:device, - * since each subsequent call simply bumps the refcount on the pci_slot. - * - * The number of calls to pci_destroy_slot from unregister_slot is - * symmetrical. + * Called once for each SxFy object in the namespace. */ static acpi_status register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) @@ -145,6 +141,15 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) if (device < 0) return AE_OK; + /* Avoid duplicated records for the same slot */ + list_for_each_entry(slot, &slot_list, list) { + pci_slot = slot->pci_slot; + if (pci_slot && pci_slot->bus == pci_bus && + pci_slot->number == device) { + return AE_OK; + } + } + slot = kmalloc(sizeof(*slot), GFP_KERNEL); if (!slot) { err("%s: cannot allocate memory\n", __func__); @@ -162,9 +167,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) slot->root_handle = parent_context->root_handle; slot->pci_slot = pci_slot; 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); @@ -299,7 +302,9 @@ acpi_pci_slot_add(acpi_handle handle) { acpi_status status; + mutex_lock(&slot_list_lock); status = walk_root_bridge(handle, register_slot); + mutex_unlock(&slot_list_lock); if (ACPI_FAILURE(status)) err("%s: register_slot failure - %d\n", __func__, status); @@ -354,17 +359,82 @@ static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = { {} }; +static void acpi_pci_slot_notify_add(struct pci_dev *dev) +{ + acpi_handle handle; + struct callback_args context; + + if (!dev->subordinate) + return; + + mutex_lock(&slot_list_lock); + handle = DEVICE_ACPI_HANDLE(&dev->dev); + context.root_handle = acpi_find_root_bridge_handle(dev); + if (handle && context.root_handle) { + context.pci_bus = dev->subordinate; + context.user_function = register_slot; + acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1, + register_slot, NULL, &context, NULL); + } + mutex_unlock(&slot_list_lock); +} + +static void acpi_pci_slot_notify_del(struct pci_dev *dev) +{ + struct acpi_pci_slot *slot, *tmp; + struct pci_bus *bus = dev->subordinate; + + if (!bus) + return; + + mutex_lock(&slot_list_lock); + list_for_each_entry_safe(slot, tmp, &slot_list, list) + if (slot->pci_slot && slot->pci_slot->bus == bus) { + list_del(&slot->list); + pci_destroy_slot(slot->pci_slot); + put_device(&bus->dev); + kfree(slot); + } + mutex_unlock(&slot_list_lock); +} + +static int acpi_pci_slot_notify_fn(struct notifier_block *nb, + unsigned long event, void *data) +{ + struct device *dev = data; + + switch (event) { + case BUS_NOTIFY_ADD_DEVICE: + acpi_pci_slot_notify_add(to_pci_dev(dev)); + break; + case BUS_NOTIFY_DEL_DEVICE: + acpi_pci_slot_notify_del(to_pci_dev(dev)); + break; + default: + return NOTIFY_DONE; + } + + return NOTIFY_OK; +} + +static struct notifier_block acpi_pci_slot_notifier = { + .notifier_call = &acpi_pci_slot_notify_fn, +}; + static int __init acpi_pci_slot_init(void) { dmi_check_system(acpi_pci_slot_dmi_table); acpi_pci_register_driver(&acpi_pci_slot_driver); + bus_register_notifier(&pci_bus_type, &acpi_pci_slot_notifier); + return 0; } static void __exit acpi_pci_slot_exit(void) { + bus_unregister_notifier(&pci_bus_type, &acpi_pci_slot_notifier); acpi_pci_unregister_driver(&acpi_pci_slot_driver); }