From patchwork Fri Sep 21 03:44:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 1489191 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 D9960DF28C for ; Fri, 21 Sep 2012 03:45:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753810Ab2IUDp7 (ORCPT ); Thu, 20 Sep 2012 23:45:59 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:4744 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753989Ab2IUDp6 (ORCPT ); Thu, 20 Sep 2012 23:45:58 -0400 Received: from 172.24.2.119 (EHLO szxeml213-edg.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id APJ95578; Fri, 21 Sep 2012 11:45:47 +0800 (CST) Received: from SZXEML413-HUB.china.huawei.com (10.82.67.152) by szxeml213-edg.china.huawei.com (172.24.2.30) with Microsoft SMTP Server (TLS) id 14.1.323.3; Fri, 21 Sep 2012 11:44:56 +0800 Received: from localhost (10.135.76.84) by szxeml413-hub.china.huawei.com (10.82.67.152) with Microsoft SMTP Server id 14.1.323.3; Fri, 21 Sep 2012 11:44:47 +0800 From: Yijing Wang To: Bjorn Helgaas , Huang Ying , Chen Gong CC: , Hanjun Guo , , Yijing Wang Subject: [PATCH v4 2/5] PCI/AER: introduce pci_bus_ops_get() to avoid a small race condition window Date: Fri, 21 Sep 2012 11:44:13 +0800 Message-ID: <1348199056-7696-3-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 In-Reply-To: <1348199056-7696-1-git-send-email-wangyijing@huawei.com> References: <1348199056-7696-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 we rmmod aer_inject module, there is a small 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 Signed-off-by: Huang Ying --- 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 fdab3bb..0123120 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) { @@ -539,14 +553,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) {