[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/21] vhost: Do not depend on !NULL VirtQueueElement on vhost_svq
From: |
Jason Wang |
Subject: |
[PULL 11/21] vhost: Do not depend on !NULL VirtQueueElement on vhost_svq_flush |
Date: |
Fri, 2 Sep 2022 14:41:28 +0800 |
From: Eugenio Pérez <eperezma@redhat.com>
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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
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 8df5296..e8e5bbc 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.7.4
- [PULL 01/21] vdpa: Skip the maps not in the iova tree, (continued)
- [PULL 01/21] vdpa: Skip the maps not in the iova tree, Jason Wang, 2022/09/02
- [PULL 03/21] util: accept iova_tree_remove_parameter by value, Jason Wang, 2022/09/02
- [PULL 02/21] vdpa: do not save failed dma maps in SVQ iova tree, Jason Wang, 2022/09/02
- [PULL 05/21] vdpa: Make SVQ vring unmapping return void, Jason Wang, 2022/09/02
- [PULL 06/21] vhost: Always store new kick fd on vhost_svq_set_svq_kick_fd, Jason Wang, 2022/09/02
- [PULL 07/21] vdpa: Use ring hwaddr at vhost_vdpa_svq_unmap_ring, Jason Wang, 2022/09/02
- [PULL 08/21] vhost: stop transfer elem ownership in vhost_handle_guest_kick, Jason Wang, 2022/09/02
- [PULL 10/21] vhost: Delete useless read memory barrier, Jason Wang, 2022/09/02
- [PULL 12/21] vhost_net: Add NetClientInfo start callback, Jason Wang, 2022/09/02
- [PULL 09/21] vhost: use SVQ element ndescs instead of opaque data for desc validation, Jason Wang, 2022/09/02
- [PULL 11/21] vhost: Do not depend on !NULL VirtQueueElement on vhost_svq_flush,
Jason Wang <=
- [PULL 13/21] vhost_net: Add NetClientInfo stop callback, Jason Wang, 2022/09/02
- [PULL 16/21] vdpa: extract vhost_vdpa_net_cvq_add from vhost_vdpa_net_handle_ctrl_avail, Jason Wang, 2022/09/02
- [PULL 15/21] vdpa: Move command buffers map to start of net device, Jason Wang, 2022/09/02
- [PULL 14/21] vdpa: add net_vhost_vdpa_cvq_info NetClientInfo, Jason Wang, 2022/09/02
- [PULL 18/21] vdpa: Add virtio-net mac address via CVQ at start, Jason Wang, 2022/09/02
- [PULL 17/21] vhost_net: add NetClientState->load() callback, Jason Wang, 2022/09/02
- [PULL 04/21] vdpa: Remove SVQ vring from iova_tree at shutdown, Jason Wang, 2022/09/02
- [PULL 19/21] vdpa: Delete CVQ migration blocker, Jason Wang, 2022/09/02
- [PULL 20/21] net/colo.c: Fix the pointer issue reported by Coverity., Jason Wang, 2022/09/02
- [PULL 21/21] net: tulip: Restrict DMA engine to memories, Jason Wang, 2022/09/02