From: "Eugenio Pérez" <eperezma@redhat.com>
To: qemu-devel@nongnu.org
Cc: kvm@vger.kernel.org, "Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Daniel Daly <dandaly0@gmail.com>,
virtualization@lists.linux-foundation.org,
Liran Alon <liralon@gmail.com>, Eli Cohen <eli@mellanox.com>,
Nitin Shrivastav <nitin.shrivastav@broadcom.com>,
Alex Barba <alex.barba@broadcom.com>,
Christophe Fontaine <cfontain@redhat.com>,
Juan Quintela <quintela@redhat.com>,
Lee Ballard <ballle98@gmail.com>,
Lars Ganrot <lars.ganrot@gmail.com>,
Rob Miller <rob.miller@broadcom.com>,
Stefano Garzarella <sgarzare@redhat.com>,
Howard Cai <howard.cai@gmail.com>,
Parav Pandit <parav@mellanox.com>, vm <vmireyno@marvell.com>,
Salil Mehta <mehta.salil.lnk@gmail.com>,
Stephen Finucane <stephenfin@redhat.com>,
Xiao W Wang <xiao.w.wang@intel.com>,
Sean Mooney <smooney@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Jim Harford <jim.harford@broadcom.com>,
Dmytro Kazantsev <dmytro.kazantsev@gmail.com>,
Siwei Liu <loseweigh@gmail.com>,
Harpreet Singh Anand <hanand@xilinx.com>,
Michael Lilja <ml@napatech.com>, Max Gurtovoy <maxgu14@gmail.com>
Subject: [RFC PATCH 20/27] vhost: Return used buffers
Date: Fri, 20 Nov 2020 19:50:58 +0100 [thread overview]
Message-ID: <20201120185105.279030-21-eperezma@redhat.com> (raw)
In-Reply-To: <20201120185105.279030-1-eperezma@redhat.com>
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
next prev parent reply other threads:[~2020-11-20 19:11 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 18:50 [RFC PATCH 00/27] vDPA software assisted live migration Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 01/27] vhost: Add vhost_dev_can_log Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 02/27] vhost: Add device callback in vhost_migration_log Eugenio Pérez
2020-12-07 16:19 ` Stefan Hajnoczi
2020-12-09 12:20 ` Eugenio Perez Martin
2020-11-20 18:50 ` [RFC PATCH 03/27] vhost: Move log resize/put to vhost_dev_set_log Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 04/27] vhost: add vhost_kernel_set_vring_enable Eugenio Pérez
2020-12-07 16:43 ` Stefan Hajnoczi
2020-12-09 12:00 ` Eugenio Perez Martin
2020-12-09 16:08 ` Stefan Hajnoczi
2020-11-20 18:50 ` [RFC PATCH 05/27] vhost: Add hdev->dev.sw_lm_vq_handler Eugenio Pérez
2020-12-07 16:52 ` Stefan Hajnoczi
2020-12-09 15:02 ` Eugenio Perez Martin
2020-12-10 11:30 ` Stefan Hajnoczi
2020-11-20 18:50 ` [RFC PATCH 06/27] virtio: Add virtio_queue_get_used_notify_split Eugenio Pérez
2020-12-07 16:58 ` Stefan Hajnoczi
2021-01-12 18:21 ` Eugenio Perez Martin
2021-03-02 11:22 ` Stefan Hajnoczi
2021-03-02 18:34 ` Eugenio Perez Martin
2021-03-08 10:46 ` Stefan Hajnoczi
2020-11-20 18:50 ` [RFC PATCH 07/27] vhost: Route guest->host notification through qemu Eugenio Pérez
2020-12-07 17:42 ` Stefan Hajnoczi
2020-12-09 17:08 ` Eugenio Perez Martin
2020-12-10 11:50 ` Stefan Hajnoczi
2021-01-21 20:10 ` Eugenio Perez Martin
2020-11-20 18:50 ` [RFC PATCH 08/27] vhost: Add a flag for software assisted Live Migration Eugenio Pérez
2020-12-08 7:20 ` Stefan Hajnoczi
2020-12-09 17:57 ` Eugenio Perez Martin
2020-11-20 18:50 ` [RFC PATCH 09/27] vhost: Route host->guest notification through qemu Eugenio Pérez
2020-12-08 7:34 ` Stefan Hajnoczi
2020-11-20 18:50 ` [RFC PATCH 10/27] vhost: Allocate shadow vring Eugenio Pérez
2020-12-08 7:49 ` Stefan Hajnoczi
2020-12-08 8:17 ` Stefan Hajnoczi
2020-12-09 18:15 ` Eugenio Perez Martin
2020-11-20 18:50 ` [RFC PATCH 11/27] virtio: const-ify all virtio_tswap* functions Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 12/27] virtio: Add virtio_queue_full Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 13/27] vhost: Send buffers to device Eugenio Pérez
2020-12-08 8:16 ` Stefan Hajnoczi
2020-12-09 18:41 ` Eugenio Perez Martin
2020-12-10 11:55 ` Stefan Hajnoczi
2021-01-22 18:18 ` Eugenio Perez Martin
[not found] ` <CAJaqyWdNeaboGaSsXPA8r=mUsbctFLzACFKLX55yRQpTvjqxJw@mail.gmail.com>
2021-03-22 10:51 ` Stefan Hajnoczi
2021-03-22 15:55 ` Eugenio Perez Martin
2021-03-22 17:40 ` Stefan Hajnoczi
2021-03-24 19:04 ` Eugenio Perez Martin
2021-03-24 19:56 ` Stefan Hajnoczi
2020-11-20 18:50 ` [RFC PATCH 14/27] virtio: Remove virtio_queue_get_used_notify_split Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 15/27] vhost: Do not invalidate signalled used Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 16/27] virtio: Expose virtqueue_alloc_element Eugenio Pérez
2020-12-08 8:25 ` Stefan Hajnoczi
2020-12-09 18:46 ` Eugenio Perez Martin
2020-12-10 11:57 ` Stefan Hajnoczi
2020-11-20 18:50 ` [RFC PATCH 17/27] vhost: add vhost_vring_set_notification_rcu Eugenio Pérez
2020-11-20 18:50 ` [RFC PATCH 18/27] vhost: add vhost_vring_poll_rcu Eugenio Pérez
2020-12-08 8:41 ` Stefan Hajnoczi
2020-12-09 18:48 ` Eugenio Perez Martin
2020-11-20 18:50 ` [RFC PATCH 19/27] vhost: add vhost_vring_get_buf_rcu Eugenio Pérez
2020-11-20 18:50 ` Eugenio Pérez [this message]
2020-12-08 8:50 ` [RFC PATCH 20/27] vhost: Return used buffers Stefan Hajnoczi
2020-11-20 18:50 ` [RFC PATCH 21/27] vhost: Add vhost_virtqueue_memory_unmap Eugenio Pérez
2020-11-20 18:51 ` [RFC PATCH 22/27] vhost: Add vhost_virtqueue_memory_map Eugenio Pérez
2020-11-20 18:51 ` [RFC PATCH 23/27] vhost: unmap qemu's shadow virtqueues on sw live migration Eugenio Pérez
2020-11-27 15:29 ` Stefano Garzarella
2020-11-30 7:54 ` Eugenio Perez Martin
2020-11-20 18:51 ` [RFC PATCH 24/27] vhost: iommu changes Eugenio Pérez
2020-12-08 9:02 ` Stefan Hajnoczi
2020-11-20 18:51 ` [RFC PATCH 25/27] vhost: Do not commit vhost used idx on vhost_virtqueue_stop Eugenio Pérez
2020-11-20 19:35 ` Eugenio Perez Martin
2020-11-20 18:51 ` [RFC PATCH 26/27] vhost: Add vhost_hdev_can_sw_lm Eugenio Pérez
2020-11-20 18:51 ` [RFC PATCH 27/27] vhost: forbid vhost devices logging Eugenio Pérez
2020-11-20 19:03 ` [RFC PATCH 00/27] vDPA software assisted live migration Eugenio Perez Martin
2020-11-20 19:30 ` no-reply
2020-11-25 7:08 ` Jason Wang
2020-11-25 12:03 ` Eugenio Perez Martin
2020-11-25 12:14 ` Eugenio Perez Martin
2020-11-26 3:07 ` Jason Wang
2020-11-27 15:44 ` Stefano Garzarella
2020-12-08 9:37 ` Stefan Hajnoczi
2020-12-09 9:26 ` Jason Wang
2020-12-09 15:57 ` Stefan Hajnoczi
2020-12-10 9:12 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201120185105.279030-21-eperezma@redhat.com \
--to=eperezma@redhat.com \
--cc=alex.barba@broadcom.com \
--cc=ballle98@gmail.com \
--cc=cfontain@redhat.com \
--cc=dandaly0@gmail.com \
--cc=dmytro.kazantsev@gmail.com \
--cc=eli@mellanox.com \
--cc=hanand@xilinx.com \
--cc=howard.cai@gmail.com \
--cc=jasowang@redhat.com \
--cc=jim.harford@broadcom.com \
--cc=kvm@vger.kernel.org \
--cc=lars.ganrot@gmail.com \
--cc=liralon@gmail.com \
--cc=loseweigh@gmail.com \
--cc=maxgu14@gmail.com \
--cc=mehta.salil.lnk@gmail.com \
--cc=ml@napatech.com \
--cc=mst@redhat.com \
--cc=nitin.shrivastav@broadcom.com \
--cc=parav@mellanox.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=rob.miller@broadcom.com \
--cc=sgarzare@redhat.com \
--cc=smooney@redhat.com \
--cc=stefanha@redhat.com \
--cc=stephenfin@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=vmireyno@marvell.com \
--cc=xiao.w.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).