[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v3 10/29] virtio: Add vhost_shadow_vq_get_vring_addr
From: |
Eugenio Pérez |
Subject: |
[RFC v3 10/29] virtio: Add vhost_shadow_vq_get_vring_addr |
Date: |
Wed, 19 May 2021 18:28:44 +0200 |
It reports the shadow virtqueue address from qemu virtual address space
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
hw/virtio/vhost-shadow-virtqueue.h | 4 +++
hw/virtio/vhost-shadow-virtqueue.c | 46 ++++++++++++++++++++++++++++++
2 files changed, 50 insertions(+)
diff --git a/hw/virtio/vhost-shadow-virtqueue.h
b/hw/virtio/vhost-shadow-virtqueue.h
index 2ca4b92b12..725091bc97 100644
--- a/hw/virtio/vhost-shadow-virtqueue.h
+++ b/hw/virtio/vhost-shadow-virtqueue.h
@@ -19,6 +19,10 @@ typedef struct VhostShadowVirtqueue VhostShadowVirtqueue;
void vhost_shadow_vq_mask(VhostShadowVirtqueue *svq, EventNotifier *masked);
void vhost_shadow_vq_unmask(VhostShadowVirtqueue *svq);
+void vhost_shadow_vq_get_vring_addr(const VhostShadowVirtqueue *svq,
+ struct vhost_vring_addr *addr);
+size_t vhost_shadow_vq_driver_area_size(const VhostShadowVirtqueue *svq);
+size_t vhost_shadow_vq_device_area_size(const VhostShadowVirtqueue *svq);
bool vhost_shadow_vq_start(struct vhost_dev *dev,
unsigned idx,
diff --git a/hw/virtio/vhost-shadow-virtqueue.c
b/hw/virtio/vhost-shadow-virtqueue.c
index c22acb4605..ff50f12410 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -17,6 +17,9 @@
/* Shadow virtqueue to relay notifications */
typedef struct VhostShadowVirtqueue {
+ /* Shadow vring */
+ struct vring vring;
+
/* Shadow kick notifier, sent to vhost */
EventNotifier kick_notifier;
/* Shadow call notifier, sent to vhost */
@@ -114,6 +117,35 @@ void vhost_shadow_vq_unmask(VhostShadowVirtqueue *svq)
svq->masked_notifier.n = NULL;
}
+/*
+ * Get the shadow vq vring address.
+ * @svq Shadow virtqueue
+ * @addr Destination to store address
+ */
+void vhost_shadow_vq_get_vring_addr(const VhostShadowVirtqueue *svq,
+ struct vhost_vring_addr *addr)
+{
+ addr->desc_user_addr = (uint64_t)svq->vring.desc;
+ addr->avail_user_addr = (uint64_t)svq->vring.avail;
+ addr->used_user_addr = (uint64_t)svq->vring.used;
+}
+
+size_t vhost_shadow_vq_driver_area_size(const VhostShadowVirtqueue *svq)
+{
+ uint16_t vq_idx = virtio_get_queue_index(svq->vq);
+ size_t desc_size = virtio_queue_get_desc_size(svq->vdev, vq_idx);
+ size_t avail_size = virtio_queue_get_avail_size(svq->vdev, vq_idx);
+
+ return ROUND_UP(desc_size + avail_size, qemu_real_host_page_size);
+}
+
+size_t vhost_shadow_vq_device_area_size(const VhostShadowVirtqueue *svq)
+{
+ uint16_t vq_idx = virtio_get_queue_index(svq->vq);
+ size_t used_size = virtio_queue_get_used_size(svq->vdev, vq_idx);
+ return ROUND_UP(used_size, qemu_real_host_page_size);
+}
+
/*
* Restore the vhost guest to host notifier, i.e., disables svq effect.
*/
@@ -232,6 +264,10 @@ void vhost_shadow_vq_stop(struct vhost_dev *dev,
VhostShadowVirtqueue *vhost_shadow_vq_new(struct vhost_dev *dev, int idx)
{
int vq_idx = dev->vq_index + idx;
+ unsigned num = virtio_queue_get_num(dev->vdev, vq_idx);
+ size_t desc_size = virtio_queue_get_desc_size(dev->vdev, vq_idx);
+ size_t driver_size;
+ size_t device_size;
g_autofree VhostShadowVirtqueue *svq = g_new0(VhostShadowVirtqueue, 1);
int r;
@@ -251,6 +287,14 @@ VhostShadowVirtqueue *vhost_shadow_vq_new(struct vhost_dev
*dev, int idx)
svq->vq = virtio_get_queue(dev->vdev, vq_idx);
svq->vdev = dev->vdev;
+ driver_size = vhost_shadow_vq_driver_area_size(svq);
+ device_size = vhost_shadow_vq_device_area_size(svq);
+ svq->vring.num = num;
+ svq->vring.desc = qemu_memalign(qemu_real_host_page_size, driver_size);
+ svq->vring.avail = (void *)((char *)svq->vring.desc + desc_size);
+ memset(svq->vring.desc, 0, driver_size);
+ svq->vring.used = qemu_memalign(qemu_real_host_page_size, device_size);
+ memset(svq->vring.used, 0, device_size);
event_notifier_set_handler(&svq->call_notifier,
vhost_shadow_vq_handle_call);
return g_steal_pointer(&svq);
@@ -270,5 +314,7 @@ void vhost_shadow_vq_free(VhostShadowVirtqueue *vq)
event_notifier_cleanup(&vq->kick_notifier);
event_notifier_set_handler(&vq->call_notifier, NULL);
event_notifier_cleanup(&vq->call_notifier);
+ qemu_vfree(vq->vring.desc);
+ qemu_vfree(vq->vring.used);
g_free(vq);
}
--
2.27.0
- [RFC v3 05/29] virtio: Add VIRTIO_F_QUEUE_STATE, (continued)
- [RFC v3 05/29] virtio: Add VIRTIO_F_QUEUE_STATE, Eugenio Pérez, 2021/05/19
- [RFC v3 04/29] vhost: Add x-vhost-enable-shadow-vq qmp, Eugenio Pérez, 2021/05/19
- [RFC v3 06/29] virtio-net: Honor VIRTIO_CONFIG_S_DEVICE_STOPPED, Eugenio Pérez, 2021/05/19
- [RFC v3 07/29] vhost: Route guest->host notification through shadow virtqueue, Eugenio Pérez, 2021/05/19
- [RFC v3 08/29] vhost: Route host->guest notification through shadow virtqueue, Eugenio Pérez, 2021/05/19
- [RFC v3 09/29] vhost: Avoid re-set masked notifier in shadow vq, Eugenio Pérez, 2021/05/19
- [RFC v3 10/29] virtio: Add vhost_shadow_vq_get_vring_addr,
Eugenio Pérez <=
- [RFC v3 11/29] vhost: Add vhost_vring_pause operation, Eugenio Pérez, 2021/05/19
- [RFC v3 12/29] vhost: add vhost_kernel_vring_pause, Eugenio Pérez, 2021/05/19
- [RFC v3 13/29] vhost: Add vhost_get_iova_range operation, Eugenio Pérez, 2021/05/19
- [RFC v3 14/29] vhost: add vhost_has_limited_iova_range, Eugenio Pérez, 2021/05/19
- [RFC v3 15/29] vhost: Add enable_custom_iommu to VhostOps, Eugenio Pérez, 2021/05/19
- [RFC v3 16/29] vhost-vdpa: Add vhost_vdpa_enable_custom_iommu, Eugenio Pérez, 2021/05/19