|
 |
586cba |
From 2f134d800a7ac521a637a0da2116b2603b12c8c0 Mon Sep 17 00:00:00 2001
|
|
|
586cba |
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
|
|
|
586cba |
Date: Tue, 23 Aug 2022 20:30:29 +0200
|
|
|
586cba |
Subject: [PATCH 14/23] vhost: Do not depend on !NULL VirtQueueElement on
|
|
|
586cba |
vhost_svq_flush
|
|
|
586cba |
MIME-Version: 1.0
|
|
|
586cba |
Content-Type: text/plain; charset=UTF-8
|
|
|
586cba |
Content-Transfer-Encoding: 8bit
|
|
|
586cba |
|
|
|
586cba |
RH-Author: Eugenio Pérez <eperezma@redhat.com>
|
|
|
586cba |
RH-MergeRequest: 116: vdpa: Restore device state on destination
|
|
|
586cba |
RH-Bugzilla: 2114060
|
|
|
586cba |
RH-Acked-by: Cindy Lu <lulu@redhat.com>
|
|
|
586cba |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
586cba |
RH-Commit: [13/21] 93ec7baa2a29031db25d86b7dc1a949388623370 (eperezmartin/qemu-kvm)
|
|
|
586cba |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2114060
|
|
|
586cba |
Upstream status: git@github.com:jasowang/qemu.git net-next
|
|
|
586cba |
|
|
|
586cba |
Since QEMU will be able to inject new elements on CVQ to restore the
|
|
|
586cba |
state, we need not to depend on a VirtQueueElement to know if a new
|
|
|
586cba |
element has been used by the device or not. Instead of check that, check
|
|
|
586cba |
if there are new elements only using used idx on vhost_svq_flush.
|
|
|
586cba |
|
|
|
586cba |
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
|
|
586cba |
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
|
586cba |
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
|
586cba |
(cherry picked from commit 7599f71c11c08b90f173c35ded1aaa1fdca86f1b)
|
|
|
586cba |
---
|
|
|
586cba |
hw/virtio/vhost-shadow-virtqueue.c | 11 +++++++----
|
|
|
586cba |
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
586cba |
|
|
|
586cba |
diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c
|
|
|
586cba |
index d36afbc547..c0e3c92e96 100644
|
|
|
586cba |
--- a/hw/virtio/vhost-shadow-virtqueue.c
|
|
|
586cba |
+++ b/hw/virtio/vhost-shadow-virtqueue.c
|
|
|
586cba |
@@ -499,17 +499,20 @@ static void vhost_svq_flush(VhostShadowVirtqueue *svq,
|
|
|
586cba |
size_t vhost_svq_poll(VhostShadowVirtqueue *svq)
|
|
|
586cba |
{
|
|
|
586cba |
int64_t start_us = g_get_monotonic_time();
|
|
|
586cba |
+ uint32_t len;
|
|
|
586cba |
+
|
|
|
586cba |
do {
|
|
|
586cba |
- uint32_t len;
|
|
|
586cba |
- VirtQueueElement *elem = vhost_svq_get_buf(svq, &len;;
|
|
|
586cba |
- if (elem) {
|
|
|
586cba |
- return len;
|
|
|
586cba |
+ if (vhost_svq_more_used(svq)) {
|
|
|
586cba |
+ break;
|
|
|
586cba |
}
|
|
|
586cba |
|
|
|
586cba |
if (unlikely(g_get_monotonic_time() - start_us > 10e6)) {
|
|
|
586cba |
return 0;
|
|
|
586cba |
}
|
|
|
586cba |
} while (true);
|
|
|
586cba |
+
|
|
|
586cba |
+ vhost_svq_get_buf(svq, &len;;
|
|
|
586cba |
+ return len;
|
|
|
586cba |
}
|
|
|
586cba |
|
|
|
586cba |
/**
|
|
|
586cba |
--
|
|
|
586cba |
2.31.1
|
|
|
586cba |
|