From patchwork Wed Sep 12 12:33:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 1443391 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id E54C44025E for ; Wed, 12 Sep 2012 12:35:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755301Ab2ILMfg (ORCPT ); Wed, 12 Sep 2012 08:35:36 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:60908 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754820Ab2ILMff (ORCPT ); Wed, 12 Sep 2012 08:35:35 -0400 Received: from 172.24.2.119 (EHLO szxeml210-edg.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id AOX24731; Wed, 12 Sep 2012 20:35:29 +0800 (CST) Received: from SZXEML411-HUB.china.huawei.com (10.82.67.138) by szxeml210-edg.china.huawei.com (172.24.2.183) with Microsoft SMTP Server (TLS) id 14.1.323.3; Wed, 12 Sep 2012 20:34:26 +0800 Received: from localhost (10.135.76.84) by szxeml411-hub.china.huawei.com (10.82.67.138) with Microsoft SMTP Server id 14.1.323.3; Wed, 12 Sep 2012 20:34:19 +0800 From: Yijing Wang To: Bjorn Helgaas , Huang Ying , Chen Gong CC: , Hanjun Guo , , Yijing Wang Subject: [PATCH v2 2/4] PCI/AER: clean all untracked pci_ops_aer when rmmod aer_inject Date: Wed, 12 Sep 2012 20:33:43 +0800 Message-ID: <1347453225-7704-2-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 In-Reply-To: <1347453225-7704-1-git-send-email-wangyijing@huawei.com> References: <1347453225-7704-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 Since hot plug for pci devices while doing aer inject, some newly created child buses' pci_ops will be assigned to pci_ops_aer. Aer_inject does not track these pci_ops_aer(not list in pci_bus_ops_list),we should clean all of these when rmmod aer_inject module. Signed-off-by: Yijing Wang --- drivers/pci/pcie/aer/aer_inject.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c index 0816483..9d195ae 100644 --- a/drivers/pci/pcie/aer/aer_inject.c +++ b/drivers/pci/pcie/aer/aer_inject.c @@ -283,6 +283,28 @@ static void pci_bus_ops_init(struct pci_bus_ops *bus_ops, bus_ops->ops = ops; } +static void pci_clean_child_aer_ops(struct pci_bus *bus) +{ + struct pci_bus *child; + + list_for_each_entry(child, &bus->children, node) { + if (child->ops == &pci_ops_aer) + pci_bus_set_ops(child, bus->ops); + pci_clean_child_aer_ops(child); + } +} + +/* find pci_ops_aer from root bus, and replace it by parent bus's pci_ops. + * pci_ops of root bus won't be pci_ops_aer here*/ +static void clean_untracked_pci_ops_aer(void) +{ + struct pci_bus *bus = NULL; + + while ((bus = pci_find_next_bus(bus)) != NULL) + pci_clean_child_aer_ops(bus); +} + + static int pci_bus_set_aer_ops(struct pci_bus *bus) { struct pci_ops *ops; @@ -546,6 +568,8 @@ static void __exit aer_inject_exit(void) pci_bus_set_ops(bus_ops->bus, bus_ops->ops); kfree(bus_ops); } + + clean_untracked_pci_aer_ops(); spin_lock_irqsave(&inject_lock, flags); list_for_each_entry_safe(err, err_next, &einjected, list) { @@ -553,6 +577,14 @@ static void __exit aer_inject_exit(void) kfree(err); } spin_unlock_irqrestore(&inject_lock, flags); + + /* Inject aer errors and hotplug the same pcie device + * maybe assign some newly created buses' pci_ops pci_ops_aer. + * Since these pci_ops_aer are not tracked in pci_bus_ops_list, + * we need to find and clean untracked pci_ops_aer before aer_inject + * module exit + */ + clean_untracked_pci_ops_aer(); } module_init(aer_inject_init);