From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnLwl-0004r7-M3 for qemu-devel@nongnu.org; Mon, 13 Mar 2017 05:07:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnLwh-0001DV-LY for qemu-devel@nongnu.org; Mon, 13 Mar 2017 05:07:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52636) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cnLwh-0001Ct-EE for qemu-devel@nongnu.org; Mon, 13 Mar 2017 05:07:15 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4095888E60 for ; Mon, 13 Mar 2017 09:07:14 +0000 (UTC) References: <1489375798-19518-1-git-send-email-jasowang@redhat.com> <1489375798-19518-2-git-send-email-jasowang@redhat.com> From: Paolo Bonzini Message-ID: Date: Mon, 13 Mar 2017 10:07:11 +0100 MIME-Version: 1.0 In-Reply-To: <1489375798-19518-2-git-send-email-jasowang@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/2] pci: introduce a bus master container List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Wang , mst@redhat.com, marcel@redhat.com, qemu-devel@nongnu.org, peterx@redhat.com On 13/03/2017 04:29, Jason Wang wrote: > 96a8821d2141 ("virtio: unbreak virtio-pci with IOMMU after caching ring > translations") tries to make IOMMU works with virtio memory region > cache, but it requires IOMMU to be created before any virtio > devices. This is sub optimal, fixing this by introduce a bus master > container to make sure address space can be initialized during device > registering, and then we can safely set alias and make > bus_master_enable_region as its subregion during bus master > initialization. > > Cc: Paolo Bonzini > Signed-off-by: Jason Wang > --- > hw/pci/pci.c | 9 +++++++-- > include/hw/pci/pci.h | 1 + > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 273f1e4..ad46390 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -88,8 +88,8 @@ static void pci_init_bus_master(PCIDevice *pci_dev) > OBJECT(pci_dev), "bus master", > dma_as->root, 0, memory_region_size(dma_as->root)); > memory_region_set_enabled(&pci_dev->bus_master_enable_region, false); > - address_space_init(&pci_dev->bus_master_as, > - &pci_dev->bus_master_enable_region, pci_dev->name); > + memory_region_add_subregion(&pci_dev->bus_master_container_region, 0, > + &pci_dev->bus_master_enable_region); > } > > static void pcibus_machine_done(Notifier *notifier, void *data) > @@ -995,6 +995,11 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, > pci_dev->devfn = devfn; > pci_dev->requester_id_cache = pci_req_id_cache_get(pci_dev); > > + memory_region_init(&pci_dev->bus_master_container_region, OBJECT(pci_dev), > + "bus master container", UINT64_MAX); > + address_space_init(&pci_dev->bus_master_as, > + &pci_dev->bus_master_container_region, pci_dev->name); > + > if (qdev_hotplug) { > pci_init_bus_master(pci_dev); > } > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index 9349acb..713ede0 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -284,6 +284,7 @@ struct PCIDevice { > char name[64]; > PCIIORegion io_regions[PCI_NUM_REGIONS]; > AddressSpace bus_master_as; > + MemoryRegion bus_master_container_region; > MemoryRegion bus_master_enable_region; > > /* do not access the following fields */ > Series Reviewed-by: Paolo Bonzini