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 2/6] PCI/AER: introduce pci_bus_ops_get() function to avoid a small race condition window
Date: Wed, 19 Sep 2012 10:40:38 +0800 [thread overview]
Message-ID: <1348022442-7816-3-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1348022442-7816-1-git-send-email-wangyijing@huawei.com>
When we rmmod aer_inject module, there is a race condition window between pci_bus_ops_pop()
and pci_bus_set_ops() in aer_inject_exit, eg. pci_read_aer/pci_write_aer was called between
them. So introduce pci_bus_ops_get() to avoid this.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
---
drivers/pci/pcie/aer/aer_inject.c | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c
index 0f00a27..442147b 100644
--- a/drivers/pci/pcie/aer/aer_inject.c
+++ b/drivers/pci/pcie/aer/aer_inject.c
@@ -67,6 +67,8 @@ struct pci_bus_ops {
struct pci_ops *ops;
};
+#define to_pci_bus_ops(n) container_of(n, struct pci_bus_ops, list)
+
static LIST_HEAD(einjected);
static LIST_HEAD(pci_bus_ops_list);
@@ -160,6 +162,18 @@ static struct pci_bus_ops *pci_bus_ops_pop(void)
return bus_ops;
}
+static struct pci_bus_ops *pci_bus_ops_get(struct pci_bus_ops *from)
+{
+ struct pci_bus_ops *bus_ops = NULL;
+ struct list_head *n;
+
+ n = from ? from->list.next : pci_bus_ops_list.next;
+ if (n != &pci_bus_ops_list)
+ bus_ops = to_pci_bus_ops(n);
+
+ return bus_ops;
+}
+
static u32 *find_pci_config_dword(struct aer_error *err, int where,
int *prw1cs)
{
@@ -540,14 +554,15 @@ static void __exit aer_inject_exit(void)
{
struct aer_error *err, *err_next;
unsigned long flags;
- struct pci_bus_ops *bus_ops;
+ struct pci_bus_ops *bus_ops = NULL;
misc_deregister(&aer_inject_device);
- while ((bus_ops = pci_bus_ops_pop())) {
+ while ((bus_ops = pci_bus_ops_get(bus_ops)))
pci_bus_set_ops(bus_ops->bus, bus_ops->ops);
+
+ while ((bus_ops = pci_bus_ops_pop()))
kfree(bus_ops);
- }
spin_lock_irqsave(&inject_lock, flags);
list_for_each_entry_safe(err, err_next, &einjected, list) {
--
1.7.1
next prev parent reply other threads:[~2012-09-19 2:42 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-19 2:40 [PATCH 0/6] fix aer_inject bug while doing pci hot-plug Yijing Wang
2012-09-19 2:40 ` [PATCH 1/6] PCI/AER: fix pci_ops return NULL when hotplug a pci bus doing aer error inject Yijing Wang
2012-09-19 5:13 ` Huang Ying
2012-09-19 5:52 ` Yijing Wang
2012-09-19 8:19 ` Jiang Liu
2012-09-19 2:40 ` Yijing Wang [this message]
2012-09-19 5:52 ` [PATCH 2/6] PCI/AER: introduce pci_bus_ops_get() function to avoid a small race condition window Huang Ying
2012-09-19 6:42 ` Yijing Wang
2012-09-19 7:00 ` Huang Ying
2012-09-19 2:40 ` [PATCH 3/6] PCI/AER: clean all untracked pci_ops_aer when rmmod aer_inject Yijing Wang
2012-09-19 5:57 ` Huang Ying
2012-09-19 6:09 ` Yijing Wang
2012-09-19 6:18 ` Huang Ying
2012-09-19 6:36 ` Yijing Wang
2012-09-19 2:40 ` [PATCH 4/6] PCI/AER: clean pci_bus_ops when related pci bus was removed Yijing Wang
2012-09-19 2:40 ` [PATCH 5/6] PCI/AER: introduce pci_bus_ops_free to free pci_bus_ops Yijing Wang
2012-09-19 6:03 ` Huang Ying
2012-09-19 6:11 ` Yijing Wang
2012-09-19 7:11 ` Chen Gong
2012-09-19 7:29 ` Yijing Wang
2012-09-19 2:40 ` [PATCH 6/6] PCI/AER: clean unused code pci_bus_ops_pop Yijing Wang
2012-09-19 7:24 ` [PATCH 0/6] fix aer_inject bug while doing pci hot-plug Chen Gong
2012-09-19 7:32 ` 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=1348022442-7816-3-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).