virtio-iommu: Fix Replay
cover virtio-iommu: Fix Replay
When assigning VFIO devices protected by a virtio-iommu we need to replay the mappings when adding a new IOMMU MR and when attaching a device to a domain. While we do a "remap" we currently fail to first unmap the existing IOVA mapping and just map the new one. With some device/group topology this can lead to errors in VFIO when trying to DMA_MAP IOVA ranges onto existing ones.
Eric Auger (2):
virtio-iommu: Add unmap on virtio_iommu_remap()
virtio-iommu: Fix replay on device attach
hw/virtio/virtio-iommu.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
Signature · 1 line
2.37.3
PATCH 1/2 virtio-iommu: Add unmap on virtio_iommu_remap()
following replay() callback documentation in memory.h we shall first invalidate (notify with flag == IOMMU_NONE) and then map for existing mappings. The code currently skips the unmap and just do map. This may lead to duplicate mapping attempts on VFIO side (leading to spurious -EEXIST DMA_MAP failures). Add the unmap.
Fixes 308e5e1b5f8 ("virtio-iommu: Add replay() memory region callback")
--- hw/virtio/virtio-iommu.c | 1 + 1 file changed, 1 insertion(+)
hw/virtio/virtio-iommu.c +1 -0
@@ -1034,6 +1034,7 @@ static gboolean virtio_iommu_remap(gpointer key, gpointer value, gpointer data)trace_virtio_iommu_remap (mr->parent_obj.name, interval->low, interval->high, mapping->phys_addr); +virtio_iommu_notify_unmap (mr, interval->low, interval->high);virtio_iommu_notify_map (mr, interval->low, interval->high, mapping->phys_addr, mapping->flags);return false;
Signature · 1 line
2.37.3
PATCH 2/2 virtio-iommu: Fix replay on device attach
In reply to Eric AugerWhen attaching a device to a domain, we replay the existing domain mappings for that device. If there are several VFIO devices in the same group on the guest we may end up with duplicate mapping attempts because the mapping already exist on VFIO side. So let's do a proper remap, ie. first unmap and then map.
Fixes 2f6eeb5f0bb ("virtio-iommu: Call memory notifiers in attach/detach")
--- hw/virtio/virtio-iommu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
hw/virtio/virtio-iommu.c +5 -3
@@ -277,19 +277,21 @@ static gboolean virtio_iommu_notify_unmap_cb(gpointer key, gpointer value,return false; } -static gboolean virtio_iommu_notify_map_cb (gpointer key,gpointer value, -gpointer data) +static gboolean virtio_iommu_notify_remap_cb (gpointer key,gpointer value, +gpointer data) {VirtIOIOMMUMapping *mapping = (VirtIOIOMMUMapping *) value;VirtIOIOMMUInterval *interval = (VirtIOIOMMUInterval *) key;IOMMUMemoryRegion *mr = (IOMMUMemoryRegion *) data; +virtio_iommu_notify_unmap (mr, interval->low, interval->high);virtio_iommu_notify_map (mr, interval->low, interval->high, mapping->phys_addr, mapping->flags);return false; } +static void virtio_iommu_detach_endpoint_from_domain (VirtIOIOMMUEndpoint *ep) {VirtIOIOMMUDomain *domain = ep->domain;
@@ -489,7 +491,7 @@ static int virtio_iommu_attach(VirtIOIOMMU *s,virtio_iommu_switch_address_space (sdev);/* Replay domain mappings on the associated memory region */ -g_tree_foreach (domain->mappings, virtio_iommu_notify_map_cb, +g_tree_foreach (domain->mappings, virtio_iommu_notify_remap_cb, ep->iommu_mr);return VIRTIO_IOMMU_S_OK ;
Signature · 1 line
2.37.3
Hi, Eric,
Quoted 6 lines · Eric Auger
When assigning VFIO devices protected by a virtio-iommu we need to replay the mappings when adding a new IOMMU MR and when attaching a device to a domain. While we do a "remap" we currently fail to first unmap the existing IOVA mapping and just map the new one. With some device/group topology this can lead to errors in VFIO when trying to
DMA_MAPIOVA ranges onto existing ones.
I'm not sure whether virtio-iommu+vfio will suffer from DMA races like when we were working on the vt-d replay for vfio. The issue is whether DMA can happen right after UNMAP but before MAP of the same page if the page was always mapped.
The vt-d resolved it by using iova_tree so in a replay vt-d knows the page didn't change, so it avoids unmap+map. It only notifies newly unmapped or newly mapped.
Thanks,
Signature · 1 line
Peter Xu
Hi Peter,
Quoted 9 lines · Peter Xu
Hi, Eric,
Quoted 6 lines · Eric Auger
When assigning VFIO devices protected by a virtio-iommu we need to replay the mappings when adding a new IOMMU MR and when attaching a device to a domain. While we do a "remap" we currently fail to first unmap the existing IOVA mapping and just map the new one. With some device/group topology this can lead to errors in VFIO when trying to
DMA_MAPIOVA ranges onto existing ones.
Quoted 4 lines
I'm not sure whether virtio-iommu+vfio will suffer from DMA races like when we were working on the vt-d replay for vfio. The issue is whether DMA can happen right after UNMAP but before MAP of the same page if the page was always mapped.
I don't think it can race because a mutex is hold while doing the virtio_iommu_replay(), and each time a virtio cmd is handled (attach, map, unmap), see virtio_iommu_handle_command.
So I think it is safe.
Thanks
Eric
Quoted 7 lines
The vt-d resolved it by using
iova_treeso in a replay vt-d knows the page didn't change, so it avoids unmap+map. It only notifies newly unmapped or newly mapped.Thanks,
Quoted 1 line · Eric Auger
Hi Peter,
Hi, Eric,
Quoted 16 lines · Peter Xu
Quoted 9 lines
Hi, Eric,
Quoted 6 lines · Eric Auger
When assigning VFIO devices protected by a virtio-iommu we need to replay the mappings when adding a new IOMMU MR and when attaching a device to a domain. While we do a "remap" we currently fail to first unmap the existing IOVA mapping and just map the new one. With some device/group topology this can lead to errors in VFIO when trying to
DMA_MAPIOVA ranges onto existing ones.Quoted 4 lines
I'm not sure whether virtio-iommu+vfio will suffer from DMA races like when we were working on the vt-d replay for vfio. The issue is whether DMA can happen right after UNMAP but before MAP of the same page if the page was always mapped.
Quoted 4 lines
I don't think it can race because a mutex is hold while doing the
virtio_iommu_replay(), and each time a virtio cmd is handled (attach, map, unmap), seevirtio_iommu_handle_command.
So I think it is safe.
It's not the race in the code, it's the race between modifying host IOMMU pgtable with DMA happening in parallel. The bug triggered with DMA_MAP returning -EEXIST means there's existing mapping.
If during replay there's mapped ranges and the ranges are prone to DMA, then IIUC it can happen.
I didn't really check specifically for virtio-iommu and I mostly forget the details, just to raise this up. It's possible for some reason it just can't trigger. VT-d definitely can, in which case we'll see DMA errors on the host from the assigned device when the DMA triggers during the "unmap and map" window.
Thanks,
Signature · 1 line
Peter Xu
Quoted 33 lines · Peter Xu
Quoted 1 line · Eric Auger
Hi Peter,
Hi, Eric,
Quoted 16 lines · Peter Xu
Quoted 9 lines
Hi, Eric,
Quoted 6 lines · Eric Auger
When assigning VFIO devices protected by a virtio-iommu we need to replay the mappings when adding a new IOMMU MR and when attaching a device to a domain. While we do a "remap" we currently fail to first unmap the existing IOVA mapping and just map the new one. With some device/group topology this can lead to errors in VFIO when trying to
DMA_MAPIOVA ranges onto existing ones.Quoted 4 lines
I'm not sure whether virtio-iommu+vfio will suffer from DMA races like when we were working on the vt-d replay for vfio. The issue is whether DMA can happen right after UNMAP but before MAP of the same page if the page was always mapped.
Quoted 4 lines
I don't think it can race because a mutex is hold while doing the
virtio_iommu_replay(), and each time a virtio cmd is handled (attach, map, unmap), seevirtio_iommu_handle_command.
So I think it is safe.It's not the race in the code, it's the race between modifying host IOMMU pgtable with DMA happening in parallel. The bug triggered with
DMA_MAPreturning-EEXISTmeans there's existing mapping.If during replay there's mapped ranges and the ranges are prone to DMA, then IIUC it can happen.
Quoted 7 lines
I didn't really check specifically for virtio-iommu and I mostly forget the details, just to raise this up. It's possible for some reason it just can't trigger. VT-d definitely can, in which case we'll see DMA errors on the host from the assigned device when the DMA triggers during the "unmap and map" window.
Thanks,
Eric any resolution on this?
Quoted 2 lines
Signature · 1 line
Peter Xu
Hi Michael, Peter,
Quoted 30 lines · Michael S. Tsirkin
Quoted 29 lines · Peter Xu
Quoted 1 line · Eric Auger
Hi Peter,
Hi, Eric,
Quoted 10 lines · Peter Xu
Quoted 9 lines
Hi, Eric,
Quoted 6 lines · Eric Auger
When assigning VFIO devices protected by a virtio-iommu we need to replay the mappings when adding a new IOMMU MR and when attaching a device to a domain. While we do a "remap" we currently fail to first unmap the existing IOVA mapping and just map the new one. With some device/group topology this can lead to errors in VFIO when trying to
DMA_MAPIOVA ranges onto existing ones.Quoted 8 lines
Quoted 4 lines
I'm not sure whether virtio-iommu+vfio will suffer from DMA races like when we were working on the vt-d replay for vfio. The issue is whether DMA can happen right after UNMAP but before MAP of the same page if the page was always mapped.
I don't think it can race because a mutex is hold while doing the
virtio_iommu_replay(), and each time a virtio cmd is handled (attach, map, unmap), seevirtio_iommu_handle_command.
So I think it is safe.It's not the race in the code, it's the race between modifying host IOMMU pgtable with DMA happening in parallel. The bug triggered with
DMA_MAPreturning-EEXISTmeans there's existing mapping.If during replay there's mapped ranges and the ranges are prone to DMA, then IIUC it can happen.
Quoted 8 lines
Quoted 7 lines
I didn't really check specifically for virtio-iommu and I mostly forget the details, just to raise this up. It's possible for some reason it just can't trigger. VT-d definitely can, in which case we'll see DMA errors on the host from the assigned device when the DMA triggers during the "unmap and map" window.
Thanks,
Eric any resolution on this?
Sorry for the delay. Not yet unfortunately. following Peter's reply I now understand the race issue and it makes total sense but I need to study it further.
Eric
Quoted 3 lines
Quoted 3 lines
Signature · 2 lines
-- Peter Xu