libxl: wait for the ack when issuing power control requests
PATCH 1/1 libxl: wait for the ack when issuing power control requests
Currently only suspend power control requests wait for an ack from the domain, while power off or reboot requests simply write the command to xenstore and exit.
Introduce a 1 minute wait for the domain to acknowledge the request, or else return an error. The suspend code is slightly modified to use the new infrastructure added, but shouldn't have any functional change.
Fix the ocaml bindings and also provide a backwards compatible interface for the reboot and poweroff libxl API functions.
---
I believe applying this patch is not going to cause regressions in osstest, albeit FreeBSD doesn't acknowledge poweroff/reboot requests in the currently tested versions, it will shutdown in less than one minute, and thus the toolstack won't complain because the control node is going to be removed from xenstore.
--- tools/libxl/libxl.h | 23 +++++++- tools/libxl/libxl_dom_suspend.c | 11 ++-- tools/libxl/libxl_domain.c | 81 ++++++++++++++++++++-------- tools/libxl/libxl_internal.h | 7 ++- tools/ocaml/libs/xl/xenlight_stubs.c | 18 ++++--- tools/xl/xl_vmcontrol.c | 4 +- 6 files changed, 102 insertions(+), 42 deletions(-)
tools/libxl/libxl.h +21 -2
@@ -1628,8 +1628,27 @@ int libxl_domain_remus_start(libxl_ctx *ctx, libxl_domain_remus_info *info, const libxl_asyncop_how *ao_how)LIBXL_EXTERNAL_CALLERS_ONLY ; -int libxl_domain_shutdown (libxl_ctx *ctx,uint32_t domid); -int libxl_domain_reboot (libxl_ctx *ctx,uint32_t domid); +int libxl_domain_shutdown(libxl_ctx *ctx, uint32_t domid, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_domain_reboot(libxl_ctx *ctx, uint32_t domid, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; +#if defined(LIBXL_API_VERSION ) &&LIBXL_API_VERSION <0x041300 +static inline int libxl_domain_shutdown_0x041200 (libxl_ctx *ctx, +uint32_t domid) +{ +return libxl_domain_shutdown (ctx, domid,NULL ); +} +#define libxl_domain_shutdown libxl_domain_shutdown_0x041200 +static inline int libxl_domain_reboot_0x041200 (libxl_ctx *ctx, +uint32_t domid) +{ +return libxl_domain_reboot (ctx, domid,NULL ); +} +#define libxl_domain_reboot libxl_domain_reboot_0x041200 +#endif + int libxl_domain_destroy(libxl_ctx *ctx, uint32_t domid, const libxl_asyncop_how *ao_how) LIBXL_EXTERNAL_CALLERS_ONLY;
tools/libxl/libxl_dom_suspend.c +3 -8
@@ -193,16 +193,11 @@ static void domain_suspend_callback_common(libxl__egc *egc,LOGD (DEBUG , domid,"issuing %s suspend request via XenBus control node" , dsps->type !=LIBXL_DOMAIN_TYPE_PV ?"PVH/HVM" :"PV" ); -libxl__domain_pvcontrol_write (gc,XBT_NULL , domid,"suspend" ); - - dsps->pvcontrol.path =libxl__domain_pvcontrol_xspath (gc, domid); -if (!dsps->pvcontrol.path) { rc =ERROR_FAIL ; goto err; } - dsps->pvcontrol.ao = ao; - dsps->pvcontrol.what ="guest acknowledgement of suspend request" ; - dsps->pvcontrol.timeout_ms =60 *1000 ; dsps->pvcontrol.callback = domain_suspend_common_pvcontrol_suspending; -libxl__xswait_start (gc, &dsps->pvcontrol); + rc =libxl__domain_pvcontrol (egc, &dsps->pvcontrol, domid,"suspend" ); +if (rc) goto err; +return ; err:
tools/libxl/libxl_domain.c +59 -22
108 lines not on this page · raw message
tools/libxl/libxl_internal.h +5 -2
@@ -1378,8 +1378,6 @@ _hidden int libxl__domain_pvcontrol_available(libxl__gc *gc, uint32_t domid); _hidden const char *libxl__domain_pvcontrol_xspath(libxl__gc*, uint32_t domid); _hidden char * libxl__domain_pvcontrol_read(libxl__gc *gc,xs_transaction_t t,uint32_t domid); -_hidden int libxl__domain_pvcontrol_write(libxl__gc *gc, xs_transaction_t t, -uint32_t domid,const char *cmd);/* from xl_device */ _hidden char *libxl__device_disk_string_of_backend(libxl_disk_backend backend);
@@ -4719,6 +4717,11 @@ _hidden void libxl__ev_devlock_init(libxl__ev_devlock *); _hidden void libxl__ev_devlock_lock(libxl__egc *, libxl__ev_devlock *); _hidden void libxl__ev_devlock_unlock(libxl__gc *, libxl__ev_devlock *); +/* Send control commands over xenstore and wait for an Ack. */ +_hidden int libxl__domain_pvcontrol(libxl__egc *egc, +libxl__xswait_state *pvcontrol, +domid_t domid,const char *cmd); +#endif /*
tools/ocaml/libs/xl/xenlight_stubs.c +12 -6
@@ -551,32 +551,38 @@ value stub_libxl_domain_create_restore(value ctx, value domain_config, value parCAMLreturn (Val_int (c_domid)); } -value stub_libxl_domain_shutdown (value ctx,value domid) +value stub_libxl_domain_shutdown (value ctx,value domid,value async,value unit) { -CAMLparam2 (ctx, domid); +CAMLparam4 (ctx, domid, async, unit);int ret;uint32_t c_domid =Int_val (domid); +libxl_asyncop_how *ao_how =aohow_val (async);caml_enter_blocking_section (); - ret =libxl_domain_shutdown (CTX , c_domid); + ret =libxl_domain_shutdown (CTX , c_domid, ao_how);caml_leave_blocking_section (); +free (ao_how); +if (ret !=0 )failwith_xl (ret,"domain_shutdown" );CAMLreturn (Val_unit); } -value stub_libxl_domain_reboot (value ctx,value domid) +value stub_libxl_domain_reboot (value ctx,value domid,value async,value unit) { -CAMLparam2 (ctx, domid); +CAMLparam4 (ctx, domid, async, unit);int ret;uint32_t c_domid =Int_val (domid); +libxl_asyncop_how *ao_how =aohow_val (async);caml_enter_blocking_section (); - ret =libxl_domain_reboot (CTX , c_domid); + ret =libxl_domain_reboot (CTX , c_domid, ao_how);caml_leave_blocking_section (); +free (ao_how); +if (ret !=0 )failwith_xl (ret,"domain_reboot" );
tools/xl/xl_vmcontrol.c +2 -2
@@ -103,7 +103,7 @@ static void reboot_domain(uint32_t domid, libxl_evgen_domain_death **deathw,int rc;fprintf (stderr,"Rebooting domain %u\n" , domid); - rc=libxl_domain_reboot (ctx, domid); + rc =libxl_domain_reboot (ctx, domid,NULL );if (rc ==ERROR_NOPARAVIRT ) {if (fallback_trigger) { fprintf(stderr, "PV control interface not available:"
@@ -136,7 +136,7 @@ static void shutdown_domain(uint32_t domid,int rc;fprintf (stderr,"Shutting down domain %u\n" , domid); - rc=libxl_domain_shutdown (ctx, domid); + rc =libxl_domain_shutdown (ctx, domid,NULL );if (rc ==ERROR_NOPARAVIRT ) {if (fallback_trigger) { fprintf(stderr, "PV control interface not available:"
Signature · 7 lines
2.23.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Review
Quoted 13 lines · Roger Pau Monne
(quoted diff) +1
-0+ libxl_asyncop_how *ao_how = aohow_val(async);caml_enter_blocking_section();tools/ocaml/libs/xl/xenlight_stubs.c +1
-1- ret =libxl_domain_shutdown (CTX , c_domid); + ret =libxl_domain_shutdown (CTX , c_domid, ao_how);caml_leave_blocking_section();(quoted diff) +2
-0+ free(ao_how); +
Does this work when aohow_val returns NULL or does this needs to be checked? Otherwise This looks good to me.
— C
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 11 lines · Christian Lindig
Quoted 11 lines · Roger Pau Monne
(quoted diff) +1
-0+ libxl_asyncop_how *ao_how = aohow_val(async);caml_enter_blocking_section();tools/ocaml/libs/xl/xenlight_stubs.c +1
-1- ret =libxl_domain_shutdown (CTX , c_domid); + ret =libxl_domain_shutdown (CTX , c_domid, ao_how);caml_leave_blocking_section();
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ free(ao_how); +Does this work when
aohow_valreturns NULL or does this needs to be checked? Otherwise This looks good to me.
Both libxl_domain_shutdown and free are perfectly fine to call with ao_how == NULL, but TBH I have no idea of ocaml, so I just copied what's done in stub_libxl_domain_destroy.
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
tools/libxl/libxl.h
Quoted 32 lines · Roger Pau Monne
Currently only suspend power control requests wait for an ack from the domain, while power off or reboot requests simply write the command to xenstore and exit.
Introduce a 1 minute wait for the domain to acknowledge the request, or else return an error. The suspend code is slightly modified to use the new infrastructure added, but shouldn't have any functional change.
Fix the ocaml bindings and also provide a backwards compatible interface for the reboot and poweroff libxl API functions.
Reported-by Ross Lagerwall <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>---
I believe applying this patch is not going to cause regressions in osstest, albeit FreeBSD doesn't acknowledge poweroff/reboot requests in the currently tested versions, it will shutdown in less than one minute, and thus the toolstack won't complain because the control node is going to be removed from xenstore.--- tools/libxl/libxl.h | 23 +++++++- tools/libxl/libxl_dom_suspend.c | 11 ++-- tools/libxl/libxl_domain.c | 81 ++++++++++++++++++++-------- tools/libxl/libxl_internal.h | 7 ++- tools/ocaml/libs/xl/xenlight_stubs.c | 18 ++++--- tools/xl/xl_vmcontrol.c | 4 +- 6 files changed, 102 insertions(+), 42 deletions(-)tools/libxl/libxl.h +0
-0
In libxl.h, can you update the comment of LIBXL_HAVE_FN_USING_QMP_ASYNC to add the _shutdown and _reboot?
(The define name might not reflect the reality, but I think the comment describe what the define is for. It was introduced by edaa631ddce.)
Quoted 24 lines
tools/libxl/libxl_domain.c +8
-2@@ -763,49 +763,86 @@ char * libxl__domain_pvcontrol_read(libxl__gc *gc, xs_transaction_t t,return libxl__xs_read (gc, t, shutdown_path); } -int libxl__domain_pvcontrol_write (libxl__gc *gc,xs_transaction_t t, -uint32_t domid,const char *cmd) +int libxl__domain_pvcontrol (libxl__egc *egc,libxl__xswait_state *pvcontrol, +domid_t domid,const char *cmd) { +STATE_AO_GC (pvcontrol->ao);const char *shutdown_path; +int rc; + + rc =libxl__domain_pvcontrol_available (gc, domid); +if (rc <0 ) +return rc; shutdown_path =libxl__domain_pvcontrol_xspath (gc, domid);if (!shutdown_path)return ERROR_FAIL ;
tools/libxl/libxl_domain.c char * libxl__domain_pvcontrol_read(libxl__gc *gc, xs_transaction_t t, · line 788
Quoted 10 lines
tools/libxl/libxl_domain.c +8
-1-return libxl__xs_printf (gc, t, shutdown_path,"%s" , cmd); + rc =libxl__xs_printf (gc,XBT_NULL , shutdown_path,"%s" , cmd); +if (rc) +return rc; + + pvcontrol->path = shutdown_path; + pvcontrol->what =GCSPRINTF ("guest acknowledgement of %s request" , cmd); + pvcontrol->timeout_ms =60 *1000 ; +libxl__xswait_start (gc, pvcontrol);
Shouldn't we watch shutdown_path before we write to it? Otherwise, we might never see the acknowledgement by the guest.
But I don't know if xswait to a read the first time it is setup.
Also, you need to check the return value of libxl__xswait_start.
Quoted 7 lines
tools/libxl/libxl_domain.c +3
-2+ +return 0 ; } -static int libxl__domain_pvcontrol (libxl__gc *gc,uint32_t domid, -const char *cmd) +static bool pvcontrol_acked (const char *state)
tools/libxl/libxl_domain.c char * libxl__domain_pvcontrol_read(libxl__gc *gc, xs_transaction_t t, · line 802
Quoted 10 lines
tools/libxl/libxl_domain.c +8
-1{ -int ret; +if (!state || !strcmp (state,"" )) +return true; + +return false; +} + +static void pvcontrol_cb (libxl__egc *egc,libxl__xswait_state *xswa,int rc, +const char *state)
Can you move pvcontrol_cb after libxl_domain_shutdown and libxl_domain_reboot ? In general, the callback of a function should be after the function that set the callback.
See "ASYNCHRONOUS/LONG-RUNNING OPERATIONS" for a more detail explanation.
Quoted 27 lines
tools/libxl/libxl_domain.c +13
-8+{ +STATE_AO_GC (xswa->ao); + +if (!rc && !pvcontrol_acked (state)) +return ; - ret =libxl__domain_pvcontrol_available (gc, domid); -if (ret <0 ) -return ret; +libxl__xswait_stop (gc, xswa); -if (!ret) -return ERROR_NOPARAVIRT ; +if (rc) +LOG (ERROR ,"guest didn't acknowledge control request: %d" , rc); -return libxl__domain_pvcontrol_write (gc,XBT_NULL , domid, cmd); +libxl__ao_complete (egc, ao, rc); } -int libxl_domain_shutdown (libxl_ctx *ctx,uint32_t domid) + +int libxl_domain_shutdown (libxl_ctx *ctx,uint32_t domid, +const libxl_asyncop_how *ao_how) { -GC_INIT (ctx); +AO_CREATE (ctx, domid, ao_how);
tools/libxl/libxl_domain.c char * libxl__domain_pvcontrol_read(libxl__gc *gc, xs_transaction_t t, · line 828
Quoted 10 lines
tools/libxl/libxl_domain.c +6
-3+libxl__xswait_state *pvcontrol;int ret; - ret =libxl__domain_pvcontrol (gc, domid,"poweroff" ); -GC_FREE ; -return ret; + +GCNEW (pvcontrol); + pvcontrol->ao = ao; + pvcontrol->callback = pvcontrol_cb; + ret =libxl__domain_pvcontrol (egc, pvcontrol, domid,"poweroff" );
libxl__domain_pvcontrol should return a libxl error (I haven't check), so it should be `rc' here, not ret.
Quoted 9 lines
tools/libxl/libxl_domain.c +2
-0+ +return ret ?AO_CREATE_FAIL (ret) :AO_INPROGRESS ; }tools/ocaml/libs/xl/xenlight_stubs.c +0
-0
tools/ocaml/libs/xl/xenlight_stubs.c value stub_libxl_domain_create_restore(value ctx, value domain_config, value par · line 554
Quoted 5 lines
tools/ocaml/libs/xl/xenlight_stubs.c +1
-1@@ -551,32 +551,38 @@ value stub_libxl_domain_create_restore(value ctx, value domain_config, value parCAMLreturn (Val_int (c_domid)); } -value stub_libxl_domain_shutdown (value ctx,value domid) +value stub_libxl_domain_shutdown (value ctx,value domid,value async,value unit)
You also need to change the ocaml prototype ;-). They are declared in the *.ml and *.mli file.
Thanks,
Signature · 6 lines
Anthony PERARD _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 11 lines · Anthony PERARD
tools/libxl/libxl_domain.c char * libxl__domain_pvcontrol_read(libxl__gc *gc, xs_transaction_t t, · line 788
Quoted 9 lines · Roger Pau Monne
tools/libxl/libxl_domain.c +8
-1-return libxl__xs_printf (gc, t, shutdown_path,"%s" , cmd); + rc =libxl__xs_printf (gc,XBT_NULL , shutdown_path,"%s" , cmd); +if (rc) +return rc; + + pvcontrol->path = shutdown_path; + pvcontrol->what =GCSPRINTF ("guest acknowledgement of %s request" , cmd); + pvcontrol->timeout_ms =60 *1000 ; +libxl__xswait_start (gc, pvcontrol);
Quoted 3 lines
Shouldn't we watch
shutdown_pathbefore we write to it? Otherwise, we might never see the acknowledgement by the guest.
But I don't know if xswait to a read the first time it is setup.
AFAIK you always get an event after the watch is registered.
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 5 lines · Roger Pau Monne
tools/ocaml/libs/xl/xenlight_stubs.c| 18 ++++---
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 5 lines · Roger Pau Monne
I believe applying this patch is not going to cause regressions in osstest, albeit FreeBSD doesn't acknowledge poweroff/reboot requests in the currently tested versions, it will shutdown in less than one minute, and thus the toolstack won't complain because the control node is going to be removed from xenstore.
Acknowledgement is described in the documentation of ~/control/shutdown (described in xenstore-paths.pandoc), so I guess it would be a bug in FreeBSD rather than a regression of the toolstack. Isn't it?
Signature · 6 lines
Anthony PERARD _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Anthony PERARD writes ("Re: [PATCH] libxl: wait for the ack when issuing power control requests"):
Quoted 10 lines · Roger Pau Monne
Quoted 5 lines
I believe applying this patch is not going to cause regressions in osstest, albeit FreeBSD doesn't acknowledge poweroff/reboot requests in the currently tested versions, it will shutdown in less than one minute, and thus the toolstack won't complain because the control node is going to be removed from xenstore.
Acknowledgement is described in the documentation of ~/control/shutdown (described in xenstore-paths.pandoc), so I guess it would be a bug in FreeBSD rather than a regression of the toolstack. Isn't it?
Well, yes, but we try to avoid breaking old guests, even if they are buggy.
Ian.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel