From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 19/27] tools/libxc+libxl+xl: Restore v2 streams Date: Mon, 15 Jun 2015 14:44:32 +0100 Message-ID: <1434375880-30914-20-git-send-email-andrew.cooper3@citrix.com> References: <1434375880-30914-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1434375880-30914-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Wei Liu , Yang Hongyang , Ian Jackson , Ian Campbell , Andrew Cooper List-Id: xen-devel@lists.xenproject.org This is a complicated set of changes which must be done together for bisectability. * libxl-save-helper is updated to unconditionally use libxc migration v2. * libxl compatibility workarounds in libxc are disabled for restore operations. * libxl__stream_read_start() is logically spliced into the event location where libxl__xc_domain_restore() used to reside. The parameters 'hvm', 'pae', and 'superpages' were previously superfluous, and are completely unused in migration v2. callbacks->toolstack_restore is handled via a migration v2 record now, rather than via a callback from libxc. NB: this change breaks Remus. Further untangling needs to happen before Remus will function. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu --- tools/libxc/Makefile | 4 ++-- tools/libxl/libxl_create.c | 47 ++++++++++++--------------------------- tools/libxl/libxl_save_helper.c | 2 +- tools/libxl/libxl_stream_read.c | 33 +++++++++++++++++++++++++++ tools/libxl/libxl_types.idl | 2 ++ tools/libxl/xl_cmdimpl.c | 7 +++++- 6 files changed, 58 insertions(+), 37 deletions(-) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 55782c8..0e65b88 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -64,8 +64,8 @@ GUEST_SRCS-$(CONFIG_X86) += xc_sr_save_x86_hvm.c GUEST_SRCS-y += xc_sr_restore.c GUEST_SRCS-y += xc_sr_save.c GUEST_SRCS-y += xc_offline_page.c xc_compression.c -$(patsubst %.c,%.o,$(GUEST_SRCS-y)): CFLAGS += -DXG_LIBXL_HVM_COMPAT -$(patsubst %.c,%.opic,$(GUEST_SRCS-y)): CFLAGS += -DXG_LIBXL_HVM_COMPAT +xc_sr_save_x86_hvm.o: CFLAGS += -DXG_LIBXL_HVM_COMPAT +xc_sr_save_x86_hvm.opic: CFLAGS += -DXG_LIBXL_HVM_COMPAT else GUEST_SRCS-y += xc_nomigrate.c endif diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index a37cdf8..7dd7130 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -779,6 +779,10 @@ static void domcreate_attach_dtdev(libxl__egc *egc, static void domcreate_console_available(libxl__egc *egc, libxl__domain_create_state *dcs); +static void domcreate_stream_done(libxl__egc *egc, + libxl__domain_create_state *dcs, + int ret); + static void domcreate_rebuild_done(libxl__egc *egc, libxl__domain_create_state *dcs, int ret); @@ -1002,11 +1006,8 @@ static void domcreate_bootloader_done(libxl__egc *egc, /* convenience aliases */ const uint32_t domid = dcs->guest_domid; libxl_domain_config *const d_config = dcs->guest_config; - libxl_domain_build_info *const info = &d_config->b_info; const int restore_fd = dcs->restore_fd; libxl__domain_build_state *const state = &dcs->build_state; - libxl__srm_restore_autogen_callbacks *const callbacks = - &dcs->shs.callbacks.restore.a; if (rc) { domcreate_rebuild_done(egc, dcs, rc); @@ -1039,30 +1040,16 @@ static void domcreate_bootloader_done(libxl__egc *egc, if (rc) goto out; - /* read signature */ - int hvm, pae, superpages; - switch (info->type) { - case LIBXL_DOMAIN_TYPE_HVM: - hvm = 1; - superpages = 1; - pae = libxl_defbool_val(info->u.hvm.pae); - callbacks->toolstack_restore = libxl__toolstack_restore; - break; - case LIBXL_DOMAIN_TYPE_PV: - hvm = 0; - superpages = 0; - pae = 1; - break; - default: - rc = ERROR_INVAL; - goto out; - } - libxl__xc_domain_restore(egc, dcs, restore_fd, - hvm, pae, superpages); + dcs->srs.ao = ao; + dcs->srs.fd = restore_fd; + dcs->srs.legacy = (dcs->restore_params.stream_version == 1); + dcs->srs.completion_callback = domcreate_stream_done; + + libxl__stream_read_start(egc, &dcs->srs); return; out: - libxl__xc_domain_restore_done(egc, dcs, rc, 0, 0); + domcreate_stream_done(egc, dcs, rc); } void libxl__srm_callout_callback_restore_results(unsigned long store_mfn, @@ -1078,10 +1065,10 @@ void libxl__srm_callout_callback_restore_results(unsigned long store_mfn, shs->need_results = 0; } -void libxl__xc_domain_restore_done(libxl__egc *egc, void *dcs_void, - int ret, int retval, int errnoval) +static void domcreate_stream_done(libxl__egc *egc, + libxl__domain_create_state *dcs, + int ret) { - libxl__domain_create_state *dcs = dcs_void; STATE_AO_GC(dcs->ao); libxl_ctx *ctx = libxl__gc_owner(gc); char **vments = NULL, **localents = NULL; @@ -1098,12 +1085,6 @@ void libxl__xc_domain_restore_done(libxl__egc *egc, void *dcs_void, if (ret) goto out; - if (retval) { - LOGEV(ERROR, errnoval, "restoring domain"); - ret = ERROR_FAIL; - goto out; - } - gettimeofday(&start_time, NULL); switch (info->type) { diff --git a/tools/libxl/libxl_save_helper.c b/tools/libxl/libxl_save_helper.c index 4b72f24..851ba92 100644 --- a/tools/libxl/libxl_save_helper.c +++ b/tools/libxl/libxl_save_helper.c @@ -311,7 +311,7 @@ int main(int argc, char **argv) startup("restore"); setup_signals(SIG_DFL); - r = xc_domain_restore(xch, io_fd, dom, store_evtchn, &store_mfn, + r = xc_domain_restore2(xch, io_fd, dom, store_evtchn, &store_mfn, store_domid, console_evtchn, &console_mfn, console_domid, hvm, pae, superpages, checkpointed, diff --git a/tools/libxl/libxl_stream_read.c b/tools/libxl/libxl_stream_read.c index 87b9737..a8cd2c3 100644 --- a/tools/libxl/libxl_stream_read.c +++ b/tools/libxl/libxl_stream_read.c @@ -225,6 +225,11 @@ static void check_stream_finished(libxl__egc *egc, libxl__convert_legacy_stream_abort(egc, &dcs->chs, rc); } + if (libxl__save_helper_inuse(&dcs->shs)) { + skip = true; + libxl__save_helper_abort(egc, &dcs->shs); + } + /* There is at least one more active task to join - wait for its callback */ if ( skip ) @@ -235,6 +240,8 @@ static void check_stream_finished(libxl__egc *egc, LOG(DEBUG, "stream still in use"); else if (libxl__convert_legacy_stream_inuse(&dcs->chs)) LOG(DEBUG, "conversion still in use"); + else if (libxl__save_helper_inuse(&dcs->shs)) + LOG(DEBUG, "save/restore still in use"); else { LOG(INFO, "Join complete: result %d", stream->joined_rc); stream->completion_callback(egc, dcs, stream->joined_rc); @@ -377,6 +384,28 @@ static void record_body_done(libxl__egc *egc, stream_failed(egc, stream, ret); } +void libxl__xc_domain_restore_done(libxl__egc *egc, void *dcs_void, + int ret, int retval, int errnoval) +{ + libxl__domain_create_state *dcs = dcs_void; + STATE_AO_GC(dcs->ao); + + if (ret) + goto err; + + if (retval) { + LOGEV(ERROR, errnoval, "restoring domain"); + ret = ERROR_FAIL; + goto err; + } + + libxl__stream_read_continue(egc, &dcs->srs); + return; + + err: + check_stream_finished(egc, dcs, ret, "save/restore helper"); +} + static void conversion_done(libxl__egc *egc, libxl__conversion_helper_state *chs, int rc) { @@ -402,6 +431,10 @@ static void process_record(libxl__egc *egc, /* Handled later, after cleanup. */ break; + case REC_TYPE_LIBXC_CONTEXT: + libxl__xc_domain_restore(egc, dcs, stream->fd, 0, 0, 0); + break; + case REC_TYPE_XENSTORE_DATA: ret = libxl__toolstack_restore(dcs->guest_domid, stream->rec_body, rec_hdr->length, &dcs->shs); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 23f27d4..7418d92 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -346,6 +346,8 @@ libxl_domain_create_info = Struct("domain_create_info",[ libxl_domain_restore_params = Struct("domain_restore_params", [ ("checkpointed_stream", integer), + ("stream_version", uint32, {'init_val': '1'}), + ("legacy_width", uint32), ]) libxl_domain_sched_params = Struct("domain_sched_params",[ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ddb293c..14d96c9 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -110,7 +110,9 @@ #define XL_MANDATORY_FLAG_JSON (1U << 0) /* config data is in JSON format */ #define XL_MANDATORY_FLAG_STREAMv2 (1U << 1) /* stream is v2 */ -#define XL_MANDATORY_FLAG_ALL (XL_MANDATORY_FLAG_JSON) +#define XL_MANDATORY_FLAG_ALL (XL_MANDATORY_FLAG_JSON | \ + XL_MANDATORY_FLAG_STREAMv2) + struct save_file_header { char magic[32]; /* savefileheader_magic */ /* All uint32_ts are in domain's byte order. */ @@ -2724,6 +2726,9 @@ static uint32_t create_domain(struct domain_create *dom_info) libxl_domain_restore_params_init(¶ms); params.checkpointed_stream = dom_info->checkpointed_stream; + params.stream_version = + (hdr.mandatory_flags & XL_MANDATORY_FLAG_STREAMv2) ? 2 : 1; + ret = libxl_domain_create_restore(ctx, &d_config, &domid, restore_fd, ¶ms, -- 1.7.10.4