* [PATCH v8 01/13] qapi: clarify that the default is backend dependent
2024-06-18 10:00 [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
@ 2024-06-18 10:00 ` Stefano Garzarella
2024-06-18 10:34 ` Philippe Mathieu-Daudé
2024-06-18 10:00 ` [PATCH v8 02/13] libvhost-user: set msg.msg_control to NULL when it is empty Stefano Garzarella
` (12 subsequent siblings)
13 siblings, 1 reply; 18+ messages in thread
From: Stefano Garzarella @ 2024-06-18 10:00 UTC (permalink / raw)
To: qemu-devel, mst
Cc: Coiby Xu, Kevin Wolf, Philippe Mathieu-Daudé, stefanha,
Markus Armbruster, slp, Eduardo Habkost, David Hildenbrand,
Raphael Norwitz, Marc-André Lureau, Daniel P. Berrangé,
Igor Mammedov, Gerd Hoffmann, Thomas Huth, qemu-block, Brad Smith,
Hanna Reitz, Eric Blake, gmaglione, Paolo Bonzini, Jason Wang,
Laurent Vivier, Stefano Garzarella
The default value of the @share option of the @MemoryBackendProperties
really depends on the backend type, so let's document the default
values in the same place where we define the option to avoid
dispersing the information.
Cc: David Hildenbrand <david@redhat.com>
Suggested-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
v2: https://patchew.org/QEMU/20240611130231.83152-1-sgarzare@redhat.com/
v1: https://patchew.org/QEMU/20240523133302.103858-1-sgarzare@redhat.com/
---
qapi/qom.json | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/qapi/qom.json b/qapi/qom.json
index 8bd299265e..9b8f6a7ab5 100644
--- a/qapi/qom.json
+++ b/qapi/qom.json
@@ -600,7 +600,9 @@
# preallocation threads (default: none) (since 7.2)
#
# @share: if false, the memory is private to QEMU; if true, it is
-# shared (default: false)
+# shared (default false for backends memory-backend-file and
+# memory-backend-ram, true for backends memory-backend-epc and
+# memory-backend-memfd)
#
# @reserve: if true, reserve swap space (or huge pages) if applicable
# (default: true) (since 6.1)
@@ -700,8 +702,6 @@
#
# Properties for memory-backend-memfd objects.
#
-# The @share boolean option is true by default with memfd.
-#
# @hugetlb: if true, the file to be created resides in the hugetlbfs
# filesystem (default: false)
#
@@ -726,8 +726,6 @@
#
# Properties for memory-backend-epc objects.
#
-# The @share boolean option is true by default with epc
-#
# The @merge boolean option is false by default with epc
#
# The @dump boolean option is false by default with epc
--
2.45.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH v8 01/13] qapi: clarify that the default is backend dependent
2024-06-18 10:00 ` [PATCH v8 01/13] qapi: clarify that the default is backend dependent Stefano Garzarella
@ 2024-06-18 10:34 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-06-18 10:34 UTC (permalink / raw)
To: Stefano Garzarella, qemu-devel, mst
Cc: Coiby Xu, Kevin Wolf, stefanha, Markus Armbruster, slp,
Eduardo Habkost, David Hildenbrand, Raphael Norwitz,
Marc-André Lureau, Daniel P. Berrangé, Igor Mammedov,
Gerd Hoffmann, Thomas Huth, qemu-block, Brad Smith, Hanna Reitz,
Eric Blake, gmaglione, Paolo Bonzini, Jason Wang, Laurent Vivier
On 18/6/24 12:00, Stefano Garzarella wrote:
> The default value of the @share option of the @MemoryBackendProperties
> really depends on the backend type, so let's document the default
> values in the same place where we define the option to avoid
> dispersing the information.
>
> Cc: David Hildenbrand <david@redhat.com>
> Suggested-by: Markus Armbruster <armbru@redhat.com>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
> ---
> v2: https://patchew.org/QEMU/20240611130231.83152-1-sgarzare@redhat.com/
> v1: https://patchew.org/QEMU/20240523133302.103858-1-sgarzare@redhat.com/
> ---
> qapi/qom.json | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v8 02/13] libvhost-user: set msg.msg_control to NULL when it is empty
2024-06-18 10:00 [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
2024-06-18 10:00 ` [PATCH v8 01/13] qapi: clarify that the default is backend dependent Stefano Garzarella
@ 2024-06-18 10:00 ` Stefano Garzarella
2024-06-18 10:00 ` [PATCH v8 03/13] libvhost-user: fail vu_message_write() if sendmsg() is failing Stefano Garzarella
` (11 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Stefano Garzarella @ 2024-06-18 10:00 UTC (permalink / raw)
To: qemu-devel, mst
Cc: Coiby Xu, Kevin Wolf, Philippe Mathieu-Daudé, stefanha,
Markus Armbruster, slp, Eduardo Habkost, David Hildenbrand,
Raphael Norwitz, Marc-André Lureau, Daniel P. Berrangé,
Igor Mammedov, Gerd Hoffmann, Thomas Huth, qemu-block, Brad Smith,
Hanna Reitz, Eric Blake, gmaglione, Paolo Bonzini, Jason Wang,
Laurent Vivier, Stefano Garzarella
On some OS (e.g. macOS) sendmsg() returns -1 (errno EINVAL) if
the `struct msghdr` has the field `msg_controllen` set to 0, but
`msg_control` is not NULL.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
subprojects/libvhost-user/libvhost-user.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c
index a879149fef..22bea0c775 100644
--- a/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@ -632,6 +632,7 @@ vu_message_write(VuDev *dev, int conn_fd, VhostUserMsg *vmsg)
memcpy(CMSG_DATA(cmsg), vmsg->fds, fdsize);
} else {
msg.msg_controllen = 0;
+ msg.msg_control = NULL;
}
do {
--
2.45.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v8 03/13] libvhost-user: fail vu_message_write() if sendmsg() is failing
2024-06-18 10:00 [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
2024-06-18 10:00 ` [PATCH v8 01/13] qapi: clarify that the default is backend dependent Stefano Garzarella
2024-06-18 10:00 ` [PATCH v8 02/13] libvhost-user: set msg.msg_control to NULL when it is empty Stefano Garzarella
@ 2024-06-18 10:00 ` Stefano Garzarella
2024-06-18 10:00 ` [PATCH v8 04/13] libvhost-user: mask F_INFLIGHT_SHMFD if memfd is not supported Stefano Garzarella
` (10 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Stefano Garzarella @ 2024-06-18 10:00 UTC (permalink / raw)
To: qemu-devel, mst
Cc: Coiby Xu, Kevin Wolf, Philippe Mathieu-Daudé, stefanha,
Markus Armbruster, slp, Eduardo Habkost, David Hildenbrand,
Raphael Norwitz, Marc-André Lureau, Daniel P. Berrangé,
Igor Mammedov, Gerd Hoffmann, Thomas Huth, qemu-block, Brad Smith,
Hanna Reitz, Eric Blake, gmaglione, Paolo Bonzini, Jason Wang,
Laurent Vivier, Stefano Garzarella
In vu_message_write() we use sendmsg() to send the message header,
then a write() to send the payload.
If sendmsg() fails we should avoid sending the payload, since we
were unable to send the header.
Discovered before fixing the issue with the previous patch, where
sendmsg() failed on macOS due to wrong parameters, but the frontend
still sent the payload which the backend incorrectly interpreted
as a wrong header.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
subprojects/libvhost-user/libvhost-user.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c
index 22bea0c775..a11afd1960 100644
--- a/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@ -639,6 +639,11 @@ vu_message_write(VuDev *dev, int conn_fd, VhostUserMsg *vmsg)
rc = sendmsg(conn_fd, &msg, 0);
} while (rc < 0 && (errno == EINTR || errno == EAGAIN));
+ if (rc <= 0) {
+ vu_panic(dev, "Error while writing: %s", strerror(errno));
+ return false;
+ }
+
if (vmsg->size) {
do {
if (vmsg->data) {
--
2.45.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v8 04/13] libvhost-user: mask F_INFLIGHT_SHMFD if memfd is not supported
2024-06-18 10:00 [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
` (2 preceding siblings ...)
2024-06-18 10:00 ` [PATCH v8 03/13] libvhost-user: fail vu_message_write() if sendmsg() is failing Stefano Garzarella
@ 2024-06-18 10:00 ` Stefano Garzarella
2024-06-18 10:00 ` [PATCH v8 05/13] vhost-user-server: do not set memory fd non-blocking Stefano Garzarella
` (9 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Stefano Garzarella @ 2024-06-18 10:00 UTC (permalink / raw)
To: qemu-devel, mst
Cc: Coiby Xu, Kevin Wolf, Philippe Mathieu-Daudé, stefanha,
Markus Armbruster, slp, Eduardo Habkost, David Hildenbrand,
Raphael Norwitz, Marc-André Lureau, Daniel P. Berrangé,
Igor Mammedov, Gerd Hoffmann, Thomas Huth, qemu-block, Brad Smith,
Hanna Reitz, Eric Blake, gmaglione, Paolo Bonzini, Jason Wang,
Laurent Vivier, Stefano Garzarella
libvhost-user will panic when receiving VHOST_USER_GET_INFLIGHT_FD
message if MFD_ALLOW_SEALING is not defined, since it's not able
to create a memfd.
VHOST_USER_GET_INFLIGHT_FD is used only if
VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD is negotiated. So, let's mask
that feature if the backend is not able to properly handle these
messages.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
subprojects/libvhost-user/libvhost-user.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c
index a11afd1960..2c20cdc16e 100644
--- a/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@ -1674,6 +1674,17 @@ vu_get_protocol_features_exec(VuDev *dev, VhostUserMsg *vmsg)
features |= dev->iface->get_protocol_features(dev);
}
+#ifndef MFD_ALLOW_SEALING
+ /*
+ * If MFD_ALLOW_SEALING is not defined, we are not able to handle
+ * VHOST_USER_GET_INFLIGHT_FD messages, since we can't create a memfd.
+ * Those messages are used only if VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD
+ * is negotiated. A device implementation can enable it, so let's mask
+ * it to avoid a runtime panic.
+ */
+ features &= ~(1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD);
+#endif
+
vmsg_set_reply_u64(vmsg, features);
return true;
}
--
2.45.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v8 05/13] vhost-user-server: do not set memory fd non-blocking
2024-06-18 10:00 [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
` (3 preceding siblings ...)
2024-06-18 10:00 ` [PATCH v8 04/13] libvhost-user: mask F_INFLIGHT_SHMFD if memfd is not supported Stefano Garzarella
@ 2024-06-18 10:00 ` Stefano Garzarella
2024-06-18 10:04 ` [PATCH v8 06/13] contrib/vhost-user-blk: fix bind() using the right size of the address Stefano Garzarella
` (8 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Stefano Garzarella @ 2024-06-18 10:00 UTC (permalink / raw)
To: qemu-devel, mst
Cc: Coiby Xu, Kevin Wolf, Philippe Mathieu-Daudé, stefanha,
Markus Armbruster, slp, Eduardo Habkost, David Hildenbrand,
Raphael Norwitz, Marc-André Lureau, Daniel P. Berrangé,
Igor Mammedov, Gerd Hoffmann, Thomas Huth, qemu-block, Brad Smith,
Hanna Reitz, Eric Blake, gmaglione, Paolo Bonzini, Jason Wang,
Laurent Vivier, Stefano Garzarella
In vhost-user-server we set all fd received from the other peer
in non-blocking mode. For some of them (e.g. memfd, shm_open, etc.)
it's not really needed, because we don't use these fd with blocking
operations, but only to map memory.
In addition, in some systems this operation can fail (e.g. in macOS
setting an fd returned by shm_open() non-blocking fails with errno
= ENOTTY).
So, let's avoid setting fd non-blocking for those messages that we
know carry memory fd (e.g. VHOST_USER_ADD_MEM_REG,
VHOST_USER_SET_MEM_TABLE).
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
v3:
- avoiding setting fd non-blocking for messages where we have memory fd
(Eric)
---
util/vhost-user-server.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c
index 3bfb1ad3ec..b19229074a 100644
--- a/util/vhost-user-server.c
+++ b/util/vhost-user-server.c
@@ -65,6 +65,18 @@ static void vmsg_close_fds(VhostUserMsg *vmsg)
static void vmsg_unblock_fds(VhostUserMsg *vmsg)
{
int i;
+
+ /*
+ * These messages carry fd used to map memory, not to send/receive messages,
+ * so this operation is useless. In addition, in some systems this
+ * operation can fail (e.g. in macOS setting an fd returned by shm_open()
+ * non-blocking fails with errno = ENOTTY)
+ */
+ if (vmsg->request == VHOST_USER_ADD_MEM_REG ||
+ vmsg->request == VHOST_USER_SET_MEM_TABLE) {
+ return;
+ }
+
for (i = 0; i < vmsg->fd_num; i++) {
qemu_socket_set_nonblock(vmsg->fds[i]);
}
--
2.45.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v8 06/13] contrib/vhost-user-blk: fix bind() using the right size of the address
2024-06-18 10:00 [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
` (4 preceding siblings ...)
2024-06-18 10:00 ` [PATCH v8 05/13] vhost-user-server: do not set memory fd non-blocking Stefano Garzarella
@ 2024-06-18 10:04 ` Stefano Garzarella
2024-06-18 10:04 ` [PATCH v8 07/13] contrib/vhost-user-*: use QEMU bswap helper functions Stefano Garzarella
` (7 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Stefano Garzarella @ 2024-06-18 10:04 UTC (permalink / raw)
To: mst, qemu-devel
Cc: Thomas Huth, Kevin Wolf, qemu-block, Marc-André Lureau,
Daniel P. Berrangé, Jason Wang, Gerd Hoffmann,
Philippe Mathieu-Daudé, Hanna Reitz, Brad Smith,
David Hildenbrand, Paolo Bonzini, Eduardo Habkost, Laurent Vivier,
Coiby Xu, slp, gmaglione, Igor Mammedov, stefanha,
Raphael Norwitz, Markus Armbruster, Eric Blake,
Stefano Garzarella
On macOS passing `-s /tmp/vhost.socket` parameter to the vhost-user-blk
application, the bind was done on `/tmp/vhost.socke` pathname,
missing the last character.
This sounds like one of the portability problems described in the
unix(7) manpage:
Pathname sockets
When binding a socket to a pathname, a few rules should
be observed for maximum portability and ease of coding:
• The pathname in sun_path should be null-terminated.
• The length of the pathname, including the terminating
null byte, should not exceed the size of sun_path.
• The addrlen argument that describes the enclosing
sockaddr_un structure should have a value of at least:
offsetof(struct sockaddr_un, sun_path) +
strlen(addr.sun_path)+1
or, more simply, addrlen can be specified as
sizeof(struct sockaddr_un).
So let's follow the last advice and simplify the code as well.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
contrib/vhost-user-blk/vhost-user-blk.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c
index 89e5f11a64..a8ab9269a2 100644
--- a/contrib/vhost-user-blk/vhost-user-blk.c
+++ b/contrib/vhost-user-blk/vhost-user-blk.c
@@ -469,7 +469,6 @@ static int unix_sock_new(char *unix_fn)
{
int sock;
struct sockaddr_un un;
- size_t len;
assert(unix_fn);
@@ -481,10 +480,9 @@ static int unix_sock_new(char *unix_fn)
un.sun_family = AF_UNIX;
(void)snprintf(un.sun_path, sizeof(un.sun_path), "%s", unix_fn);
- len = sizeof(un.sun_family) + strlen(un.sun_path);
(void)unlink(unix_fn);
- if (bind(sock, (struct sockaddr *)&un, len) < 0) {
+ if (bind(sock, (struct sockaddr *)&un, sizeof(un)) < 0) {
perror("bind");
goto fail;
}
--
2.45.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v8 07/13] contrib/vhost-user-*: use QEMU bswap helper functions
2024-06-18 10:00 [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
` (5 preceding siblings ...)
2024-06-18 10:04 ` [PATCH v8 06/13] contrib/vhost-user-blk: fix bind() using the right size of the address Stefano Garzarella
@ 2024-06-18 10:04 ` Stefano Garzarella
2024-06-18 10:04 ` [PATCH v8 08/13] vhost-user: enable frontends on any POSIX system Stefano Garzarella
` (6 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Stefano Garzarella @ 2024-06-18 10:04 UTC (permalink / raw)
To: mst, qemu-devel
Cc: Thomas Huth, Kevin Wolf, qemu-block, Marc-André Lureau,
Daniel P. Berrangé, Jason Wang, Gerd Hoffmann,
Philippe Mathieu-Daudé, Hanna Reitz, Brad Smith,
David Hildenbrand, Paolo Bonzini, Eduardo Habkost, Laurent Vivier,
Coiby Xu, slp, gmaglione, Igor Mammedov, stefanha,
Raphael Norwitz, Markus Armbruster, Eric Blake,
Stefano Garzarella
Let's replace the calls to le*toh() and htole*() with qemu/bswap.h
helpers to make the code more portable.
Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
contrib/vhost-user-blk/vhost-user-blk.c | 9 +++++----
contrib/vhost-user-input/main.c | 16 ++++++++--------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c
index a8ab9269a2..9492146855 100644
--- a/contrib/vhost-user-blk/vhost-user-blk.c
+++ b/contrib/vhost-user-blk/vhost-user-blk.c
@@ -16,6 +16,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/bswap.h"
#include "standard-headers/linux/virtio_blk.h"
#include "libvhost-user-glib.h"
@@ -194,8 +195,8 @@ vub_discard_write_zeroes(VubReq *req, struct iovec *iov, uint32_t iovcnt,
#if defined(__linux__) && defined(BLKDISCARD) && defined(BLKZEROOUT)
VubDev *vdev_blk = req->vdev_blk;
desc = buf;
- uint64_t range[2] = { le64toh(desc->sector) << 9,
- le32toh(desc->num_sectors) << 9 };
+ uint64_t range[2] = { le64_to_cpu(desc->sector) << 9,
+ le32_to_cpu(desc->num_sectors) << 9 };
if (type == VIRTIO_BLK_T_DISCARD) {
if (ioctl(vdev_blk->blk_fd, BLKDISCARD, range) == 0) {
g_free(buf);
@@ -267,13 +268,13 @@ static int vub_virtio_process_req(VubDev *vdev_blk,
req->in = (struct virtio_blk_inhdr *)elem->in_sg[in_num - 1].iov_base;
in_num--;
- type = le32toh(req->out->type);
+ type = le32_to_cpu(req->out->type);
switch (type & ~VIRTIO_BLK_T_BARRIER) {
case VIRTIO_BLK_T_IN:
case VIRTIO_BLK_T_OUT: {
ssize_t ret = 0;
bool is_write = type & VIRTIO_BLK_T_OUT;
- req->sector_num = le64toh(req->out->sector);
+ req->sector_num = le64_to_cpu(req->out->sector);
if (is_write) {
ret = vub_writev(req, &elem->out_sg[1], out_num);
} else {
diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c
index 081230da54..f3362d41ac 100644
--- a/contrib/vhost-user-input/main.c
+++ b/contrib/vhost-user-input/main.c
@@ -51,8 +51,8 @@ static void vi_input_send(VuInput *vi, struct virtio_input_event *event)
vi->queue[vi->qindex++].event = *event;
/* ... until we see a report sync ... */
- if (event->type != htole16(EV_SYN) ||
- event->code != htole16(SYN_REPORT)) {
+ if (event->type != cpu_to_le16(EV_SYN) ||
+ event->code != cpu_to_le16(SYN_REPORT)) {
return;
}
@@ -103,9 +103,9 @@ vi_evdev_watch(VuDev *dev, int condition, void *data)
g_debug("input %d %d %d", evdev.type, evdev.code, evdev.value);
- virtio.type = htole16(evdev.type);
- virtio.code = htole16(evdev.code);
- virtio.value = htole32(evdev.value);
+ virtio.type = cpu_to_le16(evdev.type);
+ virtio.code = cpu_to_le16(evdev.code);
+ virtio.value = cpu_to_le32(evdev.value);
vi_input_send(vi, &virtio);
}
}
@@ -124,9 +124,9 @@ static void vi_handle_status(VuInput *vi, virtio_input_event *event)
evdev.input_event_sec = tval.tv_sec;
evdev.input_event_usec = tval.tv_usec;
- evdev.type = le16toh(event->type);
- evdev.code = le16toh(event->code);
- evdev.value = le32toh(event->value);
+ evdev.type = le16_to_cpu(event->type);
+ evdev.code = le16_to_cpu(event->code);
+ evdev.value = le32_to_cpu(event->value);
rc = write(vi->evdevfd, &evdev, sizeof(evdev));
if (rc == -1) {
--
2.45.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v8 08/13] vhost-user: enable frontends on any POSIX system
2024-06-18 10:00 [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
` (6 preceding siblings ...)
2024-06-18 10:04 ` [PATCH v8 07/13] contrib/vhost-user-*: use QEMU bswap helper functions Stefano Garzarella
@ 2024-06-18 10:04 ` Stefano Garzarella
2024-06-18 10:05 ` [PATCH v8 09/13] libvhost-user: enable it " Stefano Garzarella
` (5 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Stefano Garzarella @ 2024-06-18 10:04 UTC (permalink / raw)
To: mst, qemu-devel
Cc: Thomas Huth, Kevin Wolf, qemu-block, Marc-André Lureau,
Daniel P. Berrangé, Jason Wang, Gerd Hoffmann,
Philippe Mathieu-Daudé, Hanna Reitz, Brad Smith,
David Hildenbrand, Paolo Bonzini, Eduardo Habkost, Laurent Vivier,
Coiby Xu, slp, gmaglione, Igor Mammedov, stefanha,
Raphael Norwitz, Markus Armbruster, Eric Blake,
Stefano Garzarella
The vhost-user protocol is not really Linux-specific so let's enable
vhost-user frontends for any POSIX system.
In vhost_net.c we use VHOST_FILE_UNBIND which is defined in a Linux
specific header, let's define it for other systems as well.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
meson.build | 1 -
hw/net/vhost_net.c | 5 +++++
hw/block/Kconfig | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 97e00d6f59..2ba95a8c35 100644
--- a/meson.build
+++ b/meson.build
@@ -151,7 +151,6 @@ have_tpm = get_option('tpm') \
# vhost
have_vhost_user = get_option('vhost_user') \
- .disable_auto_if(host_os != 'linux') \
.require(host_os != 'windows',
error_message: 'vhost-user is not available on Windows').allowed()
have_vhost_vdpa = get_option('vhost_vdpa') \
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index fd1a93701a..fced429813 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -34,8 +34,13 @@
#include "standard-headers/linux/virtio_ring.h"
#include "hw/virtio/vhost.h"
#include "hw/virtio/virtio-bus.h"
+#if defined(__linux__)
#include "linux-headers/linux/vhost.h"
+#endif
+#ifndef VHOST_FILE_UNBIND
+#define VHOST_FILE_UNBIND -1
+#endif
/* Features supported by host kernel. */
static const int kernel_feature_bits[] = {
diff --git a/hw/block/Kconfig b/hw/block/Kconfig
index 9e8f28f982..29ee09e434 100644
--- a/hw/block/Kconfig
+++ b/hw/block/Kconfig
@@ -40,7 +40,7 @@ config VHOST_USER_BLK
bool
# Only PCI devices are provided for now
default y if VIRTIO_PCI
- depends on VIRTIO && VHOST_USER && LINUX
+ depends on VIRTIO && VHOST_USER
config SWIM
bool
--
2.45.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v8 09/13] libvhost-user: enable it on any POSIX system
2024-06-18 10:00 [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
` (7 preceding siblings ...)
2024-06-18 10:04 ` [PATCH v8 08/13] vhost-user: enable frontends on any POSIX system Stefano Garzarella
@ 2024-06-18 10:05 ` Stefano Garzarella
2024-06-18 10:05 ` [PATCH v8 10/13] contrib/vhost-user-blk: " Stefano Garzarella
` (4 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Stefano Garzarella @ 2024-06-18 10:05 UTC (permalink / raw)
To: mst, qemu-devel
Cc: Thomas Huth, Kevin Wolf, qemu-block, Marc-André Lureau,
Daniel P. Berrangé, Jason Wang, Gerd Hoffmann,
Philippe Mathieu-Daudé, Hanna Reitz, Brad Smith,
David Hildenbrand, Paolo Bonzini, Eduardo Habkost, Laurent Vivier,
Coiby Xu, slp, gmaglione, Igor Mammedov, stefanha,
Raphael Norwitz, Markus Armbruster, Eric Blake,
Stefano Garzarella
The vhost-user protocol is not really Linux-specific so let's enable
libvhost-user for any POSIX system.
Compiling it on macOS and FreeBSD some problems came up:
- avoid to include linux/vhost.h which is available only on Linux
(vhost_types.h contains many of the things we need)
- macOS doesn't provide sys/endian.h, so let's define them
(note: libvhost-user doesn't include QEMU's headers, so we can't use
use "qemu/bswap.h")
- define eventfd_[write|read] as write/read wrapper when system doesn't
provide those (e.g. macOS)
- copy SEAL defines from include/qemu/memfd.h to make the code works
on FreeBSD where MFD_ALLOW_SEALING is defined
- define MAP_NORESERVE if it's not defined (e.g. on FreeBSD)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
v5:
- fixed typos in the commit description [Phil]
---
meson.build | 2 +-
subprojects/libvhost-user/libvhost-user.h | 2 +-
subprojects/libvhost-user/libvhost-user.c | 60 +++++++++++++++++++++--
3 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/meson.build b/meson.build
index 2ba95a8c35..487153a431 100644
--- a/meson.build
+++ b/meson.build
@@ -3190,7 +3190,7 @@ if have_system and vfio_user_server_allowed
endif
vhost_user = not_found
-if host_os == 'linux' and have_vhost_user
+if have_vhost_user
libvhost_user = subproject('libvhost-user')
vhost_user = libvhost_user.get_variable('vhost_user_dep')
endif
diff --git a/subprojects/libvhost-user/libvhost-user.h b/subprojects/libvhost-user/libvhost-user.h
index deb40e77b3..e13e1d3931 100644
--- a/subprojects/libvhost-user/libvhost-user.h
+++ b/subprojects/libvhost-user/libvhost-user.h
@@ -18,9 +18,9 @@
#include <stdbool.h>
#include <stddef.h>
#include <poll.h>
-#include <linux/vhost.h>
#include <pthread.h>
#include "standard-headers/linux/virtio_ring.h"
+#include "standard-headers/linux/vhost_types.h"
/* Based on qemu/hw/virtio/vhost-user.c */
#define VHOST_USER_F_PROTOCOL_FEATURES 30
diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c
index 2c20cdc16e..57e58d4adb 100644
--- a/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@ -28,9 +28,7 @@
#include <inttypes.h>
#include <sys/types.h>
#include <sys/socket.h>
-#include <sys/eventfd.h>
#include <sys/mman.h>
-#include <endian.h>
/* Necessary to provide VIRTIO_F_VERSION_1 on system
* with older linux headers. Must appear before
@@ -39,8 +37,8 @@
#include "standard-headers/linux/virtio_config.h"
#if defined(__linux__)
+#include <endian.h>
#include <sys/syscall.h>
-#include <fcntl.h>
#include <sys/ioctl.h>
#include <linux/vhost.h>
#include <sys/vfs.h>
@@ -52,6 +50,62 @@
#endif
+#if defined(__APPLE__) && (__MACH__)
+#include <libkern/OSByteOrder.h>
+#define htobe16(x) OSSwapHostToBigInt16(x)
+#define htole16(x) OSSwapHostToLittleInt16(x)
+#define be16toh(x) OSSwapBigToHostInt16(x)
+#define le16toh(x) OSSwapLittleToHostInt16(x)
+
+#define htobe32(x) OSSwapHostToBigInt32(x)
+#define htole32(x) OSSwapHostToLittleInt32(x)
+#define be32toh(x) OSSwapBigToHostInt32(x)
+#define le32toh(x) OSSwapLittleToHostInt32(x)
+
+#define htobe64(x) OSSwapHostToBigInt64(x)
+#define htole64(x) OSSwapHostToLittleInt64(x)
+#define be64toh(x) OSSwapBigToHostInt64(x)
+#define le64toh(x) OSSwapLittleToHostInt64(x)
+#endif
+
+#ifdef CONFIG_EVENTFD
+#include <sys/eventfd.h>
+#else
+#define eventfd_t uint64_t
+
+int eventfd_write(int fd, eventfd_t value)
+{
+ return (write(fd, &value, sizeof(value)) == sizeof(value)) ? 0 : -1;
+}
+
+int eventfd_read(int fd, eventfd_t *value)
+{
+ return (read(fd, value, sizeof(*value)) == sizeof(*value)) ? 0 : -1;
+}
+#endif
+
+#ifdef MFD_ALLOW_SEALING
+#include <fcntl.h>
+
+#ifndef F_LINUX_SPECIFIC_BASE
+#define F_LINUX_SPECIFIC_BASE 1024
+#endif
+
+#ifndef F_ADD_SEALS
+#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
+#define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
+
+#define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */
+#define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */
+#define F_SEAL_GROW 0x0004 /* prevent file from growing */
+#define F_SEAL_WRITE 0x0008 /* prevent writes */
+#endif
+#endif
+
+#ifndef MAP_NORESERVE
+#define MAP_NORESERVE 0
+#endif
+
#include "include/atomic.h"
#include "libvhost-user.h"
--
2.45.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v8 10/13] contrib/vhost-user-blk: enable it on any POSIX system
2024-06-18 10:00 [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
` (8 preceding siblings ...)
2024-06-18 10:05 ` [PATCH v8 09/13] libvhost-user: enable it " Stefano Garzarella
@ 2024-06-18 10:05 ` Stefano Garzarella
2024-06-18 10:05 ` [PATCH v8 11/13] hostmem: add a new memory backend based on POSIX shm_open() Stefano Garzarella
` (3 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Stefano Garzarella @ 2024-06-18 10:05 UTC (permalink / raw)
To: mst, qemu-devel
Cc: Thomas Huth, Kevin Wolf, qemu-block, Marc-André Lureau,
Daniel P. Berrangé, Jason Wang, Gerd Hoffmann,
Philippe Mathieu-Daudé, Hanna Reitz, Brad Smith,
David Hildenbrand, Paolo Bonzini, Eduardo Habkost, Laurent Vivier,
Coiby Xu, slp, gmaglione, Igor Mammedov, stefanha,
Raphael Norwitz, Markus Armbruster, Eric Blake,
Stefano Garzarella
Let's make the code more portable by adding defines from
block/file-posix.c to support O_DIRECT in other systems (e.g. macOS).
vhost-user-server.c is a dependency, let's enable it for any POSIX
system.
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
v6:
- reverted v5 changes since we can't move O_DSYNC and O_DIRECT in osdep
[Daniel, failing tests on Windows]
v5:
- O_DSYNC and O_DIRECT definition are now in osdep [Phil]
- commit updated since we moved out all code changes
v4:
- moved using of "qemu/bswap.h" API in a separate patch [Phil]
---
meson.build | 2 --
contrib/vhost-user-blk/vhost-user-blk.c | 14 ++++++++++++++
util/meson.build | 4 +++-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 487153a431..f86ce92364 100644
--- a/meson.build
+++ b/meson.build
@@ -2001,8 +2001,6 @@ has_statx = cc.has_header_symbol('sys/stat.h', 'STATX_BASIC_STATS', prefix: gnu_
has_statx_mnt_id = cc.has_header_symbol('sys/stat.h', 'STATX_MNT_ID', prefix: gnu_source_prefix)
have_vhost_user_blk_server = get_option('vhost_user_blk_server') \
- .require(host_os == 'linux',
- error_message: 'vhost_user_blk_server requires linux') \
.require(have_vhost_user,
error_message: 'vhost_user_blk_server requires vhost-user support') \
.disable_auto_if(not have_tools and not have_system) \
diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c
index 9492146855..a450337685 100644
--- a/contrib/vhost-user-blk/vhost-user-blk.c
+++ b/contrib/vhost-user-blk/vhost-user-blk.c
@@ -25,6 +25,20 @@
#include <sys/ioctl.h>
#endif
+/* OS X does not have O_DSYNC */
+#ifndef O_DSYNC
+#ifdef O_SYNC
+#define O_DSYNC O_SYNC
+#elif defined(O_FSYNC)
+#define O_DSYNC O_FSYNC
+#endif
+#endif
+
+/* Approximate O_DIRECT with O_DSYNC if O_DIRECT isn't available */
+#ifndef O_DIRECT
+#define O_DIRECT O_DSYNC
+#endif
+
enum {
VHOST_USER_BLK_MAX_QUEUES = 8,
};
diff --git a/util/meson.build b/util/meson.build
index 72b505df11..c414178ace 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -112,10 +112,12 @@ if have_block
util_ss.add(files('filemonitor-stub.c'))
endif
if host_os == 'linux'
- util_ss.add(files('vhost-user-server.c'), vhost_user)
util_ss.add(files('vfio-helpers.c'))
util_ss.add(files('chardev_open.c'))
endif
+ if host_os != 'windows'
+ util_ss.add(files('vhost-user-server.c'), vhost_user)
+ endif
util_ss.add(files('yank.c'))
endif
--
2.45.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v8 11/13] hostmem: add a new memory backend based on POSIX shm_open()
2024-06-18 10:00 [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
` (9 preceding siblings ...)
2024-06-18 10:05 ` [PATCH v8 10/13] contrib/vhost-user-blk: " Stefano Garzarella
@ 2024-06-18 10:05 ` Stefano Garzarella
2024-06-18 10:05 ` [PATCH v8 12/13] tests/qtest/vhost-user-blk-test: use memory-backend-shm Stefano Garzarella
` (2 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Stefano Garzarella @ 2024-06-18 10:05 UTC (permalink / raw)
To: mst, qemu-devel
Cc: Thomas Huth, Kevin Wolf, qemu-block, Marc-André Lureau,
Daniel P. Berrangé, Jason Wang, Gerd Hoffmann,
Philippe Mathieu-Daudé, Hanna Reitz, Brad Smith,
David Hildenbrand, Paolo Bonzini, Eduardo Habkost, Laurent Vivier,
Coiby Xu, slp, gmaglione, Igor Mammedov, stefanha,
Raphael Norwitz, Markus Armbruster, Eric Blake,
Stefano Garzarella
shm_open() creates and opens a new POSIX shared memory object.
A POSIX shared memory object allows creating memory backend with an
associated file descriptor that can be shared with external processes
(e.g. vhost-user).
The new `memory-backend-shm` can be used as an alternative when
`memory-backend-memfd` is not available (Linux only), since shm_open()
should be provided by any POSIX-compliant operating system.
This backend mimics memfd, allocating memory that is practically
anonymous. In theory shm_open() requires a name, but this is allocated
for a short time interval and shm_unlink() is called right after
shm_open(). After that, only fd is shared with external processes
(e.g., vhost-user) as if it were associated with anonymous memory.
In the future we may also allow the user to specify the name to be
passed to shm_open(), but for now we keep the backend simple, mimicking
anonymous memory such as memfd.
Acked-by: David Hildenbrand <david@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Markus Armbruster <armbru@redhat.com> (QAPI schema)
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
v8
- Fixed QAPI documentation about share option [Markus]
v7
- changed default value documentation for @share rebasing on
20240611130231.83152-1-sgarzare@redhat.com [Markus]
- used `memory-backend-shm` instead of `shm` and wrapped to 70 columns
[Markus]
- added 'if': 'CONFIG_POSIX' to MemoryBackendShmProperties [Markus]
v5
- fixed documentation in qapi/qom.json and qemu-options.hx [Markus]
v4
- fail if we find "share=off" in shm_backend_memory_alloc() [David]
v3
- enriched commit message and documentation to highlight that we
want to mimic memfd (David)
---
docs/system/devices/vhost-user.rst | 5 +-
qapi/qom.json | 23 +++++-
backends/hostmem-shm.c | 123 +++++++++++++++++++++++++++++
backends/meson.build | 1 +
qemu-options.hx | 16 ++++
5 files changed, 164 insertions(+), 4 deletions(-)
create mode 100644 backends/hostmem-shm.c
diff --git a/docs/system/devices/vhost-user.rst b/docs/system/devices/vhost-user.rst
index 9b2da106ce..35259d8ec7 100644
--- a/docs/system/devices/vhost-user.rst
+++ b/docs/system/devices/vhost-user.rst
@@ -98,8 +98,9 @@ Shared memory object
In order for the daemon to access the VirtIO queues to process the
requests it needs access to the guest's address space. This is
-achieved via the ``memory-backend-file`` or ``memory-backend-memfd``
-objects. A reference to a file-descriptor which can access this object
+achieved via the ``memory-backend-file``, ``memory-backend-memfd``, or
+``memory-backend-shm`` objects.
+A reference to a file-descriptor which can access this object
will be passed via the socket as part of the protocol negotiation.
Currently the shared memory object needs to match the size of the main
diff --git a/qapi/qom.json b/qapi/qom.json
index 9b8f6a7ab5..92b0fea76c 100644
--- a/qapi/qom.json
+++ b/qapi/qom.json
@@ -601,8 +601,8 @@
#
# @share: if false, the memory is private to QEMU; if true, it is
# shared (default false for backends memory-backend-file and
-# memory-backend-ram, true for backends memory-backend-epc and
-# memory-backend-memfd)
+# memory-backend-ram, true for backends memory-backend-epc,
+# memory-backend-memfd, and memory-backend-shm)
#
# @reserve: if true, reserve swap space (or huge pages) if applicable
# (default: true) (since 6.1)
@@ -721,6 +721,21 @@
'*hugetlbsize': 'size',
'*seal': 'bool' } }
+##
+# @MemoryBackendShmProperties:
+#
+# Properties for memory-backend-shm objects.
+#
+# This memory backend supports only shared memory, which is the
+# default.
+#
+# Since: 9.1
+##
+{ 'struct': 'MemoryBackendShmProperties',
+ 'base': 'MemoryBackendProperties',
+ 'data': { },
+ 'if': 'CONFIG_POSIX' }
+
##
# @MemoryBackendEpcProperties:
#
@@ -1049,6 +1064,8 @@
{ 'name': 'memory-backend-memfd',
'if': 'CONFIG_LINUX' },
'memory-backend-ram',
+ { 'name': 'memory-backend-shm',
+ 'if': 'CONFIG_POSIX' },
'pef-guest',
{ 'name': 'pr-manager-helper',
'if': 'CONFIG_LINUX' },
@@ -1121,6 +1138,8 @@
'memory-backend-memfd': { 'type': 'MemoryBackendMemfdProperties',
'if': 'CONFIG_LINUX' },
'memory-backend-ram': 'MemoryBackendProperties',
+ 'memory-backend-shm': { 'type': 'MemoryBackendShmProperties',
+ 'if': 'CONFIG_POSIX' },
'pr-manager-helper': { 'type': 'PrManagerHelperProperties',
'if': 'CONFIG_LINUX' },
'qtest': 'QtestProperties',
diff --git a/backends/hostmem-shm.c b/backends/hostmem-shm.c
new file mode 100644
index 0000000000..374edc3db8
--- /dev/null
+++ b/backends/hostmem-shm.c
@@ -0,0 +1,123 @@
+/*
+ * QEMU host POSIX shared memory object backend
+ *
+ * Copyright (C) 2024 Red Hat Inc
+ *
+ * Authors:
+ * Stefano Garzarella <sgarzare@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "sysemu/hostmem.h"
+#include "qapi/error.h"
+
+#define TYPE_MEMORY_BACKEND_SHM "memory-backend-shm"
+
+OBJECT_DECLARE_SIMPLE_TYPE(HostMemoryBackendShm, MEMORY_BACKEND_SHM)
+
+struct HostMemoryBackendShm {
+ HostMemoryBackend parent_obj;
+};
+
+static bool
+shm_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
+{
+ g_autoptr(GString) shm_name = g_string_new(NULL);
+ g_autofree char *backend_name = NULL;
+ uint32_t ram_flags;
+ int fd, oflag;
+ mode_t mode;
+
+ if (!backend->size) {
+ error_setg(errp, "can't create shm backend with size 0");
+ return false;
+ }
+
+ if (!backend->share) {
+ error_setg(errp, "can't create shm backend with `share=off`");
+ return false;
+ }
+
+ /*
+ * Let's use `mode = 0` because we don't want other processes to open our
+ * memory unless we share the file descriptor with them.
+ */
+ mode = 0;
+ oflag = O_RDWR | O_CREAT | O_EXCL;
+ backend_name = host_memory_backend_get_name(backend);
+
+ /*
+ * Some operating systems allow creating anonymous POSIX shared memory
+ * objects (e.g. FreeBSD provides the SHM_ANON constant), but this is not
+ * defined by POSIX, so let's create a unique name.
+ *
+ * From Linux's shm_open(3) man-page:
+ * For portable use, a shared memory object should be identified
+ * by a name of the form /somename;"
+ */
+ g_string_printf(shm_name, "/qemu-" FMT_pid "-shm-%s", getpid(),
+ backend_name);
+
+ fd = shm_open(shm_name->str, oflag, mode);
+ if (fd < 0) {
+ error_setg_errno(errp, errno,
+ "failed to create POSIX shared memory");
+ return false;
+ }
+
+ /*
+ * We have the file descriptor, so we no longer need to expose the
+ * POSIX shared memory object. However it will remain allocated as long as
+ * there are file descriptors pointing to it.
+ */
+ shm_unlink(shm_name->str);
+
+ if (ftruncate(fd, backend->size) == -1) {
+ error_setg_errno(errp, errno,
+ "failed to resize POSIX shared memory to %" PRIu64,
+ backend->size);
+ close(fd);
+ return false;
+ }
+
+ ram_flags = RAM_SHARED;
+ ram_flags |= backend->reserve ? 0 : RAM_NORESERVE;
+
+ return memory_region_init_ram_from_fd(&backend->mr, OBJECT(backend),
+ backend_name, backend->size,
+ ram_flags, fd, 0, errp);
+}
+
+static void
+shm_backend_instance_init(Object *obj)
+{
+ HostMemoryBackendShm *m = MEMORY_BACKEND_SHM(obj);
+
+ MEMORY_BACKEND(m)->share = true;
+}
+
+static void
+shm_backend_class_init(ObjectClass *oc, void *data)
+{
+ HostMemoryBackendClass *bc = MEMORY_BACKEND_CLASS(oc);
+
+ bc->alloc = shm_backend_memory_alloc;
+}
+
+static const TypeInfo shm_backend_info = {
+ .name = TYPE_MEMORY_BACKEND_SHM,
+ .parent = TYPE_MEMORY_BACKEND,
+ .instance_init = shm_backend_instance_init,
+ .class_init = shm_backend_class_init,
+ .instance_size = sizeof(HostMemoryBackendShm),
+};
+
+static void register_types(void)
+{
+ type_register_static(&shm_backend_info);
+}
+
+type_init(register_types);
diff --git a/backends/meson.build b/backends/meson.build
index 8b2b111497..3867b0d363 100644
--- a/backends/meson.build
+++ b/backends/meson.build
@@ -13,6 +13,7 @@ system_ss.add([files(
if host_os != 'windows'
system_ss.add(files('rng-random.c'))
system_ss.add(files('hostmem-file.c'))
+ system_ss.add([files('hostmem-shm.c'), rt])
endif
if host_os == 'linux'
system_ss.add(files('hostmem-memfd.c'))
diff --git a/qemu-options.hx b/qemu-options.hx
index 8ca7f34ef0..ad6521ef5e 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -5240,6 +5240,22 @@ SRST
The ``share`` boolean option is on by default with memfd.
+ ``-object memory-backend-shm,id=id,merge=on|off,dump=on|off,share=on|off,prealloc=on|off,size=size,host-nodes=host-nodes,policy=default|preferred|bind|interleave``
+ Creates a POSIX shared memory backend object, which allows
+ QEMU to share the memory with an external process (e.g. when
+ using vhost-user).
+
+ ``memory-backend-shm`` is a more portable and less featureful version
+ of ``memory-backend-memfd``. It can then be used in any POSIX system,
+ especially when memfd is not supported.
+
+ Please refer to ``memory-backend-file`` for a description of the
+ options.
+
+ The ``share`` boolean option is on by default with shm. Setting it to
+ off will cause a failure during allocation because it is not supported
+ by this backend.
+
``-object iommufd,id=id[,fd=fd]``
Creates an iommufd backend which allows control of DMA mapping
through the ``/dev/iommu`` device.
--
2.45.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v8 12/13] tests/qtest/vhost-user-blk-test: use memory-backend-shm
2024-06-18 10:00 [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
` (10 preceding siblings ...)
2024-06-18 10:05 ` [PATCH v8 11/13] hostmem: add a new memory backend based on POSIX shm_open() Stefano Garzarella
@ 2024-06-18 10:05 ` Stefano Garzarella
2024-06-18 10:05 ` [PATCH v8 13/13] tests/qtest/vhost-user-test: add a test case for memory-backend-shm Stefano Garzarella
2024-07-03 22:49 ` [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Michael S. Tsirkin
13 siblings, 0 replies; 18+ messages in thread
From: Stefano Garzarella @ 2024-06-18 10:05 UTC (permalink / raw)
To: mst, qemu-devel
Cc: Thomas Huth, Kevin Wolf, qemu-block, Marc-André Lureau,
Daniel P. Berrangé, Jason Wang, Gerd Hoffmann,
Philippe Mathieu-Daudé, Hanna Reitz, Brad Smith,
David Hildenbrand, Paolo Bonzini, Eduardo Habkost, Laurent Vivier,
Coiby Xu, slp, gmaglione, Igor Mammedov, stefanha,
Raphael Norwitz, Markus Armbruster, Eric Blake,
Stefano Garzarella
`memory-backend-memfd` is available only on Linux while the new
`memory-backend-shm` can be used on any POSIX-compliant operating
system. Let's use it so we can run the test in multiple environments.
Since we are here, let`s remove `share=on` which is the default for shm
(and also for memfd).
Acked-by: Thomas Huth <thuth@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
v6
- removed `share=on` since it's the default [David]
---
tests/qtest/vhost-user-blk-test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qtest/vhost-user-blk-test.c b/tests/qtest/vhost-user-blk-test.c
index 117b9acd10..ea90d41232 100644
--- a/tests/qtest/vhost-user-blk-test.c
+++ b/tests/qtest/vhost-user-blk-test.c
@@ -906,7 +906,7 @@ static void start_vhost_user_blk(GString *cmd_line, int vus_instances,
vhost_user_blk_bin);
g_string_append_printf(cmd_line,
- " -object memory-backend-memfd,id=mem,size=256M,share=on "
+ " -object memory-backend-shm,id=mem,size=256M "
" -M memory-backend=mem -m 256M ");
for (i = 0; i < vus_instances; i++) {
--
2.45.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v8 13/13] tests/qtest/vhost-user-test: add a test case for memory-backend-shm
2024-06-18 10:00 [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
` (11 preceding siblings ...)
2024-06-18 10:05 ` [PATCH v8 12/13] tests/qtest/vhost-user-blk-test: use memory-backend-shm Stefano Garzarella
@ 2024-06-18 10:05 ` Stefano Garzarella
2024-07-03 22:49 ` [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Michael S. Tsirkin
13 siblings, 0 replies; 18+ messages in thread
From: Stefano Garzarella @ 2024-06-18 10:05 UTC (permalink / raw)
To: mst, qemu-devel
Cc: Thomas Huth, Kevin Wolf, qemu-block, Marc-André Lureau,
Daniel P. Berrangé, Jason Wang, Gerd Hoffmann,
Philippe Mathieu-Daudé, Hanna Reitz, Brad Smith,
David Hildenbrand, Paolo Bonzini, Eduardo Habkost, Laurent Vivier,
Coiby Xu, slp, gmaglione, Igor Mammedov, stefanha,
Raphael Norwitz, Markus Armbruster, Eric Blake,
Stefano Garzarella
`memory-backend-shm` can be used with vhost-user devices, so let's
add a new test case for it.
Acked-by: Thomas Huth <thuth@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
tests/qtest/vhost-user-test.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c
index d4e437265f..8c1d903b2a 100644
--- a/tests/qtest/vhost-user-test.c
+++ b/tests/qtest/vhost-user-test.c
@@ -44,6 +44,8 @@
"mem-path=%s,share=on -numa node,memdev=mem"
#define QEMU_CMD_MEMFD " -m %d -object memory-backend-memfd,id=mem,size=%dM," \
" -numa node,memdev=mem"
+#define QEMU_CMD_SHM " -m %d -object memory-backend-shm,id=mem,size=%dM," \
+ " -numa node,memdev=mem"
#define QEMU_CMD_CHR " -chardev socket,id=%s,path=%s%s"
#define QEMU_CMD_NETDEV " -netdev vhost-user,id=hs0,chardev=%s,vhostforce=on"
@@ -195,6 +197,7 @@ enum test_memfd {
TEST_MEMFD_AUTO,
TEST_MEMFD_YES,
TEST_MEMFD_NO,
+ TEST_MEMFD_SHM,
};
static void append_vhost_net_opts(TestServer *s, GString *cmd_line,
@@ -228,6 +231,8 @@ static void append_mem_opts(TestServer *server, GString *cmd_line,
if (memfd == TEST_MEMFD_YES) {
g_string_append_printf(cmd_line, QEMU_CMD_MEMFD, size, size);
+ } else if (memfd == TEST_MEMFD_SHM) {
+ g_string_append_printf(cmd_line, QEMU_CMD_SHM, size, size);
} else {
const char *root = init_hugepagefs() ? : server->tmpfs;
@@ -788,6 +793,19 @@ static void *vhost_user_test_setup_memfd(GString *cmd_line, void *arg)
return server;
}
+static void *vhost_user_test_setup_shm(GString *cmd_line, void *arg)
+{
+ TestServer *server = test_server_new("vhost-user-test", arg);
+ test_server_listen(server);
+
+ append_mem_opts(server, cmd_line, 256, TEST_MEMFD_SHM);
+ server->vu_ops->append_opts(server, cmd_line, "");
+
+ g_test_queue_destroy(vhost_user_test_cleanup, server);
+
+ return server;
+}
+
static void test_read_guest_mem(void *obj, void *arg, QGuestAllocator *alloc)
{
TestServer *server = arg;
@@ -1081,6 +1099,11 @@ static void register_vhost_user_test(void)
"virtio-net",
test_read_guest_mem, &opts);
+ opts.before = vhost_user_test_setup_shm;
+ qos_add_test("vhost-user/read-guest-mem/shm",
+ "virtio-net",
+ test_read_guest_mem, &opts);
+
if (qemu_memfd_check(MFD_ALLOW_SEALING)) {
opts.before = vhost_user_test_setup_memfd;
qos_add_test("vhost-user/read-guest-mem/memfd",
--
2.45.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD)
2024-06-18 10:00 [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
` (12 preceding siblings ...)
2024-06-18 10:05 ` [PATCH v8 13/13] tests/qtest/vhost-user-test: add a test case for memory-backend-shm Stefano Garzarella
@ 2024-07-03 22:49 ` Michael S. Tsirkin
2024-07-05 8:39 ` Stefano Garzarella
13 siblings, 1 reply; 18+ messages in thread
From: Michael S. Tsirkin @ 2024-07-03 22:49 UTC (permalink / raw)
To: Stefano Garzarella
Cc: qemu-devel, Coiby Xu, Kevin Wolf, Philippe Mathieu-Daudé,
stefanha, Markus Armbruster, slp, Eduardo Habkost,
David Hildenbrand, Raphael Norwitz, Marc-André Lureau,
Daniel P. Berrangé, Igor Mammedov, Gerd Hoffmann,
Thomas Huth, qemu-block, Brad Smith, Hanna Reitz, Eric Blake,
gmaglione, Paolo Bonzini, Jason Wang, Laurent Vivier
On Tue, Jun 18, 2024 at 12:00:30PM +0200, Stefano Garzarella wrote:
> As discussed with Michael and Markus [1], this version also includes the patch
> on which v7 depended to simplify the merge in Michael's tree.
>
> The series is all reviewed, so if there are no new changes required, I would
> ask to merge it.
I dropped patches 9 and 10 for now since otherwise make vm-build-freebsd
fails.
Pls figure it out and resend just 9 and 10.
> [1] https://patchew.org/QEMU/20240612130140.63004-1-sgarzare@redhat.com/#vabzv4z6g3dd5yndvpmwktcfgbqrdg7qk2e5se6zuflrhss723@dws4vrzen6cs
>
> Thanks,
> Stefano
>
> Changelog
>
> v1: https://patchew.org/QEMU/20240228114759.44758-1-sgarzare@redhat.com/
> v2: https://patchew.org/QEMU/20240326133936.125332-1-sgarzare@redhat.com/
> v3: https://patchew.org/QEMU/20240404122330.92710-1-sgarzare@redhat.com/
> v4: https://patchew.org/QEMU/20240508074457.12367-1-sgarzare@redhat.com/
> v5: https://patchew.org/QEMU/20240523145522.313012-1-sgarzare@redhat.com/
> v6: https://patchew.org/QEMU/20240528103543.145412-1-sgarzare@redhat.com/
> v7: https://patchew.org/QEMU/20240612130140.63004-1-sgarzare@redhat.com/
> v8:
> - Included the dependent patch in this series
> https://patchew.org/QEMU/20240611130231.83152-1-sgarzare@redhat.com/
> - Fixed QAPI documentation about share option [Markus]
>
> Description
>
> The vhost-user protocol is not really Linux-specific, so let's try support
> QEMU's frontends and backends (including libvhost-user) in any POSIX system
> with this series. The main use case is to be able to use virtio devices that
> we don't have built-in in QEMU (e.g. virtiofsd, vhost-user-vsock, etc.) even
> in non-Linux systems.
>
> The first 5 patches are more like fixes discovered at runtime on macOS or
> FreeBSD that could go even independently of this series.
>
> Patches 6, 7, 8, 9 enable building of frontends and backends (including
> libvhost-user) with associated code changes to succeed in compilation.
>
> Patch 10 adds `memory-backend-shm` that uses the POSIX shm_open() API to
> create shared memory which is identified by an fd that can be shared with
> vhost-user backends. This is useful on those systems (like macOS) where
> we don't have memfd_create() or special filesystems like "/dev/shm".
>
> Patches 11 and 12 use `memory-backend-shm` in some vhost-user tests.
>
> Maybe the first 5 patches can go separately, but I only discovered those
> problems after testing patches 6 - 9, so I have included them in this series
> for now. Please let me know if you prefer that I send them separately.
>
> I tested this series using vhost-user-blk and QSD on macOS Sonoma 14.4
> (aarch64), FreeBSD 14 (x86_64), OpenBSD 7.4 (x86_64), and Fedora 40 (x86_64)
> in this way:
>
> - Start vhost-user-blk or QSD (same commands for all systems)
>
> vhost-user-blk -s /tmp/vhost.socket \
> -b Fedora-Cloud-Base-39-1.5.x86_64.raw
>
> qemu-storage-daemon \
> --blockdev file,filename=Fedora-Cloud-Base-39-1.5.x86_64.qcow2,node-name=file \
> --blockdev qcow2,file=file,node-name=qcow2 \
> --export vhost-user-blk,addr.type=unix,addr.path=/tmp/vhost.socket,id=vub,num-queues=1,node-name=qcow2,writable=on
>
> - macOS (aarch64): start QEMU (using hvf accelerator)
>
> qemu-system-aarch64 -smp 2 -cpu host -M virt,accel=hvf,memory-backend=mem \
> -drive file=./build/pc-bios/edk2-aarch64-code.fd,if=pflash,format=raw,readonly=on \
> -device virtio-net-device,netdev=net0 -netdev user,id=net0 \
> -device ramfb -device usb-ehci -device usb-kbd \
> -object memory-backend-shm,id=mem,size=512M \
> -device vhost-user-blk-pci,num-queues=1,disable-legacy=on,chardev=char0 \
> -chardev socket,id=char0,path=/tmp/vhost.socket
>
> - FreeBSD/OpenBSD (x86_64): start QEMU (no accelerators available)
>
> qemu-system-x86_64 -smp 2 -M q35,memory-backend=mem \
> -object memory-backend-shm,id=mem,size="512M" \
> -device vhost-user-blk-pci,num-queues=1,chardev=char0 \
> -chardev socket,id=char0,path=/tmp/vhost.socket
>
> - Fedora (x86_64): start QEMU (using kvm accelerator)
>
> qemu-system-x86_64 -smp 2 -M q35,accel=kvm,memory-backend=mem \
> -object memory-backend-shm,size="512M" \
> -device vhost-user-blk-pci,num-queues=1,chardev=char0 \
> -chardev socket,id=char0,path=/tmp/vhost.socket
>
> Branch pushed (and CI started) at https://gitlab.com/sgarzarella/qemu/-/tree/macos-vhost-user?ref_type=heads
>
> Stefano Garzarella (13):
> qapi: clarify that the default is backend dependent
> libvhost-user: set msg.msg_control to NULL when it is empty
> libvhost-user: fail vu_message_write() if sendmsg() is failing
> libvhost-user: mask F_INFLIGHT_SHMFD if memfd is not supported
> vhost-user-server: do not set memory fd non-blocking
> contrib/vhost-user-blk: fix bind() using the right size of the address
> contrib/vhost-user-*: use QEMU bswap helper functions
> vhost-user: enable frontends on any POSIX system
> libvhost-user: enable it on any POSIX system
> contrib/vhost-user-blk: enable it on any POSIX system
> hostmem: add a new memory backend based on POSIX shm_open()
> tests/qtest/vhost-user-blk-test: use memory-backend-shm
> tests/qtest/vhost-user-test: add a test case for memory-backend-shm
>
> docs/system/devices/vhost-user.rst | 5 +-
> meson.build | 5 +-
> qapi/qom.json | 27 ++++-
> subprojects/libvhost-user/libvhost-user.h | 2 +-
> backends/hostmem-shm.c | 123 ++++++++++++++++++++++
> contrib/vhost-user-blk/vhost-user-blk.c | 27 +++--
> contrib/vhost-user-input/main.c | 16 +--
> hw/net/vhost_net.c | 5 +
> subprojects/libvhost-user/libvhost-user.c | 77 +++++++++++++-
> tests/qtest/vhost-user-blk-test.c | 2 +-
> tests/qtest/vhost-user-test.c | 23 ++++
> util/vhost-user-server.c | 12 +++
> backends/meson.build | 1 +
> hw/block/Kconfig | 2 +-
> qemu-options.hx | 16 +++
> util/meson.build | 4 +-
> 16 files changed, 314 insertions(+), 33 deletions(-)
> create mode 100644 backends/hostmem-shm.c
>
>
> base-commit: 60b54b67c63d8f076152e0f7dccf39854dfc6a77
> prerequisite-patch-id: 9a9fc9901c4fffc060dbc8a5cfe421ab592afb5a
> prerequisite-patch-id: 5ebb17e9220273c9962df7be30a60fee638a9ad9
> prerequisite-patch-id: 28507635bdac7fefb17ea3ff024292b46c1bc324
> prerequisite-patch-id: a05519b87d25c56641814798f978cdf08cd32074
> prerequisite-patch-id: ff3b4b9981df39b041afa017b1fc638416d14611
> prerequisite-patch-id: 5f441be8ccdec01c02658eedec89ca2aa3ad3c5c
> prerequisite-patch-id: 120307d86e36e3343a4f83f450ab2ae361e259cc
> prerequisite-patch-id: 16f58ef94a15fad5a389a8f9e3305281dc87ffee
> prerequisite-patch-id: d2ce57b4e7adf084a8a156679fa27fdc5fdc71e1
> prerequisite-patch-id: 99dc1b8acda26b05ebc2396822126026189f887a
> prerequisite-patch-id: a8c454b7ac4d8025a61dbc3fa6ea3d16f6ef1273
> prerequisite-patch-id: 72ced5e768ed91e1e07cb86fa1428f2c769ec1e4
> prerequisite-patch-id: 5c615ec5a46fbe357527e6e196d6402413aa3121
> prerequisite-patch-id: cf2fb177a9188fe727b41db633b7cb108e0ce19d
> prerequisite-patch-id: ff35dae9c2a37074e5f179384b874b7ca9c66f67
> prerequisite-patch-id: 49ace634cfb082c705d2d7caf808db8339cd5431
> prerequisite-patch-id: 6936e66cb455833fb93303a12fbe3014d121d12f
> prerequisite-patch-id: 82f332c9e3d048258061fe64fb143d7a65afae90
> prerequisite-patch-id: 2c333aaf540376d5267aa51e40879c2f06b8d725
> prerequisite-patch-id: e650380ae0cf23e7ce2fc9848447ce5d92fd87e3
> prerequisite-patch-id: 5eeb7624da657a6b009224cd76f1a5c5e59ffb90
> prerequisite-patch-id: 1d1e52bf8c672cddb4f23b1094bceafbdf7d1e79
> prerequisite-patch-id: aa6d84776bf01bdb08bf99f8ae79af888a2d60b1
> prerequisite-patch-id: 22803721bed02010687685974c2053bc3aea5f25
> prerequisite-patch-id: 62c529f53b8be1d152e8953a11584207dfaaa2d5
> prerequisite-patch-id: a809b81f773fe4ac106f0348e1b7edf83f2d63d6
> prerequisite-patch-id: 945bf0f99292a8d28a9e0cd718f3fdad64b62825
> prerequisite-patch-id: 4d05eee85d0be89df4d07d1f09e812eba9b74e06
> prerequisite-patch-id: ab615369f2d516af998be14bf21a51dffa1a6f78
> prerequisite-patch-id: bfdcb5ec094ccc56cfdc5df83b01b3f9fb9e8236
> prerequisite-patch-id: e66fd32c22960ed55bb3035015459cc1426d8a12
> prerequisite-patch-id: 71ff9a225aa34939a7df81d3ede6e0f1982c68af
> prerequisite-patch-id: 8de2dd32abb1cefa8b6a0119632248bc0cbcd92a
> prerequisite-patch-id: f01631beae528e69d3bfc9ebde4bb92150ab1233
> prerequisite-patch-id: eeb9531ea111f9f8685b07335c5e18be46106200
> prerequisite-patch-id: cda491052a6d7531b979f7957afc4a4963ceb2ff
> prerequisite-patch-id: e50341e39150230a9c5e56196684a6460f53dfe3
> prerequisite-patch-id: 544277c70903004bbc92a00490a012c7ef0eb32a
> prerequisite-patch-id: f14700246a64393535a86e76689c2818e5e4ad93
> prerequisite-patch-id: f4ad30bb909d1adf71a5bd1c4becff8c50bfb98c
> prerequisite-patch-id: d50f547244f73607e998b0cd4827c76beed0cdaf
> prerequisite-patch-id: 2cf516a30811cd3358a3bf3201a994c00d2ffdaf
> prerequisite-patch-id: 12b253a5446c6612052cb9ffc4eb73cf9d7397b6
> prerequisite-patch-id: 99589144e70280249ad93dec099355b72fb17562
> prerequisite-patch-id: b4c8cea48d4e1a05dd3a664d9ce3be8d10dcfe94
> prerequisite-patch-id: 5250f1b544a1b1ef45f41cf5d2afd8868e9bd009
> prerequisite-patch-id: 5805e8bada7d1365397d4eccd21eacb7c663d32b
> prerequisite-patch-id: 2490efee88fd07a21a6c6424c53263ce8d41eacd
> prerequisite-patch-id: ae68d3b89bd040a8618d7d9cc777f2cb9cf49592
> prerequisite-patch-id: 20cbd7c15e4fec4f42d02367f17f3376e130c7ff
> prerequisite-patch-id: 28c5aaacb3dd831aa527d607d76d6a79c5449a47
> prerequisite-patch-id: ac7fd2d45fd55dfc15fffabe11af48cb13570a82
> prerequisite-patch-id: dc8cf815eaa73c51ab0c96effdf19058a81e362a
> prerequisite-patch-id: 31ac16391a89f067f49e88cf377999156957fbd3
> prerequisite-patch-id: 8967950672a400e14db223c2c3c9a4d6f8a97657
> prerequisite-patch-id: 76f488f6b3597db046e22abad4fdba9ee4aa86ce
> prerequisite-patch-id: 214eb68a3b9cfcf70a679b03642f984dcd8b1382
> prerequisite-patch-id: 353e5a76c80369929234d462dd9ca7de7be4b4d5
> prerequisite-patch-id: 123f2b6686681035df59de5c27c921b28dfe5d1e
> prerequisite-patch-id: b95550fd5354b38fa03a40b48a3cd7eb34b0ab84
> prerequisite-patch-id: 98241a724cf500988a15d42b06f8bc0cb2a78033
> prerequisite-patch-id: d21276a22abffa24ab2a4337da24c87ca95d7623
> prerequisite-patch-id: 9c84ca842fa29e9681a33a95109e27570740b5c8
> prerequisite-patch-id: 5283d3a2a1ffa1baa0d48c2d4f266f0f683a0848
> prerequisite-patch-id: d1a494ce416f68a02e0ce338ca283dbb79596e18
> prerequisite-patch-id: 1926ebf42d3c65cbacb078fa3d82e655c6be8ee8
> prerequisite-patch-id: bf36bbe5cc1e9c86cd185abdcfbde3d6dc594dfe
> prerequisite-patch-id: e107e54e357e0cd59c0f18b1770ba52b7ac4eace
> prerequisite-patch-id: 3afae9bc90cc00b0adb57d2e27f2058bd91b9645
> prerequisite-patch-id: 2b7f2115bbc92c93f8142a1f4c566e0e55bc3555
> prerequisite-patch-id: 174920d507fffc8c031cf54ee60eca524f163d86
> prerequisite-patch-id: 8737a3ef34016f65515700564bc13ba73cdeebbe
> prerequisite-patch-id: 31870935f04e20695ab2b5bfdadf8027f488b0b7
> prerequisite-patch-id: cce2037bbe515f81e6ef08fc5ba451b4d2f52772
> prerequisite-patch-id: 1c1bfc8091083b7ea5e7761d33cd06b7de1e1648
> prerequisite-patch-id: 0f452b4b91fd6c5bab43d200d6b7c486f6a11601
> prerequisite-patch-id: ae494add09825423eee3f384f691d0aae5c90dd0
> prerequisite-patch-id: 98d93e4be44f7a67c69038aae8853d3fcb5a30c2
> prerequisite-patch-id: 13e31112ffce5b06132400ed3b2b909153fa315f
> prerequisite-patch-id: 0307e4f37006b980facc17c1b1ae2f4e88d1ae70
> prerequisite-patch-id: c816b09178a7da605db814b8bd709c4c6469b79b
> prerequisite-patch-id: 51975fe45e8f34c2b2d98875ca38540547e8092e
> prerequisite-patch-id: aa52dbcce9f511159a945a8428cebdb47f6d2e5a
> prerequisite-patch-id: 3b6f78114524f15d324913faab386c490ca9a639
> prerequisite-patch-id: 5ec7691a9f185056510d02b1639c883900790724
> prerequisite-patch-id: 042323eae4f8df09fec1552ed838e78208f2ffc4
> prerequisite-patch-id: a83017b0771353507a62b7ff3cc7d3821b7a8829
> prerequisite-patch-id: e51ff22a2e53b7162bca3f356290b91d56509410
> prerequisite-patch-id: 191aadac60a85235ec8f8f603b5fc78e71e09ba6
> prerequisite-patch-id: 264cd9d6fee6c01e186735a491c25d73d2d2ccfd
> prerequisite-patch-id: 28c4a0a1f19cb803ce47b446ae898e736cf349f8
> prerequisite-patch-id: ee39ed191f6a43ede1f07f48dc48669d46905978
> prerequisite-patch-id: 720968ff9cdf1f44f53731135602321f3e210480
> prerequisite-patch-id: 8ed9604ed5dac7170bffb6882efc6c417c4d65a7
> prerequisite-patch-id: 192d3211b55d6f4287ecab6c5109b898060f69c8
> prerequisite-patch-id: 4ac42fedd9329d613472228507d083864af68bbc
> prerequisite-patch-id: e346cb412c2204035fa969fe0e904bc6ad1d9514
> prerequisite-patch-id: 291b46176175ceb2efedfbc38e5d2628b0250c30
> prerequisite-patch-id: feb328077708dcb80ea294fcfcad9c806f249cfd
> prerequisite-patch-id: 3976fb2af88ec7d5e333abe8c369bf25439aa2c8
> prerequisite-patch-id: d8082299e2d7a86b47596d795c0e646ea05a5b05
> prerequisite-patch-id: a752941597c7ab406776a111f64e13ae40619b17
> prerequisite-patch-id: a40acdf9d4de5b3861fc9a17a5e525c81f7dab92
> prerequisite-patch-id: 4701d35560942a67da3b329d5c4e585c7a33bf0d
> prerequisite-patch-id: fa7a331b8da2cb04250621e2d8d1f25c452141f9
> prerequisite-patch-id: df4aa2ca4ffd76c05f247d2656c34d19f3b9ff90
> prerequisite-patch-id: ccc28d2ed350195cd6be446243622d202e623a79
> prerequisite-patch-id: 8263f731797748b03b7fb7ef1a01903064bd788a
> prerequisite-patch-id: 2db725a2c16c2b5cb52b72ff745acd5437de43de
> prerequisite-patch-id: 21c8bb8c06095924c3f628c25364b52d7f85dd61
> prerequisite-patch-id: 33da128d7377476cac289f4aad2ee7026ded9d22
> prerequisite-patch-id: 72958afa3f270df306503ea76c99f82576411577
> prerequisite-patch-id: d0a9c278a42f8d5ff776ded9c9b7b6401ee68bd4
> prerequisite-patch-id: ee203ba6198f3cd58c7e2453a187188e17c1a771
> prerequisite-patch-id: 34270cb4f7d4ab25a52ec462f929c9b151311cfd
> prerequisite-patch-id: e6d5e3fb8443903dc12abfc70cfbfc6216f92b58
> prerequisite-patch-id: ba8141a6db6840731fd3c2c2d9c7799a4d64b30b
> prerequisite-patch-id: 148f96b283476ff929a73ff80c997ec54a2cd7bb
> prerequisite-patch-id: 76547bebb2e1af1448d3011be914fa10dabaa6af
> prerequisite-patch-id: bf1672295d4993d81010fe2c6902c7d7bb19b0da
> prerequisite-patch-id: 1a875992089d4e66bb9ee777c312b0af0edbf489
> prerequisite-patch-id: 99da94291e43c47aa732a7d63aa7d78e7bfbde3f
> prerequisite-patch-id: b0d74d49170c14dc8194da2b0592c1121f1c6f4c
> prerequisite-patch-id: ba102a6b1c37ec107549c99dfc57fcf8cb869cbb
> prerequisite-patch-id: eb208c0cab6ef242bca1c84a3bbf4f26193774b6
> prerequisite-patch-id: b3ee7ef1d506dc31053da887cd4a5bf17e3a6d5d
> prerequisite-patch-id: bf27b97f9d95c916bfa853aca516c8dd8b9c5563
> prerequisite-patch-id: 5b41c20998ef383435b47a020a00836d4d0e634d
> prerequisite-patch-id: d764b6d898e4f000c2df684c48a69c8f0bb85b79
> prerequisite-patch-id: f293a5d68945e18d767b36588275d684cb3db956
> prerequisite-patch-id: 796d32031f9c633cfe2a20d3c3a75483364e456e
> prerequisite-patch-id: 933c6406d9ef46e8a7c9495fab82d6b6567a63d0
> prerequisite-patch-id: d21b052281968b985478c6271ed7a473faef032a
> prerequisite-patch-id: 84a70fa3a4bd6adba1ffe40d16b7357ee15b19d7
> prerequisite-patch-id: ca524c79a7b38aca87d5b48ef7081fa4723d0dcd
> prerequisite-patch-id: 334386ed13ccae8d5b91d92fa26ab5a12eb21ba5
> prerequisite-patch-id: 654ea7846358b392019b2352df95fd041e7fbdfb
> prerequisite-patch-id: 85ea7e867427f02af595ab231d4ead0d0b96eafe
> prerequisite-patch-id: 863fd007b0dcf130dd8c483084174cdd575090a2
> prerequisite-patch-id: ed2fc3452b918176a886ab90198afe51de9a378e
> prerequisite-patch-id: 8ecc772fb5444a3d3ac4a01a2f6702f6bf4d3a67
> prerequisite-patch-id: f251620c7644d907b5969c498416e2e877dbf4fd
> prerequisite-patch-id: fc77785ed434654231bba2dd92e1f1f8e944ff91
> prerequisite-patch-id: 876d400010bb989161ef7832c605104cdd329506
> prerequisite-patch-id: 6360e6e080ec33819b7b4ab385f872f0a905df84
> prerequisite-patch-id: 63b3a982300f6162a699ccf9eda870bd095d2fa6
> prerequisite-patch-id: cf995e99b76839a0cf2cf972d46ab941e0958dc3
> prerequisite-patch-id: ba81cb349a62ca84e5160a5c1d0243cfa9fb9972
> prerequisite-patch-id: 44afe78f0171c6e0541a12fffd99564c9f383673
> prerequisite-patch-id: a5531d8b703351da2492f9b02d3a451c22390687
> prerequisite-patch-id: 647d5122058b6ec4fb2d1ec243fce1290fb1df6a
> prerequisite-patch-id: ef1d0fdf1376b2aa632640af321989ffb7bc9813
> prerequisite-patch-id: 694d221c4af600e99cc8b290b335bee24a5629f1
> prerequisite-patch-id: fe4b5cf7c1ba87cdf8d7223504066c14fe55fd16
> prerequisite-patch-id: ae6b64ec1e4d50b7ff3ea475b92ee385185ccd13
> prerequisite-patch-id: 950f3f75abe12f17ffbcac13b12088f2b743d42c
> prerequisite-patch-id: 7bd9d4248fc59f1b9331fd20caae0488294385cf
> prerequisite-patch-id: e70bca29f4bf73da1257739cdb395f5f1a4da2c1
> prerequisite-patch-id: 3bdd14c80b47219f2886e53582f709a9f4ea6543
> prerequisite-patch-id: 6b492458231efa88be4bb51f505ba6b50fbe9f36
> prerequisite-patch-id: 93b3062dce77cecded38d7a231f160376dfa5253
> prerequisite-patch-id: dfa5abe5d310ce14cff0643d4ae4b250406bd3bd
> prerequisite-patch-id: e3fdc9a5451c12806c75dee7101f5f2a9eb2ff3b
> prerequisite-patch-id: b2d7be382b5b140efecab2973acfc654d76660dd
> prerequisite-patch-id: e5d7a954a747fe55b3334c0c89c345489fb84cd3
> prerequisite-patch-id: c8a74c8f490278f64915c349fb6ced3edc76a745
> prerequisite-patch-id: c436dab92e25eb0bb8c3294a4d2c59767fcdc74e
> prerequisite-patch-id: d03e86390b906eaa2b5f02075b3a5e841420475c
> prerequisite-patch-id: 5dbe45c5d6f35b9129f78497910c602fa0c05345
> prerequisite-patch-id: bf67fec728a3d2fc46eb1d3966e0f09feb0176c6
> prerequisite-patch-id: 4ef531d42ae7fa2d30eda7158c379e3ce407b8b0
> prerequisite-patch-id: 6de7f90a59151643092efed9914e7b163e4986e4
> prerequisite-patch-id: 10fea080f442ea04266471c41b557113ab3878c5
> prerequisite-patch-id: 13b3bdcbc4ba37ce007ea01f3b97a4715f1cb8e5
> prerequisite-patch-id: fa5f17e9c80fcce3c8b6af0f8e04ed7b7d5c0950
> prerequisite-patch-id: 12288d0b49669bc96fe7bb60fcead783d07e54f2
> prerequisite-patch-id: 668e845a011ea725f44f6eb220b186dbe865fa8b
> prerequisite-patch-id: d263a533dd33046dbb89564881bb098c758cbace
> prerequisite-patch-id: 15ce2f23b5eeedead09ee93ec6230812a1897f03
> prerequisite-patch-id: cb5e32bc00b44593548803fafea49846b1fbfd8e
> prerequisite-patch-id: 5825adf8d34d9bc9a01bb99ebe2857acc4e48837
> prerequisite-patch-id: 446316f606e1ebe5d1a36eb6faa01e7abe5b01b3
> prerequisite-patch-id: 1b971ad81ad8161c7e21a2298dfd90c361f59d81
> prerequisite-patch-id: a0fd852eacce6e62bbcd0599bc2c6b9e352c22cf
> prerequisite-patch-id: c69fc3623449b73cffce9539c9d91d23ecc28d27
> prerequisite-patch-id: 20225ef0715ae31057ded54abfdf08476b65c820
> prerequisite-patch-id: ad105361da70c94743ce2b4096cb6694c8f9e93d
> prerequisite-patch-id: 33ef5e8d08adc16123fecada7496ce2b21121b4e
> prerequisite-patch-id: 49143535f99193c3f9d3ec1baa99609396e16726
> prerequisite-patch-id: f1c195757737eed5c657b8d4c932e746eb8b6828
> prerequisite-patch-id: 00873bc529c5e2ab8832e960eac08f43d7e118d3
> prerequisite-patch-id: dbe80915cb9510677723f8b6532de4c0aafb00d0
> prerequisite-patch-id: a0ece85dd85953f4438536e084e584746edef3fe
> prerequisite-patch-id: 93310291d1d191198af70417214e4e3bf230fdf1
> prerequisite-patch-id: 2178db95d1976bd335bdc606b2ea88881e7f1a0e
> prerequisite-patch-id: 0fb9c8a496e46d8d93107842afe6476135a370d4
> prerequisite-patch-id: 446e52dde62004604489532b8b3586374ab40469
> prerequisite-patch-id: dcf23bf3e4d1ca6193b1420797e92d6ca94eb1b5
> prerequisite-patch-id: 648e39344d2f5a28175b429ec1d1725cd7b40832
> prerequisite-patch-id: 08c9c5bfcc7fc59c4742e51dac3aece772746154
> prerequisite-patch-id: 994d7a671c227b1980fd199372a9133322bd33b6
> prerequisite-patch-id: 9104f3c2d6cd2fb741285fe50380b8542e9a0fc9
> prerequisite-patch-id: 32f9dcae093841a2f6d24a7deaa760e4ba8f586a
> prerequisite-patch-id: f5cd20074b9b9a9ab7bdb4f1cfb4dfb5b102b3f1
> prerequisite-patch-id: 07420c53830a4739100b1973056238007a0eb53f
> prerequisite-patch-id: 4a32cb11838b1156ccf521ba0b4262366a72694b
> prerequisite-patch-id: c5c9fbdd46c675766887185be4490629a1b82c85
> prerequisite-patch-id: d058aeab00e2d92b9d2c5c84e7b48a383da227f8
> prerequisite-patch-id: 12777e32c096e913b2d02d0284c0cefd060db1be
> prerequisite-patch-id: 68464d97360fcd8829d3875fa9b40106f15b142e
> prerequisite-patch-id: f4ba0d65afdc7571042935aadf23c5169357a0c6
> prerequisite-patch-id: 43e3b7cec0c1efed8c177164260f8493de379b6d
> prerequisite-patch-id: bfc849fb32943cac2ac4e6cc667eea84a17fde45
> prerequisite-patch-id: 9abb71281e3353e80a4a8d7723491300fb10e46b
> prerequisite-patch-id: e5c8890c24836f032661e7df14884f272b45d405
> prerequisite-patch-id: b7cfe3cdbd106e8f365fb9843de9fabc249c1f7e
> prerequisite-patch-id: afe882e31560b8b926a04a5a303507600b8a785e
> prerequisite-patch-id: ffa937e7c83d5faa0ae05d191705c5b46dfcc1cd
> prerequisite-patch-id: b3824302e7c466aa04ffdb422b51b224cc4ff0a0
> prerequisite-patch-id: ec5d99103698e4fb07060015e2892b9615bf3655
> prerequisite-patch-id: 0c9e5a2c64d1c90b5b3063b722effb9a181d7dc1
> prerequisite-patch-id: 54b8048952f276cd567fbe3c1ec5ede6cc17c3fe
> prerequisite-patch-id: 02e0153fab34c940fa24da7e0cf18e22e0841969
> prerequisite-patch-id: 35a9ae0cae72e6d2addb5312861fd9e7f8b0e016
> prerequisite-patch-id: 81283fc449a77c52ab57948ab1c20232b3a27d0f
> prerequisite-patch-id: e9b9541587266d037f795861c8b92258f7906b3f
> prerequisite-patch-id: 93c9a26aa7078b3e7fa5df1f43286a1ada03e47a
> prerequisite-patch-id: 5dd8ba31312b3497fca5791014d622cc7afa05d2
> prerequisite-patch-id: df6f2698dae60d1d077c112f6164634be36f234f
> prerequisite-patch-id: a42f61db594dcb2c9c4c6ad98dda4e0a26e8dc9f
> prerequisite-patch-id: 17ba0a295e091e160f75cb2fa0f34d641792ab3a
> prerequisite-patch-id: b3f512b793c45f450f38ee61fd2b323175a815e7
> prerequisite-patch-id: 17e4374126de232483d0aac726703306a2acb978
> prerequisite-patch-id: a7c52145f8eb9a4e21c0d4880da9d54ffad81bed
> prerequisite-patch-id: 2caedc3297049beaf7641b3def7953556969e188
> prerequisite-patch-id: 19df4b2ca9b8e5083294c4cb7589549438b173aa
> prerequisite-patch-id: 50a7404e844005954ccab0df31fe26867eb46eb9
> prerequisite-patch-id: b51538406699bc501c805a0c66ae6c6469d74e0f
> prerequisite-patch-id: e23c6afe110917b26a34a7dced94499c3e35d590
> prerequisite-patch-id: eb4117091c76d31b7bf0775cbc3355f141c7718e
> prerequisite-patch-id: faf9846d8f602d1a7898b2f94c18cbb863bf1fb5
> prerequisite-patch-id: d6957b911681be1659bf9c42a5e58a3ff4a71ea6
> prerequisite-patch-id: 1b83e7539f4ad605203cb87354e6bc305ef8d00b
> prerequisite-patch-id: a9663fc20ea645469b513ef26f06562e7925aa27
> prerequisite-patch-id: 37af00c7de96e5d0db554ca26ab50377646e5bb5
> prerequisite-patch-id: 15ef726f868b61b4218c70f1fd69f12b8503d77e
> prerequisite-patch-id: 01a098895ef542664e5baf90a2eaa1075076cc3b
> prerequisite-patch-id: defd3d558483dfc1ae9ca63d021859b68f625916
> prerequisite-patch-id: 77c67fa6c48e58bab2006a456ac084a3c8c724cd
> prerequisite-patch-id: 7cbb84ce26b8c4cec4ecd6ab812d72ee835b4276
> prerequisite-patch-id: 5b9f9bed5455f11c483e640e03ac106c9a675303
> prerequisite-patch-id: 981c6f7198106174847ffa91e5561d9729eab29c
> prerequisite-patch-id: 527f4972d02f6395f20ff71fe347e7df4e9c5d49
> prerequisite-patch-id: acb9e9e7d35626830f55a48b71d9ddfa21a6f3f8
> prerequisite-patch-id: 598773c3926246bc50817560f4a71f97516c1b5e
> prerequisite-patch-id: 0253f84e39294c8fde5ae91ae3ff522ab3151a14
> prerequisite-patch-id: 910a61665db49fb6f6135cb4880c8701e3825b2f
> prerequisite-patch-id: 3c9674434cffd43b72b67be4301074a8e52f97d2
> prerequisite-patch-id: 77f3f0ddd291120c16eaa640b8a86c1f4c84f863
> prerequisite-patch-id: 095942e7b63211b760365ce5362847687abc8317
> prerequisite-patch-id: 786c61f9545c93d3d4cbe4484c74bf8a85753e50
> prerequisite-patch-id: 15aa2a5ef635f2bb858be24b4e8f1bd4e0608b39
> prerequisite-patch-id: 2f627bc5310387d732355acaf926780554d48f7c
> prerequisite-patch-id: c7adf0cf40acd38ab738eaf97eced4f369affffa
> prerequisite-patch-id: ecc4536e360c90ab9e3609cdd0b73758a4fd9942
> prerequisite-patch-id: e53fb0c690bb8c1997f3357d48370e954aa2e7fa
> prerequisite-patch-id: d1f3151facfc2531c41e016aad471447c0a15099
> prerequisite-patch-id: 909c62f4b9102124ba9a41ea666e226b107ff952
> prerequisite-patch-id: 8d9a45c57f4c31589952ba09599292dc4072450d
> prerequisite-patch-id: a7d209b97b24756aa91aadb198f4cf3bfe914042
> prerequisite-patch-id: b533e83b2b68b34b68f47d0dcde10060bd257d24
> prerequisite-patch-id: b60b37b3f83c3eb0d3c3f283b3c659fd3acd434d
> prerequisite-patch-id: 0ed5b5d4ad29ebec38f8a1bc5c41e1bf46dc450a
> prerequisite-patch-id: 48e300f8fa939c1f9112845dbe8c757eff617a92
> prerequisite-patch-id: 595ed3348f76d24968ea65f7c68caa63bad6122f
> prerequisite-patch-id: bf23bb87b969450461566899549cfcc4d0dde6df
> prerequisite-patch-id: c89c9b274b83db5de08c6f5c35a018879d7b60cd
> prerequisite-patch-id: 4f4336258b77ac72ed58b33f33ad4daa15524383
> prerequisite-patch-id: 767d34e16bc46ca88cf30de1e55dee7e8b696a44
> prerequisite-patch-id: 69d14aed9c5bf5b8ead291df5006b9f2609661e1
> prerequisite-patch-id: 2d35e97beadf421452a107e318a47c2283bb4bd3
> prerequisite-patch-id: 9e99f28f8fdf94856cf237ec291b3e522e940dd2
> prerequisite-patch-id: b5579698d05839390237f31dc1759379c57ede1b
> prerequisite-patch-id: cf988ff1ccb26e98a8d791cdd1f8ec12ea9ab2e9
> prerequisite-patch-id: 7ba5de8045696070d6e71dd2b4a12ab01163debf
> prerequisite-patch-id: 7efcc80df72d0cce93237cfb1ce66766b06543ea
> prerequisite-patch-id: ce53af57a0cae525a1d0f30c2b40dd1a2328aa99
> prerequisite-patch-id: bb8ee7752839c14c6057a25ab992f467a75cd3d0
> prerequisite-patch-id: 2816ba27dbf4433edac47a9bb90679e1d82700d0
> prerequisite-patch-id: 970c7622f790ab8dd7c90c3c69d652db72fef28c
> prerequisite-patch-id: 370561873e809f871cf74ac039af3106afaa07ea
> prerequisite-patch-id: 7829b94aaf5bc7ec3b82ab2d006c0a560dc2b283
> prerequisite-patch-id: ab561297c603ec94a616f26384fa40bbbb2c0cd6
> prerequisite-patch-id: 871c2d1e0a36574cdd253af5bf017dbf274e2607
> prerequisite-patch-id: a7c9f42a40fc04413862800a3aed7e9fe4f3b328
> prerequisite-patch-id: dd48f9c1f61db071fa540687e8326744f695e957
> prerequisite-patch-id: 1f3326fcbb083425e5e58fab821a96fb0786d8bc
> prerequisite-patch-id: 3a23986302dbbefb2f3310251ace36e852e04139
> prerequisite-patch-id: ecd17f6471d32a1ca7469ff9f0df3ce6f52cc958
> prerequisite-patch-id: e426a207bac31cb79213dccc046eef660bd2f11b
> prerequisite-patch-id: f2a25fd554a2e7c2a3b8a3e512c1eb88e7de7c83
> prerequisite-patch-id: 75c6065974585cec7ba7f506a74e07a69aaaf995
> prerequisite-patch-id: 6a80ed64de5fe92527365fed6581cac20485682f
> prerequisite-patch-id: 4a219d25c3480355952531465d9ac813eac60334
> prerequisite-patch-id: a1c9c86e5c395916846f061917d54fc978eb6e3c
> prerequisite-patch-id: 3348fee15eaeacc7fcb676ca6184a4993ee3150c
> prerequisite-patch-id: 36584017836685b4f8405dc14c8b534f19c8e554
> prerequisite-patch-id: cbfb2f0adefe9b0c701c5fc451091cd1bd28f272
> prerequisite-patch-id: 16548fc5b18667ab7fd4b08d17b310638e1b78ed
> prerequisite-patch-id: c459e5f956e9575a51c7e57304b496518220c16b
> prerequisite-patch-id: 27d900837c8a09f066ef8e0e63a18884ee371145
> prerequisite-patch-id: a4fc936692ddae3e94669cb6eda99f159ed9a33b
> prerequisite-patch-id: 64f547f1428e499be930e9f6520b05e8a72f4693
> prerequisite-patch-id: 22be676197ddd497d0f2ec236dfbaebe5ba734a0
> prerequisite-patch-id: 09d9a99d0b4d0f6aa82d14e011f4b0b60abc113c
> prerequisite-patch-id: 03bb62f06f97e7a923d24535c9ab3da741004f0e
> prerequisite-patch-id: cca12a59062e5b76474927f67533dddea4ae765c
> prerequisite-patch-id: 49d677a267b652f1b48734acde10ff32ec5c24f9
> prerequisite-patch-id: 71f6ba630e9ee4132972b3771db2f01bf1937ae8
> prerequisite-patch-id: c7eaf24675afaafa12a90eb3467cb64de70889cd
> prerequisite-patch-id: 8c3650c0a209d28ebfd6dd49e25b3612bc68aa72
> prerequisite-patch-id: fa7b9795a7c043df333d355b77fd4b5372160cc1
> prerequisite-patch-id: 91ede923e60281453861a3369a2a036c9cc7edb1
> prerequisite-patch-id: 416208989c3537275b0a6423eae1c35c7c3568c9
> prerequisite-patch-id: 3d11956e5b0d23d5803fa2ce0c6af70331e7a59f
> prerequisite-patch-id: 2d0849956881d251f6727c1c500964da9cfe7a4d
> prerequisite-patch-id: f5e9996d677d3f271a228e13cc474b8a4a228a7d
> prerequisite-patch-id: 81202dd5649a9c71d60bd5fa2d420fc92d6dbb93
> prerequisite-patch-id: eec909f2cce1ee6dbfdb2566cceef8330a89ded1
> prerequisite-patch-id: c32d7469a6a94d7338ce33bf02b10dac9fd58905
> prerequisite-patch-id: cee3b16546f89a21cf1bd042759a93fc4395f5e7
> prerequisite-patch-id: 44f84ab816894c29dd9f1df568ca2a540dc2082f
> prerequisite-patch-id: 81497b1cb79924649beb9115a348d46566ef2250
> prerequisite-patch-id: 57ea7a0039178014fed7ba520e16282c37db2008
> prerequisite-patch-id: 19f051ac20b3d54d5cb31f4020ce1097b1127806
> prerequisite-patch-id: 36e27eb139331cfd31bcb1b1c7cf8bda40b3219e
> prerequisite-patch-id: dc1c0934f5853b39cbcd29d46080b8a089c55711
> prerequisite-patch-id: 03bce6f0056238e30d6d7e2351f84eed2cc80116
> prerequisite-patch-id: 1b37177237d6b93dfd3fde8bc183b4cb60431a0a
> prerequisite-patch-id: 0d14ebba6a55ace8d69bbf1f28d547919453612f
> prerequisite-patch-id: 63fe96d6f0f90faf3f073bf0754f03e2449f7a0f
> prerequisite-patch-id: 440f07af20c96a28130d59af3c4d5017f4589f7c
> prerequisite-patch-id: 0f6ab7fe9c2f8f690cfc999e3379dd7c3698acdf
> prerequisite-patch-id: 0b6074cf8c6e4c30f39d1cc37bf0b743e92106d8
> prerequisite-patch-id: 92a86bd2b713849bd81203e038ba26e2c34a0b48
> prerequisite-patch-id: 696c0c463867740835b94a5653cf220a544bbd6d
> prerequisite-patch-id: 022f8972e319c4d6eea41b44af08fc30b8430194
> prerequisite-patch-id: a7094d414ca2489cd7b2e9368251f20743aa0cbc
> prerequisite-patch-id: 1ac6a9e24eac0091848dc06f0a97bb302b329616
> prerequisite-patch-id: f2c360e3d3575a5e633e1b7be99523779b7edbb4
> prerequisite-patch-id: c3e190a3aaeec9f11b881fd395f3542902288d4e
> prerequisite-patch-id: 4b9dc3072903e653d687b08827cc4feef3fe42a2
> prerequisite-patch-id: 4be7d02682f4bb15aaa70d9944f0074fdf0b55b0
> prerequisite-patch-id: 540cca782c7ada1b555e9aff154b23215b9deeb1
> prerequisite-patch-id: 9d2fd7bc54256c3905069ab17a7676621dbc4824
> prerequisite-patch-id: 7c77b8c2e4e29169d4db27154b61efda0f3a60f7
> prerequisite-patch-id: 63e0bd09888cdd1688018a5444faea5585b615eb
> prerequisite-patch-id: 63bda4bbdff01a9af8b2a899f3f399f64821e8e5
> prerequisite-patch-id: f2f5b845fbd96a556d6d6beb6f9dc62f66c551ba
> prerequisite-patch-id: 2bfd3ff17c27c9fd0c6e2f62f94ae94ca3be2c2f
> prerequisite-patch-id: 6dcbf1f29f7bdb2d090df3fa2386f84bdabb134c
> prerequisite-patch-id: aee978ee331aade69dfb15f34d3a49d1e1456010
> prerequisite-patch-id: 508da75a30876b4308fa195bfc195d423e8b6926
> prerequisite-patch-id: c0dd414a118e4a4928227cc99d4fa9950ac13e1a
> prerequisite-patch-id: b44e5bd8ebee1347e6a1bbc509567a9c7131c670
> prerequisite-patch-id: 4b1976720172be748bfabb9ce1b3df2be5740ccb
> prerequisite-patch-id: e085ee46525358621a3cdbb764f9c261df2189b9
> prerequisite-patch-id: cf6c9acae8563614effe680f66358e22fbee16df
> prerequisite-patch-id: d35a7c3f4d491c8e2fa99d13a24e96b0ffd20fe3
> prerequisite-patch-id: 252042c9bb537434faac9b6a3b1a5916c87bff3c
> prerequisite-patch-id: fdf66e6c9bb9ecd2686f343fb7d7199c122c20a8
> prerequisite-patch-id: 706b9dd63b1a5af07deba0c9c424ce90f0c3089f
> prerequisite-patch-id: 9d0dda91fae4a3236f64f69e9e705b03b82ccfd1
> prerequisite-patch-id: daffab6f9c0b0ff08bed4418650dc1e237714750
> prerequisite-patch-id: 92e5fe246b5aee161ab4d59169e03f453005c0bc
> prerequisite-patch-id: fb8032a010a548166cf9736591494ddc3592a403
> prerequisite-patch-id: 9d9291f4523a351f057572d29949453aeba14470
> prerequisite-patch-id: c81839e007344dc0abd136ce84dd9a03700ed40f
> prerequisite-patch-id: 36b831f47d3373991800bf859a4b91edb25948aa
> prerequisite-patch-id: d3859427aaa383739cbc997d1dab5de456d3d93d
> prerequisite-patch-id: 2799d1da30f6d7527bd1768c526f22dd84442c90
> prerequisite-patch-id: 864df2fcd3690f8b43fe2932f9a4905fdd84d688
> prerequisite-patch-id: e3174748a7dbdffc24880593485b7cba9ffe4543
> prerequisite-patch-id: b55ea90b0a7c76782966811235e6166f36767f17
> prerequisite-patch-id: fb0e6e79c1eff64537a94318756ca9b5e5527bd8
> prerequisite-patch-id: 643632539707f6faf28f1e08e0ab9befd18bf907
> prerequisite-patch-id: 0c5ab44384756b26713f87a7629fce2f903619d4
> prerequisite-patch-id: 7f97b645947f225f1ca9a8e9f43a2061f1b5c6bd
> prerequisite-patch-id: 16d51862c67f2397b6f72c4c0b59c19d72562ec9
> prerequisite-patch-id: 9b9cec25d00826ce998f5b19fa4c597ba3cd686a
> prerequisite-patch-id: 835fadd8fb7326e16eb864925360702a87aed5d0
> prerequisite-patch-id: 1798611cf144f3272522dbd7236f4b25ec3ec788
> prerequisite-patch-id: 4d5cb04222fdfd5e34d325a6180f9424afaabd1d
> prerequisite-patch-id: b44129cdbee40066940bb4229de42bd18492ca0c
> prerequisite-patch-id: 9cf1e7134e498540b41444faf838ddf8aadb00da
> prerequisite-patch-id: 87f8b8a8f40c1735a068e38da505f1255600d601
> prerequisite-patch-id: 388ec700b5ba4b375a3935d1130d09761b0b2e58
> prerequisite-patch-id: 035132e672b63d5f81bd67dee7855d6b7fd969d0
> prerequisite-patch-id: 1111439ad6dce401e5d1b0177b3634f32c1cd831
> prerequisite-patch-id: a0689a89468f7bd82b10d9229c7b6aa3fe490cc5
> prerequisite-patch-id: 3d67ad089d87d96f022c9b97b1cad490ae067521
> prerequisite-patch-id: 94dfdcabb3b924f01fca88a52470a54c6624a3b7
> prerequisite-patch-id: ea6880da98e2b36732d74ec3baceb33ebf4f92d9
> prerequisite-patch-id: 9306673f95d19b4691fbda21712754bf17466827
> prerequisite-patch-id: aeedbcc9c2281775c99bb3d63c1e3dbffbf5550c
> prerequisite-patch-id: 34fdc5009dbd9dddd5561651f12f3d1022e0abc1
> prerequisite-patch-id: d42e1038d68eecf064d94555ac570962db845692
> prerequisite-patch-id: 333208f79e46468817cef0bf948348488c3e6233
> prerequisite-patch-id: 362fe76bd3530139ab14bd9ff470b653fc77ddbb
> prerequisite-patch-id: c44c4f29d7740e459d8ab08899a8d5a6689a3516
> prerequisite-patch-id: e3a6bcfc0fc563e5dbdc854ea09e48305a6fa09a
> prerequisite-patch-id: 7464a4da1f3e57a43eb587fdfb3fb0d29401703e
> prerequisite-patch-id: f3a1b4b6d4e6170df160cd4e32429c50ce416d93
> prerequisite-patch-id: 68e52ce216a7f29dd1d652787002181c89899203
> prerequisite-patch-id: a352568b04aec91189142b046981f0db09b041dd
> prerequisite-patch-id: b0740e612ccc5612b641b93a107d2ea2bea876ca
> prerequisite-patch-id: aff877b6fa3772864b829635566bb265885b9a2d
> prerequisite-patch-id: 4aeaca9916de80d6965cf8a4a2046ce838868b9e
> prerequisite-patch-id: d9e1e0e24aec960bd97fb6ea6090f96b279065ae
> prerequisite-patch-id: 962f178f4adb196263ac97e3e122c227ba8b4593
> prerequisite-patch-id: ff1bc4e5b325bb70ea2f6e81520079ea23c63877
> prerequisite-patch-id: 97614480e57fb4965d2d43bede127f74b7e163b5
> prerequisite-patch-id: 244f7cdda45a32a112ae5f2fb6c838f76d40c632
> prerequisite-patch-id: cff74a2c389963404740bcdf2eccc500e6c3617f
> prerequisite-patch-id: de452ad08659abf6b5b9e1955c04f00eea9c6743
> prerequisite-patch-id: e5da75b92c986b15e60e7831a2f627451a7302c7
> prerequisite-patch-id: f632675b99397cf02e36f5bce8d43b31a7059b17
> prerequisite-patch-id: 4cfd90cf66035d8fac4cba4a2c4da96ff14a8353
> prerequisite-patch-id: 5d6373f107805d335a04e2da363f3bf9a3f4e226
> prerequisite-patch-id: e255bb29d8f9e1eac9c02534b42c85ea6032743d
> prerequisite-patch-id: 40362bf8fc5556d749b069aac9da05ec4b3f0322
> prerequisite-patch-id: 9b61da74940edce0a0e8066502afb931c4448a08
> prerequisite-patch-id: 6b6b67624ad3279fd1d5bfa85e5c629b19457a1a
> prerequisite-patch-id: 0f7b52d343155db70d7f6032a33fb42e08c63d6b
> prerequisite-patch-id: d1cab56c2c0f626b48fb27e8b3d0dfe23467274a
> prerequisite-patch-id: 4214a4e2601f4316614855d902c756469a975541
> prerequisite-patch-id: 24d081c7d38f31469fe9bc0b8c31880a87e4f803
> prerequisite-patch-id: 0207778851a2185aa1cb6add0789895e57a17e37
> prerequisite-patch-id: 31d9287af072dae499ba3615ac01ac1cb1850768
> prerequisite-patch-id: be401b009255cd0359d025b2a8b2f2da426968cc
> prerequisite-patch-id: ea6dab75f14f5d0883fbb2254bfaf05aa0cedbc4
> prerequisite-patch-id: 66f43dd746c8a4db3d1f63781f07e3f257e1b951
> prerequisite-patch-id: 66b530ac2d65b27ab400405a694b540232cb48b8
> prerequisite-patch-id: 4f030521add263c813e5c7ca260da8d3ad0294c7
> prerequisite-patch-id: 4527a4ba70cfe527485ed026ba1c867e88c1cd49
> prerequisite-patch-id: d154abd788a30e1b8b20db08891ba6ed3a691589
> prerequisite-patch-id: 2142cf58a70b837c9b9e37c54908033007f6894e
> prerequisite-patch-id: 97d9f6cfc40c030d657a62a4baee6ed3a5f771c9
> prerequisite-patch-id: f87f989cc7f612bad0191f5ce0ae742a1167b164
> prerequisite-patch-id: 84181d66be864cf3ee399b2e461827ba7222804d
> prerequisite-patch-id: a1276987d4d75a5882580baf3fb92bb80fdcdec6
> prerequisite-patch-id: f0b2e6091648632353e392fe8c3393e8902312b5
> prerequisite-patch-id: f3c3904a4ee5ffd7a7e7cd4543a9b59978d3370a
> prerequisite-patch-id: d2dc8ff5796218bfe77e2fd5e4d422fa7f13f2df
> prerequisite-patch-id: 15d1bf096a4efee76a07b2e0040afe1106ec6a8d
> prerequisite-patch-id: 28710fffbba300a706bdec231466be2488a22020
> prerequisite-patch-id: a9e960d9bdfeaa6725229b39540f9f12fae17696
> prerequisite-patch-id: 3d86a9343fc7c4cceba6a73e16d366e939801a18
> prerequisite-patch-id: 07b50455cb10229d4ad233bbecc5798388f062e6
> prerequisite-patch-id: 51fdff7f75da815c19684b3581367f80460849e4
> prerequisite-patch-id: c46f80c6ec7a86988d432c9185b8fa1fad266689
> prerequisite-patch-id: 886a1f50d9fd351364a7d72d125e7dad4403ed8e
> prerequisite-patch-id: b05ea374da004aa93a503e26bd06e79de358ca8a
> prerequisite-patch-id: cfdffb3ad12056811ec180cfdd375964e7c05f78
> prerequisite-patch-id: 4b945743feb00647979d295450500830bc510f16
> prerequisite-patch-id: 8c663bd7270ff7128a8ca9b9213956528eb9d795
> prerequisite-patch-id: 7c68984430bb09524c2347f5c5cf4db10ed0e11e
> prerequisite-patch-id: 00c5213959edfe39bd0889e8fdf9879bbb65cc9d
> prerequisite-patch-id: 28597d3ad923f6d64cbeee2e07e480ec4006f212
> prerequisite-patch-id: d5516a71154adccc271e449a1cfb4b857cbb0193
> prerequisite-patch-id: e682f00b2389e82ed5d507347ecc2c0fd12290dd
> prerequisite-patch-id: 3a3498ff58ff056d9a7df7efa08ff748838b398e
> --
> 2.45.2
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD)
2024-07-03 22:49 ` [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Michael S. Tsirkin
@ 2024-07-05 8:39 ` Stefano Garzarella
2024-07-05 8:49 ` Michael S. Tsirkin
0 siblings, 1 reply; 18+ messages in thread
From: Stefano Garzarella @ 2024-07-05 8:39 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: qemu-devel, Coiby Xu, Kevin Wolf, Philippe Mathieu-Daudé,
stefanha, Markus Armbruster, slp, Eduardo Habkost,
David Hildenbrand, Raphael Norwitz, Marc-André Lureau,
Daniel P. Berrangé, Igor Mammedov, Gerd Hoffmann,
Thomas Huth, qemu-block, Brad Smith, Hanna Reitz, Eric Blake,
gmaglione, Paolo Bonzini, Jason Wang, Laurent Vivier
On Wed, Jul 03, 2024 at 06:49:30PM GMT, Michael S. Tsirkin wrote:
>On Tue, Jun 18, 2024 at 12:00:30PM +0200, Stefano Garzarella wrote:
>> As discussed with Michael and Markus [1], this version also includes the patch
>> on which v7 depended to simplify the merge in Michael's tree.
>>
>> The series is all reviewed, so if there are no new changes required, I would
>> ask to merge it.
>
>
>I dropped patches 9 and 10 for now since otherwise make vm-build-freebsd
>fails.
>
>Pls figure it out and resend just 9 and 10.
I replicated locally, but I can't understand why it only happens in
certain architectures, in my case on loongarch64, ppc64, and riscv32:
326/846 qemu:qtest+qtest-loongarch64 / qtest-loongarch64/qos-test
ERROR 116.10s killed by signal 6 SIGABRT
337/846 qemu:qtest+qtest-ppc64 / qtest-ppc64/qos-test
ERROR 115.10s killed by signal 6 SIGABRT
339/846 qemu:qtest+qtest-riscv32 / qtest-riscv32/qos-test
ERROR 107.65s killed by signal 6 SIGABRT
I focused on ppc64 running `gmake --output-sync -j6 check-qtest-ppc64`
in the FreeBSD VM and it fails every time. In particular, the test that
fails is the `vhost-user/reconnect` test, in fact disabling it this way,
the qos-test tests always pass:
diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c
index 0fa8951c9f..c3d686f0ee 100644
--- a/tests/qtest/vhost-user-test.c
+++ b/tests/qtest/vhost-user-test.c
@@ -1118,9 +1119,11 @@ static void register_vhost_user_test(void)
"virtio-net",
test_migrate, &opts);
+#if 0
opts.before = vhost_user_test_setup_reconnect;
qos_add_test("vhost-user/reconnect", "virtio-net",
test_reconnect, &opts);
+#endif
opts.before = vhost_user_test_setup_connect_fail;
qos_add_test("vhost-user/connect-fail", "virtio-net",
Analyzing the test, what happens is that after the disconnection, the
test doesn't receive VHOST_USER_SET_MEM_TABLE message, so the second
`wait_for_fds()` fails after the 5 sec timeout (increasing it doesn't
help), not having received the fds.
diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c
index 0fa8951c9f..c3d686f0ee 100644
--- a/tests/qtest/vhost-user-test.c
+++ b/tests/qtest/vhost-user-test.c
@@ -976,6 +976,7 @@ static void test_reconnect(void *obj, void *arg,
QGuestAllocator *alloc)
g_source_set_callback(src, reconnect_cb, s, NULL);
g_source_attach(src, s->context);
g_source_unref(src);
+ // THIS one is failing
g_assert(wait_for_fds(s));
wait_for_rings_started(s, 2);
}
This is the test log (note: IIUC QEMU failures happen after the test
exits on the assertion, so so it could mean that the chardev reconnected
correctly):
▶ 28/30 /ppc64/pseries/spapr-pci-host-bridge/pci-bus-spapr/pci-bus/virtio-net-pci/virtio-net/virtio-net-tests/vhost-user/reconnect - ERROR:../src/tests/qtest/qos-test.c:191:subprocess_run_one_test: child process (/ppc64/pseries/spapr-pci-host-bridge/pci-bus-spapr/pci-bus/virtio-net-pci/virtio-net/virtio-net-tests/vhost-user/reconnect/subprocess [54991]) failed unexpectedly FAIL
▶ 28/30 ERROR
[28-30/30] 🌒 qemu:qtest+qtest-ppc64 / qtest-ppc64/qmp-cmd-test [28-30/30] 🌓 qemu:qtest+qtest-ppc64 / qtest-ppc64/migration-test 28/30 qemu:qtest+qtest-ppc64 / qtest-ppc64/qos-test ERROR 21.53s killed by signal 6 SIGABRT
>>> PYTHON=/usr/home/qemu/qemu-test.OD8v2L/build/pyvenv/bin/python3.9 ASAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1 G_TEST_DBUS_DAEMON=/usr/home/qemu/qemu-test.OD8v2L/src/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-ppc64 MALLOC_PERTURB_=141 QTEST_QEMU_IMG=./qemu-img QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon UBSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 /usr/home/qemu/qemu-test.OD8v2L/build/tests/qtest/qos-test --tap -k
―――――――――――――――――――――――――――――――――――――――― ✀ ――――――――――――――――――――――――――――――――――――――――
stderr:
Vhost user backend fails to broadcast fake RARP
qemu-system-ppc64: -chardev socket,id=chr-reconnect,path=/tmp/vhost-test-Z5VMQ2/reconnect.sock,server=on: info: QEMU waiting for connection on: disconnected:unix:/tmp/vhost-test-Z5VMQ2/reconnect.sock,server=on
**
ERROR:../src/tests/qtest/vhost-user-test.c:255:wait_for_fds: assertion failed: (s->fds_num)
qemu-system-ppc64: Failed to set msg fds.
qemu-system-ppc64: vhost VQ 0 ring restore failed: -22: Invalid argument (22)
qemu-system-ppc64: Failed to set msg fds.
qemu-system-ppc64: vhost_set_vring_endian failed: Invalid argument (22)
qemu-system-ppc64: Failed to set msg fds.
qemu-system-ppc64: vhost VQ 1 ring restore failed: -22: Invalid argument
(22)
qemu-system-ppc64: Failed to set msg fds.
qemu-system-ppc64: vhost_set_vring_endian failed: Invalid argument (22)
qemu-system-ppc64: Failed to write msg. Wrote -1 instead of 12.
qemu-system-ppc64: vhost_backend_init failed: Protocol error
qemu-system-ppc64: failed to init vhost_net for queue 0
**
ERROR:../src/tests/qtest/qos-test.c:191:subprocess_run_one_test: child process (/ppc64/pseries/spapr-pci-host-bridge/pci-bus-spapr/pci-bus/virtio-net-pci/virtio-net/virtio-net-tests/vhost-user/reconnect/subprocess [54991]) failed unexpectedly
(test program exited with status code -6)
I would think of some endianness problem, but it's strange that it only
happens in the reconnect test. Next week I'll try to figure out why this
is systematic only on some architectures, does anyone have any ideas?
Thanks,
Stefano
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD)
2024-07-05 8:39 ` Stefano Garzarella
@ 2024-07-05 8:49 ` Michael S. Tsirkin
0 siblings, 0 replies; 18+ messages in thread
From: Michael S. Tsirkin @ 2024-07-05 8:49 UTC (permalink / raw)
To: Stefano Garzarella
Cc: qemu-devel, Coiby Xu, Kevin Wolf, Philippe Mathieu-Daudé,
stefanha, Markus Armbruster, slp, Eduardo Habkost,
David Hildenbrand, Raphael Norwitz, Marc-André Lureau,
Daniel P. Berrangé, Igor Mammedov, Gerd Hoffmann,
Thomas Huth, qemu-block, Brad Smith, Hanna Reitz, Eric Blake,
gmaglione, Paolo Bonzini, Jason Wang, Laurent Vivier
On Fri, Jul 05, 2024 at 10:39:33AM +0200, Stefano Garzarella wrote:
> On Wed, Jul 03, 2024 at 06:49:30PM GMT, Michael S. Tsirkin wrote:
> > On Tue, Jun 18, 2024 at 12:00:30PM +0200, Stefano Garzarella wrote:
> > > As discussed with Michael and Markus [1], this version also includes the patch
> > > on which v7 depended to simplify the merge in Michael's tree.
> > >
> > > The series is all reviewed, so if there are no new changes required, I would
> > > ask to merge it.
> >
> >
> > I dropped patches 9 and 10 for now since otherwise make vm-build-freebsd
> > fails.
> >
> > Pls figure it out and resend just 9 and 10.
>
> I replicated locally, but I can't understand why it only happens in certain
> architectures, in my case on loongarch64, ppc64, and riscv32:
>
> 326/846 qemu:qtest+qtest-loongarch64 / qtest-loongarch64/qos-test
> ERROR 116.10s killed by signal 6 SIGABRT
> 337/846 qemu:qtest+qtest-ppc64 / qtest-ppc64/qos-test
> ERROR 115.10s killed by signal 6 SIGABRT
> 339/846 qemu:qtest+qtest-riscv32 / qtest-riscv32/qos-test
> ERROR 107.65s killed by signal 6 SIGABRT
>
> I focused on ppc64 running `gmake --output-sync -j6 check-qtest-ppc64` in
> the FreeBSD VM and it fails every time. In particular, the test that fails
> is the `vhost-user/reconnect` test, in fact disabling it this way, the
> qos-test tests always pass:
>
> diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c
> index 0fa8951c9f..c3d686f0ee 100644
> --- a/tests/qtest/vhost-user-test.c
> +++ b/tests/qtest/vhost-user-test.c
> @@ -1118,9 +1119,11 @@ static void register_vhost_user_test(void)
> "virtio-net",
> test_migrate, &opts);
>
> +#if 0
> opts.before = vhost_user_test_setup_reconnect;
> qos_add_test("vhost-user/reconnect", "virtio-net",
> test_reconnect, &opts);
> +#endif
>
> opts.before = vhost_user_test_setup_connect_fail;
> qos_add_test("vhost-user/connect-fail", "virtio-net",
>
> Analyzing the test, what happens is that after the disconnection, the test
> doesn't receive VHOST_USER_SET_MEM_TABLE message, so the second
> `wait_for_fds()` fails after the 5 sec timeout (increasing it doesn't help),
> not having received the fds.
>
> diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c
> index 0fa8951c9f..c3d686f0ee 100644
> --- a/tests/qtest/vhost-user-test.c
> +++ b/tests/qtest/vhost-user-test.c
> @@ -976,6 +976,7 @@ static void test_reconnect(void *obj, void *arg,
> QGuestAllocator *alloc)
> g_source_set_callback(src, reconnect_cb, s, NULL);
> g_source_attach(src, s->context);
> g_source_unref(src);
> + // THIS one is failing
> g_assert(wait_for_fds(s));
> wait_for_rings_started(s, 2);
> }
>
> This is the test log (note: IIUC QEMU failures happen after the test exits
> on the assertion, so so it could mean that the chardev reconnected
> correctly):
>
> ▶ 28/30 /ppc64/pseries/spapr-pci-host-bridge/pci-bus-spapr/pci-bus/virtio-net-pci/virtio-net/virtio-net-tests/vhost-user/reconnect - ERROR:../src/tests/qtest/qos-test.c:191:subprocess_run_one_test: child process (/ppc64/pseries/spapr-pci-host-bridge/pci-bus-spapr/pci-bus/virtio-net-pci/virtio-net/virtio-net-tests/vhost-user/reconnect/subprocess [54991]) failed unexpectedly FAIL
> ▶ 28/30 ERROR
> [28-30/30] 🌒 qemu:qtest+qtest-ppc64 / qtest-ppc64/qmp-cmd-test [28-30/30] 🌓 qemu:qtest+qtest-ppc64 / qtest-ppc64/migration-test 28/30 qemu:qtest+qtest-ppc64 / qtest-ppc64/qos-test ERROR 21.53s killed by signal 6 SIGABRT
> >>> PYTHON=/usr/home/qemu/qemu-test.OD8v2L/build/pyvenv/bin/python3.9 ASAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1 G_TEST_DBUS_DAEMON=/usr/home/qemu/qemu-test.OD8v2L/src/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-ppc64 MALLOC_PERTURB_=141 QTEST_QEMU_IMG=./qemu-img QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon UBSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 /usr/home/qemu/qemu-test.OD8v2L/build/tests/qtest/qos-test --tap -k
> ―――――――――――――――――――――――――――――――――――――――― ✀ ――――――――――――――――――――――――――――――――――――――――
> stderr:
> Vhost user backend fails to broadcast fake RARP
> qemu-system-ppc64: -chardev socket,id=chr-reconnect,path=/tmp/vhost-test-Z5VMQ2/reconnect.sock,server=on: info: QEMU waiting for connection on: disconnected:unix:/tmp/vhost-test-Z5VMQ2/reconnect.sock,server=on
> **
> ERROR:../src/tests/qtest/vhost-user-test.c:255:wait_for_fds: assertion failed: (s->fds_num)
> qemu-system-ppc64: Failed to set msg fds.
> qemu-system-ppc64: vhost VQ 0 ring restore failed: -22: Invalid argument (22)
> qemu-system-ppc64: Failed to set msg fds.
> qemu-system-ppc64: vhost_set_vring_endian failed: Invalid argument (22)
> qemu-system-ppc64: Failed to set msg fds.
> qemu-system-ppc64: vhost VQ 1 ring restore failed: -22: Invalid argument
> (22)
> qemu-system-ppc64: Failed to set msg fds.
> qemu-system-ppc64: vhost_set_vring_endian failed: Invalid argument (22)
> qemu-system-ppc64: Failed to write msg. Wrote -1 instead of 12.
> qemu-system-ppc64: vhost_backend_init failed: Protocol error
> qemu-system-ppc64: failed to init vhost_net for queue 0
> **
> ERROR:../src/tests/qtest/qos-test.c:191:subprocess_run_one_test: child process (/ppc64/pseries/spapr-pci-host-bridge/pci-bus-spapr/pci-bus/virtio-net-pci/virtio-net/virtio-net-tests/vhost-user/reconnect/subprocess [54991]) failed unexpectedly
> (test program exited with status code -6)
>
>
> I would think of some endianness problem, but it's strange that it only
> happens in the reconnect test.
loongarch64 is LE and I think so is riscv in practice.
> Next week I'll try to figure out why this is
> systematic only on some architectures, does anyone have any ideas?
>
> Thanks,
> Stefano
^ permalink raw reply [flat|nested] 18+ messages in thread