[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v10 04/12] vhost: Do not depend on !NULL VirtQueueElement on vhos
From: |
Eugenio Pérez |
Subject: |
[PATCH v10 04/12] vhost: Do not depend on !NULL VirtQueueElement on vhost_svq_flush |
Date: |
Tue, 23 Aug 2022 20:30:29 +0200 |
Since QEMU will be able to inject new elements on CVQ to restore the
state, we need not to depend on a VirtQueueElement to know if a new
element has been used by the device or not. Instead of check that, check
if there are new elements only using used idx on vhost_svq_flush.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
v6: Change less from the previous function
---
hw/virtio/vhost-shadow-virtqueue.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/hw/virtio/vhost-shadow-virtqueue.c
b/hw/virtio/vhost-shadow-virtqueue.c
index 8df5296f24..e8e5bbc368 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -499,17 +499,20 @@ static void vhost_svq_flush(VhostShadowVirtqueue *svq,
size_t vhost_svq_poll(VhostShadowVirtqueue *svq)
{
int64_t start_us = g_get_monotonic_time();
+ uint32_t len;
+
do {
- uint32_t len;
- VirtQueueElement *elem = vhost_svq_get_buf(svq, &len);
- if (elem) {
- return len;
+ if (vhost_svq_more_used(svq)) {
+ break;
}
if (unlikely(g_get_monotonic_time() - start_us > 10e6)) {
return 0;
}
} while (true);
+
+ vhost_svq_get_buf(svq, &len);
+ return len;
}
/**
--
2.31.1
- [PATCH v10 00/12] NIC vhost-vdpa state restore via Shadow CVQ, Eugenio Pérez, 2022/08/23
- [PATCH v10 01/12] vhost: stop transfer elem ownership in vhost_handle_guest_kick, Eugenio Pérez, 2022/08/23
- [PATCH v10 02/12] vhost: use SVQ element ndescs instead of opaque data for desc validation, Eugenio Pérez, 2022/08/23
- [PATCH v10 03/12] vhost: Delete useless read memory barrier, Eugenio Pérez, 2022/08/23
- [PATCH v10 04/12] vhost: Do not depend on !NULL VirtQueueElement on vhost_svq_flush,
Eugenio Pérez <=
- [PATCH v10 06/12] vhost_net: Add NetClientInfo stop callback, Eugenio Pérez, 2022/08/23
- [PATCH v10 05/12] vhost_net: Add NetClientInfo start callback, Eugenio Pérez, 2022/08/23
- [PATCH v10 07/12] vdpa: add net_vhost_vdpa_cvq_info NetClientInfo, Eugenio Pérez, 2022/08/23
- [PATCH v10 08/12] vdpa: Move command buffers map to start of net device, Eugenio Pérez, 2022/08/23
- [PATCH v10 09/12] vdpa: extract vhost_vdpa_net_cvq_add from vhost_vdpa_net_handle_ctrl_avail, Eugenio Pérez, 2022/08/23
- [PATCH v10 12/12] vdpa: Delete CVQ migration blocker, Eugenio Pérez, 2022/08/23
- [PATCH v10 11/12] vdpa: Add virtio-net mac address via CVQ at start, Eugenio Pérez, 2022/08/23
- [PATCH v10 10/12] vhost_net: add NetClientState->load() callback, Eugenio Pérez, 2022/08/23
- Re: [PATCH v10 00/12] NIC vhost-vdpa state restore via Shadow CVQ, Jason Wang, 2022/08/23