[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 05/14] virtio: Add vhost_svq_get_vring_addr
From: |
Eugenio Pérez |
Subject: |
[PATCH v4 05/14] virtio: Add vhost_svq_get_vring_addr |
Date: |
Thu, 3 Mar 2022 19:51:38 +0100 |
It reports the shadow virtqueue address from qemu virtual address space.
Since this will be different from the guest's vaddr, but the device can
access it, SVQ takes special care about its alignment & lack of garbage
data. It assumes that IOMMU will work in host_page_size ranges for that.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
hw/virtio/vhost-shadow-virtqueue.h | 9 +++++++++
hw/virtio/vhost-shadow-virtqueue.c | 29 +++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/hw/virtio/vhost-shadow-virtqueue.h
b/hw/virtio/vhost-shadow-virtqueue.h
index 9e12f77201..82cea1c3fa 100644
--- a/hw/virtio/vhost-shadow-virtqueue.h
+++ b/hw/virtio/vhost-shadow-virtqueue.h
@@ -11,9 +11,14 @@
#define VHOST_SHADOW_VIRTQUEUE_H
#include "qemu/event_notifier.h"
+#include "hw/virtio/virtio.h"
+#include "standard-headers/linux/vhost_types.h"
/* Shadow virtqueue to relay notifications */
typedef struct VhostShadowVirtqueue {
+ /* Shadow vring */
+ struct vring vring;
+
/* Shadow kick notifier, sent to vhost */
EventNotifier hdev_kick;
/* Shadow call notifier, sent to vhost */
@@ -37,6 +42,10 @@ bool vhost_svq_valid_features(uint64_t features, Error
**errp);
void vhost_svq_set_svq_kick_fd(VhostShadowVirtqueue *svq, int svq_kick_fd);
void vhost_svq_set_svq_call_fd(VhostShadowVirtqueue *svq, int call_fd);
+void vhost_svq_get_vring_addr(const VhostShadowVirtqueue *svq,
+ struct vhost_vring_addr *addr);
+size_t vhost_svq_driver_area_size(const VhostShadowVirtqueue *svq);
+size_t vhost_svq_device_area_size(const VhostShadowVirtqueue *svq);
void vhost_svq_stop(VhostShadowVirtqueue *svq);
diff --git a/hw/virtio/vhost-shadow-virtqueue.c
b/hw/virtio/vhost-shadow-virtqueue.c
index ba3cc0f428..7c00ccc42e 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -107,6 +107,35 @@ void vhost_svq_set_svq_call_fd(VhostShadowVirtqueue *svq,
int call_fd)
}
}
+/**
+ * Get the shadow vq vring address.
+ * @svq: Shadow virtqueue
+ * @addr: Destination to store address
+ */
+void vhost_svq_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_svq_driver_area_size(const VhostShadowVirtqueue *svq)
+{
+ size_t desc_size = sizeof(vring_desc_t) * svq->vring.num;
+ size_t avail_size = offsetof(vring_avail_t, ring) +
+ sizeof(uint16_t) * svq->vring.num;
+
+ return ROUND_UP(desc_size + avail_size, qemu_real_host_page_size);
+}
+
+size_t vhost_svq_device_area_size(const VhostShadowVirtqueue *svq)
+{
+ size_t used_size = offsetof(vring_used_t, ring) +
+ sizeof(vring_used_elem_t) * svq->vring.num;
+ return ROUND_UP(used_size, qemu_real_host_page_size);
+}
+
/**
* Set a new file descriptor for the guest to kick the SVQ and notify for avail
*
--
2.27.0
- [PATCH v4 00/14] vDPA shadow virtqueue, Eugenio Pérez, 2022/03/03
- [PATCH v4 01/14] vhost: Add VhostShadowVirtqueue, Eugenio Pérez, 2022/03/03
- [PATCH v4 02/14] vhost: Add Shadow VirtQueue kick forwarding capabilities, Eugenio Pérez, 2022/03/03
- [PATCH v4 03/14] vhost: Add Shadow VirtQueue call forwarding capabilities, Eugenio Pérez, 2022/03/03
- [PATCH v4 04/14] vhost: Add vhost_svq_valid_features to shadow vq, Eugenio Pérez, 2022/03/03
- [PATCH v4 05/14] virtio: Add vhost_svq_get_vring_addr,
Eugenio Pérez <=
- [PATCH v4 06/14] vdpa: adapt vhost_ops callbacks to svq, Eugenio Pérez, 2022/03/03
- [PATCH v4 07/14] vhost: Shadow virtqueue buffers forwarding, Eugenio Pérez, 2022/03/03
- [PATCH v4 08/14] util: Add iova_tree_alloc_map, Eugenio Pérez, 2022/03/03
- [PATCH v4 09/14] vhost: Add VhostIOVATree, Eugenio Pérez, 2022/03/03
- [PATCH v4 10/14] vdpa: Add custom IOTLB translations to SVQ, Eugenio Pérez, 2022/03/03
- [PATCH v4 11/14] vdpa: Adapt vhost_vdpa_get_vring_base to SVQ, Eugenio Pérez, 2022/03/03
- [PATCH v4 12/14] vdpa: Never set log_base addr if SVQ is enabled, Eugenio Pérez, 2022/03/03
- [PATCH v4 13/14] vdpa: Expose VHOST_F_LOG_ALL on SVQ, Eugenio Pérez, 2022/03/03