[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 05/13] vhost-user-server: do not set memory fd non-blocking
From: |
Stefano Garzarella |
Subject: |
[PATCH v8 05/13] vhost-user-server: do not set memory fd non-blocking |
Date: |
Tue, 18 Jun 2024 12:00:35 +0200 |
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
- [PATCH v8 00/13] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD), Stefano Garzarella, 2024/06/18
- [PATCH v8 01/13] qapi: clarify that the default is backend dependent, Stefano Garzarella, 2024/06/18
- [PATCH v8 02/13] libvhost-user: set msg.msg_control to NULL when it is empty, Stefano Garzarella, 2024/06/18
- [PATCH v8 03/13] libvhost-user: fail vu_message_write() if sendmsg() is failing, Stefano Garzarella, 2024/06/18
- [PATCH v8 04/13] libvhost-user: mask F_INFLIGHT_SHMFD if memfd is not supported, Stefano Garzarella, 2024/06/18
- [PATCH v8 05/13] vhost-user-server: do not set memory fd non-blocking,
Stefano Garzarella <=
- [PATCH v8 06/13] contrib/vhost-user-blk: fix bind() using the right size of the address, Stefano Garzarella, 2024/06/18
- [PATCH v8 08/13] vhost-user: enable frontends on any POSIX system, Stefano Garzarella, 2024/06/18
- [PATCH v8 07/13] contrib/vhost-user-*: use QEMU bswap helper functions, Stefano Garzarella, 2024/06/18
- [PATCH v8 09/13] libvhost-user: enable it on any POSIX system, Stefano Garzarella, 2024/06/18
- [PATCH v8 10/13] contrib/vhost-user-blk: enable it on any POSIX system, Stefano Garzarella, 2024/06/18
- [PATCH v8 11/13] hostmem: add a new memory backend based on POSIX shm_open(), Stefano Garzarella, 2024/06/18
- [PATCH v8 12/13] tests/qtest/vhost-user-blk-test: use memory-backend-shm, Stefano Garzarella, 2024/06/18
- [PATCH v8 13/13] tests/qtest/vhost-user-test: add a test case for memory-backend-shm, Stefano Garzarella, 2024/06/18