From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753190Ab3FQUUR (ORCPT ); Mon, 17 Jun 2013 16:20:17 -0400 Received: from mail-ie0-f171.google.com ([209.85.223.171]:48188 "EHLO mail-ie0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751470Ab3FQUUO (ORCPT ); Mon, 17 Jun 2013 16:20:14 -0400 Date: Mon, 17 Jun 2013 14:20:10 -0600 From: Bjorn Helgaas To: Jiang Liu Cc: Yinghai Lu , Jiang Liu , "Rafael J . Wysocki" , Greg Kroah-Hartman , Gu Zheng , Toshi Kani , Myron Stowe , Yijing Wang , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Joerg Roedel , Ingo Molnar , Donald Dutile , Hannes Reinecke , "Li, Zhen-Hua" , iommu@lists.linux-foundation.org Subject: Re: [PATCH v3, part2 17/20] PCI, iommu: use hotplug-safe iterators to walk PCI buses Message-ID: <20130617202010.GC7877@google.com> References: <1369583597-3801-1-git-send-email-jiang.liu@huawei.com> <1369583597-3801-18-git-send-email-jiang.liu@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1369583597-3801-18-git-send-email-jiang.liu@huawei.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, May 26, 2013 at 11:53:14PM +0800, Jiang Liu wrote: > Enhance iommu drviers to use hotplug-safe iterators to walk > PCI buses. > > Signed-off-by: Jiang Liu > Cc: Joerg Roedel > Cc: Ingo Molnar > Cc: Donald Dutile > Cc: Hannes Reinecke > Cc: "Li, Zhen-Hua" > Cc: iommu@lists.linux-foundation.org > Cc: linux-kernel@vger.kernel.org > --- > drivers/iommu/amd_iommu.c | 4 +++- > drivers/iommu/dmar.c | 6 ++++-- The AMD and Intel IOMMU drivers are very different, and I would split this into a patch for each. > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c > index 21d02b0..eef7a7e 100644 > --- a/drivers/iommu/amd_iommu.c > +++ b/drivers/iommu/amd_iommu.c > @@ -352,6 +352,7 @@ static int init_iommu_group(struct device *dev) > struct iommu_dev_data *dev_data; > struct iommu_group *group; > struct pci_dev *dma_pdev; > + struct pci_bus *b = NULL; > int ret; > > group = iommu_group_get(dev); > @@ -388,7 +389,7 @@ static int init_iommu_group(struct device *dev) > * the alias. Be careful to also test the parent device if > * we think the alias is the root of the group. > */ > - bus = pci_find_bus(0, alias >> 8); > + b = bus = pci_get_bus(0, alias >> 8); > if (!bus) > goto use_group; > > @@ -408,6 +409,7 @@ static int init_iommu_group(struct device *dev) > dma_pdev = get_isolation_root(pci_dev_get(to_pci_dev(dev))); > use_pdev: > ret = use_pdev_iommu_group(dma_pdev, dev); > + pci_bus_put(b); > pci_dev_put(dma_pdev); > return ret; > use_group: > diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c > index a7967ce..7162787 100644 > --- a/drivers/iommu/dmar.c > +++ b/drivers/iommu/dmar.c > @@ -67,12 +67,12 @@ static void __init dmar_register_drhd_unit(struct dmar_drhd_unit *drhd) > static int __init dmar_parse_one_dev_scope(struct acpi_dmar_device_scope *scope, > struct pci_dev **dev, u16 segment) > { > - struct pci_bus *bus; > + struct pci_bus *b, *bus; > struct pci_dev *pdev = NULL; > struct acpi_dmar_pci_path *path; > int count; > > - bus = pci_find_bus(segment, scope->bus); > + b = bus = pci_get_bus(segment, scope->bus); > path = (struct acpi_dmar_pci_path *)(scope + 1); > count = (scope->length - sizeof(struct acpi_dmar_device_scope)) > / sizeof(struct acpi_dmar_pci_path); > @@ -97,6 +97,8 @@ static int __init dmar_parse_one_dev_scope(struct acpi_dmar_device_scope *scope, > count --; > bus = pdev->subordinate; > } > + pci_bus_put(b); > + > if (!pdev) { > pr_warn("Device scope device [%04x:%02x:%02x.%02x] not found\n", > segment, scope->bus, path->dev, path->fn); > -- > 1.8.1.2 >