f1eed34ac7
This version includes both the AioContext lock and the block graph lock, so there might be some deadlocks lurking. It's not possible to disable the block graph lock like was done in QEMU 8.1, because there are no changes like the function bdrv_schedule_unref() that require it. QEMU 9.0 will finally get rid of the AioContext locking. During live-restore with a VirtIO SCSI drive with iothread there is a known racy deadlock related to the AioContext lock. Not new [1], but not sure if more likely now. Should be fixed in QEMU 9.0. The block graph lock comes with annotations that can be checked by clang's TSA. This required changes to the block drivers, i.e. alloc-track, pbs, zeroinit as well as taking the appropriate locks in pve-backup, savevm-async, vma-reader. Local variable shadowing is prohibited via a compiler flag now, required slight adaptation in vma.c. Major changes only affect alloc-track: * It is not possible to call a generated co-wrapper like bdrv_get_info() while holding the block graph lock exclusively [0], which does happen during initialization of alloc-track when the backing hd is set and the refresh_limits driver callback is invoked. The bdrv_get_info() call to get the cluster size is moved to directly after opening the file child in track_open(). The important thing is that at least the request alignment for the write target is used, because then the RMW cycle in bdrv_pwritev will gather enough data from the backing file. Partial cluster allocations in the target are not a fundamental issue, because the driver returns its allocation status based on the bitmap, so any other data that maps to the same cluster will still be copied later by a stream job (or during writes to that cluster). * Replacing the node cannot be done in the track_co_change_backing_file() callback, because it is a coroutine and cannot hold the block graph lock exclusively. So it is moved to the stream job itself with the auto-remove option not having an effect anymore (qemu-server would always set it anyways). In the future, there could either be a special option for the stream job, or maybe the upcoming blockdev-replace QMP command can be used. Replacing the backing child is actually already done in the stream job, so no need to do it in the track_co_change_backing_file() callback. It also cannot be called from a coroutine. Looking at the implementation in the qcow2 driver, it doesn't seem to be intended to change the backing child itself, just update driver-internal state. Other changes: * alloc-track: Error out early when used without auto-remove. Since replacing the node now happens in the stream job, where the option cannot be read from (it's internal to the driver), it will always be treated as 'on'. Makes sure to have users beside qemu-server notice the change (should they even exist). The option can be fully dropped in the future while adding a version guard in qemu-server. * alloc-track: Avoid seemingly superfluous child permission update. Doesn't seem necessary nowadays (maybe after commit "alloc-track: fix deadlock during drop" where the dropping is not rescheduled and delayed anymore or some upstream change). Replacing the block node will already update the permissions of the new node (which was the file child before). Should there really be some issue, instead of having a drop state, this could also be just based off the fact whether there is still a backing child. Dumping the cumulative (shared) permissions for the BDS with a debug print yields the same values after this patch and with QEMU 8.1, namely 3 and 5. * PBS block driver: compile unconditionally. Proxmox VE always needs it and something in the build process changed to make it not enabled by default. Probably would need to move the build option to meson otherwise. * backup: job unreferencing during cleanup needs to happen outside of coroutine, so it was moved to before invoking the clean * mirror: Cherry-pick stable fix to avoid potential deadlock. * savevm-async: migrate_init now can fail, so propagate potential error. * savevm-async: compression counters are not accessible outside migration/ram-compress now, so drop code that prophylactically set it to zero. [0]: https://lore.kernel.org/qemu-devel/220be383-3b0d-4938-b584-69ad214e5d5d@proxmox.com/ [1]: https://lore.kernel.org/qemu-devel/e13b488e-bf13-44f2-acca-e724d14f43fd@proxmox.com/ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
120 lines
3.3 KiB
Diff
120 lines
3.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Fiona Ebner <f.ebner@proxmox.com>
|
|
Date: Mon, 18 Dec 2023 11:13:40 +0100
|
|
Subject: [PATCH] qemu_init: increase NOFILE soft limit on POSIX
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
In many configurations, e.g. multiple vNICs with multiple queues or
|
|
with many Ceph OSDs, the default soft limit of 1024 is not enough.
|
|
QEMU is supposed to work fine with file descriptors >= 1024 and does
|
|
not use select() on POSIX. Bump the soft limit to the allowed hard
|
|
limit to avoid issues with the aforementioned configurations.
|
|
|
|
Of course the limit could be raised from the outside, but the man page
|
|
of systemd.exec states about 'LimitNOFILE=':
|
|
|
|
> Don't use.
|
|
> [...]
|
|
> Typically applications should increase their soft limit to the hard
|
|
> limit on their own, if they are OK with working with file
|
|
> descriptors above 1023,
|
|
|
|
If the soft limit is already the same as the hard limit, avoid the
|
|
superfluous setrlimit call. This can avoid a warning with a strict
|
|
seccomp filter blocking setrlimit if NOFILE was already raised before
|
|
executing QEMU.
|
|
|
|
Buglink: https://bugzilla.proxmox.com/show_bug.cgi?id=4507
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
---
|
|
include/sysemu/os-posix.h | 1 +
|
|
include/sysemu/os-win32.h | 5 +++++
|
|
os-posix.c | 22 ++++++++++++++++++++++
|
|
system/vl.c | 2 ++
|
|
4 files changed, 30 insertions(+)
|
|
|
|
diff --git a/include/sysemu/os-posix.h b/include/sysemu/os-posix.h
|
|
index dff32ae185..b881ac6c6f 100644
|
|
--- a/include/sysemu/os-posix.h
|
|
+++ b/include/sysemu/os-posix.h
|
|
@@ -51,6 +51,7 @@ bool is_daemonized(void);
|
|
void os_daemonize(void);
|
|
bool os_set_runas(const char *user_id);
|
|
void os_set_chroot(const char *path);
|
|
+void os_setup_limits(void);
|
|
void os_setup_post(void);
|
|
int os_mlock(void);
|
|
|
|
diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h
|
|
index 1047d260cb..106f155037 100644
|
|
--- a/include/sysemu/os-win32.h
|
|
+++ b/include/sysemu/os-win32.h
|
|
@@ -128,6 +128,11 @@ static inline int os_mlock(void)
|
|
return -ENOSYS;
|
|
}
|
|
|
|
+void os_setup_limits(void)
|
|
+{
|
|
+ return;
|
|
+}
|
|
+
|
|
#define fsync _commit
|
|
|
|
#if !defined(lseek)
|
|
diff --git a/os-posix.c b/os-posix.c
|
|
index 52ef6990ff..a4284e2c07 100644
|
|
--- a/os-posix.c
|
|
+++ b/os-posix.c
|
|
@@ -24,6 +24,7 @@
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
+#include <sys/resource.h>
|
|
#include <sys/wait.h>
|
|
#include <pwd.h>
|
|
#include <grp.h>
|
|
@@ -256,6 +257,27 @@ void os_daemonize(void)
|
|
}
|
|
}
|
|
|
|
+void os_setup_limits(void)
|
|
+{
|
|
+ struct rlimit nofile;
|
|
+
|
|
+ if (getrlimit(RLIMIT_NOFILE, &nofile) < 0) {
|
|
+ warn_report("unable to query NOFILE limit: %s", strerror(errno));
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if (nofile.rlim_cur == nofile.rlim_max) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ nofile.rlim_cur = nofile.rlim_max;
|
|
+
|
|
+ if (setrlimit(RLIMIT_NOFILE, &nofile) < 0) {
|
|
+ warn_report("unable to set NOFILE limit: %s", strerror(errno));
|
|
+ return;
|
|
+ }
|
|
+}
|
|
+
|
|
void os_setup_post(void)
|
|
{
|
|
int fd = 0;
|
|
diff --git a/system/vl.c b/system/vl.c
|
|
index e18fa3ce46..d2a3b3f457 100644
|
|
--- a/system/vl.c
|
|
+++ b/system/vl.c
|
|
@@ -2782,6 +2782,8 @@ void qemu_init(int argc, char **argv)
|
|
error_init(argv[0]);
|
|
qemu_init_exec_dir(argv[0]);
|
|
|
|
+ os_setup_limits();
|
|
+
|
|
qemu_init_arch_modules();
|
|
|
|
qemu_init_subsystems();
|