From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Johannes Berg" <johannes.berg@intel.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Xie Yongji" <xieyongji@baidu.com>
Subject: [PULL 22/32] libvhost-user: implement VHOST_USER_PROTOCOL_F_REPLY_ACK
Date: Tue, 25 Feb 2020 10:14:15 -0500 [thread overview]
Message-ID: <20200225151210.647797-23-mst@redhat.com> (raw)
In-Reply-To: <20200225151210.647797-1-mst@redhat.com>
From: Johannes Berg <johannes.berg@intel.com>
This is really simple, since we know whether a response is
already requested or not, so we can just send a (successful)
response when there isn't one already.
Given that, it's not all _that_ useful but the master can at
least be sure the message was processed, and we can exercise
more code paths using the example code.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Message-Id: <20200123081708.7817-2-johannes@sipsolutions.net>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
contrib/libvhost-user/libvhost-user.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/contrib/libvhost-user/libvhost-user.c b/contrib/libvhost-user/libvhost-user.c
index b89bf18501..533d55d82a 100644
--- a/contrib/libvhost-user/libvhost-user.c
+++ b/contrib/libvhost-user/libvhost-user.c
@@ -1199,7 +1199,8 @@ vu_get_protocol_features_exec(VuDev *dev, VhostUserMsg *vmsg)
1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD |
1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ |
1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER |
- 1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD;
+ 1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD |
+ 1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK;
if (have_userfault()) {
features |= 1ULL << VHOST_USER_PROTOCOL_F_PAGEFAULT;
@@ -1581,13 +1582,20 @@ vu_dispatch(VuDev *dev)
{
VhostUserMsg vmsg = { 0, };
int reply_requested;
- bool success = false;
+ bool need_reply, success = false;
if (!vu_message_read(dev, dev->sock, &vmsg)) {
goto end;
}
+ need_reply = vmsg.flags & VHOST_USER_NEED_REPLY_MASK;
+
reply_requested = vu_process_message(dev, &vmsg);
+ if (!reply_requested && need_reply) {
+ vmsg_set_reply_u64(&vmsg, 0);
+ reply_requested = 1;
+ }
+
if (!reply_requested) {
success = true;
goto end;
--
MST
next prev parent reply other threads:[~2020-02-25 15:28 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-25 15:12 [PULL 00/32] virtio, pc: fixes, features Michael S. Tsirkin
2020-02-25 15:12 ` [PULL 01/32] bios-tables-test: tell people how to update Michael S. Tsirkin
2020-02-25 15:12 ` [PULL 02/32] bios-tables-test: fix up DIFF generation Michael S. Tsirkin
2020-02-25 15:12 ` [PULL 03/32] bios-tables-test: default diff command Michael S. Tsirkin
2020-02-25 15:12 ` [PULL 04/32] rebuild-expected-aml.sh: remind about the process Michael S. Tsirkin
2020-02-25 15:12 ` [PULL 05/32] vhost-user-fs: do delete virtio_queues in unrealize Michael S. Tsirkin
2020-02-25 15:12 ` [PULL 06/32] vhost-user-fs: convert to the new virtio_delete_queue function Michael S. Tsirkin
2020-02-25 15:12 ` [PULL 07/32] virtio-pmem: do delete rq_vq in virtio_pmem_unrealize Michael S. Tsirkin
2020-02-25 15:13 ` [PULL 08/32] virtio-crypto: do delete ctrl_vq in virtio_crypto_device_unrealize Michael S. Tsirkin
2020-02-25 15:13 ` [PULL 09/32] vhost-user-blk: delete virtioqueues in unrealize to fix memleaks Michael S. Tsirkin
2020-02-25 15:13 ` [PULL 10/32] vhost-user-blk: convert to new virtio_delete_queue Michael S. Tsirkin
2020-02-25 15:13 ` [PULL 11/32] virtio: gracefully handle invalid region caches Michael S. Tsirkin
2020-02-25 15:13 ` [PULL 12/32] virtio-iommu: Add skeleton Michael S. Tsirkin
2020-02-25 15:13 ` [PULL 13/32] virtio-iommu: Decode the command payload Michael S. Tsirkin
2020-02-25 15:13 ` [PULL 14/32] virtio-iommu: Implement attach/detach command Michael S. Tsirkin
2020-02-25 15:13 ` [PULL 15/32] virtio-iommu: Implement map/unmap Michael S. Tsirkin
2020-02-25 15:13 ` [PULL 16/32] virtio-iommu: Implement translate Michael S. Tsirkin
2020-02-25 15:13 ` [PULL 17/32] virtio-iommu: Implement fault reporting Michael S. Tsirkin
2020-02-25 15:13 ` [PULL 18/32] virtio-iommu: Support migration Michael S. Tsirkin
2020-02-25 15:14 ` [PULL 19/32] virtio-iommu-pci: Add virtio iommu pci support Michael S. Tsirkin
2020-02-25 15:14 ` [PULL 20/32] hw/arm/virt: Add the virtio-iommu device tree mappings Michael S. Tsirkin
2020-02-25 15:14 ` [PULL 21/32] MAINTAINERS: add virtio-iommu related files Michael S. Tsirkin
2020-02-25 15:14 ` Michael S. Tsirkin [this message]
2020-02-25 15:14 ` [PULL 23/32] libvhost-user-glib: fix VugDev main fd cleanup Michael S. Tsirkin
2020-02-25 15:14 ` [PULL 24/32] libvhost-user-glib: use g_main_context_get_thread_default() Michael S. Tsirkin
2020-02-25 15:14 ` [PULL 25/32] libvhost-user: handle NOFD flag in call/kick/err better Michael S. Tsirkin
2020-02-25 15:14 ` [PULL 26/32] docs: vhost-user: add in-band kick/call messages Michael S. Tsirkin
2020-02-25 15:14 ` [PULL 27/32] libvhost-user: implement in-band notifications Michael S. Tsirkin
2020-02-25 15:14 ` [PULL 28/32] acpi: cpuhp: document CPHP_GET_CPU_ID_CMD command Michael S. Tsirkin
2020-02-25 15:14 ` [PULL 29/32] vhost-user: only set slave channel for first vq Michael S. Tsirkin
2020-02-25 15:14 ` [PULL 30/32] tests/vhost-user-bridge: move to contrib/ Michael S. Tsirkin
2020-02-25 15:15 ` [PULL 31/32] virtiofsd: add it to the tools list Michael S. Tsirkin
2020-02-25 15:15 ` [PULL 32/32] Fixed assert in vhost_user_set_mem_table_postcopy Michael S. Tsirkin
2020-02-25 16:47 ` [PULL 00/32] virtio, pc: fixes, features Peter Maydell
2020-02-25 18:39 ` Michael S. Tsirkin
2020-02-25 21:57 ` Michael S. Tsirkin
2020-02-26 4:48 ` no-reply
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=20200225151210.647797-23-mst@redhat.com \
--to=mst@redhat.com \
--cc=johannes.berg@intel.com \
--cc=kraxel@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=xieyongji@baidu.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).