qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Eugenio Pérez" <eperezma@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefano Garzarella <sgarzare@redhat.com>,
	"Gonglei (Arei)" <arei.gonglei@huawei.com>,
	Cornelia Huck <cohuck@redhat.com>,
	Liuxiangdong <liuxiangdong5@huawei.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Jason Wang <jasowang@redhat.com>,
	Gautam Dawar <gdawar@xilinx.com>,
	Laurent Vivier <lvivier@redhat.com>, Eli Cohen <eli@mellanox.com>,
	Zhu Lingshan <lingshan.zhu@intel.com>, Cindy Lu <lulu@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Parav Pandit <parav@mellanox.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Harpreet Singh Anand <hanand@xilinx.com>,
	Eric Blake <eblake@redhat.com>,
	Markus Armbruster <armbru@redhat.com>
Subject: [PATCH v6 04/12] vhost: Do not depend on !NULL VirtQueueElement on vhost_svq_flush
Date: Thu,  4 Aug 2022 20:17:14 +0200	[thread overview]
Message-ID: <20220804181722.701067-5-eperezma@redhat.com> (raw)
In-Reply-To: <20220804181722.701067-1-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>
---
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 1b49bf54f2..f863b08627 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



  parent reply	other threads:[~2022-08-04 18:32 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-04 18:17 [PATCH v6 00/12] NIC vhost-vdpa state restore via Shadow CVQ Eugenio Pérez
2022-08-04 18:17 ` [PATCH v6 01/12] vhost: stop transfer elem ownership in vhost_handle_guest_kick Eugenio Pérez
2022-08-04 18:17 ` [PATCH v6 02/12] vhost: use SVQ element ndescs instead of opaque data for desc validation Eugenio Pérez
2022-08-04 18:17 ` [PATCH v6 03/12] vhost: Delete useless read memory barrier Eugenio Pérez
2022-08-04 18:17 ` Eugenio Pérez [this message]
2022-08-04 18:17 ` [PATCH v6 05/12] vhost_net: Add NetClientInfo prepare callback Eugenio Pérez
2022-08-04 18:17 ` [PATCH v6 06/12] vhost_net: Add NetClientInfo stop callback Eugenio Pérez
2022-08-04 18:17 ` [PATCH v6 07/12] vdpa: add net_vhost_vdpa_cvq_info NetClientInfo Eugenio Pérez
2022-08-04 18:17 ` [PATCH v6 08/12] vdpa: Move command buffers map to start of net device Eugenio Pérez
2022-08-04 18:17 ` [PATCH v6 09/12] vdpa: Extract vhost_vdpa_net_cvq_add from vhost_vdpa_net_handle_ctrl_avail Eugenio Pérez
2022-08-04 18:17 ` [PATCH v6 10/12] vhost_net: add NetClientState->load() callback Eugenio Pérez
2022-08-04 18:17 ` [PATCH v6 11/12] vdpa: Add virtio-net mac address via CVQ at start Eugenio Pérez
2022-08-04 18:17 ` [PATCH v6 12/12] vdpa: Delete CVQ migration blocker Eugenio Pérez

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=20220804181722.701067-5-eperezma@redhat.com \
    --to=eperezma@redhat.com \
    --cc=arei.gonglei@huawei.com \
    --cc=armbru@redhat.com \
    --cc=cohuck@redhat.com \
    --cc=eblake@redhat.com \
    --cc=eli@mellanox.com \
    --cc=gdawar@xilinx.com \
    --cc=hanand@xilinx.com \
    --cc=jasowang@redhat.com \
    --cc=lingshan.zhu@intel.com \
    --cc=liuxiangdong5@huawei.com \
    --cc=lulu@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=mst@redhat.com \
    --cc=parav@mellanox.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sgarzare@redhat.com \
    --cc=stefanha@redhat.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).