[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/8] vhost: propagate errors in vhost_device_iotlb_mi
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 4/8] vhost: propagate errors in vhost_device_iotlb_miss() |
Date: |
Fri, 2 Jun 2017 19:34:38 +0300 |
From: Maxime Coquelin <address@hidden>
Some backends might want to know when things went wrong.
Signed-off-by: Maxime Coquelin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/virtio/vhost.h | 2 +-
hw/virtio/vhost.c | 15 ++++++++++-----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index a450321..467dc77 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -105,5 +105,5 @@ bool vhost_has_free_slot(void);
int vhost_net_set_backend(struct vhost_dev *hdev,
struct vhost_vring_file *file);
-void vhost_device_iotlb_miss(struct vhost_dev *dev, uint64_t iova, int write);
+int vhost_device_iotlb_miss(struct vhost_dev *dev, uint64_t iova, int write);
#endif
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 03a46a7..8fab12d 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -971,18 +971,20 @@ static int vhost_memory_region_lookup(struct vhost_dev
*hdev,
return -EFAULT;
}
-void vhost_device_iotlb_miss(struct vhost_dev *dev, uint64_t iova, int write)
+int vhost_device_iotlb_miss(struct vhost_dev *dev, uint64_t iova, int write)
{
IOMMUTLBEntry iotlb;
uint64_t uaddr, len;
+ int ret = -EFAULT;
rcu_read_lock();
iotlb = address_space_get_iotlb_entry(dev->vdev->dma_as,
iova, write);
if (iotlb.target_as != NULL) {
- if (vhost_memory_region_lookup(dev, iotlb.translated_addr,
- &uaddr, &len)) {
+ ret = vhost_memory_region_lookup(dev, iotlb.translated_addr,
+ &uaddr, &len);
+ if (ret) {
error_report("Fail to lookup the translated address "
"%"PRIx64, iotlb.translated_addr);
goto out;
@@ -991,14 +993,17 @@ void vhost_device_iotlb_miss(struct vhost_dev *dev,
uint64_t iova, int write)
len = MIN(iotlb.addr_mask + 1, len);
iova = iova & ~iotlb.addr_mask;
- if (dev->vhost_ops->vhost_update_device_iotlb(dev, iova, uaddr,
- len, iotlb.perm)) {
+ ret = dev->vhost_ops->vhost_update_device_iotlb(dev, iova, uaddr,
+ len, iotlb.perm);
+ if (ret) {
error_report("Fail to update device iotlb");
goto out;
}
}
out:
rcu_read_unlock();
+
+ return ret;
}
static int vhost_virtqueue_start(struct vhost_dev *dev,
--
MST
- [Qemu-devel] [PULL 0/8] virtio, vhost: fixes, features, Michael S. Tsirkin, 2017/06/02
- [Qemu-devel] [PULL 1/8] virtio-serial-bus: Unset hotplug handler when unrealize, Michael S. Tsirkin, 2017/06/02
- [Qemu-devel] [PULL 2/8] virtio: add virtqueue_alloc_element tracepoint, Michael S. Tsirkin, 2017/06/02
- [Qemu-devel] [PULL 3/8] virtio-serial: fix segfault on disconnect, Michael S. Tsirkin, 2017/06/02
- [Qemu-devel] [PULL 4/8] vhost: propagate errors in vhost_device_iotlb_miss(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 5/8] vhost: rework IOTLB messaging, Michael S. Tsirkin, 2017/06/02
- [Qemu-devel] [PULL 6/8] vhost-user: add vhost_user to hold the chr, Michael S. Tsirkin, 2017/06/02
- [Qemu-devel] [PULL 7/8] vhost-user: add slave-req-fd support, Michael S. Tsirkin, 2017/06/02
- [Qemu-devel] [PULL 8/8] spec/vhost-user spec: Add IOMMU support, Michael S. Tsirkin, 2017/06/02
- Re: [Qemu-devel] [PULL 0/8] virtio, vhost: fixes, features, Peter Maydell, 2017/06/02