From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: "Eugenio Pérez" <eperezma@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
"Jason Wang" <jasowang@redhat.com>
Subject: [PULL V2 13/25] vhost: add vhost_svq_poll
Date: Wed, 20 Jul 2022 17:03:01 +0800 [thread overview]
Message-ID: <20220720090313.55169-14-jasowang@redhat.com> (raw)
In-Reply-To: <20220720090313.55169-1-jasowang@redhat.com>
From: Eugenio Pérez <eperezma@redhat.com>
It allows the Shadow Control VirtQueue to wait for the device to use the
available buffers.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/virtio/vhost-shadow-virtqueue.c | 27 +++++++++++++++++++++++++++
hw/virtio/vhost-shadow-virtqueue.h | 1 +
2 files changed, 28 insertions(+)
diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c
index c3a75ca..cc2ee47 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -486,6 +486,33 @@ static void vhost_svq_flush(VhostShadowVirtqueue *svq,
}
/**
+ * Poll the SVQ for one device used buffer.
+ *
+ * This function race with main event loop SVQ polling, so extra
+ * synchronization is needed.
+ *
+ * Return the length written by the device.
+ */
+size_t vhost_svq_poll(VhostShadowVirtqueue *svq)
+{
+ int64_t start_us = g_get_monotonic_time();
+ do {
+ uint32_t len;
+ VirtQueueElement *elem = vhost_svq_get_buf(svq, &len);
+ if (elem) {
+ return len;
+ }
+
+ if (unlikely(g_get_monotonic_time() - start_us > 10e6)) {
+ return 0;
+ }
+
+ /* Make sure we read new used_idx */
+ smp_rmb();
+ } while (true);
+}
+
+/**
* Forward used buffers.
*
* @n: hdev call event notifier, the one that device set to notify svq.
diff --git a/hw/virtio/vhost-shadow-virtqueue.h b/hw/virtio/vhost-shadow-virtqueue.h
index dd78f4b..cf442f7 100644
--- a/hw/virtio/vhost-shadow-virtqueue.h
+++ b/hw/virtio/vhost-shadow-virtqueue.h
@@ -89,6 +89,7 @@ void vhost_svq_push_elem(VhostShadowVirtqueue *svq,
int vhost_svq_add(VhostShadowVirtqueue *svq, const struct iovec *out_sg,
size_t out_num, const struct iovec *in_sg, size_t in_num,
VirtQueueElement *elem);
+size_t vhost_svq_poll(VhostShadowVirtqueue *svq);
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);
--
2.7.4
next prev parent reply other threads:[~2022-07-20 9:15 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-20 9:02 [PULL V2 00/25] Net patches Jason Wang
2022-07-20 9:02 ` [PULL V2 01/25] vhost: move descriptor translation to vhost_svq_vring_write_descs Jason Wang
2022-07-20 9:02 ` [PULL V2 02/25] virtio-net: Expose MAC_TABLE_ENTRIES Jason Wang
2022-07-20 9:02 ` [PULL V2 03/25] virtio-net: Expose ctrl virtqueue logic Jason Wang
2022-07-20 9:02 ` [PULL V2 04/25] vdpa: Avoid compiler to squash reads to used idx Jason Wang
2022-07-20 9:02 ` [PULL V2 05/25] vhost: Reorder vhost_svq_kick Jason Wang
2022-07-20 9:02 ` [PULL V2 06/25] vhost: Move vhost_svq_kick call to vhost_svq_add Jason Wang
2022-07-20 9:02 ` [PULL V2 07/25] vhost: Check for queue full at vhost_svq_add Jason Wang
2022-07-20 9:02 ` [PULL V2 08/25] vhost: Decouple vhost_svq_add from VirtQueueElement Jason Wang
2022-07-20 9:02 ` [PULL V2 09/25] vhost: Add SVQDescState Jason Wang
2022-07-20 9:02 ` [PULL V2 10/25] vhost: Track number of descs in SVQDescState Jason Wang
2022-07-20 9:02 ` [PULL V2 11/25] vhost: add vhost_svq_push_elem Jason Wang
2022-07-20 9:03 ` [PULL V2 12/25] vhost: Expose vhost_svq_add Jason Wang
2022-07-20 9:03 ` Jason Wang [this message]
2022-07-20 9:03 ` [PULL V2 14/25] vhost: Add svq avail_handler callback Jason Wang
2022-07-20 9:03 ` [PULL V2 15/25] vdpa: Export vhost_vdpa_dma_map and unmap calls Jason Wang
2022-07-20 9:03 ` [PULL V2 16/25] vhost-net-vdpa: add stubs for when no virtio-net device is present Jason Wang
2022-07-20 9:03 ` [PULL V2 17/25] vdpa: manual forward CVQ buffers Jason Wang
2022-07-20 9:03 ` [PULL V2 18/25] vdpa: Buffer CVQ support on shadow virtqueue Jason Wang
2022-07-20 9:03 ` [PULL V2 19/25] vdpa: Extract get features part from vhost_vdpa_get_max_queue_pairs Jason Wang
2022-07-29 14:08 ` Peter Maydell
2022-08-01 3:28 ` Jason Wang
2022-08-01 13:16 ` Eugenio Perez Martin
2022-07-20 9:03 ` [PULL V2 20/25] vdpa: Add device migration blocker Jason Wang
2022-07-20 9:03 ` [PULL V2 21/25] vdpa: Add x-svq to NetdevVhostVDPAOptions Jason Wang
2022-07-20 9:03 ` [PULL V2 22/25] softmmu/runstate.c: add RunStateTransition support form COLO to PRELAUNCH Jason Wang
2022-07-20 9:03 ` [PULL V2 23/25] net/colo: Fix a "double free" crash to clear the conn_list Jason Wang
2022-07-20 9:03 ` [PULL V2 24/25] net/colo.c: No need to track conn_list for filter-rewriter Jason Wang
2022-07-20 9:03 ` [PULL V2 25/25] net/colo.c: fix segmentation fault when packet is not parsed correctly Jason Wang
2022-07-29 13:58 ` Peter Maydell
2022-08-01 4:17 ` Jason Wang
2022-08-01 5:32 ` Zhang, Chen
2022-07-20 21:32 ` [PULL V2 00/25] Net patches Peter Maydell
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=20220720090313.55169-14-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=eperezma@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).