From patchwork Wed Nov 14 12:27:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 1741131 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 0C331DF264 for ; Wed, 14 Nov 2012 12:28:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161213Ab2KNM2W (ORCPT ); Wed, 14 Nov 2012 07:28:22 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:54717 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161191Ab2KNM2W (ORCPT ); Wed, 14 Nov 2012 07:28:22 -0500 Received: from 172.24.2.119 (EHLO szxeml205-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id ASU14353; Wed, 14 Nov 2012 20:28:16 +0800 (CST) Received: from SZXEML457-HUB.china.huawei.com (10.82.67.200) by szxeml205-edg.china.huawei.com (172.24.2.58) with Microsoft SMTP Server (TLS) id 14.1.323.3; Wed, 14 Nov 2012 20:28:13 +0800 Received: from localhost (10.135.76.84) by szxeml457-hub.china.huawei.com (10.82.67.200) with Microsoft SMTP Server id 14.1.323.3; Wed, 14 Nov 2012 20:28:05 +0800 From: Yijing Wang To: Bjorn Helgaas CC: Huang Ying , , Hanjun Guo , , Yijing Wang Subject: [PATCH v5 4/5][RESEND] PCI/AER: clean pci_bus_ops when related pci bus was removed Date: Wed, 14 Nov 2012 20:27:21 +0800 Message-ID: <1352896042-11832-5-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 In-Reply-To: <1352896042-11832-1-git-send-email-wangyijing@huawei.com> References: <1352896042-11832-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.135.76.84] X-CFilter-Loop: Reflected Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org When Inject aer errors to the target pci device, a pci_bus_ops will be allocated for the pci device's pci bus.When the pci bus was removed, we should also release the pci_bus_ops. Signed-off-by: Yijing Wang Reviewed-by: Sven Dietrich --- drivers/pci/pcie/aer/aer_inject.c | 49 ++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c index 4777c44..c5372dd 100644 --- a/drivers/pci/pcie/aer/aer_inject.c +++ b/drivers/pci/pcie/aer/aer_inject.c @@ -553,9 +553,55 @@ static struct miscdevice aer_inject_device = { .fops = &aer_inject_fops, }; +static void aer_clean_pci_bus_ops(struct pci_dev *dev) +{ + unsigned long flags; + struct pci_bus_ops *bus_ops, *tmp_ops; + struct pci_bus *bus; + bus = dev->subordinate; + if (!bus) + return; + + spin_lock_irqsave(&inject_lock, flags); + list_for_each_entry_safe(bus_ops, tmp_ops, &pci_bus_ops_list, list) + if (bus_ops->bus == bus) { + list_del(&bus_ops->list); + kfree(bus_ops); + break; + } + spin_unlock_irqrestore(&inject_lock, flags); +} + +static int aer_hp_notify_fn(struct notifier_block *nb, + unsigned long event, void *data) +{ + switch (event) { + case BUS_NOTIFY_DEL_DEVICE: + aer_clean_pci_bus_ops(to_pci_dev(data)); + break; + default: + return NOTIFY_DONE; + } + + return NOTIFY_OK; +} + +static struct notifier_block aerinj_hp_notifier = { + .notifier_call = &aer_hp_notify_fn, +}; + static int __init aer_inject_init(void) { - return misc_register(&aer_inject_device); + int ret; + ret = misc_register(&aer_inject_device); + if (ret) + goto out; + + ret = bus_register_notifier(&pci_bus_type, &aerinj_hp_notifier); + if (ret) + misc_deregister(&aer_inject_device); +out: + return ret; } static void __exit aer_inject_exit(void) @@ -564,6 +610,7 @@ static void __exit aer_inject_exit(void) unsigned long flags; struct pci_bus_ops *bus_ops; + bus_unregister_notifier(&pci_bus_type, &aerinj_hp_notifier); misc_deregister(&aer_inject_device); list_for_each_entry(bus_ops, &pci_bus_ops_list, list)