Re: [Xen-devel] [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream
On 10/07/15 11:55, Ian Campbell wrote:
On Mon, 2015-06-15 at 14:44 +0100, Andrew Cooper wrote:
+void libxl__stream_write_start(libxl__egc *egc,
+ libxl__stream_write_state *stream)
+{
+libxl__datacopier_state *dc = stream-dc;
+STATE_AO_GC(stream-ao);
+struct libxl_sr_hdr hdr = { 0 };
+int ret = 0;
+
+assert(!stream-running);
This has the same issue wrt who initialises this when as the restore
side.
+stream-running = true;
+
+memset(dc, 0, sizeof(*dc));
+dc-readwhat = ;
+dc-copywhat = suspend header;
+dc-writewhat = save/migration stream;
+dc-ao = ao;
+dc-readfd = -1;
+dc-writefd = stream-fd;
+dc-maxsz = INT_MAX;
+dc-bytes_to_read = INT_MAX;
+dc-callback = stream_header_done;
On the read side some of this was nicely encapsulated in a helper. Not a
blocker, just an observation for a potential future tidying.
So, the only immediate issue is the -running one, which I suppose will
be discussed on the restore side patch and the same conclusion applied
here.
You realise you have moved back onto v1 of the series? This is very
different in v2.
~Andrew
___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream
On Mon, 2015-06-15 at 14:44 +0100, Andrew Cooper wrote:
+void libxl__stream_write_start(libxl__egc *egc,
+ libxl__stream_write_state *stream)
+{
+libxl__datacopier_state *dc = stream-dc;
+STATE_AO_GC(stream-ao);
+struct libxl_sr_hdr hdr = { 0 };
+int ret = 0;
+
+assert(!stream-running);
This has the same issue wrt who initialises this when as the restore
side.
+stream-running = true;
+
+memset(dc, 0, sizeof(*dc));
+dc-readwhat = ;
+dc-copywhat = suspend header;
+dc-writewhat = save/migration stream;
+dc-ao = ao;
+dc-readfd = -1;
+dc-writefd = stream-fd;
+dc-maxsz = INT_MAX;
+dc-bytes_to_read = INT_MAX;
+dc-callback = stream_header_done;
On the read side some of this was nicely encapsulated in a helper. Not a
blocker, just an observation for a potential future tidying.
So, the only immediate issue is the -running one, which I suppose will
be discussed on the restore side patch and the same conclusion applied
here.
Ian.
___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream
On Fri, 2015-07-10 at 12:03 +0100, Andrew Cooper wrote:
On 10/07/15 11:55, Ian Campbell wrote:
On Mon, 2015-06-15 at 14:44 +0100, Andrew Cooper wrote:
+void libxl__stream_write_start(libxl__egc *egc,
+ libxl__stream_write_state *stream)
+{
+libxl__datacopier_state *dc = stream-dc;
+STATE_AO_GC(stream-ao);
+struct libxl_sr_hdr hdr = { 0 };
+int ret = 0;
+
+assert(!stream-running);
This has the same issue wrt who initialises this when as the restore
side.
+stream-running = true;
+
+memset(dc, 0, sizeof(*dc));
+dc-readwhat = ;
+dc-copywhat = suspend header;
+dc-writewhat = save/migration stream;
+dc-ao = ao;
+dc-readfd = -1;
+dc-writefd = stream-fd;
+dc-maxsz = INT_MAX;
+dc-bytes_to_read = INT_MAX;
+dc-callback = stream_header_done;
On the read side some of this was nicely encapsulated in a helper. Not a
blocker, just an observation for a potential future tidying.
So, the only immediate issue is the -running one, which I suppose will
be discussed on the restore side patch and the same conclusion applied
here.
You realise you have moved back onto v1 of the series? This is very
different in v2.
Oh c..k, no, I didn't. I shall go take another look at hte correct
thing!
Ian.
___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream
On 06/15/2015 09:44 PM, Andrew Cooper wrote:
[...]
+
+static void stream_success(libxl__egc *egc,
+ libxl__stream_write_state *stream);
+static void stream_failed(libxl__egc *egc,
+ libxl__stream_write_state *stream, int ret);
+static void stream_done(libxl__egc *egc,
+libxl__stream_write_state *stream);
+
+static void check_stream_finished(libxl__egc *egc,
+ libxl__domain_suspend_state *dcs,
s/dcs/dss/
+ int rc, const char *what);
+
+/* Event callbacks for plain VM. */
+static void stream_header_done(libxl__egc *egc,
+ libxl__datacopier_state *dc,
+ int onwrite, int errnoval);
+static void libxc_header_done(libxl__egc *egc,
+ libxl__datacopier_state *dc,
+ int onwrite, int errnoval);
+/* libxl__xc_domain_save_done() lives here, event-order wise. */
+static void write_toolstack_record(libxl__egc *egc,
+ libxl__stream_write_state *stream);
+static void toolstack_record_done(libxl__egc *egc,
+ libxl__datacopier_state *dc,
+ int onwrite, int errnoval);
+static void write_emulator_record(libxl__egc *egc,
+ libxl__stream_write_state *stream);
+static void emulator_body_done(libxl__egc *egc,
+ libxl__datacopier_state *dc,
+ int onwrite, int errnoval);
+static void emulator_padding_done(libxl__egc *egc,
+ libxl__datacopier_state *dc,
+ int onwrite, int errnoval);
+static void write_end_record(libxl__egc *egc,
+ libxl__stream_write_state *stream);
+static void 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)
+{
+libxl__datacopier_state *dc = stream-dc;
+STATE_AO_GC(stream-ao);
+struct libxl_sr_hdr hdr = { 0 };
+int ret = 0;
+
+assert(!stream-running);
+stream-running = true;
+
+memset(dc, 0, sizeof(*dc));
+dc-readwhat = ;
+dc-copywhat = suspend header;
+dc-writewhat = save/migration stream;
+dc-ao = ao;
+dc-readfd = -1;
+dc-writefd = stream-fd;
+dc-maxsz = INT_MAX;
+dc-bytes_to_read = INT_MAX;
+dc-callback = stream_header_done;
+
+ret = libxl__datacopier_start(dc);
+if (ret)
+goto err;
+
+hdr.ident = htobe64(RESTORE_STREAM_IDENT);
+hdr.version = htobe32(RESTORE_STREAM_VERSION);
+hdr.options = htobe32(0);
+
+libxl__datacopier_prefixdata(egc, dc, hdr, sizeof(hdr));
+return;
+
+ err:
+assert(ret);
+stream_failed(egc, stream, ret);
+}
+
+void libxl__stream_write_abort(libxl__egc *egc,
+ libxl__stream_write_state *stream, int rc)
+{
+stream_failed(egc, stream, rc);
+}
+
+static void stream_success(libxl__egc *egc, libxl__stream_write_state *stream)
+{
+stream-rc = 0;
+stream-running = false;
+
+stream_done(egc, stream);
+}
+
+static void stream_failed(libxl__egc *egc,
+ libxl__stream_write_state *stream, int rc)
+{
+assert(rc);
+stream-rc = rc;
+
+if (stream-running) {
+stream-running = false;
+stream_done(egc, stream);
+}
+}
+
+static void stream_done(libxl__egc *egc,
+libxl__stream_write_state *stream)
+{
+libxl__domain_suspend_state *dss = CONTAINER_OF(stream, *dss, sws);
+
+assert(!stream-running);
+
+check_stream_finished(egc, dss, stream-rc, stream);
+}
+
+static void check_stream_finished(libxl__egc *egc,
+ libxl__domain_suspend_state *dss,
+ int rc, const char *what)
+{
+libxl__stream_write_state *stream = dss-sws;
+STATE_AO_GC(dss-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_write_inuse(dss-sws)) {
+skip = true;
+libxl__stream_write_abort(egc, dss-sws, rc);
+}
+
+if (libxl__save_helper_inuse(dss-shs)) {
+skip = true;
+libxl__save_helper_abort(egc, dss-shs);
+}
+
+/* There is at least one more active task to join - wait for its
+ callback */
+if ( skip )
+return;
+}
+
+if (libxl__stream_write_inuse(dss-sws))
+LOG(DEBUG, stream still in use);
+else if (libxl__save_helper_inuse(dss-shs))
+
Re: [Xen-devel] [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream
On 17/06/15 02:31, Yang Hongyang wrote: +default: +ret = ERROR_FAIL; +goto err; +} + +ret = libxl__domain_suspend_device_model(gc, dss); This is no longer needed, the suspend callback already called this function and the emulator context already saved to a file. This call will cause Primary's emulator stop under Remus. postcopy callback will resume primary. then in checkpoint callback, we shouldn't suspend device model. It is the result of copying how everything was done previously. I will drop it. ~Andrew ___ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream
On 06/15/2015 09:44 PM, Andrew Cooper wrote:
From: Ross Lagerwall ross.lagerw...@citrix.com
Signed-off-by: Ross Lagerwall ross.lagerw...@citrix.com
Signed-off-by: Andrew Cooper andrew.coop...@citrix.com
CC: Ian Campbell ian.campb...@citrix.com
CC: Ian Jackson ian.jack...@eu.citrix.com
CC: Wei Liu wei.l...@citrix.com
---
tools/libxl/Makefile |2 +-
tools/libxl/libxl_internal.h | 33 +++
tools/libxl/libxl_stream_write.c | 536
++
3 files changed, 570 insertions(+), 1 deletion(-)
create mode 100644 tools/libxl/libxl_stream_write.c
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index ca0ae3e..63e32f7 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -94,7 +94,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o
libxl_pci.o \
libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \
libxl_internal.o libxl_utils.o libxl_uuid.o \
libxl_json.o libxl_aoutils.o libxl_numa.o libxl_vnuma.o
\
- libxl_stream_read.o \
+ libxl_stream_read.o libxl_stream_write.o \
libxl_save_callout.o _libxl_save_msgs_callout.o \
libxl_convert_callout.o \
libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y)
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 5482950..82cd792 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -2868,6 +2868,38 @@ typedef void libxl__domain_suspend_cb(libxl__egc*,
typedef void libxl__save_device_model_cb(libxl__egc*,
libxl__domain_suspend_state*, int
rc);
+/* State for writing a libxl migration v2 stream */
+typedef struct libxl__stream_write_state libxl__stream_write_state;
+
+struct libxl__stream_write_state {
+/* filled by the user */
+libxl__ao *ao;
+int fd;
+uint32_t domid;
+void (*completion_callback)(libxl__egc *egc,
+libxl__domain_suspend_state *dss,
+int rc);
+/* Private */
+int rc;
+int joined_rc;
+size_t padding;
+bool running;
+libxl__datacopier_state dc;
+};
+
+_hidden void libxl__stream_write_start(libxl__egc *egc,
+ libxl__stream_write_state *stream);
+
+_hidden void libxl__stream_write_abort(libxl__egc *egc,
+ libxl__stream_write_state *stream,
+ int rc);
+
+static inline bool libxl__stream_write_inuse(
+const libxl__stream_write_state *stream)
+{
+return stream-running;
+}
+
typedef struct libxl__logdirty_switch {
const char *cmd;
const char *cmd_path;
@@ -2907,6 +2939,7 @@ struct libxl__domain_suspend_state {
/* private for libxl__domain_save_device_model */
libxl__save_device_model_cb *save_dm_callback;
libxl__datacopier_state save_dm_datacopier;
+libxl__stream_write_state sws;
};
diff --git a/tools/libxl/libxl_stream_write.c
b/tools/libxl/libxl_stream_write.c
new file mode 100644
index 000..856d72e
--- /dev/null
+++ b/tools/libxl/libxl_stream_write.c
@@ -0,0 +1,536 @@
+/*
+ * Copyright (C) 2015 Citrix Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ */
+
+#include libxl_osdeps.h /* must come before any other headers */
+
+#include libxl_internal.h
+
+/*
+ * Infrastructure for writing a domain to a libxl migration v2 stream.
+ *
+ * Entry points from outside:
+ * - libxl__stream_write_start()
+ * - Start writing a stream from the start.
+ *
+ * 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.
+ *
+ * Nomenclature for event callbacks:
+ * - $FOO_done(): Completion callback for $FOO
+ * - write_$FOO(): Set up writing a $FOO
+ * - $BAR_header(): A $BAR record header only
+ * - $BAR_record(): A complete $BAR record with header and content
+ *
+ * The main loop for a plain VM writes:
+ * - Stream header
+ * - Libxc record
+ * - Toolstack record
+ * - if (hvm), Qemu record
+ * - End record
+ */
+
+static const uint8_t zero_padding[1U REC_ALIGN_ORDER] = { 0 };
+
Re: [Xen-devel] [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream
On 16/06/15 15:57, Ian Campbell wrote:
On Mon, 2015-06-15 at 14:44 +0100, Andrew Cooper wrote:
From: Ross Lagerwall ross.lagerw...@citrix.com
Signed-off-by: Ross Lagerwall ross.lagerw...@citrix.com
Signed-off-by: Andrew Cooper andrew.coop...@citrix.com
CC: Ian Campbell ian.campb...@citrix.com
CC: Ian Jackson ian.jack...@eu.citrix.com
CC: Wei Liu wei.l...@citrix.com
---
tools/libxl/Makefile |2 +-
tools/libxl/libxl_internal.h | 33 +++
tools/libxl/libxl_stream_write.c | 536
++
3 files changed, 570 insertions(+), 1 deletion(-)
create mode 100644 tools/libxl/libxl_stream_write.c
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index ca0ae3e..63e32f7 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -94,7 +94,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o
libxl_pci.o \
libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \
libxl_internal.o libxl_utils.o libxl_uuid.o \
libxl_json.o libxl_aoutils.o libxl_numa.o libxl_vnuma.o
\
-libxl_stream_read.o \
+libxl_stream_read.o libxl_stream_write.o \
libxl_save_callout.o _libxl_save_msgs_callout.o \
libxl_convert_callout.o \
libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y)
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 5482950..82cd792 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -2868,6 +2868,38 @@ typedef void libxl__domain_suspend_cb(libxl__egc*,
typedef void libxl__save_device_model_cb(libxl__egc*,
libxl__domain_suspend_state*, int
rc);
+/* State for writing a libxl migration v2 stream */
+typedef struct libxl__stream_write_state libxl__stream_write_state;
+
+struct libxl__stream_write_state {
+/* filled by the user */
+libxl__ao *ao;
+int fd;
+uint32_t domid;
+void (*completion_callback)(libxl__egc *egc,
+libxl__domain_suspend_state *dss,
+int rc);
+/* Private */
+int rc;
+int joined_rc;
+size_t padding;
+bool running;
+libxl__datacopier_state dc;
+};
+
+_hidden void libxl__stream_write_start(libxl__egc *egc,
+ libxl__stream_write_state *stream);
+
+_hidden void libxl__stream_write_abort(libxl__egc *egc,
+ libxl__stream_write_state *stream,
+ int rc);
+
+static inline bool libxl__stream_write_inuse(
+const libxl__stream_write_state *stream)
+{
+return stream-running;
+}
+
typedef struct libxl__logdirty_switch {
const char *cmd;
const char *cmd_path;
@@ -2907,6 +2939,7 @@ struct libxl__domain_suspend_state {
/* private for libxl__domain_save_device_model */
libxl__save_device_model_cb *save_dm_callback;
libxl__datacopier_state save_dm_datacopier;
+libxl__stream_write_state sws;
};
diff --git a/tools/libxl/libxl_stream_write.c
b/tools/libxl/libxl_stream_write.c
new file mode 100644
index 000..856d72e
--- /dev/null
+++ b/tools/libxl/libxl_stream_write.c
@@ -0,0 +1,536 @@
+/*
+ * Copyright (C) 2015 Citrix Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ */
+
+#include libxl_osdeps.h /* must come before any other headers */
+
+#include libxl_internal.h
+
+/*
+ * Infrastructure for writing a domain to a libxl migration v2 stream.
+ *
+ * Entry points from outside:
+ * - libxl__stream_write_start()
+ * - Start writing a stream from the start.
+ *
+ * In normal operation, there are two tasks running at once; this stream
+ * processing, and the the libxl-save-helper. check_stream_finished() is
used
the the.
+ * to join all the tasks in both success and error cases.
+ *
+ * Nomenclature for event callbacks:
+ * - $FOO_done(): Completion callback for $FOO
+ * - write_$FOO(): Set up writing a $FOO
Set up or actually write?
Set up the dc to write $FOO
The write doesn't actually happen until we get the dc callback.
+
+void libxl__stream_write_start(libxl__egc *egc,
+ libxl__stream_write_state *stream)
+{
+libxl__datacopier_state *dc = stream-dc;
+
Re: [Xen-devel] [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream
On Mon, 2015-06-15 at 14:44 +0100, Andrew Cooper wrote:
From: Ross Lagerwall ross.lagerw...@citrix.com
Signed-off-by: Ross Lagerwall ross.lagerw...@citrix.com
Signed-off-by: Andrew Cooper andrew.coop...@citrix.com
CC: Ian Campbell ian.campb...@citrix.com
CC: Ian Jackson ian.jack...@eu.citrix.com
CC: Wei Liu wei.l...@citrix.com
---
tools/libxl/Makefile |2 +-
tools/libxl/libxl_internal.h | 33 +++
tools/libxl/libxl_stream_write.c | 536
++
3 files changed, 570 insertions(+), 1 deletion(-)
create mode 100644 tools/libxl/libxl_stream_write.c
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index ca0ae3e..63e32f7 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -94,7 +94,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o
libxl_pci.o \
libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \
libxl_internal.o libxl_utils.o libxl_uuid.o \
libxl_json.o libxl_aoutils.o libxl_numa.o libxl_vnuma.o
\
- libxl_stream_read.o \
+ libxl_stream_read.o libxl_stream_write.o \
libxl_save_callout.o _libxl_save_msgs_callout.o \
libxl_convert_callout.o \
libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y)
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 5482950..82cd792 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -2868,6 +2868,38 @@ typedef void libxl__domain_suspend_cb(libxl__egc*,
typedef void libxl__save_device_model_cb(libxl__egc*,
libxl__domain_suspend_state*, int
rc);
+/* State for writing a libxl migration v2 stream */
+typedef struct libxl__stream_write_state libxl__stream_write_state;
+
+struct libxl__stream_write_state {
+/* filled by the user */
+libxl__ao *ao;
+int fd;
+uint32_t domid;
+void (*completion_callback)(libxl__egc *egc,
+libxl__domain_suspend_state *dss,
+int rc);
+/* Private */
+int rc;
+int joined_rc;
+size_t padding;
+bool running;
+libxl__datacopier_state dc;
+};
+
+_hidden void libxl__stream_write_start(libxl__egc *egc,
+ libxl__stream_write_state *stream);
+
+_hidden void libxl__stream_write_abort(libxl__egc *egc,
+ libxl__stream_write_state *stream,
+ int rc);
+
+static inline bool libxl__stream_write_inuse(
+const libxl__stream_write_state *stream)
+{
+return stream-running;
+}
+
typedef struct libxl__logdirty_switch {
const char *cmd;
const char *cmd_path;
@@ -2907,6 +2939,7 @@ struct libxl__domain_suspend_state {
/* private for libxl__domain_save_device_model */
libxl__save_device_model_cb *save_dm_callback;
libxl__datacopier_state save_dm_datacopier;
+libxl__stream_write_state sws;
};
diff --git a/tools/libxl/libxl_stream_write.c
b/tools/libxl/libxl_stream_write.c
new file mode 100644
index 000..856d72e
--- /dev/null
+++ b/tools/libxl/libxl_stream_write.c
@@ -0,0 +1,536 @@
+/*
+ * Copyright (C) 2015 Citrix Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ */
+
+#include libxl_osdeps.h /* must come before any other headers */
+
+#include libxl_internal.h
+
+/*
+ * Infrastructure for writing a domain to a libxl migration v2 stream.
+ *
+ * Entry points from outside:
+ * - libxl__stream_write_start()
+ * - Start writing a stream from the start.
+ *
+ * In normal operation, there are two tasks running at once; this stream
+ * processing, and the the libxl-save-helper. check_stream_finished() is
used
the the.
+ * to join all the tasks in both success and error cases.
+ *
+ * Nomenclature for event callbacks:
+ * - $FOO_done(): Completion callback for $FOO
+ * - write_$FOO(): Set up writing a $FOO
Set up or actually write?
+
+void libxl__stream_write_start(libxl__egc *egc,
+ libxl__stream_write_state *stream)
+{
+libxl__datacopier_state *dc = stream-dc;
+STATE_AO_GC(stream-ao);
+struct libxl_sr_hdr hdr = { 0 };
+int ret = 0;
+
+assert(!stream-running);
+stream-running
Re: [Xen-devel] [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream
On 06/15/2015 09:44 PM, Andrew Cooper wrote:
[...]
+
+static void write_emulator_record(libxl__egc *egc,
+ libxl__stream_write_state *stream)
+{
+libxl__domain_suspend_state *dss = CONTAINER_OF(stream, *dss, sws);
+libxl__datacopier_state *dc = stream-dc;
+STATE_AO_GC(stream-ao);
+struct libxl_sr_rec_hdr rec = { REC_TYPE_EMULATOR_CONTEXT, 0 };
+struct libxl_sr_emulator_hdr ehdr = { 0 };
+struct stat st;
+int ret = 0;
+uint32_t qemu_state_len;
+
+assert(dss-type == LIBXL_DOMAIN_TYPE_HVM);
+
+/* Convenience aliases */
+const char *const filename = dss-dm_savefile;
+const uint32_t domid = dss-domid;
+
+switch(libxl__device_model_version_running(gc, domid)) {
+case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL:
+ehdr.id = EMULATOR_QEMU_TRADITIONAL;
+break;
+
+case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN:
+ehdr.id = EMULATOR_QEMU_UPSTREAM;
+break;
+
+default:
+ret = ERROR_FAIL;
+goto err;
+}
+
+ret = libxl__domain_suspend_device_model(gc, dss);
This is no longer needed, the suspend callback already called
this function and the emulator context already saved to a file.
This call will cause Primary's emulator stop under Remus.
postcopy callback will resume primary. then in checkpoint
callback, we shouldn't suspend device model.
+if (ret)
+goto err;
+
+dc-readwhat = GCSPRINTF(qemu save file %s, filename);
+dc-copywhat = emulator record;
+dc-writewhat = save/migration stream;
+dc-callback = emulator_body_done;
+
+dc-readfd = open(filename, O_RDONLY);
+if (dc-readfd 0) {
+LOGE(ERROR, unable to open %s, dc-readwhat);
+goto err;
+}
+
+if (fstat(dc-readfd, st))
+{
+LOGE(ERROR, unable to fstat %s, dc-readwhat);
+goto err;
+}
+
+if (!S_ISREG(st.st_mode)) {
+LOG(ERROR, %s is not a plain file!, dc-readwhat);
+goto err;
+}
+
+qemu_state_len = st.st_size;
+rec.length = qemu_state_len + sizeof(ehdr);
+
+ret = libxl__datacopier_start(dc);
+if (ret)
+goto err;
+
+libxl__datacopier_prefixdata(egc, dc, rec, sizeof(rec));
+libxl__datacopier_prefixdata(egc, dc, ehdr, sizeof(ehdr));
+
+stream-padding = ROUNDUP(qemu_state_len, REC_ALIGN_ORDER) -
qemu_state_len;
+return;
+
+ err:
+assert(ret);
+stream_failed(egc, stream, ret);
+}
+
+static void emulator_body_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;
+}
+
+dc-readwhat = ;
+dc-readfd = -1;
+
+if (stream-padding) {
+assert(stream-padding (1U REC_ALIGN_ORDER));
+
+dc-copywhat = emulator padding;
+dc-writewhat = save/migration stream;
+dc-callback = emulator_padding_done;
+
+ret = libxl__datacopier_start(dc);
+if (ret)
+goto err;
+
+libxl__datacopier_prefixdata(egc, dc, zero_padding, stream-padding);
+return;
+}
+
+emulator_padding_done(egc, dc, 0, 0);
+return;
+
+ err:
+assert(ret);
+stream_failed(egc, stream, ret);
+}
+
+static void emulator_padding_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;
+}
+
+write_end_record(egc, stream);
+return;
+
+ err:
+assert(ret);
+stream_failed(egc, stream, ret);
+}
+
+static void write_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_END, 0 };
+int ret = 0;
+
+dc-copywhat = suspend footer;
+dc-writewhat = save/migration stream;
+dc-callback = 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 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;
+}
+
+stream_success(egc, stream);
+return;
+
+ err:
+assert(ret);
+
Re: [Xen-devel] [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream
On 06/15/2015 09:44 PM, Andrew Cooper wrote:
From: Ross Lagerwall ross.lagerw...@citrix.com
Signed-off-by: Ross Lagerwall ross.lagerw...@citrix.com
Signed-off-by: Andrew Cooper andrew.coop...@citrix.com
CC: Ian Campbell ian.campb...@citrix.com
CC: Ian Jackson ian.jack...@eu.citrix.com
CC: Wei Liu wei.l...@citrix.com
---
tools/libxl/Makefile |2 +-
tools/libxl/libxl_internal.h | 33 +++
tools/libxl/libxl_stream_write.c | 536
++
3 files changed, 570 insertions(+), 1 deletion(-)
create mode 100644 tools/libxl/libxl_stream_write.c
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index ca0ae3e..63e32f7 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -94,7 +94,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o
libxl_pci.o \
libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \
libxl_internal.o libxl_utils.o libxl_uuid.o \
libxl_json.o libxl_aoutils.o libxl_numa.o libxl_vnuma.o
\
- libxl_stream_read.o \
+ libxl_stream_read.o libxl_stream_write.o \
libxl_save_callout.o _libxl_save_msgs_callout.o \
libxl_convert_callout.o \
libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y)
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 5482950..82cd792 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -2868,6 +2868,38 @@ typedef void libxl__domain_suspend_cb(libxl__egc*,
typedef void libxl__save_device_model_cb(libxl__egc*,
libxl__domain_suspend_state*, int
rc);
+/* State for writing a libxl migration v2 stream */
+typedef struct libxl__stream_write_state libxl__stream_write_state;
+
+struct libxl__stream_write_state {
+/* filled by the user */
+libxl__ao *ao;
+int fd;
+uint32_t domid;
+void (*completion_callback)(libxl__egc *egc,
+libxl__domain_suspend_state *dss,
+int rc);
+/* Private */
+int rc;
+int joined_rc;
+size_t padding;
+bool running;
+libxl__datacopier_state dc;
+};
+
+_hidden void libxl__stream_write_start(libxl__egc *egc,
+ libxl__stream_write_state *stream);
+
+_hidden void libxl__stream_write_abort(libxl__egc *egc,
+ libxl__stream_write_state *stream,
+ int rc);
+
+static inline bool libxl__stream_write_inuse(
+const libxl__stream_write_state *stream)
+{
+return stream-running;
+}
+
typedef struct libxl__logdirty_switch {
const char *cmd;
const char *cmd_path;
@@ -2907,6 +2939,7 @@ struct libxl__domain_suspend_state {
/* private for libxl__domain_save_device_model */
libxl__save_device_model_cb *save_dm_callback;
libxl__datacopier_state save_dm_datacopier;
+libxl__stream_write_state sws;
};
diff --git a/tools/libxl/libxl_stream_write.c
b/tools/libxl/libxl_stream_write.c
new file mode 100644
index 000..856d72e
--- /dev/null
+++ b/tools/libxl/libxl_stream_write.c
@@ -0,0 +1,536 @@
+/*
+ * Copyright (C) 2015 Citrix Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ */
+
+#include libxl_osdeps.h /* must come before any other headers */
+
+#include libxl_internal.h
+
+/*
+ * Infrastructure for writing a domain to a libxl migration v2 stream.
+ *
+ * Entry points from outside:
+ * - libxl__stream_write_start()
+ * - Start writing a stream from the start.
+ *
+ * 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.
+ *
+ * Nomenclature for event callbacks:
+ * - $FOO_done(): Completion callback for $FOO
+ * - write_$FOO(): Set up writing a $FOO
+ * - $BAR_header(): A $BAR record header only
+ * - $BAR_record(): A complete $BAR record with header and content
+ *
+ * The main loop for a plain VM writes:
+ * - Stream header
+ * - Libxc record
+ * - Toolstack record
+ * - if (hvm), Qemu record
+ * - End record
+ */
+
+static const uint8_t zero_padding[1U REC_ALIGN_ORDER] = { 0 };
+
Re: [Xen-devel] [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream
On 06/15/2015 09:44 PM, Andrew Cooper wrote:
From: Ross Lagerwall ross.lagerw...@citrix.com
Signed-off-by: Ross Lagerwall ross.lagerw...@citrix.com
Signed-off-by: Andrew Cooper andrew.coop...@citrix.com
CC: Ian Campbell ian.campb...@citrix.com
CC: Ian Jackson ian.jack...@eu.citrix.com
CC: Wei Liu wei.l...@citrix.com
---
tools/libxl/Makefile |2 +-
tools/libxl/libxl_internal.h | 33 +++
tools/libxl/libxl_stream_write.c | 536
++
3 files changed, 570 insertions(+), 1 deletion(-)
create mode 100644 tools/libxl/libxl_stream_write.c
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index ca0ae3e..63e32f7 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -94,7 +94,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o
libxl_pci.o \
libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \
libxl_internal.o libxl_utils.o libxl_uuid.o \
libxl_json.o libxl_aoutils.o libxl_numa.o libxl_vnuma.o
\
- libxl_stream_read.o \
+ libxl_stream_read.o libxl_stream_write.o \
libxl_save_callout.o _libxl_save_msgs_callout.o \
libxl_convert_callout.o \
libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y)
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 5482950..82cd792 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -2868,6 +2868,38 @@ typedef void libxl__domain_suspend_cb(libxl__egc*,
typedef void libxl__save_device_model_cb(libxl__egc*,
libxl__domain_suspend_state*, int
rc);
+/* State for writing a libxl migration v2 stream */
+typedef struct libxl__stream_write_state libxl__stream_write_state;
+
+struct libxl__stream_write_state {
+/* filled by the user */
+libxl__ao *ao;
+int fd;
+uint32_t domid;
+void (*completion_callback)(libxl__egc *egc,
+libxl__domain_suspend_state *dss,
+int rc);
+/* Private */
+int rc;
+int joined_rc;
+size_t padding;
+bool running;
+libxl__datacopier_state dc;
+};
+
+_hidden void libxl__stream_write_start(libxl__egc *egc,
+ libxl__stream_write_state *stream);
+
+_hidden void libxl__stream_write_abort(libxl__egc *egc,
+ libxl__stream_write_state *stream,
+ int rc);
+
+static inline bool libxl__stream_write_inuse(
+const libxl__stream_write_state *stream)
+{
+return stream-running;
+}
+
typedef struct libxl__logdirty_switch {
const char *cmd;
const char *cmd_path;
@@ -2907,6 +2939,7 @@ struct libxl__domain_suspend_state {
/* private for libxl__domain_save_device_model */
libxl__save_device_model_cb *save_dm_callback;
libxl__datacopier_state save_dm_datacopier;
+libxl__stream_write_state sws;
};
diff --git a/tools/libxl/libxl_stream_write.c
b/tools/libxl/libxl_stream_write.c
new file mode 100644
index 000..856d72e
--- /dev/null
+++ b/tools/libxl/libxl_stream_write.c
@@ -0,0 +1,536 @@
+/*
+ * Copyright (C) 2015 Citrix Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ */
+
+#include libxl_osdeps.h /* must come before any other headers */
+
+#include libxl_internal.h
+
+/*
+ * Infrastructure for writing a domain to a libxl migration v2 stream.
+ *
+ * Entry points from outside:
+ * - libxl__stream_write_start()
+ * - Start writing a stream from the start.
+ *
+ * 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.
+ *
+ * Nomenclature for event callbacks:
+ * - $FOO_done(): Completion callback for $FOO
+ * - write_$FOO(): Set up writing a $FOO
+ * - $BAR_header(): A $BAR record header only
+ * - $BAR_record(): A complete $BAR record with header and content
+ *
+ * The main loop for a plain VM writes:
+ * - Stream header
+ * - Libxc record
+ * - Toolstack record
+ * - if (hvm), Qemu record
+ * - End record
+ */
+
+static const uint8_t zero_padding[1U REC_ALIGN_ORDER] = { 0 };
+
[Xen-devel] [PATCH 20/27] tools/libxl: Infrastructure for writing a v2 stream
From: Ross Lagerwall ross.lagerw...@citrix.com
Signed-off-by: Ross Lagerwall ross.lagerw...@citrix.com
Signed-off-by: Andrew Cooper andrew.coop...@citrix.com
CC: Ian Campbell ian.campb...@citrix.com
CC: Ian Jackson ian.jack...@eu.citrix.com
CC: Wei Liu wei.l...@citrix.com
---
tools/libxl/Makefile |2 +-
tools/libxl/libxl_internal.h | 33 +++
tools/libxl/libxl_stream_write.c | 536 ++
3 files changed, 570 insertions(+), 1 deletion(-)
create mode 100644 tools/libxl/libxl_stream_write.c
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index ca0ae3e..63e32f7 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -94,7 +94,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o
libxl_pci.o \
libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \
libxl_internal.o libxl_utils.o libxl_uuid.o \
libxl_json.o libxl_aoutils.o libxl_numa.o libxl_vnuma.o
\
- libxl_stream_read.o \
+ libxl_stream_read.o libxl_stream_write.o \
libxl_save_callout.o _libxl_save_msgs_callout.o \
libxl_convert_callout.o \
libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y)
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 5482950..82cd792 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -2868,6 +2868,38 @@ typedef void libxl__domain_suspend_cb(libxl__egc*,
typedef void libxl__save_device_model_cb(libxl__egc*,
libxl__domain_suspend_state*, int rc);
+/* State for writing a libxl migration v2 stream */
+typedef struct libxl__stream_write_state libxl__stream_write_state;
+
+struct libxl__stream_write_state {
+/* filled by the user */
+libxl__ao *ao;
+int fd;
+uint32_t domid;
+void (*completion_callback)(libxl__egc *egc,
+libxl__domain_suspend_state *dss,
+int rc);
+/* Private */
+int rc;
+int joined_rc;
+size_t padding;
+bool running;
+libxl__datacopier_state dc;
+};
+
+_hidden void libxl__stream_write_start(libxl__egc *egc,
+ libxl__stream_write_state *stream);
+
+_hidden void libxl__stream_write_abort(libxl__egc *egc,
+ libxl__stream_write_state *stream,
+ int rc);
+
+static inline bool libxl__stream_write_inuse(
+const libxl__stream_write_state *stream)
+{
+return stream-running;
+}
+
typedef struct libxl__logdirty_switch {
const char *cmd;
const char *cmd_path;
@@ -2907,6 +2939,7 @@ struct libxl__domain_suspend_state {
/* private for libxl__domain_save_device_model */
libxl__save_device_model_cb *save_dm_callback;
libxl__datacopier_state save_dm_datacopier;
+libxl__stream_write_state sws;
};
diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c
new file mode 100644
index 000..856d72e
--- /dev/null
+++ b/tools/libxl/libxl_stream_write.c
@@ -0,0 +1,536 @@
+/*
+ * Copyright (C) 2015 Citrix Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ */
+
+#include libxl_osdeps.h /* must come before any other headers */
+
+#include libxl_internal.h
+
+/*
+ * Infrastructure for writing a domain to a libxl migration v2 stream.
+ *
+ * Entry points from outside:
+ * - libxl__stream_write_start()
+ * - Start writing a stream from the start.
+ *
+ * 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.
+ *
+ * Nomenclature for event callbacks:
+ * - $FOO_done(): Completion callback for $FOO
+ * - write_$FOO(): Set up writing a $FOO
+ * - $BAR_header(): A $BAR record header only
+ * - $BAR_record(): A complete $BAR record with header and content
+ *
+ * The main loop for a plain VM writes:
+ * - Stream header
+ * - Libxc record
+ * - Toolstack record
+ * - if (hvm), Qemu record
+ * - End record
+ */
+
+static const uint8_t zero_padding[1U REC_ALIGN_ORDER] = { 0 };
+
+static void stream_success(libxl__egc *egc,
+ libxl__stream_write_state *stream);
+static void stream_failed(libxl__egc *egc,
+
