convert LIBXL_DEVICE_MODEL_START_TIMEOUT to env var
cover convert LIBXL_DEVICE_MODEL_START_TIMEOUT to env var
This patch series proposes converting the compile-time define LIBXL_DEVICE_MODEL_START_TIMEOUT value to an optionally overridden by environment variable value, just like the current behavior for LIBXL_BOOTLOADER_TIMEOUT is.
Manos Pitsidianakis (2):
libs/light: add device model start timeout env var libs/light: expand device model start timeout use
docs/man/xl.1.pod.in | 11 +++++++++++ tools/libs/light/libxl_9pfs.c | 2 +- tools/libs/light/libxl_device.c | 2 +- tools/libs/light/libxl_dm.c | 10 +++++----- tools/libs/light/libxl_dom_suspend.c | 2 +- tools/libs/light/libxl_domain.c | 5 +++-- tools/libs/light/libxl_internal.h | 6 ++++++ tools/libs/light/libxl_pci.c | 10 +++++----- tools/libs/light/libxl_usb.c | 8 ++++---- 9 files changed, 37 insertions(+), 19 deletions(-)
base-commit: f48299cad5c3c69fdc2c101517a6dab9c9827ea5
Signature · 1 line
γαῖα πυρί μιχθήτω
RFC PATCH 1/2 libs/light: add device model start timeout env var
When debugging QEMU, the need to run it under Valgrind and asan meant the compile-time define LIBXL_DEVICE_MODEL_START_TIMEOUT must be changed to allow for xl to wait longer while the instrumented QEMU initializes.
This commit adds support for reading the environment variable LIBXL_DEVICE_MODEL_START_TIMEOUT to configure the timeout value and otherwise fall back to the default 60.
--- docs/man/xl.1.pod.in | 11 +++++++++++ tools/libs/light/libxl_9pfs.c | 2 +- tools/libs/light/libxl_device.c | 2 +- tools/libs/light/libxl_dm.c | 6 +++--- tools/libs/light/libxl_dom_suspend.c | 2 +- tools/libs/light/libxl_internal.h | 6 ++++++ tools/libs/light/libxl_pci.c | 6 +++--- 7 files changed, 26 insertions(+), 9 deletions(-)
man/xl.1.pod.in +11 -0
@@ -1993,6 +1993,17 @@ Otherwise the build time default in LIBXL_BOOTLOADER_TIMEOUT will be used. If defined the value must be an unsigned integer between 0 and INT_MAX, otherwise behavior is undefined. Setting to 0 disables the timeout. +=item LIBXL_DEVICE_MODEL_START_TIMEOUT + +Timeout in seconds for starting the device model process. Useful in case the +device model takes an unusual amount of time to start— for example in case of +very slow I/O, in case of slow performance due to memory sanitizer usage, etc. + +If undefined, the default hard-coded value of 60 seconds is used. + +If defined, the value must be an unsigned integer between 0 and INT_MAX, +otherwise behaviour is undefined. Setting the value to 0 disables the timeout. + =back =head1 SEE ALSO
libs/light/libxl_9pfs.c +1 -1
@@ -132,7 +132,7 @@ static int xen9pfsd_spawn(libxl__egc *egc, uint32_t domid, libxl_device_p9 *p9, aop9->spawn.ao = aodev->ao; aop9->spawn.what ="xen-9pfs daemon" ; aop9->spawn.xspath =GCSPRINTF ("%s/state" , path); - aop9->spawn.timeout_ms =LIBXL_DEVICE_MODEL_START_TIMEOUT *1000 ; + aop9->spawn.timeout_ms =__libxl_device_model_start_timeout () *1000 ; aop9->spawn.pidpath =GCSPRINTF ("%s/pid" , path); aop9->spawn.midproc_cb = libxl__spawn_record_pid; aop9->spawn.confirm_cb = xen9pfsd_confirm;
libs/light/libxl_device.c +1 -1
@@ -1436,7 +1436,7 @@ int libxl__wait_for_device_model_deprecated(libxl__gc *gc, path =DEVICE_MODEL_XS_PATH (gc, dm_domid, domid,"/state" );return libxl__xenstore_child_wait_deprecated (gc, domid, -LIBXL_DEVICE_MODEL_START_TIMEOUT , +__libxl_device_model_start_timeout (),"Device Model" , path, state, spawning, check_callback, check_callback_userdata); }
libs/light/libxl_dm.c +3 -3
@@ -2629,7 +2629,7 @@ static void spawn_qmp_proxy(libxl__egc *egc, sdss->qmp_proxy_spawn.pidpath =GCSPRINTF ("%s/image/qmp-proxy-pid" , dom_path); sdss->qmp_proxy_spawn.xspath =DEVICE_MODEL_XS_PATH (gc,LIBXL_TOOLSTACK_DOMID , dm_domid,"/qmp-proxy-state" ); - sdss->qmp_proxy_spawn.timeout_ms =LIBXL_DEVICE_MODEL_START_TIMEOUT *1000 ; + sdss->qmp_proxy_spawn.timeout_ms =__libxl_device_model_start_timeout () *1000 ; sdss->qmp_proxy_spawn.midproc_cb = libxl__spawn_record_pid; sdss->qmp_proxy_spawn.confirm_cb = qmp_proxy_confirm; sdss->qmp_proxy_spawn.failure_cb = qmp_proxy_startup_failed;
@@ -3011,7 +3011,7 @@ retry_transaction: spawn->what =GCSPRINTF ("domain %d device model" , domid); spawn->xspath =DEVICE_MODEL_XS_PATH (gc,LIBXL_TOOLSTACK_DOMID , domid,"/state" ); - spawn->timeout_ms =LIBXL_DEVICE_MODEL_START_TIMEOUT *1000 ; + spawn->timeout_ms =__libxl_device_model_start_timeout () *1000 ; spawn->pidpath =GCSPRINTF ("%s/image/device-model-pid" , dom_path); spawn->midproc_cb = libxl__spawn_record_pid; spawn->confirm_cb = device_model_confirm;
@@ -3435,7 +3435,7 @@ void libxl__spawn_qdisk_backend(libxl__egc *egc, libxl__dm_spawn_state *dmss) dmss->spawn.what =GCSPRINTF ("domain %u Qdisk backend" , domid); dmss->spawn.xspath =GCSPRINTF ("device-model/%u/state" , domid); - dmss->spawn.timeout_ms =LIBXL_DEVICE_MODEL_START_TIMEOUT *1000 ; + dmss->spawn.timeout_ms =__libxl_device_model_start_timeout () *1000 ;/* * We cannot save Qemu pid anywhere in the xenstore guest dir, * because we will call this from unprivileged driver domains,
libs/light/libxl_dom_suspend.c +1 -1
@@ -517,7 +517,7 @@ void libxl__dm_resume(libxl__egc *egc, rc =libxl__ev_time_register_rel (dmrs->ao, &dmrs->time, dm_resume_timeout, -LIBXL_DEVICE_MODEL_START_TIMEOUT *1000 ); +__libxl_device_model_start_timeout () *1000 );if (rc) goto out;switch (libxl__device_model_version_running (gc, domid)) {
libs/light/libxl_internal.h +6 -0
@@ -97,6 +97,12 @@/* QEMU may be slow to load and start due to a bug in Linux where the I/O * subsystem sometime produce high latency under load. */ #define LIBXL_DEVICE_MODEL_START_TIMEOUT 60 +static inline int __libxl_device_model_start_timeout (void ) +{ +const char *timeout_env =getenv ("LIBXL_DEVICE_MODEL_START_TIMEOUT" ); +return timeout_env ?atoi (timeout_env) + :LIBXL_DEVICE_MODEL_START_TIMEOUT ; +}#define LIBXL_DEVICE_MODEL_SAVE_FILE XEN_LIB_DIR "/qemu-save"/* .$domid */ #define LIBXL_DEVICE_MODEL_RESTORE_FILE XEN_LIB_DIR "/qemu-resume"/* .$domid */ #define LIBXL_QMP_CMD_TIMEOUT 10
libs/light/libxl_pci.c +3 -3
@@ -1157,7 +1157,7 @@ static void do_pci_add(libxl__egc *egc, pas->xswait.what ="Device Model" ; pas->xswait.path =DEVICE_MODEL_XS_PATH (gc,libxl_get_stubdom_id (CTX , domid), domid,"/state" ); - pas->xswait.timeout_ms =LIBXL_DEVICE_MODEL_START_TIMEOUT *1000 ; + pas->xswait.timeout_ms =__libxl_device_model_start_timeout () *1000 ; pas->xswait.callback = pci_add_qemu_trad_watch_state_cb; rc =libxl__xswait_start (gc, &pas->xswait);if (rc) goto out;
@@ -1719,7 +1719,7 @@ static void device_pci_add_stubdom_wait(libxl__egc *egc, rc =libxl__ev_devstate_wait (ao, &pas->pciback_ds, device_pci_add_stubdom_ready, state_path, XenbusStateConnected, -LIBXL_DEVICE_MODEL_START_TIMEOUT *1000 ); +__libxl_device_model_start_timeout () *1000 );if (rc) goto out;return ; out:
@@ -1976,7 +1976,7 @@ static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs) prs->xswait.what ="Device Model" ; prs->xswait.path =DEVICE_MODEL_XS_PATH (gc,libxl_get_stubdom_id (CTX , domid), domid,"/state" ); - prs->xswait.timeout_ms =LIBXL_DEVICE_MODEL_START_TIMEOUT *1000 ; + prs->xswait.timeout_ms =__libxl_device_model_start_timeout () *1000 ; prs->xswait.callback = pci_remove_qemu_trad_watch_state_cb; rc =libxl__xswait_start (gc, &prs->xswait);if (rc) goto out_fail;
Signature · 1 line
γαῖα πυρί μιχθήτω
RFC PATCH 2/2 libs/light: expand device model start timeout use
In reply to Manos PitsidianakisVarious timeout values that depend on the device model should also respect the device model start timeout setting. This commit adds the __libxl_device_model_start_timeout() value to those time outs without changing their default values.
--- tools/libs/light/libxl_dm.c | 4 ++-- tools/libs/light/libxl_domain.c | 5 +++-- tools/libs/light/libxl_pci.c | 4 ++-- tools/libs/light/libxl_usb.c | 8 ++++---- 4 files changed, 11 insertions(+), 10 deletions(-)
libs/light/libxl_dm.c +2 -2
@@ -2807,7 +2807,7 @@ static void stubdom_pvqemu_unpaused(libxl__egc *egc, dm_domid, sdss->dm.guest_domid); sdss->xswait.path =DEVICE_MODEL_XS_PATH (gc, dm_domid, sdss->dm.guest_domid,"/state" ); - sdss->xswait.timeout_ms =LIBXL_STUBDOM_START_TIMEOUT *1000 ; + sdss->xswait.timeout_ms = (__libxl_device_model_start_timeout () +LIBXL_STUBDOM_START_TIMEOUT ) *1000 ; sdss->xswait.callback = stubdom_xswait_cb; rc =libxl__xswait_start (gc, &sdss->xswait);if (rc) goto out;
@@ -3177,7 +3177,7 @@ static void device_model_spawn_outcome(libxl__egc *egc, == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { rc =libxl__ev_time_register_rel (ao, &dmss->timeout, devise_model_postconfig_timeout, -LIBXL_QMP_CMD_TIMEOUT *1000 ); + (__libxl_device_model_start_timeout () +LIBXL_QMP_CMD_TIMEOUT ) *1000 );if (rc) goto out; dmss->qmp.ao = ao; dmss->qmp.domid = dmss->guest_domid;
libs/light/libxl_domain.c +3 -2
@@ -1882,7 +1882,8 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid,case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN : rc =libxl__ev_time_register_rel (ao, &svos->timeout, set_vcpuonline_timeout, -LIBXL_QMP_CMD_TIMEOUT *1000 ); + (__libxl_device_model_start_timeout () + +LIBXL_QMP_CMD_TIMEOUT ) *1000 );if (rc) goto out; qmp->callback = set_vcpuonline_qmp_cpus_fast_queried; rc =libxl__ev_qmp_send (egc, qmp,"query-cpus-fast" ,NULL );
@@ -2353,7 +2354,7 @@ static void retrieve_domain_configuration_lock_acquired(*/ rc =libxl__ev_time_register_rel (ao, &rdcs->timeout, retrieve_domain_configuration_timeout, -LIBXL_QMP_CMD_TIMEOUT *1000 ); + (__libxl_device_model_start_timeout () +LIBXL_QMP_CMD_TIMEOUT ) *1000 );if (rc) goto out;libxl_bitmap_alloc (CTX , &rdcs->qemuu_cpus, d_config->b_info.max_vcpus);
libs/light/libxl_pci.c +2 -2
@@ -1165,7 +1165,7 @@ static void do_pci_add(libxl__egc *egc,case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN : rc =libxl__ev_time_register_rel (ao, &pas->timeout, pci_add_timeout, -LIBXL_QMP_CMD_TIMEOUT *1000 ); + (__libxl_device_model_start_timeout () +LIBXL_QMP_CMD_TIMEOUT ) *1000 );if (rc) goto out;pci_add_qmp_device_add (egc, pas);/* must be last */
@@ -2030,7 +2030,7 @@ static void pci_remove_qmp_device_del(libxl__egc *egc, rc =libxl__ev_time_register_rel (ao, &prs->timeout, pci_remove_timeout, -LIBXL_QMP_CMD_TIMEOUT *1000 ); + (__libxl_device_model_start_timeout () +LIBXL_QMP_CMD_TIMEOUT ) *1000 );if (rc) goto out; QMP_PARAMETERS_SPRINTF(&args, "id", PCI_PT_QDEV_ID,
libs/light/libxl_usb.c +4 -4
@@ -487,7 +487,7 @@ static void libxl__device_usbctrl_add(libxl__egc *egc, uint32_t domid, rc =libxl__ev_time_register_rel (ao, &aodev->timeout, device_usbctrl_add_timeout, -LIBXL_QMP_CMD_TIMEOUT *1000 ); + (__libxl_device_model_start_timeout () +LIBXL_QMP_CMD_TIMEOUT ) *1000 );if (rc) goto outrm; qmp->ao = ao;
@@ -644,7 +644,7 @@ static void device_usbctrl_usbdevs_removed(libxl__egc *egc, rc =libxl__ev_time_register_rel (ao, &aodev->timeout, device_usbctrl_remove_timeout, -LIBXL_QMP_CMD_TIMEOUT *1000 ); + (__libxl_device_model_start_timeout () +LIBXL_QMP_CMD_TIMEOUT ) *1000 );if (rc) goto out; qmp->ao = ao;
@@ -1794,7 +1794,7 @@ static void libxl__device_usbdev_add(libxl__egc *egc, uint32_t domid, rc =libxl__ev_time_register_rel (ao, &aodev->timeout, device_usbdev_add_timeout, -LIBXL_QMP_CMD_TIMEOUT *1000 ); + (__libxl_device_model_start_timeout () +LIBXL_QMP_CMD_TIMEOUT ) *1000 );if (rc) goto out; aodev->qmp.ao = ao;
@@ -1976,7 +1976,7 @@ static void libxl__device_usbdev_remove(libxl__egc *egc, uint32_t domid, rc =libxl__ev_time_register_rel (ao, &aodev->timeout, device_usbdev_remove_timeout, -LIBXL_QMP_CMD_TIMEOUT *1000 ); + (__libxl_device_model_start_timeout () +LIBXL_QMP_CMD_TIMEOUT ) *1000 );if (rc) goto out; aodev->qmp.ao = ao;
Signature · 1 line
γαῖα πυρί μιχθήτω
Quoted 21 lines · Manos Pitsidianakis
This patch series proposes converting the compile-time define
LIBXL_DEVICE_MODEL_START_TIMEOUTvalue to an optionally overridden by environment variable value, just like the current behavior forLIBXL_BOOTLOADER_TIMEOUTis.Manos Pitsidianakis (2):
libs/light: add device model start timeout env var libs/light: expand device model start timeout usedocs/man/xl.1.pod.in | 11 +++++++++++ tools/libs/light/libxl_9pfs.c | 2 +- tools/libs/light/libxl_device.c | 2 +- tools/libs/light/libxl_dm.c | 10 +++++----- tools/libs/light/libxl_dom_suspend.c | 2 +- tools/libs/light/libxl_domain.c | 5 +++-- tools/libs/light/libxl_internal.h | 6 ++++++ tools/libs/light/libxl_pci.c | 10 +++++----- tools/libs/light/libxl_usb.c | 8 ++++---- 9 files changed, 37 insertions(+), 19 deletions(-)
Quoted 5 lines
base-commit:
f48299cad5c3c69fdc2c101517a6dab9c9827ea5Signature · 1 line
γαῖα πυρί μιχθήτω
Hi Manos,
Did you know that you could run something like
`git send-email --cc-cmd="scripts/get_maintainer.pl --no-l" ...`
and git would CC the maintainers of the code?
I've configure my xen repo to have that been automatic, with
git config sendemail.cccmd 'cd `git rev-parse --show-toplevel` && scripts/get_maintainer.pl --no-l'
There's other way to send patch, like using "scripts/add_maintainers.pl" described on this page:
https://wiki.xenproject.org/wiki/Submitting_Xen_Project_Patches#Sending_a_Patch_Series
Not sure which one is better.
Anyway, I've added the series to my list of patch to look at. But I might miss it next time if I'm not CCed.
Cheers,
Signature · 1 line
Anthony PERARD
Quoted 43 lines · Anthony PERARD
Quoted 21 lines · Manos Pitsidianakis
This patch series proposes converting the compile-time define
LIBXL_DEVICE_MODEL_START_TIMEOUTvalue to an optionally overridden by environment variable value, just like the current behavior forLIBXL_BOOTLOADER_TIMEOUTis.Manos Pitsidianakis (2):
libs/light: add device model start timeout env var libs/light: expand device model start timeout usedocs/man/xl.1.pod.in | 11 +++++++++++ tools/libs/light/libxl_9pfs.c | 2 +- tools/libs/light/libxl_device.c | 2 +- tools/libs/light/libxl_dm.c | 10 +++++----- tools/libs/light/libxl_dom_suspend.c | 2 +- tools/libs/light/libxl_domain.c | 5 +++-- tools/libs/light/libxl_internal.h | 6 ++++++ tools/libs/light/libxl_pci.c | 10 +++++----- tools/libs/light/libxl_usb.c | 8 ++++---- 9 files changed, 37 insertions(+), 19 deletions(-)Quoted 5 lines
base-commit:
f48299cad5c3c69fdc2c101517a6dab9c9827ea5--
γαῖα πυρί μιχθήτωHi Manos,
Did you know that you could run something like
`git send-email --cc-cmd="scripts/get_maintainer.pl --no-l" ...`and git would CC the maintainers of the code?
I've configure my xen repo to have that been automatic, with
git config sendemail.cccmd 'cd `git rev-parse --show-toplevel` && scripts/get_maintainer.pl --no-l'There's other way to send patch, like using "
scripts/add_maintainers.pl" described on this page:
https://wiki.xenproject.org/wiki/Submitting_Xen_Project_Patches#Sending_a_Patch_Series
Not sure which one is better.
Quoted 7 lines
Anyway, I've added the series to my list of patch to look at. But I might miss it next time if I'm not CCed.
Cheers,
--
Anthony PERARD
Hello Anthony,
I do know about that, in fact I used it and it did not output your email. Here's what the get_maintainer.pl outputs: (same output for all patches):
$ ./scripts/get_maintainer.pl --no-l ../../patches/libxl-dm-timeout-v1/v1-0001-libs-light-add-device-model-start-timeout-env-var.patch Andrew Cooper <[email protected]> George Dunlap <[email protected]> Jan Beulich <[email protected]> Julien Grall <[email protected]> Stefano Stabellini <[email protected]>
Thanks,
Signature · 2 lines
Manos Pitsidianakis Emulation and Virtualization Engineer at Linaro Ltd
Quoted 6 lines · Manos Pitsidianakis
Hello Anthony,
I do know about that, in fact I used it and it did not output your email. Here's what the
get_maintainer.ploutputs: (same output for all patches):
Quoted 7 lines
$ ./scripts/get_maintainer.pl --no-l ../../patches/libxl-dm-timeout-v1/v1-0001-libs-light-add-device-model-start-timeout-env-var.patch Andrew Cooper <[email protected]> George Dunlap <[email protected]> Jan Beulich <[email protected]> Julien Grall <[email protected]> Stefano Stabellini <[email protected]>
Oh, sorry, I didn't realise this was "THE REST" that is the list of default maintainers.
So for some reason, the script fail to parse the patches to find which files are modified. And I think I know why. Usually, git format-patch output something like:
diff --git a/tools/libs/light/libxl_dm.c b/tools/libs/light/libxl_dm.c
index 4369fef161..9ffdd50c69 100644
--- a/tools/libs/light/libxl_dm.c
+++ b/tools/libs/light/libxl_dm.cwith all path starting with "a/" or "b/", which get_maintainer then strip. (It strip them from the "diff --git" line, but remove the first "directory" from the path for line starting with "---" or "+++".)
The patches in this series instead look like this:
diff --git tools/libs/light/libxl_dm.c tools/libs/light/libxl_dm.c
index 4369fef161..9ffdd50c69 100644
--- tools/libs/light/libxl_dm.c
+++ tools/libs/light/libxl_dm.cwith "a/" and "b/" missing, and that confuses get_maintainer.pl. It tries to find maintainers for "libs/light/libxl_dm.c" which don't exist.
Did you by any chance used "--no-prefix"? It doesn't seems worse it to handle this case as I'm guessing more than on tool rely on those.
Cheers,
Signature · 1 line
Anthony PERARD
Quoted 38 lines · Anthony PERARD
Quoted 6 lines · Manos Pitsidianakis
Hello Anthony,
I do know about that, in fact I used it and it did not output your email. Here's what the
get_maintainer.ploutputs: (same output for all patches):Quoted 7 lines
$ ./scripts/get_maintainer.pl --no-l ../../patches/libxl-dm-timeout-v1/v1-0001-libs-light-add-device-model-start-timeout-env-var.patch Andrew Cooper <[email protected]> George Dunlap <[email protected]> Jan Beulich <[email protected]> Julien Grall <[email protected]> Stefano Stabellini <[email protected]>Oh, sorry, I didn't realise this was "THE REST" that is the list of default maintainers.
So for some reason, the script fail to parse the patches to find which files are modified. And I think I know why. Usually,
git format-patchoutput something like:diff --git a/tools/libs/light/libxl_dm.c b/tools/libs/light/libxl_dm.c index 4369fef161..9ffdd50c69 100644 --- a/tools/libs/light/libxl_dm.c +++ b/tools/libs/light/libxl_dm.cwith all path starting with "a/" or "b/", which
get_maintainerthen strip. (It strip them from the "diff --git" line, but remove the first "directory" from the path for line starting with "---" or "+++".)The patches in this series instead look like this:
diff --git tools/libs/light/libxl_dm.c tools/libs/light/libxl_dm.c index 4369fef161..9ffdd50c69 100644 --- tools/libs/light/libxl_dm.c +++ tools/libs/light/libxl_dm.cwith "a/" and "b/" missing, and that confuses get_maintainer.pl. It tries to find maintainers for "
libs/light/libxl_dm.c" which don't exist.
Quoted 7 lines
Did you by any chance used "--no-prefix"? It doesn't seems worse it to handle this case as I'm guessing more than on tool rely on those.
Cheers,
--
Anthony PERARD
Mystery solved: I generated those patches on my arm64 workstation, which had the debian packaged git version 2.39 which has the old behavior of git-format-patch being affected by diff.noprefix. I just re-generated them using 2.44 (which is what my config expected) and the a/b prefixes are back:
./scripts/get_maintainer.pl ../../patches/libxl-dm-timeout-v2/v2-0002-libs-light-expand-device-model-start-timeout-use.patch Anthony PERARD <[email protected]>
Juergen Gross <[email protected]>
[email protected]
I will send a v2, thanks for letting me know!
Signature · 2 lines
Manos Pitsidianakis Emulation and Virtualization Engineer at Linaro Ltd