diff options
| author | Jason Wang <jasowang@redhat.com> | 2018-04-13 11:01:49 +0800 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2018-04-16 19:11:38 +0300 |
| commit | aebbdbee559389a9f0d0e56670b9332534b6bb9b (patch) | |
| tree | 1af4f0941b6ba2ea30696c126d9479f59d349f24 | |
| parent | 38e83a71d02e026d4a6d0ab1ef9855c4924c2c68 (diff) | |
vhost: do not verify ring mappings when IOMMU is enabled
When IOMMU is enabled, we store virtqueue metadata as iova (though it
may has _phys suffix) and access them through dma helpers. Any
translation failures could be reported by IOMMU.
In this case, trying to validate iova against gpa won't work and will
cause a false error reporting. So this patch bypasses the ring
verification if IOMMU is enabled which is similar to the behavior
before 0ca1fd2d6878 that calls vhost_memory_map() which is a nop when
IOMMU is enabled.
Fixes: 0ca1fd2d6878 ("vhost: Simplify ring verification checks")
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/virtio/vhost.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index f51bf573d5..9d5850a7d7 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -342,6 +342,10 @@ static int vhost_verify_ring_mappings(struct vhost_dev *dev, "used ring" }; + if (vhost_dev_has_iommu(dev)) { + return 0; + } + for (i = 0; i < dev->nvqs; ++i) { struct vhost_virtqueue *vq = dev->vqs + i; |