From: Yijing Wang <wangyijing@huawei.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Huang Ying <ying.huang@intel.com>,
Chen Gong <gong.chen@linux.intel.com>
Cc: <jiang.liu@huawei.com>, Hanjun Guo <guohanjun@huawei.com>,
<linux-pci@vger.kernel.org>, Yijing Wang <wangyijing@huawei.com>
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 [thread overview]
Message-ID: <1347453225-7704-2-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1347453225-7704-1-git-send-email-wangyijing@huawei.com>
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 <wangyijing@huawei.com>
---
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);
--
1.7.1
next prev parent reply other threads:[~2012-09-12 12:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-12 12:33 [PATCH v2 1/4] PCI/AER: Fix pci_ops return NULL when hotplug a pci bus doing aer error inject Yijing Wang
2012-09-12 12:33 ` Yijing Wang [this message]
2012-09-13 1:43 ` [PATCH v2 2/4] PCI/AER: clean all untracked pci_ops_aer when rmmod aer_inject Huang Ying
2012-09-13 10:54 ` Yijing Wang
2012-09-14 0:56 ` Huang Ying
2012-09-14 1:29 ` Yijing Wang
2012-09-12 12:33 ` [PATCH v2 3/4] PCI/AER: Clean pci_bus_ops when related pci bus was removed Yijing Wang
2012-09-12 12:33 ` [PATCH v2 4/4] PCI/AER: fix a small race condition window when rmmod aer_inject Yijing Wang
2012-09-13 1:29 ` Huang Ying
2012-09-13 10:59 ` Yijing Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347453225-7704-2-git-send-email-wangyijing@huawei.com \
--to=wangyijing@huawei.com \
--cc=bhelgaas@google.com \
--cc=gong.chen@linux.intel.com \
--cc=guohanjun@huawei.com \
--cc=jiang.liu@huawei.com \
--cc=linux-pci@vger.kernel.org \
--cc=ying.huang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).