From: Alex Williamson <alex.williamson@redhat.com>
To: David Gibson <david@gibson.dropbear.id.au>
Cc: aik@ozlabs.ru, pbonzini@redhat.com, qemu-ppc@nongnu.org,
qemu-devel@nongnu.org, mst@redhat.com
Subject: Re: [Qemu-devel] [PATCH 11/11] vfio: Add guest side IOMMU support
Date: Tue, 14 May 2013 11:15:26 -0600 [thread overview]
Message-ID: <1368551726.5520.127.camel@ul30vt.home> (raw)
In-Reply-To: <1368522837-20747-12-git-send-email-david@gibson.dropbear.id.au>
On Tue, 2013-05-14 at 19:13 +1000, David Gibson wrote:
> This patch uses the new IOMMU notifiers to allow VFIO pass through devices
> to work with guest side IOMMUs, as long as the host-side VFIO iommu has
> sufficient capability and granularity to match the guest side. This works
> by tracking all map and unmap operations on the guest IOMMU using the
> notifiers, and mirroring them into VFIO.
>
> There are a number of FIXMEs, and the scheme involves rather more notifier
> structures than I'd like, but it shuold make for a reasonable proof of
> concept.
>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> hw/misc/vfio.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 126 insertions(+), 13 deletions(-)
>
> diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c
> index f4e3792..62a83ca 100644
> --- a/hw/misc/vfio.c
> +++ b/hw/misc/vfio.c
> @@ -133,10 +133,18 @@ typedef struct VFIOContainer {
> };
> void (*release)(struct VFIOContainer *);
> } iommu_data;
> + QLIST_HEAD(, VFIOGuestIOMMU) guest_iommus;
Seems like this would be related to the space, not the container.
> QLIST_HEAD(, VFIOGroup) group_list;
> QLIST_ENTRY(VFIOContainer) next;
> } VFIOContainer;
>
> +typedef struct VFIOGuestIOMMU {
> + VFIOContainer *container;
> + MemoryRegion *iommu;
> + Notifier n;
> + QLIST_ENTRY(VFIOGuestIOMMU) list;
> +} VFIOGuestIOMMU;
> +
> /* Cache of MSI-X setup plus extra mmap and memory region for split BAR map */
> typedef struct VFIOMSIXInfo {
> uint8_t table_bar;
> @@ -1940,7 +1948,64 @@ static int vfio_dma_map(VFIOContainer *container, hwaddr iova,
>
> static bool vfio_listener_skipped_section(MemoryRegionSection *section)
> {
> - return !memory_region_is_ram(section->mr);
> + return !memory_region_is_ram(section->mr) &&
> + !memory_region_is_iommu(section->mr);
> +}
> +
> +static void vfio_iommu_map_notify(Notifier *n, void *data)
> +{
> + VFIOGuestIOMMU *giommu = container_of(n, VFIOGuestIOMMU, n);
> + MemoryRegion *iommu = giommu->iommu;
> + VFIOContainer *container = giommu->container;
> + IOMMUTLBEntry *iotlb = data;
> + MemoryRegionSection *mrs;
> + hwaddr xlat;
> + hwaddr len = iotlb->addr_mask + 1;
> + void *vaddr;
> + int ret;
> +
> + DPRINTF("iommu map @ %"HWADDR_PRIx" - %"HWADDR_PRIx"\n",
> + iotlb->iova, iotlb->iova + iotlb->address_mask);
> +
> + /* The IOMMU TLB entry we have just covers translation through
> + * this IOMMU to its immediate target. We need to translate
> + * it the rest of the way through to memory. */
> + mrs = address_space_translate(iommu->iommu_target_as,
> + iotlb->translated_addr,
> + &xlat, &len, iotlb->perm[1]);
> + if (!memory_region_is_ram(mrs->mr)) {
> + DPRINTF("iommu map to non memory area %"HWADDR_PRIx"\n",
> + xlat);
> + return;
> + }
> + if (len & iotlb->addr_mask) {
> + DPRINTF("iommu has granularity incompatible with target AS\n");
> + return;
> + }
> +
> + vaddr = memory_region_get_ram_ptr(mrs->mr) +
> + mrs->offset_within_region +
> + (xlat - mrs->offset_within_address_space);
> +
> + if (iotlb->perm[0] || iotlb->perm[1]) {
> + ret = vfio_dma_map(container, iotlb->iova,
> + iotlb->addr_mask + 1, vaddr,
> + !iotlb->perm[1] || mrs->readonly);
> + if (ret) {
> + error_report("vfio_dma_map(%p, 0x%"HWADDR_PRIx", "
> + "0x%"HWADDR_PRIx", %p) = %d (%m)",
> + container, iotlb->iova,
> + iotlb->addr_mask + 1, vaddr, ret);
> + }
> + } else {
> + ret = vfio_dma_unmap(container, iotlb->iova, iotlb->addr_mask + 1);
> + if (ret) {
> + error_report("vfio_dma_unmap(%p, 0x%"HWADDR_PRIx", "
> + "0x%"HWADDR_PRIx") = %d (%m)",
> + container, iotlb->iova,
> + iotlb->addr_mask + 1, ret);
> + }
> + }
> }
>
> static void vfio_listener_region_add(MemoryListener *listener,
> @@ -1949,11 +2014,8 @@ static void vfio_listener_region_add(MemoryListener *listener,
> VFIOContainer *container = container_of(listener, VFIOContainer,
> iommu_data.listener);
> hwaddr iova, end;
> - void *vaddr;
> int ret;
>
> - assert(!memory_region_is_iommu(section->mr));
> -
> if (vfio_listener_skipped_section(section)) {
> DPRINTF("SKIPPING region_add %"HWADDR_PRIx" - %"PRIx64"\n",
> section->offset_within_address_space,
> @@ -1975,20 +2037,55 @@ static void vfio_listener_region_add(MemoryListener *listener,
> return;
> }
>
> - vaddr = memory_region_get_ram_ptr(section->mr) +
> + memory_region_ref(section->mr);
> +
> + if (memory_region_is_ram(section->mr)) {
> + void *vaddr;
> +
> + DPRINTF("region_add [ram] %"HWADDR_PRIx" - %"HWADDR_PRIx" [%p]\n",
> + iova, end - 1, vaddr);
> +
> + vaddr = memory_region_get_ram_ptr(section->mr) +
> section->offset_within_region +
> (iova - section->offset_within_address_space);
>
> - DPRINTF("region_add %"HWADDR_PRIx" - %"HWADDR_PRIx" [%p]\n",
> - iova, end - 1, vaddr);
>
> - memory_region_ref(section->mr);
> - ret = vfio_dma_map(container, iova, end - iova, vaddr, section->readonly);
> - if (ret) {
> - error_report("vfio_dma_map(%p, 0x%"HWADDR_PRIx", "
> - "0x%"HWADDR_PRIx", %p) = %d (%m)",
> - container, iova, end - iova, vaddr, ret);
> + ret = vfio_dma_map(container, iova, end - iova, vaddr,
> + section->readonly);
> + if (ret) {
> + error_report("vfio_dma_map(%p, 0x%"HWADDR_PRIx", "
> + "0x%"HWADDR_PRIx", %p) = %d (%m)",
> + container, iova, end - iova, vaddr, ret);
> + }
> + } else if (memory_region_is_iommu(section->mr)) {
> + VFIOGuestIOMMU *giommu;
> +
> + DPRINTF("region_add [iommu] %"HWADDR_PRIx" - %"HWADDR_PRIx"\n",
> + iova, end - 1);
> +
> + /*
> + * FIXME: We should do some checking to see if the
> + * capabilities of the host VFIO IOMMU are adequate to model
> + * the guest IOMMU
> + *
> + * FIXME: This assumes that the guest IOMMU is empty of
> + * mappings at this point - we should either enforce this, or
> + * loop through existing mappings to map them into VFIO.
> + *
> + * FIXME: For VFIO iommu types which have KVM acceleration to
> + * avoid bouncing all map/unmaps through qemu this way, this
> + * would be the right place to wire that up (tell the KVM
> + * device emulation the VFIO iommu handles to use).
> + */
> + giommu = g_malloc0(sizeof(*giommu));
> + giommu->iommu = section->mr;
> + giommu->container = container;
> + giommu->n.notify = vfio_iommu_map_notify;
> +
> + QLIST_INSERT_HEAD(&container->guest_iommus, giommu, list);
> + memory_region_register_iommu_notifier(giommu->iommu, &giommu->n);
And this is also filtered on the space, so we're not adding iommus that
aren't handling regions within this space, right?
Does the memory listener need to move to the space?
> }
> +
> }
>
> static void vfio_listener_region_del(MemoryListener *listener,
> @@ -2012,6 +2109,22 @@ static void vfio_listener_region_del(MemoryListener *listener,
> return;
> }
>
> + if (memory_region_is_iommu(section->mr)) {
> + VFIOGuestIOMMU *giommu;
> +
> + QLIST_FOREACH(giommu, &container->guest_iommus, list) {
> + if (giommu->iommu == section->mr) {
> + memory_region_unregister_iommu_notifier(&giommu->n);
Missing free
> + break;
> + }
> + }
> +
> + /* FIXME: We assume the one big unmap below is adequate to
> + * remove any individual page mappings in the IOMMU which
> + * might have been copied into VFIO. That may not be true for
> + * all IOMMU types */
> + }
> +
> iova = TARGET_PAGE_ALIGN(section->offset_within_address_space);
> end = (section->offset_within_address_space + section->size) &
> TARGET_PAGE_MASK;
next prev parent reply other threads:[~2013-05-14 17:15 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-14 9:13 [Qemu-devel] [0/11] RFC: VFIO and guest side IOMMUs, version 3 David Gibson
2013-05-14 9:13 ` [Qemu-devel] [PATCH 01/11] iommu: Fix compile error in ioapic.c David Gibson
2013-05-14 9:13 ` [Qemu-devel] [PATCH 02/11] pci: Don't del_subgregion on a non subregion David Gibson
2013-05-14 9:13 ` [Qemu-devel] [PATCH 03/11] pci: Rework PCI iommu lifetime assumptions David Gibson
2013-05-14 9:13 ` [Qemu-devel] [PATCH 04/11] pci: Use AddressSpace rather than MemoryRegion to represent PCI DMA space David Gibson
2013-05-14 9:13 ` [Qemu-devel] [PATCH 05/11] pci: Introduce helper to retrieve a PCI device's DMA address space David Gibson
2013-05-14 9:13 ` [Qemu-devel] [PATCH 06/11] memory: Sanity check that no listeners remain on a destroyed AddressSpace David Gibson
2013-05-14 9:13 ` [Qemu-devel] [PATCH 07/11] vfio: Introduce VFIO address spaces David Gibson
2013-05-14 16:53 ` Alex Williamson
2013-05-15 1:18 ` [Qemu-devel] [Qemu-ppc] " David Gibson
2013-05-14 9:13 ` [Qemu-devel] [PATCH 08/11] vfio: Create VFIOAddressSpace objects as needed David Gibson
2013-05-14 9:13 ` [Qemu-devel] [PATCH 09/11] memory: Add iova to IOMMUTLBEntry David Gibson
2013-05-14 16:53 ` Alex Williamson
2013-05-15 3:51 ` [Qemu-devel] [Qemu-ppc] " David Gibson
2013-05-14 21:22 ` [Qemu-devel] " Paolo Bonzini
2013-05-14 9:13 ` [Qemu-devel] [PATCH 10/11] memory: Add iommu map/unmap notifiers David Gibson
2013-05-14 17:15 ` Alex Williamson
2013-05-14 21:02 ` Paolo Bonzini
2013-05-14 21:23 ` Paolo Bonzini
2013-05-15 1:21 ` [Qemu-devel] [Qemu-ppc] " David Gibson
2013-05-14 9:13 ` [Qemu-devel] [PATCH 11/11] vfio: Add guest side IOMMU support David Gibson
2013-05-14 9:48 ` Paolo Bonzini
2013-05-14 13:57 ` [Qemu-devel] [Qemu-ppc] " David Gibson
2013-05-14 17:15 ` Alex Williamson [this message]
2013-05-15 1:33 ` David Gibson
2013-05-15 2:51 ` Alex Williamson
2013-05-15 3:32 ` David Gibson
2013-05-16 6:53 ` David Gibson
2013-05-14 9:39 ` [Qemu-devel] [0/11] RFC: VFIO and guest side IOMMUs, version 3 Paolo Bonzini
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=1368551726.5520.127.camel@ul30vt.home \
--to=alex.williamson@redhat.com \
--cc=aik@ozlabs.ru \
--cc=david@gibson.dropbear.id.au \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/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).