54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
From 3e2df0133efdf3e3aea63f413b42e37bc6c87112 Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Tue, 21 Nov 2023 06:36:05 +0000
|
|
Subject: [PATCH] libvhost-user: Fix VHOST_USER_GET_MAX_MEM_SLOTS reply
|
|
mainline inclusion commit 69a5daec06f423843ce1bb9be5fb049314996f78 category:
|
|
bugfix
|
|
|
|
---------------------------------------------------------------
|
|
|
|
With REPLY_NEEDED, libvhost-user sends both the acutal result and an
|
|
additional ACK reply for VHOST_USER_GET_MAX_MEM_SLOTS. This is
|
|
incorrect, the spec mandates that it behave the same with and without
|
|
REPLY_NEEDED because it always sends a reply.
|
|
|
|
Fixes: 6fb2e173d20c9bbb5466183d33a3ad7dcd0375fa
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Message-Id: <20220627134500.94842-3-kwolf@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
---
|
|
subprojects/libvhost-user/libvhost-user.c | 11 ++---------
|
|
1 file changed, 2 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c
|
|
index 787f4d2d4f..27e7799262 100644
|
|
--- a/subprojects/libvhost-user/libvhost-user.c
|
|
+++ b/subprojects/libvhost-user/libvhost-user.c
|
|
@@ -1788,18 +1788,11 @@ vu_handle_vring_kick(VuDev *dev, VhostUserMsg *vmsg)
|
|
|
|
static bool vu_handle_get_max_memslots(VuDev *dev, VhostUserMsg *vmsg)
|
|
{
|
|
- vmsg->flags = VHOST_USER_REPLY_MASK | VHOST_USER_VERSION;
|
|
- vmsg->size = sizeof(vmsg->payload.u64);
|
|
- vmsg->payload.u64 = VHOST_USER_MAX_RAM_SLOTS;
|
|
- vmsg->fd_num = 0;
|
|
-
|
|
- if (!vu_message_write(dev, dev->sock, vmsg)) {
|
|
- vu_panic(dev, "Failed to send max ram slots: %s\n", strerror(errno));
|
|
- }
|
|
+ vmsg_set_reply_u64(vmsg, VHOST_USER_MAX_RAM_SLOTS);
|
|
|
|
DPRINT("u64: 0x%016"PRIx64"\n", (uint64_t) VHOST_USER_MAX_RAM_SLOTS);
|
|
|
|
- return false;
|
|
+ return true;
|
|
}
|
|
|
|
static bool
|
|
--
|
|
2.27.0
|
|
|