[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 20/27] vhost: Return used buffers
From: |
Eugenio Pérez |
Subject: |
[RFC PATCH 20/27] vhost: Return used buffers |
Date: |
Fri, 20 Nov 2020 19:50:58 +0100 |
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
hw/virtio/vhost-sw-lm-ring.h | 3 +++
hw/virtio/vhost-sw-lm-ring.c | 14 +++++++----
hw/virtio/vhost.c | 46 +++++++++++++++++++++++++++++++++---
3 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/hw/virtio/vhost-sw-lm-ring.h b/hw/virtio/vhost-sw-lm-ring.h
index 429a125558..0c4fa772c7 100644
--- a/hw/virtio/vhost-sw-lm-ring.h
+++ b/hw/virtio/vhost-sw-lm-ring.h
@@ -17,6 +17,9 @@
typedef struct VhostShadowVirtqueue VhostShadowVirtqueue;
+VirtIODevice *vhost_vring_vdev(VhostShadowVirtqueue *svq);
+VirtQueue *vhost_vring_vdev_vq(VhostShadowVirtqueue *svq);
+
bool vhost_vring_kick(VhostShadowVirtqueue *vq);
int vhost_vring_add(VhostShadowVirtqueue *vq, VirtQueueElement *elem);
VirtQueueElement *vhost_vring_get_buf_rcu(VhostShadowVirtqueue *vq, size_t sz);
diff --git a/hw/virtio/vhost-sw-lm-ring.c b/hw/virtio/vhost-sw-lm-ring.c
index 4fafd1b278..244c722910 100644
--- a/hw/virtio/vhost-sw-lm-ring.c
+++ b/hw/virtio/vhost-sw-lm-ring.c
@@ -46,6 +46,16 @@ typedef struct VhostShadowVirtqueue {
vring_desc_t descs[];
} VhostShadowVirtqueue;
+VirtIODevice *vhost_vring_vdev(VhostShadowVirtqueue *svq)
+{
+ return svq->vdev;
+}
+
+VirtQueue *vhost_vring_vdev_vq(VhostShadowVirtqueue *svq)
+{
+ return svq->vq;
+}
+
static bool vhost_vring_should_kick_rcu(VhostShadowVirtqueue *vq)
{
VirtIODevice *vdev = vq->vdev;
@@ -179,10 +189,6 @@ static int vhost_vring_add_split(VhostShadowVirtqueue *vq,
int vhost_vring_add(VhostShadowVirtqueue *vq, VirtQueueElement *elem)
{
int host_head = vhost_vring_add_split(vq, elem);
- if (vq->ring_id_maps[host_head]) {
- g_free(vq->ring_id_maps[host_head]);
- }
-
vq->ring_id_maps[host_head] = elem;
return 0;
}
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index ac2bc14190..9a3c580dcf 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -986,17 +986,50 @@ static void handle_sw_lm_vq(VirtIODevice *vdev, VirtQueue
*vq)
} while(!virtio_queue_empty(vq));
}
+static void handle_sw_lm_vq_call(struct vhost_dev *hdev,
+ VhostShadowVirtqueue *svq)
+{
+ VirtQueueElement *elem;
+ VirtIODevice *vdev = vhost_vring_vdev(svq);
+ VirtQueue *vq = vhost_vring_vdev_vq(svq);
+ uint16_t idx = virtio_get_queue_index(vq);
+
+ RCU_READ_LOCK_GUARD();
+ /*
+ * Make used all buffers as possible.
+ */
+ do {
+ unsigned i = 0;
+
+ vhost_vring_set_notification_rcu(svq, false);
+ while (true) {
+ elem = vhost_vring_get_buf_rcu(svq, sizeof(*elem));
+ if (!elem) {
+ break;
+ }
+
+ assert(i < virtio_queue_get_num(vdev, idx));
+ virtqueue_fill(vq, elem, elem->len, i++);
+ }
+
+ virtqueue_flush(vq, i);
+ virtio_notify_irqfd(vdev, vq);
+
+ vhost_vring_set_notification_rcu(svq, true);
+ } while (vhost_vring_poll_rcu(svq));
+}
+
static void vhost_handle_call(EventNotifier *n)
{
struct vhost_virtqueue *hvq = container_of(n,
struct vhost_virtqueue,
masked_notifier);
struct vhost_dev *vdev = hvq->dev;
- int idx = vdev->vq_index + (hvq == &vdev->vqs[0] ? 0 : 1);
- VirtQueue *vq = virtio_get_queue(vdev->vdev, idx);
+ int idx = hvq == &vdev->vqs[0] ? 0 : 1;
+ VhostShadowVirtqueue *vq = vdev->sw_lm_shadow_vq[idx];
if (event_notifier_test_and_clear(n)) {
- virtio_notify_irqfd(vdev->vdev, vq);
+ handle_sw_lm_vq_call(vdev, vq);
}
}
@@ -1028,6 +1061,7 @@ static int vhost_sw_live_migration_start(struct vhost_dev
*dev)
for (idx = 0; idx < dev->nvqs; ++idx) {
struct vhost_virtqueue *vq = &dev->vqs[idx];
+ unsigned num = virtio_queue_get_num(dev->vdev, idx);
struct vhost_vring_addr addr = {
.index = idx,
};
@@ -1044,6 +1078,12 @@ static int vhost_sw_live_migration_start(struct
vhost_dev *dev)
r = dev->vhost_ops->vhost_set_vring_addr(dev, &addr);
assert(r == 0);
+ r = vhost_backend_update_device_iotlb(dev, addr.used_user_addr,
+ addr.used_user_addr,
+ sizeof(vring_used_elem_t) * num,
+ IOMMU_RW);
+ assert(r == 0);
+
r = dev->vhost_ops->vhost_set_vring_base(dev, &s);
assert(r == 0);
}
--
2.18.4
- [RFC PATCH 10/27] vhost: Allocate shadow vring, (continued)
- [RFC PATCH 10/27] vhost: Allocate shadow vring, Eugenio Pérez, 2020/11/20
- [RFC PATCH 11/27] virtio: const-ify all virtio_tswap* functions, Eugenio Pérez, 2020/11/20
- [RFC PATCH 12/27] virtio: Add virtio_queue_full, Eugenio Pérez, 2020/11/20
- [RFC PATCH 13/27] vhost: Send buffers to device, Eugenio Pérez, 2020/11/20
- [RFC PATCH 14/27] virtio: Remove virtio_queue_get_used_notify_split, Eugenio Pérez, 2020/11/20
- [RFC PATCH 15/27] vhost: Do not invalidate signalled used, Eugenio Pérez, 2020/11/20
- [RFC PATCH 16/27] virtio: Expose virtqueue_alloc_element, Eugenio Pérez, 2020/11/20
- [RFC PATCH 17/27] vhost: add vhost_vring_set_notification_rcu, Eugenio Pérez, 2020/11/20
- [RFC PATCH 18/27] vhost: add vhost_vring_poll_rcu, Eugenio Pérez, 2020/11/20
- [RFC PATCH 19/27] vhost: add vhost_vring_get_buf_rcu, Eugenio Pérez, 2020/11/20
- [RFC PATCH 20/27] vhost: Return used buffers,
Eugenio Pérez <=
- [RFC PATCH 21/27] vhost: Add vhost_virtqueue_memory_unmap, Eugenio Pérez, 2020/11/20
- [RFC PATCH 22/27] vhost: Add vhost_virtqueue_memory_map, Eugenio Pérez, 2020/11/20
- [RFC PATCH 23/27] vhost: unmap qemu's shadow virtqueues on sw live migration, Eugenio Pérez, 2020/11/20
- [RFC PATCH 24/27] vhost: iommu changes, Eugenio Pérez, 2020/11/20
- [RFC PATCH 25/27] vhost: Do not commit vhost used idx on vhost_virtqueue_stop, Eugenio Pérez, 2020/11/20
- [RFC PATCH 26/27] vhost: Add vhost_hdev_can_sw_lm, Eugenio Pérez, 2020/11/20
- [RFC PATCH 27/27] vhost: forbid vhost devices logging, Eugenio Pérez, 2020/11/20