From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Wei Liu <wei.liu2@citrix.com>,
Yang Hongyang <yanghy@cn.fujitsu.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Ian Campbell <Ian.Campbell@citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH 18/27] tools/libxl: Convert a legacy stream if needed
Date: Mon, 15 Jun 2015 14:44:31 +0100 [thread overview]
Message-ID: <1434375880-30914-19-git-send-email-andrew.cooper3@citrix.com> (raw)
In-Reply-To: <1434375880-30914-1-git-send-email-andrew.cooper3@citrix.com>
For backwards compatibility, a legacy stream needs converting before it can be
read by the v2 stream logic.
This causes the v2 stream logic to need to juggle two parallel tasks.
check_stream_finished() is introduced for the purpose of joining the tasks in
both success and error cases.
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_internal.h | 3 ++
tools/libxl/libxl_stream_read.c | 85 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 87 insertions(+), 1 deletion(-)
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 3e43cc6..5482950 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -3161,11 +3161,14 @@ struct libxl__stream_read_state {
/* filled by the user */
libxl__ao *ao;
int fd;
+ bool legacy;
void (*completion_callback)(libxl__egc *egc,
libxl__domain_create_state *dcs,
int rc);
/* Private */
+ libxl__carefd *v2_carefd;
int rc;
+ int joined_rc;
bool running;
libxl__datacopier_state dc;
size_t expected_len;
diff --git a/tools/libxl/libxl_stream_read.c b/tools/libxl/libxl_stream_read.c
index 9cdaadf..87b9737 100644
--- a/tools/libxl/libxl_stream_read.c
+++ b/tools/libxl/libxl_stream_read.c
@@ -38,6 +38,10 @@
* process_record() will choose the correct next action based upon the
* record. Upon completion of the action, the next record header will be read
* from the stream.
+ *
+ * Depending on the contents of the stream, there are likely to be several
+ * parallel tasks being managed. check_stream_finished() is used to join all
+ * tasks in both success and error cases.
*/
static void stream_success(libxl__egc *egc,
@@ -47,6 +51,12 @@ static void stream_failed(libxl__egc *egc,
static void stream_done(libxl__egc *egc,
libxl__stream_read_state *stream);
+static void conversion_done(libxl__egc *egc,
+ libxl__conversion_helper_state *chs, int rc);
+static void check_stream_finished(libxl__egc *egc,
+ libxl__domain_create_state *dcs,
+ int rc, const char *what);
+
/* Event callbacks for main reading loop. */
static void stream_header_done(libxl__egc *egc,
libxl__datacopier_state *dc,
@@ -73,12 +83,33 @@ static void emulator_padding_done(libxl__egc *egc,
void libxl__stream_read_start(libxl__egc *egc,
libxl__stream_read_state *stream)
{
+ libxl__domain_create_state *dcs = CONTAINER_OF(stream, *dcs, srs);
libxl__datacopier_state *dc = &stream->dc;
+ STATE_AO_GC(stream->ao);
int ret = 0;
/* State initialisation. */
assert(!stream->running);
+ if (stream->legacy) {
+ /* Convert a legacy stream, if needed. */
+ dcs->chs.ao = stream->ao;
+ dcs->chs.legacy_fd = stream->fd;
+ dcs->chs.legacy_width = dcs->restore_params.legacy_width;
+ dcs->chs.hvm =
+ (dcs->guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM);
+ dcs->chs.v2_carefd = NULL;
+ dcs->chs.completion_callback = conversion_done;
+
+ libxl__convert_legacy_stream(egc, &dcs->chs);
+
+ assert(dcs->chs.v2_carefd);
+ stream->v2_carefd = dcs->chs.v2_carefd;
+ stream->fd = libxl__carefd_fd(dcs->chs.v2_carefd);
+ }
+
+ /* stream->fd is now guarenteed to be a v2 stream. */
+
memset(dc, 0, sizeof(*dc));
dc->ao = stream->ao;
dc->readfd = stream->fd;
@@ -164,7 +195,50 @@ static void stream_done(libxl__egc *egc,
assert(!stream->running);
- stream->completion_callback(egc, dcs, stream->rc);
+ if (stream->v2_carefd)
+ libxl__carefd_close(stream->v2_carefd);
+
+ check_stream_finished(egc, dcs, stream->rc, "stream");
+}
+
+static void check_stream_finished(libxl__egc *egc,
+ libxl__domain_create_state *dcs,
+ int rc, const char *what)
+{
+ libxl__stream_read_state *stream = &dcs->srs;
+ STATE_AO_GC(dcs->ao);
+
+ LOG(INFO, "Task '%s' joining (rc %d)", what, rc);
+
+ if (rc && !stream->joined_rc) {
+ bool skip = false;
+ /* First reported failure from joining tasks. Tear everything down */
+ stream->joined_rc = rc;
+
+ if (libxl__stream_read_inuse(&dcs->srs)) {
+ skip = true;
+ libxl__stream_read_abort(egc, &dcs->srs, rc);
+ }
+
+ if (libxl__convert_legacy_stream_inuse(&dcs->chs)) {
+ skip = true;
+ libxl__convert_legacy_stream_abort(egc, &dcs->chs, rc);
+ }
+
+ /* There is at least one more active task to join - wait for its
+ callback */
+ if ( skip )
+ return;
+ }
+
+ if (libxl__stream_read_inuse(&dcs->srs))
+ LOG(DEBUG, "stream still in use");
+ else if (libxl__convert_legacy_stream_inuse(&dcs->chs))
+ LOG(DEBUG, "conversion still in use");
+ else {
+ LOG(INFO, "Join complete: result %d", stream->joined_rc);
+ stream->completion_callback(egc, dcs, stream->joined_rc);
+ }
}
static void stream_header_done(libxl__egc *egc,
@@ -303,6 +377,15 @@ static void record_body_done(libxl__egc *egc,
stream_failed(egc, stream, ret);
}
+static void conversion_done(libxl__egc *egc,
+ libxl__conversion_helper_state *chs, int rc)
+{
+ STATE_AO_GC(chs->ao);
+ libxl__domain_create_state *dcs = CONTAINER_OF(chs, *dcs, chs);
+
+ check_stream_finished(egc, dcs, rc, "conversion");
+}
+
static void process_record(libxl__egc *egc,
libxl__stream_read_state *stream)
{
--
1.7.10.4
next prev parent reply other threads:[~2015-06-15 13:44 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 ` Andrew Cooper [this message]
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
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=1434375880-30914-19-git-send-email-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=Ian.Jackson@eu.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.