From: Wen Congyang <wency@cn.fujitsu.com>
To: Andrew Cooper <andrew.cooper3@citrix.com>,
Xen-devel <xen-devel@lists.xen.org>
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>,
Yang Hongyang <yanghy@cn.fujitsu.com>,
Wei Liu <wei.liu2@citrix.com>,
Ian Campbell <Ian.Campbell@citrix.com>
Subject: Re: [PATCH 23/27] tools/libxl: [RFC] Write checkpoint records into the stream
Date: Thu, 18 Jun 2015 11:13:52 +0800 [thread overview]
Message-ID: <55823770.9040801@cn.fujitsu.com> (raw)
In-Reply-To: <1434375880-30914-24-git-send-email-andrew.cooper3@citrix.com>
On 06/15/2015 09:44 PM, Andrew Cooper wrote:
> when signalled to do so by libxl__remus_domain_checkpoint_callback()
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> CC: Ian Campbell <Ian.Campbell@citrix.com>
> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
> CC: Wei Liu <wei.liu2@citrix.com>
> ---
> tools/libxl/libxl_dom.c | 16 +++---
> tools/libxl/libxl_internal.h | 7 +++
> tools/libxl/libxl_stream_write.c | 111 ++++++++++++++++++++++++++++++++++++--
> 3 files changed, 121 insertions(+), 13 deletions(-)
>
> diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
> index 06bfaab..3597a91 100644
> --- a/tools/libxl/libxl_dom.c
> +++ b/tools/libxl/libxl_dom.c
> @@ -1867,8 +1867,8 @@ static void remus_devices_preresume_cb(libxl__egc *egc,
>
> /*----- remus asynchronous checkpoint callback -----*/
>
> -static void remus_checkpoint_dm_saved(libxl__egc *egc,
> - libxl__domain_suspend_state *dss, int rc);
> +static void remus_checkpoint_stream_written(
> + libxl__egc *egc, libxl__domain_suspend_state *dss, int rc);
> static void remus_devices_commit_cb(libxl__egc *egc,
> libxl__remus_devices_state *rds,
> int rc);
> @@ -1882,16 +1882,11 @@ static void libxl__remus_domain_checkpoint_callback(void *data)
> libxl__egc *egc = dss->shs.egc;
> STATE_AO_GC(dss->ao);
>
> - /* This would go into tailbuf. */
> - if (dss->hvm) {
> - libxl__domain_save_device_model(egc, dss, remus_checkpoint_dm_saved);
> - } else {
> - remus_checkpoint_dm_saved(egc, dss, 0);
> - }
> + libxl__stream_write_start_checkpoint(egc, &dss->sws);
> }
>
> -static void remus_checkpoint_dm_saved(libxl__egc *egc,
> - libxl__domain_suspend_state *dss, int rc)
> +static void remus_checkpoint_stream_written(
> + libxl__egc *egc, libxl__domain_suspend_state *dss, int rc)
> {
> /* Convenience aliases */
> libxl__remus_devices_state *const rds = &dss->rds;
> @@ -2036,6 +2031,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss)
> callbacks->suspend = libxl__remus_domain_suspend_callback;
> callbacks->postcopy = libxl__remus_domain_resume_callback;
> callbacks->checkpoint = libxl__remus_domain_checkpoint_callback;
> + dss->sws.checkpoint_callback = remus_checkpoint_stream_written;
> } else
> callbacks->suspend = libxl__domain_suspend_callback;
>
> diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
> index 82cd792..bf1c377 100644
> --- a/tools/libxl/libxl_internal.h
> +++ b/tools/libxl/libxl_internal.h
> @@ -2879,17 +2879,24 @@ struct libxl__stream_write_state {
> void (*completion_callback)(libxl__egc *egc,
> libxl__domain_suspend_state *dss,
> int rc);
> + void (*checkpoint_callback)(libxl__egc *egc,
> + libxl__domain_suspend_state *dss,
> + int rc);
> /* Private */
> int rc;
> int joined_rc;
> size_t padding;
> bool running;
> + bool in_checkpoint;
> libxl__datacopier_state dc;
> };
>
> _hidden void libxl__stream_write_start(libxl__egc *egc,
> libxl__stream_write_state *stream);
>
> +_hidden void libxl__stream_write_start_checkpoint(
> + libxl__egc *egc, libxl__stream_write_state *stream);
> +
> _hidden void libxl__stream_write_abort(libxl__egc *egc,
> libxl__stream_write_state *stream,
> int rc);
> diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c
> index d28a8a5..40f2cb7 100644
> --- a/tools/libxl/libxl_stream_write.c
> +++ b/tools/libxl/libxl_stream_write.c
> @@ -23,6 +23,9 @@
> * - libxl__stream_write_start()
> * - Start writing a stream from the start.
> *
> + * - libxl__stream_write_start()
> + * - Write the records which form a checkpoint into a stream.
> + *
> * In normal operation, there are two tasks running at once; this stream
> * processing, and the the libxl-save-helper. check_stream_finished() is used
> * to join all the tasks in both success and error cases.
> @@ -39,6 +42,12 @@
> * - Toolstack record
> * - if (hvm), Qemu record
> * - End record
> + *
> + * For checkpointed stream, there is a second loop which is triggered by a
> + * save-helper checkpoint callback. It writes:
> + * - Toolstack record
> + * - if (hvm), Qemu record
> + * - Checkpoint end record
> */
>
> static const uint8_t zero_padding[1U << REC_ALIGN_ORDER] = { 0 };
> @@ -81,6 +90,16 @@ static void end_record_done(libxl__egc *egc,
> libxl__datacopier_state *dc,
> int onwrite, int errnoval);
>
> +/* Event callbacks unique to checkpointed streams. */
> +static void checkpoint_done(libxl__egc *egc,
> + libxl__stream_write_state *stream,
> + int rc);
> +static void write_checkpoint_end_record(libxl__egc *egc,
> + libxl__stream_write_state *stream);
> +static void checkpoint_end_record_done(libxl__egc *egc,
> + libxl__datacopier_state *dc,
> + int onwrite, int errnoval);
> +
> void libxl__stream_write_start(libxl__egc *egc,
> libxl__stream_write_state *stream)
> {
> @@ -119,6 +138,16 @@ void libxl__stream_write_start(libxl__egc *egc,
> stream_failed(egc, stream, ret);
> }
>
> +void libxl__stream_write_start_checkpoint(libxl__egc *egc,
> + libxl__stream_write_state *stream)
> +{
> + assert(stream->running);
> + assert(!stream->in_checkpoint);
> + stream->in_checkpoint = true;
> +
> + write_toolstack_record(egc, stream);
> +}
> +
> void libxl__stream_write_abort(libxl__egc *egc,
> libxl__stream_write_state *stream, int rc)
> {
> @@ -130,6 +159,7 @@ static void stream_success(libxl__egc *egc, libxl__stream_write_state *stream)
> stream->rc = 0;
> stream->running = false;
>
> + assert(!stream->in_checkpoint);
> stream_done(egc, stream);
> }
>
> @@ -139,6 +169,15 @@ static void stream_failed(libxl__egc *egc,
> assert(rc);
> stream->rc = rc;
>
> + /*
> + *If we are in a checkpoint, pass the failure to libxc, which will come
> + * back around to us via libxl__xc_domain_save_done().
> + */
> + if (stream->in_checkpoint) {
I think we should set running to false here too.
Thanks
Wen Congyang
> + checkpoint_done(egc, stream, rc);
> + return;
> + }
> +
> if (stream->running) {
> stream->running = false;
> stream_done(egc, stream);
> @@ -151,6 +190,7 @@ static void stream_done(libxl__egc *egc,
> libxl__domain_suspend_state *dss = CONTAINER_OF(stream, *dss, sws);
>
> assert(!stream->running);
> + assert(!stream->in_checkpoint);
>
> check_stream_finished(egc, dss, stream->rc, "stream");
> }
> @@ -335,8 +375,12 @@ static void toolstack_record_done(libxl__egc *egc,
>
> if (dss->type == LIBXL_DOMAIN_TYPE_HVM)
> write_emulator_record(egc, stream);
> - else
> - write_end_record(egc, stream);
> + else {
> + if (stream->in_checkpoint)
> + write_checkpoint_end_record(egc, stream);
> + else
> + write_end_record(egc, stream);
> + }
>
> return;
>
> @@ -473,7 +517,10 @@ static void emulator_padding_done(libxl__egc *egc,
> goto err;
> }
>
> - write_end_record(egc, stream);
> + if (stream->in_checkpoint)
> + write_checkpoint_end_record(egc, stream);
> + else
> + write_end_record(egc, stream);
> return;
>
> err:
> @@ -526,6 +573,64 @@ static void end_record_done(libxl__egc *egc,
> stream_failed(egc, stream, ret);
> }
>
> +static void checkpoint_done(libxl__egc *egc,
> + libxl__stream_write_state *stream,
> + int rc)
> +{
> + libxl__domain_suspend_state *dss = CONTAINER_OF(stream, *dss, sws);
> +
> + assert(stream->in_checkpoint);
> + stream->in_checkpoint = false;
> + stream->checkpoint_callback(egc, dss, rc);
> +}
> +
> +static void write_checkpoint_end_record(libxl__egc *egc,
> + libxl__stream_write_state *stream)
> +{
> + libxl__datacopier_state *dc = &stream->dc;
> + STATE_AO_GC(stream->ao);
> + struct libxl_sr_rec_hdr rec = { REC_TYPE_CHECKPOINT_END, 0 };
> + int ret = 0;
> +
> + assert(stream->in_checkpoint);
> +
> + dc->copywhat = "checkpoint record";
> + dc->writewhat = "save/migration stream";
> + dc->callback = checkpoint_end_record_done;
> +
> + ret = libxl__datacopier_start(dc);
> + if (ret)
> + goto err;
> +
> + libxl__datacopier_prefixdata(egc, dc, &rec, sizeof(rec));
> + return;
> +
> + err:
> + assert(ret);
> + stream_failed(egc, stream, ret);
> +}
> +
> +static void checkpoint_end_record_done(libxl__egc *egc,
> + libxl__datacopier_state *dc,
> + int onwrite, int errnoval)
> +{
> + libxl__stream_write_state *stream = CONTAINER_OF(dc, *stream, dc);
> + STATE_AO_GC(stream->ao);
> + int ret = 0;
> +
> + if (onwrite || errnoval) {
> + ret = ERROR_FAIL;
> + goto err;
> + }
> +
> + checkpoint_done(egc, stream, 0);
> + return;
> +
> + err:
> + assert(ret);
> + stream_failed(egc, stream, ret);
> +}
> +
> /*
> * Local variables:
> * mode: C
>
next prev parent reply other threads:[~2015-06-18 3:13 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-15 13:44 [PATCH 00/27] Libxl migration v2 Andrew Cooper
2015-06-15 13:44 ` [PATCH 01/27] tools/libxl: Fix libxl__ev_child_inuse() check for not-yet-initialised children Andrew Cooper
2015-06-16 13:21 ` Ian Campbell
2015-06-16 13:36 ` Andrew Cooper
2015-06-16 13:47 ` Ian Jackson
2015-06-16 14:05 ` Andrew Cooper
2015-06-16 15:26 ` Ian Campbell
2015-06-16 15:24 ` Ian Campbell
2015-06-16 13:39 ` Ian Jackson
2015-06-15 13:44 ` [PATCH 02/27] tools/libxc: Always compile the compat qemu variables into xc_sr_context Andrew Cooper
2015-06-16 13:22 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 03/27] tools/libxl: Stash all restore parameters in domain_create_state Andrew Cooper
2015-06-16 13:37 ` Ian Campbell
2015-06-16 14:09 ` Andrew Cooper
2015-06-18 2:32 ` Yang Hongyang
2015-06-15 13:44 ` [PATCH 04/27] tools/xl: Mandatory flag indicating the format of the migration stream Andrew Cooper
2015-06-16 13:39 ` Ian Campbell
2015-06-16 14:10 ` Andrew Cooper
2015-06-15 13:44 ` [PATCH 05/27] tools/libxl: Introduce ROUNDUP() Andrew Cooper
2015-06-16 13:39 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 06/27] libxl: cancellation: Preparations for save/restore cancellation Andrew Cooper
2015-06-15 13:44 ` [PATCH 07/27] libxl: cancellation: Handle SIGTERM in save/restore helper Andrew Cooper
2015-06-15 13:44 ` [PATCH 08/27] tools/libxl: Extra APIs for the save helper Andrew Cooper
2015-06-16 13:50 ` Ian Campbell
2015-06-16 15:03 ` Andrew Cooper
2015-06-15 13:44 ` [PATCH 09/27] tools/libxl: Pass restore_fd as a parameter to libxl__xc_domain_restore() Andrew Cooper
2015-06-16 13:53 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 10/27] docs: Libxl migration v2 stream specification Andrew Cooper
2015-06-16 13:58 ` Ian Campbell
2015-07-08 13:49 ` Andrew Cooper
2015-07-08 13:58 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 11/27] tools/python: Libxc migration v2 infrastructure Andrew Cooper
2015-06-16 14:01 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 12/27] tools/python: Libxl " Andrew Cooper
2015-06-15 13:44 ` [PATCH 13/27] tools/python: Verification utility for v2 stream spec compliance Andrew Cooper
2015-06-15 13:44 ` [PATCH 14/27] tools/python: Conversion utility for legacy migration streams Andrew Cooper
2015-06-16 14:01 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 15/27] tools/libxl: Migration v2 stream format Andrew Cooper
2015-06-16 14:04 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 16/27] tools/libxl: Infrastructure for reading a libxl migration v2 stream Andrew Cooper
2015-06-16 14:31 ` Ian Campbell
2015-06-16 15:01 ` Andrew Cooper
2015-06-16 15:35 ` Ian Campbell
2015-06-16 15:46 ` Andrew Cooper
2015-06-17 3:09 ` Wen Congyang
2015-06-17 10:15 ` Ian Campbell
2015-06-17 10:49 ` Wen Congyang
2015-06-17 10:55 ` Ian Campbell
2015-06-17 6:03 ` Wen Congyang
2015-06-17 9:47 ` Andrew Cooper
2015-06-17 7:57 ` Wen Congyang
2015-06-17 9:50 ` Andrew Cooper
2015-06-17 10:01 ` Wen Congyang
2015-06-17 10:48 ` Andrew Cooper
2015-06-15 13:44 ` [PATCH 17/27] tools/libxl: Support converting a legacy stream to a " Andrew Cooper
2015-06-16 14:38 ` Ian Campbell
2015-06-16 15:13 ` Andrew Cooper
2015-06-16 15:38 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 18/27] tools/libxl: Convert a legacy stream if needed Andrew Cooper
2015-06-15 13:44 ` [PATCH 19/27] tools/libxc+libxl+xl: Restore v2 streams Andrew Cooper
2015-06-16 14:53 ` Ian Campbell
2015-06-16 15:23 ` Andrew Cooper
2015-06-16 15:39 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream Andrew Cooper
2015-06-16 14:57 ` Ian Campbell
2015-06-16 15:28 ` Andrew Cooper
2015-06-17 1:31 ` Yang Hongyang
2015-06-17 9:51 ` Andrew Cooper
2015-06-17 1:39 ` Wen Congyang
2015-06-17 2:24 ` Wen Congyang
2015-06-17 7:38 ` Yang Hongyang
2015-06-17 10:14 ` Wen Congyang
2015-07-10 10:55 ` Ian Campbell
2015-07-10 11:03 ` Andrew Cooper
2015-07-10 11:05 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 21/27] tools/libxc+libxl+xl: Save v2 streams Andrew Cooper
2015-06-16 14:59 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 22/27] docs/libxl: [RFC] Introduce CHECKPOINT_END to support migration v2 remus streams Andrew Cooper
2015-06-16 15:00 ` Ian Campbell
2015-06-16 15:30 ` Andrew Cooper
2015-06-17 3:30 ` Wen Congyang
2015-06-15 13:44 ` [PATCH 23/27] tools/libxl: [RFC] Write checkpoint records into the stream Andrew Cooper
2015-06-16 15:03 ` Ian Campbell
2015-06-16 15:53 ` Andrew Cooper
2015-06-17 7:30 ` Ian Campbell
2015-06-17 9:55 ` Andrew Cooper
2015-06-18 3:13 ` Wen Congyang [this message]
2015-06-18 9:44 ` Andrew Cooper
2015-06-15 13:44 ` [PATCH 24/27] tools/libx{c, l}: [RFC] Introduce restore_callbacks.checkpoint() Andrew Cooper
2015-06-16 2:23 ` Yang Hongyang
2015-06-17 8:20 ` Yang Hongyang
2015-06-15 13:44 ` [PATCH 25/27] tools/libxl: [RFC] Handle checkpoint records in a libxl migration v2 stream Andrew Cooper
2015-06-17 7:28 ` Wen Congyang
2015-06-15 13:44 ` [PATCH 26/27] tools/libxc: Drop all XG_LIBXL_HVM_COMPAT code from libxc Andrew Cooper
2015-06-16 15:03 ` Ian Campbell
2015-06-15 13:44 ` [PATCH 27/27] tools/libxl: Drop all knowledge of toolstack callbacks Andrew Cooper
2015-06-16 15:04 ` Ian Campbell
2015-06-16 15:06 ` Andrew Cooper
2015-06-17 10:14 ` Ian Campbell
2015-06-17 10:43 ` Andrew Cooper
2015-06-17 10:53 ` Ian Campbell
2015-06-16 2:21 ` [PATCH 00/27] Libxl migration v2 Yang Hongyang
2015-06-17 1:55 ` Wen Congyang
2015-06-17 9:45 ` Andrew Cooper
2015-07-02 7:33 ` Yang Hongyang
2015-07-02 9:26 ` Andrew Cooper
2015-07-02 9:33 ` Yang Hongyang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55823770.9040801@cn.fujitsu.com \
--to=wency@cn.fujitsu.com \
--cc=Ian.Campbell@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
--cc=yanghy@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.