ab7fc8ee5b
- target/i386: Introduce SapphireRapids-v3 to add missing features - qtest/fuzz-lsi53c895a-test: set guest RAM to 2G - hw/net/lan9118: Signal TSFL_INT flag when TX FIFO reaches specified level - target/arm: Fix alignment for VLD4.32 - hw/microblaze: pass random seed to fdt - tests/qtest: npcm7xx-emc-test: Skip checking MAC - tests: mark io-command test as skipped if socat is missing - tests: unit: add NULL-pointer check - tests: test-qga: close socket on failure to connect - vdpa:block device capacity expansion online support vdpa block device update capacity. - virtio-net: Ensure queue index fits with RSS(CVE-2024-6505) - nbd/server: CVE-2024-7409: Avoid use-after-free when closing server - ppc/vof: Fix unaligned FDT property access - vvfat: Fix reading files with non-continuous clusters - vvfat: Fix bug in writing to middle of file - savevm: Fix load_snapshot error path crash - hw/dma/xilinx_axidma: Use semicolon at end of statement, not comma - hw/remote/message.c: Don't directly invoke DeviceClass:reset - crypto/tlscredspsk: Free username on finalize - hw/display/vhost-user-gpu.c: fix vhost_user_gpu_chr_read() - virtio: remove virtio_tswap16s() call in vring_packed_event_read() - char-stdio: Restore blocking mode of stdout on exit - hw/ppc: spapr: Use qemu_vfree() to free spapr->htab - smbios: sanitize type from external type before checking have_fields_bitmap - spapr_pci: fix leak in spapr_phb_vfio_get_loc_code - KVM: use store-release to mark dirty pages as harvested - monitor/hmp: print trace as option in help for log command - tpm_crb: Avoid backend startup just before shutdown under Xen - crypto/block-luks: make range overlap check more readable - spapr: Free stdout path - target/rx: Use target_ulong for address in LI - virtio-pci: Fix the use of an uninitialized irqfd - rtl8139: Fix behaviour for old kernels. - virtio-rng: block max-bytes=0 MIME-Version: 1.0 - hw/audio/es1370: Clean up comment - vhost-user-server: do not set memory fd non-blocking - ui: reject extended clipboard message if not activated - virtio-net: Fix vhost virtqueue notifiers for RSS - hw/misc/applesmc: Fix memory leak in reset() handler Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit db7a5d9a7239db307c8c1454fab5f8a92fd486b8)
60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
From 4b38d60e4a4a1fc4b7191ec94959f304b222b604 Mon Sep 17 00:00:00 2001
|
|
From: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
Date: Thu, 15 Aug 2024 20:20:35 -0700
|
|
Subject: [PATCH] vhost-user-server: do not set memory fd non-blocking
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
Message-Id: <20240618100043.144657-6-sgarzare@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit 4c58843e5d3192c67394b28a3330144ea56eefac)
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
---
|
|
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 783d847a6d..eda82447bd 100644
|
|
--- a/util/vhost-user-server.c
|
|
+++ b/util/vhost-user-server.c
|
|
@@ -64,6 +64,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_set_nonblock(vmsg->fds[i]);
|
|
}
|
|
--
|
|
2.41.0.windows.1
|
|
|