All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3 0/3] Introduce migration precopy policy
@ 2017-09-25 18:55 Jennifer Herbert
  2017-09-25 18:55 ` [PATCH v3 1/3] Tidy libxc xc_domain_save Jennifer Herbert
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Jennifer Herbert @ 2017-09-25 18:55 UTC (permalink / raw)
  To: Ian Jackson, Wei Liu, xen-devel, jtotto; +Cc: Jennifer Herbert

Hi all,

v3:

In patch 2/3, have changed/added comments, removed iteration parmeter from
update_progress_string and made a few formatting corrections.

v2:

Have tidied some formatting, s.o.b Joshua, and added a RFC patch
showing how to use this in  libxl.

v1:

Here I present a updated/modified subset of patch 7/20, part of
Joshua Otto's "Add postcopy live migration support." patch,
dated 27th March 2017.  As indicated on the original thread,
I wish to make use of this this within the XenServer product,
and hence am trying to get this subset  pulled in now. I also
hope this will aid Josh in pushing the remainder of his series.

Here I present two patches, the first which does some tidy up, removing
unused and unhelpful paramaters to xc_domain_save(), and the second
which allows a precopy callback to be specified, providing the
test for when to end the live phase of migration should end.
If none is provided, a default policy of the current behaviour
is used.


Jennifer Herbert (3):
  Tidy libxc xc_domain_save
  Introduce migration precopy policy
  RFC: migration: defer precopy policy to libxl

 tools/libxc/include/xenguest.h     |  41 ++++++++++++--
 tools/libxc/xc_nomigrate.c         |   3 +-
 tools/libxc/xc_sr_common.h         |   6 +-
 tools/libxc/xc_sr_save.c           | 113 +++++++++++++++++++++++++------------
 tools/libxl/libxl_dom_save.c       |  20 +++++++
 tools/libxl/libxl_save_callout.c   |   4 +-
 tools/libxl/libxl_save_helper.c    |   7 +--
 tools/libxl/libxl_save_msgs_gen.pl |   4 +-
 8 files changed, 142 insertions(+), 56 deletions(-)

-- 
1.8.3.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH v3 1/3] Tidy libxc xc_domain_save
  2017-09-25 18:55 [PATCH v3 0/3] Introduce migration precopy policy Jennifer Herbert
@ 2017-09-25 18:55 ` Jennifer Herbert
  2017-09-25 18:55 ` [PATCH v3 2/3] Introduce migration precopy policy Jennifer Herbert
  2017-09-25 18:55 ` [PATCH v3 3/3] RFC: migration: defer precopy policy to libxl Jennifer Herbert
  2 siblings, 0 replies; 11+ messages in thread
From: Jennifer Herbert @ 2017-09-25 18:55 UTC (permalink / raw)
  To: Ian Jackson, Wei Liu, xen-devel, jtotto; +Cc: Jennifer Herbert

Tidy up libxc's xc_domain_save, removing unused paramaters
max_iters and max_factor, making matching changes to libxl.

Signed-off-by: Joshua Otto <jtotto@uwaterloo.ca>
Signed-off-by: Jennifer Herbert <Jennifer.Herbert@citrix.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/libxc/include/xenguest.h   | 4 ++--
 tools/libxc/xc_nomigrate.c       | 3 +--
 tools/libxc/xc_sr_save.c         | 8 +++-----
 tools/libxl/libxl_save_callout.c | 4 ++--
 tools/libxl/libxl_save_helper.c  | 7 ++-----
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h
index 5cd8111..6626f0c 100644
--- a/tools/libxc/include/xenguest.h
+++ b/tools/libxc/include/xenguest.h
@@ -100,8 +100,8 @@ typedef enum {
  *        doesn't use checkpointing
  * @return 0 on success, -1 on failure
  */
-int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters,
-                   uint32_t max_factor, uint32_t flags /* XCFLAGS_xxx */,
+int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom,
+                   uint32_t flags /* XCFLAGS_xxx */,
                    struct save_callbacks* callbacks, int hvm,
                    xc_migration_stream_t stream_type, int recv_fd);
 
diff --git a/tools/libxc/xc_nomigrate.c b/tools/libxc/xc_nomigrate.c
index 317c8ce..fe8f68c 100644
--- a/tools/libxc/xc_nomigrate.c
+++ b/tools/libxc/xc_nomigrate.c
@@ -20,8 +20,7 @@
 #include <xenctrl.h>
 #include <xenguest.h>
 
-int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters,
-                   uint32_t max_factor, uint32_t flags,
+int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t flags,
                    struct save_callbacks* callbacks, int hvm,
                    xc_migration_stream_t stream_type, int recv_fd)
 {
diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c
index ca6913b..1e7502d 100644
--- a/tools/libxc/xc_sr_save.c
+++ b/tools/libxc/xc_sr_save.c
@@ -916,9 +916,8 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type)
 };
 
 int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom,
-                   uint32_t max_iters, uint32_t max_factor, uint32_t flags,
-                   struct save_callbacks* callbacks, int hvm,
-                   xc_migration_stream_t stream_type, int recv_fd)
+                   uint32_t flags, struct save_callbacks* callbacks,
+                   int hvm, xc_migration_stream_t stream_type, int recv_fd)
 {
     struct xc_sr_context ctx =
         {
@@ -955,8 +954,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom,
     if ( ctx.save.checkpointed == XC_MIG_STREAM_COLO )
         assert(callbacks->wait_checkpoint);
 
-    DPRINTF("fd %d, dom %u, max_iters %u, max_factor %u, flags %u, hvm %d",
-            io_fd, dom, max_iters, max_factor, flags, hvm);
+    DPRINTF("fd %d, dom %u, flags %u, hvm %d", io_fd, dom, flags, hvm);
 
     if ( xc_domain_getinfo(xch, dom, 1, &ctx.dominfo) != 1 )
     {
diff --git a/tools/libxl/libxl_save_callout.c b/tools/libxl/libxl_save_callout.c
index 891c669..6452d70 100644
--- a/tools/libxl/libxl_save_callout.c
+++ b/tools/libxl/libxl_save_callout.c
@@ -89,8 +89,8 @@ void libxl__xc_domain_save(libxl__egc *egc, libxl__domain_save_state *dss,
         libxl__srm_callout_enumcallbacks_save(&shs->callbacks.save.a);
 
     const unsigned long argnums[] = {
-        dss->domid, 0, 0, dss->xcflags, dss->hvm,
-        cbflags, dss->checkpointed_stream,
+        dss->domid, dss->xcflags, dss->hvm, cbflags,
+        dss->checkpointed_stream,
     };
 
     shs->ao = ao;
diff --git a/tools/libxl/libxl_save_helper.c b/tools/libxl/libxl_save_helper.c
index 1dece23..38089a0 100644
--- a/tools/libxl/libxl_save_helper.c
+++ b/tools/libxl/libxl_save_helper.c
@@ -251,8 +251,6 @@ int main(int argc, char **argv)
         io_fd =                             atoi(NEXTARG);
         recv_fd =                           atoi(NEXTARG);
         uint32_t dom =                      strtoul(NEXTARG,0,10);
-        uint32_t max_iters =                strtoul(NEXTARG,0,10);
-        uint32_t max_factor =               strtoul(NEXTARG,0,10);
         uint32_t flags =                    strtoul(NEXTARG,0,10);
         int hvm =                           atoi(NEXTARG);
         unsigned cbflags =                  strtoul(NEXTARG,0,10);
@@ -264,9 +262,8 @@ int main(int argc, char **argv)
         startup("save");
         setup_signals(save_signal_handler);
 
-        r = xc_domain_save(xch, io_fd, dom, max_iters, max_factor, flags,
-                           &helper_save_callbacks, hvm, stream_type,
-                           recv_fd);
+        r = xc_domain_save(xch, io_fd, dom, flags, &helper_save_callbacks,
+                           hvm, stream_type, recv_fd);
         complete(r);
 
     } else if (!strcmp(mode,"--restore-domain")) {
-- 
1.8.3.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v3 2/3] Introduce migration precopy policy
  2017-09-25 18:55 [PATCH v3 0/3] Introduce migration precopy policy Jennifer Herbert
  2017-09-25 18:55 ` [PATCH v3 1/3] Tidy libxc xc_domain_save Jennifer Herbert
@ 2017-09-25 18:55 ` Jennifer Herbert
  2017-09-26  8:36   ` Wei Liu
                     ` (2 more replies)
  2017-09-25 18:55 ` [PATCH v3 3/3] RFC: migration: defer precopy policy to libxl Jennifer Herbert
  2 siblings, 3 replies; 11+ messages in thread
From: Jennifer Herbert @ 2017-09-25 18:55 UTC (permalink / raw)
  To: Ian Jackson, Wei Liu, xen-devel, jtotto; +Cc: Jennifer Herbert

This Patch allows a migration precopy policy to be specified.

The precopy phase of the xc_domain_save() live migration algorithm has
historically been implemented to run until either a) (almost) no pages
are dirty or b) some fixed, hard-coded maximum number of precopy
iterations has been exceeded.  This policy and its implementation are
less than ideal for a few reasons:
- the logic of the policy is intertwined with the control flow of the
  mechanism of the precopy stage
- it can't take into account facts external to the immediate
  migration context, such external state transfer state, interactive
  user input, or the passage of wall-clock time.
- it does not permit the user to change their mind, over time, about
  what to do at the end of the precopy (they get an unconditional
  transition into the stop-and-copy phase of the migration)

To permit callers to implement arbitrary higher-level policies governing
when the live migration precopy phase should end, and what should be
done next:
- add a precopy_policy() callback to the xc_domain_save() user-supplied
  callbacks
- during the precopy phase of live migrations, consult this policy after
  each batch of pages transmitted and take the dictated action, which
  may be to a) abort the migration entirely, b) continue with the
  precopy, or c) proceed to the stop-and-copy phase.
- provide an implementation of the old policy, used when
  precopy_policy callback  is not provided.

Signed-off-by: Jennifer Herbert <Jennifer.Herbert@citrix.com>
Signed-off-by: Joshua Otto <jtotto@uwaterloo.ca>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>

---

v3:

Have changed/added comments, removed iteration parmeter from
update_progress_string and made a few formatting corrections.

v2:

Have made a few formatting corrections, added typedef as suggested.

This is updated/modified subset of patch 7/20, part of
Joshua Otto's "Add postcopy live migration support." patch,
dated 27th March 2017.  As indicated on the original thread,
I wish to make use of this this within the XenServer product.
I hope this will aid Josh in pushing the remainder of his series.
---
 tools/libxc/include/xenguest.h |  37 +++++++++++++--
 tools/libxc/xc_sr_common.h     |   6 +--
 tools/libxc/xc_sr_save.c       | 105 ++++++++++++++++++++++++++++-------------
 3 files changed, 109 insertions(+), 39 deletions(-)

diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h
index 6626f0c..de97f1b 100644
--- a/tools/libxc/include/xenguest.h
+++ b/tools/libxc/include/xenguest.h
@@ -39,6 +39,20 @@
  */
 struct xenevtchn_handle;
 
+/* For save's precopy_policy(). */
+struct precopy_stats
+{
+    unsigned int iteration;
+    unsigned int total_written;
+    long dirty_count; /* -1 if unknown */
+};
+
+/*
+ * A precopy_policy callback may not be running in the same address
+ * space as libxc an so precopy_stats is passed by value.
+ */
+typedef int (*precopy_policy_t)(struct precopy_stats, void *);
+
 /* callbacks provided by xc_domain_save */
 struct save_callbacks {
     /* Called after expiration of checkpoint interval,
@@ -46,7 +60,22 @@ struct save_callbacks {
      */
     int (*suspend)(void* data);
 
-    /* Called after the guest's dirty pages have been
+    /*
+     * Called before and after every batch of page data sent during
+     * the precopy phase of a live migration to ask the caller what
+     * to do next based on the current state of the precopy migration.
+     *
+     * Should return one of the values listed below:
+     */
+#define XGS_POLICY_ABORT          (-1) /* Abandon the migration entirely
+                                        * and tidy up. */
+#define XGS_POLICY_CONTINUE_PRECOPY 0  /* Remain in the precopy phase. */
+#define XGS_POLICY_STOP_AND_COPY    1  /* Immediately suspend and transmit the
+                                        * remaining dirty pages. */
+    precopy_policy_t precopy_policy;
+
+    /*
+     * Called after the guest's dirty pages have been
      *  copied into an output buffer.
      * Callback function resumes the guest & the device model,
      *  returns to xc_domain_save.
@@ -55,7 +84,8 @@ struct save_callbacks {
      */
     int (*postcopy)(void* data);
 
-    /* Called after the memory checkpoint has been flushed
+    /*
+     * Called after the memory checkpoint has been flushed
      * out into the network. Typical actions performed in this
      * callback include:
      *   (a) send the saved device model state (for HVM guests),
@@ -65,7 +95,8 @@ struct save_callbacks {
      *
      * returns:
      * 0: terminate checkpointing gracefully
-     * 1: take another checkpoint */
+     * 1: take another checkpoint
+     */
     int (*checkpoint)(void* data);
 
     /*
diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h
index a83f22a..3635704 100644
--- a/tools/libxc/xc_sr_common.h
+++ b/tools/libxc/xc_sr_common.h
@@ -198,12 +198,10 @@ struct xc_sr_context
             /* Further debugging information in the stream. */
             bool debug;
 
-            /* Parameters for tweaking live migration. */
-            unsigned max_iterations;
-            unsigned dirty_threshold;
-
             unsigned long p2m_size;
 
+            struct precopy_stats stats;
+
             xen_pfn_t *batch_pfns;
             unsigned nr_batch_pfns;
             unsigned long *deferred_pages;
diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c
index 1e7502d..5a40e58 100644
--- a/tools/libxc/xc_sr_save.c
+++ b/tools/libxc/xc_sr_save.c
@@ -446,14 +446,13 @@ static int enable_logdirty(struct xc_sr_context *ctx)
     return 0;
 }
 
-static int update_progress_string(struct xc_sr_context *ctx,
-                                  char **str, unsigned iter)
+static int update_progress_string(struct xc_sr_context *ctx, char **str)
 {
     xc_interface *xch = ctx->xch;
     char *new_str = NULL;
+    unsigned int iter = ctx->save.stats.iteration;
 
-    if ( asprintf(&new_str, "Frames iteration %u of %u",
-                  iter, ctx->save.max_iterations) == -1 )
+    if ( asprintf(&new_str, "Frames iteration %u", iter) == -1 )
     {
         PERROR("Unable to allocate new progress string");
         return -1;
@@ -467,6 +466,28 @@ static int update_progress_string(struct xc_sr_context *ctx,
 }
 
 /*
+ * This is the live migration precopy policy - it's called periodically during
+ * the precopy phase of live migrations, and is responsible for deciding when
+ * the precopy phase should terminate and what should be done next.
+ *
+ * The policy implemented here behaves identically to the policy previously
+ * hard-coded into xc_domain_save() - it proceeds to the stop-and-copy phase of
+ * the live migration when there are either fewer than 50 dirty pages, or more
+ * than 5 precopy rounds have completed.
+ */
+#define SPP_MAX_ITERATIONS      5
+#define SPP_TARGET_DIRTY_COUNT 50
+
+static int simple_precopy_policy(struct precopy_stats stats, void *user)
+{
+    return ((stats.dirty_count >= 0 &&
+            stats.dirty_count < SPP_TARGET_DIRTY_COUNT) ||
+            stats.iteration >= SPP_MAX_ITERATIONS)
+        ? XGS_POLICY_STOP_AND_COPY
+        : XGS_POLICY_CONTINUE_PRECOPY;
+}
+
+/*
  * Send memory while guest is running.
  */
 static int send_memory_live(struct xc_sr_context *ctx)
@@ -474,21 +495,59 @@ static int send_memory_live(struct xc_sr_context *ctx)
     xc_interface *xch = ctx->xch;
     xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size };
     char *progress_str = NULL;
-    unsigned x;
+    unsigned int x = 0;
     int rc;
+    int policy_decision;
 
-    rc = update_progress_string(ctx, &progress_str, 0);
-    if ( rc )
-        goto out;
+    DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap,
+                                    &ctx->save.dirty_bitmap_hbuf);
 
-    rc = send_all_pages(ctx);
+    precopy_policy_t precopy_policy = ctx->save.callbacks->precopy_policy;
+    void *data = ctx->save.callbacks->data;
+
+    struct precopy_stats *policy_stats;
+
+    rc = update_progress_string(ctx, &progress_str);
     if ( rc )
         goto out;
 
-    for ( x = 1;
-          ((x < ctx->save.max_iterations) &&
-           (stats.dirty_count > ctx->save.dirty_threshold)); ++x )
+    ctx->save.stats = (struct precopy_stats)
+        { .dirty_count   = ctx->save.p2m_size };
+    policy_stats = &ctx->save.stats;
+
+    if ( precopy_policy == NULL )
+         precopy_policy = simple_precopy_policy;
+
+    bitmap_set(dirty_bitmap, ctx->save.p2m_size);
+
+    for ( ; ; )
     {
+        policy_decision = precopy_policy(*policy_stats, data);
+        x++;
+
+        if ( stats.dirty_count > 0 && policy_decision != XGS_POLICY_ABORT )
+        {
+            rc = update_progress_string(ctx, &progress_str);
+            if ( rc )
+                goto out;
+
+            rc = send_dirty_pages(ctx, stats.dirty_count);
+            if ( rc )
+                goto out;
+        }
+
+        if ( policy_decision != XGS_POLICY_CONTINUE_PRECOPY )
+            break;
+
+        policy_stats->iteration     = x;
+        policy_stats->total_written += policy_stats->dirty_count;
+        policy_stats->dirty_count   = -1;
+
+        policy_decision = precopy_policy(*policy_stats, data);
+
+        if ( policy_decision != XGS_POLICY_CONTINUE_PRECOPY )
+           break;
+
         if ( xc_shadow_control(
                  xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_CLEAN,
                  &ctx->save.dirty_bitmap_hbuf, ctx->save.p2m_size,
@@ -499,16 +558,8 @@ static int send_memory_live(struct xc_sr_context *ctx)
             goto out;
         }
 
-        if ( stats.dirty_count == 0 )
-            break;
+        policy_stats->dirty_count = stats.dirty_count;
 
-        rc = update_progress_string(ctx, &progress_str, x);
-        if ( rc )
-            goto out;
-
-        rc = send_dirty_pages(ctx, stats.dirty_count);
-        if ( rc )
-            goto out;
     }
 
  out:
@@ -600,8 +651,7 @@ static int suspend_and_send_dirty(struct xc_sr_context *ctx)
 
     if ( ctx->save.live )
     {
-        rc = update_progress_string(ctx, &progress_str,
-                                    ctx->save.max_iterations);
+        rc = update_progress_string(ctx, &progress_str);
         if ( rc )
             goto out;
     }
@@ -937,15 +987,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom,
            stream_type == XC_MIG_STREAM_REMUS ||
            stream_type == XC_MIG_STREAM_COLO);
 
-    /*
-     * TODO: Find some time to better tweak the live migration algorithm.
-     *
-     * These parameters are better than the legacy algorithm especially for
-     * busy guests.
-     */
-    ctx.save.max_iterations = 5;
-    ctx.save.dirty_threshold = 50;
-
     /* Sanity checks for callbacks. */
     if ( hvm )
         assert(callbacks->switch_qemu_logdirty);
-- 
1.8.3.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v3 3/3] RFC: migration: defer precopy policy to libxl
  2017-09-25 18:55 [PATCH v3 0/3] Introduce migration precopy policy Jennifer Herbert
  2017-09-25 18:55 ` [PATCH v3 1/3] Tidy libxc xc_domain_save Jennifer Herbert
  2017-09-25 18:55 ` [PATCH v3 2/3] Introduce migration precopy policy Jennifer Herbert
@ 2017-09-25 18:55 ` Jennifer Herbert
  2017-09-26  8:48   ` Wei Liu
  2 siblings, 1 reply; 11+ messages in thread
From: Jennifer Herbert @ 2017-09-25 18:55 UTC (permalink / raw)
  To: Ian Jackson, Wei Liu, xen-devel, jtotto; +Cc: Jennifer Herbert

Provide an implementation of the old policy as a callback in
libxl and plumb it through the IPC machinery to libxc.

This serves as an example for defining a libxl policy,
and provides no advantage over the default policy in libxc.

Signed-off-by: Joshua Otto <jtotto@uwaterloo.ca>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
---
 tools/libxl/libxl_dom_save.c       | 20 ++++++++++++++++++++
 tools/libxl/libxl_save_msgs_gen.pl |  4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/tools/libxl/libxl_dom_save.c b/tools/libxl/libxl_dom_save.c
index 77fe30e..6d28cce 100644
--- a/tools/libxl/libxl_dom_save.c
+++ b/tools/libxl/libxl_dom_save.c
@@ -328,6 +328,25 @@ int libxl__save_emulator_xenstore_data(libxl__domain_save_state *dss,
     return rc;
 }
 
+/*
+ * This is the live migration precopy policy - it's called periodically during
+ * the precopy phase of live migrations, and is responsible for deciding when
+ * the precopy phase should terminate and what should be done next.
+ *
+ * The policy implemented here behaves identically to the policy previously
+ * hard-coded into xc_domain_save() - it proceeds to the stop-and-copy phase of
+ * the live migration when there are either fewer than 50 dirty pages, or more
+ * than 5 precopy rounds have completed.
+ */
+static int libxl__save_live_migration_simple_precopy_policy(
+    struct precopy_stats stats, void *user)
+{
+    return ((stats.dirty_count >= 0 && stats.dirty_count < 50) ||
+            stats.iteration >= 5)
+        ? XGS_POLICY_STOP_AND_COPY
+        : XGS_POLICY_CONTINUE_PRECOPY;
+}
+
 /*----- main code for saving, in order of execution -----*/
 
 void libxl__domain_save(libxl__egc *egc, libxl__domain_save_state *dss)
@@ -401,6 +420,7 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_save_state *dss)
     if (dss->checkpointed_stream == LIBXL_CHECKPOINTED_STREAM_NONE)
         callbacks->suspend = libxl__domain_suspend_callback;
 
+    callbacks->precopy_policy = libxl__save_live_migration_simple_precopy_policy;
     callbacks->switch_qemu_logdirty = libxl__domain_suspend_common_switch_qemu_logdirty;
 
     dss->sws.ao  = dss->ao;
diff --git a/tools/libxl/libxl_save_msgs_gen.pl b/tools/libxl/libxl_save_msgs_gen.pl
index 3ae7373..bb1d4e9 100755
--- a/tools/libxl/libxl_save_msgs_gen.pl
+++ b/tools/libxl/libxl_save_msgs_gen.pl
@@ -33,6 +33,7 @@ our @msgs = (
                                               'xen_pfn_t', 'console_gfn'] ],
     [  9, 'srW',    "complete",              [qw(int retval
                                                  int errnoval)] ],
+    [ 10, 'scxW',   "precopy_policy", ['struct precopy_stats', 'stats'] ]
 );
 
 #----------------------------------------
@@ -141,7 +142,8 @@ static void bytes_put(unsigned char *const buf, int *len,
 
 END
 
-foreach my $simpletype (qw(int uint16_t uint32_t unsigned), 'unsigned long', 'xen_pfn_t') {
+foreach my $simpletype (qw(int uint16_t uint32_t unsigned),
+                        'unsigned long', 'xen_pfn_t', 'struct precopy_stats') {
     my $typeid = typeid($simpletype);
     $out_body{'callout'} .= <<END;
 static int ${typeid}_get(const unsigned char **msg,
-- 
1.8.3.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH v3 2/3] Introduce migration precopy policy
  2017-09-25 18:55 ` [PATCH v3 2/3] Introduce migration precopy policy Jennifer Herbert
@ 2017-09-26  8:36   ` Wei Liu
  2017-09-26 10:58   ` Andrew Cooper
  2017-09-26 11:02   ` Andrew Cooper
  2 siblings, 0 replies; 11+ messages in thread
From: Wei Liu @ 2017-09-26  8:36 UTC (permalink / raw)
  To: Jennifer Herbert; +Cc: Wei Liu, Ian Jackson, jtotto, xen-devel

On Mon, Sep 25, 2017 at 07:55:34PM +0100, Jennifer Herbert wrote:
> This Patch allows a migration precopy policy to be specified.
> 
> The precopy phase of the xc_domain_save() live migration algorithm has
> historically been implemented to run until either a) (almost) no pages
> are dirty or b) some fixed, hard-coded maximum number of precopy
> iterations has been exceeded.  This policy and its implementation are
> less than ideal for a few reasons:
> - the logic of the policy is intertwined with the control flow of the
>   mechanism of the precopy stage
> - it can't take into account facts external to the immediate
>   migration context, such external state transfer state, interactive
>   user input, or the passage of wall-clock time.
> - it does not permit the user to change their mind, over time, about
>   what to do at the end of the precopy (they get an unconditional
>   transition into the stop-and-copy phase of the migration)
> 
> To permit callers to implement arbitrary higher-level policies governing
> when the live migration precopy phase should end, and what should be
> done next:
> - add a precopy_policy() callback to the xc_domain_save() user-supplied
>   callbacks
> - during the precopy phase of live migrations, consult this policy after
>   each batch of pages transmitted and take the dictated action, which
>   may be to a) abort the migration entirely, b) continue with the
>   precopy, or c) proceed to the stop-and-copy phase.
> - provide an implementation of the old policy, used when
>   precopy_policy callback  is not provided.
> 
> Signed-off-by: Jennifer Herbert <Jennifer.Herbert@citrix.com>
> Signed-off-by: Joshua Otto <jtotto@uwaterloo.ca>
> Reviewed-by: Paul Durrant <paul.durrant@citrix.com>

Acked-by: Wei Liu <wei.liu2@citrix.com>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v3 3/3] RFC: migration: defer precopy policy to libxl
  2017-09-25 18:55 ` [PATCH v3 3/3] RFC: migration: defer precopy policy to libxl Jennifer Herbert
@ 2017-09-26  8:48   ` Wei Liu
  2017-09-26  9:42     ` Jennifer Herbert
  0 siblings, 1 reply; 11+ messages in thread
From: Wei Liu @ 2017-09-26  8:48 UTC (permalink / raw)
  To: Jennifer Herbert; +Cc: Wei Liu, Ian Jackson, jtotto, xen-devel

On Mon, Sep 25, 2017 at 07:55:35PM +0100, Jennifer Herbert wrote:
> Provide an implementation of the old policy as a callback in
> libxl and plumb it through the IPC machinery to libxc.
> 
> This serves as an example for defining a libxl policy,
> and provides no advantage over the default policy in libxc.
> 
> Signed-off-by: Joshua Otto <jtotto@uwaterloo.ca>
> Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>

The code looks plausible but it is not really usable by libxl users
as-is, because a public API is still missing.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v3 3/3] RFC: migration: defer precopy policy to libxl
  2017-09-26  8:48   ` Wei Liu
@ 2017-09-26  9:42     ` Jennifer Herbert
  0 siblings, 0 replies; 11+ messages in thread
From: Jennifer Herbert @ 2017-09-26  9:42 UTC (permalink / raw)
  To: Wei Liu; +Cc: xen-devel, Ian Jackson, jtotto

On 26/09/17 09:48, Wei Liu wrote:
> On Mon, Sep 25, 2017 at 07:55:35PM +0100, Jennifer Herbert wrote:
>> Provide an implementation of the old policy as a callback in
>> libxl and plumb it through the IPC machinery to libxc.
>>
>> This serves as an example for defining a libxl policy,
>> and provides no advantage over the default policy in libxc.
>>
>> Signed-off-by: Joshua Otto <jtotto@uwaterloo.ca>
>> Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
> The code looks plausible but it is not really usable by libxl users
> as-is, because a public API is still missing.

This is why I excluded it to start with, and now labelled  it RFC.
Its only the first two patches I would like to see pulled atm.

Cheers

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v3 2/3] Introduce migration precopy policy
  2017-09-25 18:55 ` [PATCH v3 2/3] Introduce migration precopy policy Jennifer Herbert
  2017-09-26  8:36   ` Wei Liu
@ 2017-09-26 10:58   ` Andrew Cooper
  2017-09-26 11:38     ` Jennifer Herbert
  2017-09-26 11:02   ` Andrew Cooper
  2 siblings, 1 reply; 11+ messages in thread
From: Andrew Cooper @ 2017-09-26 10:58 UTC (permalink / raw)
  To: Jennifer Herbert, Ian Jackson, Wei Liu, xen-devel, jtotto

On 25/09/17 19:55, Jennifer Herbert wrote:
> +/*
> + * A precopy_policy callback may not be running in the same address
> + * space as libxc an so precopy_stats is passed by value.
> + */

Please take a step back and thing about what is written here...

As I've said repeatedly, the structure vs pointer argument here is
entirely unrelated to the IPC boundary.

I am also unhappy that, after multiple review requests saying "turn this
into a pointer", its remained being passed by value.  It is not ok to
hack things like this up simply because its the easier cause of action.

~Andrew

> +typedef int (*precopy_policy_t)(struct precopy_stats, void *);
> +
>  /* callbacks provided by xc_domain_save */
>  struct save_callbacks {
>      /* Called after expiration of checkpoint interval,
>


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v3 2/3] Introduce migration precopy policy
  2017-09-25 18:55 ` [PATCH v3 2/3] Introduce migration precopy policy Jennifer Herbert
  2017-09-26  8:36   ` Wei Liu
  2017-09-26 10:58   ` Andrew Cooper
@ 2017-09-26 11:02   ` Andrew Cooper
  2017-09-26 11:49     ` Jennifer Herbert
  2 siblings, 1 reply; 11+ messages in thread
From: Andrew Cooper @ 2017-09-26 11:02 UTC (permalink / raw)
  To: Jennifer Herbert, Ian Jackson, Wei Liu, xen-devel, jtotto

On 25/09/17 19:55, Jennifer Herbert wrote:
> @@ -46,7 +60,22 @@ struct save_callbacks {
>       */
>      int (*suspend)(void* data);
>  
> -    /* Called after the guest's dirty pages have been
> +    /*
> +     * Called before and after every batch of page data sent during
> +     * the precopy phase of a live migration to ask the caller what
> +     * to do next based on the current state of the precopy migration.

How is the callback supposed to determine whether it is before or ahead
of the data batch?

As far as I can tell, its not possible.

~Andrew

> +     *
> +     * Should return one of the values listed below:
> +     */
> +#define XGS_POLICY_ABORT          (-1) /* Abandon the migration entirely
> +                                        * and tidy up. */
> +#define XGS_POLICY_CONTINUE_PRECOPY 0  /* Remain in the precopy phase. */
> +#define XGS_POLICY_STOP_AND_COPY    1  /* Immediately suspend and transmit the
> +                                        * remaining dirty pages. */
> +    precopy_policy_t precopy_policy;
> +
> +    /*
> +     * Called after the guest's dirty pages have been
>       *  copied into an output buffer.
>       * Callback function resumes the guest & the device model,
>       *  returns to xc_domain_save.
>


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v3 2/3] Introduce migration precopy policy
  2017-09-26 10:58   ` Andrew Cooper
@ 2017-09-26 11:38     ` Jennifer Herbert
  0 siblings, 0 replies; 11+ messages in thread
From: Jennifer Herbert @ 2017-09-26 11:38 UTC (permalink / raw)
  To: Andrew Cooper, Ian Jackson, Wei Liu, xen-devel, jtotto

On 26/09/17 11:58, Andrew Cooper wrote:
> On 25/09/17 19:55, Jennifer Herbert wrote:
>> +/*
>> + * A precopy_policy callback may not be running in the same address
>> + * space as libxc an so precopy_stats is passed by value.
>> + */
> Please take a step back and thing about what is written here...
>
> As I've said repeatedly, the structure vs pointer argument here is
> entirely unrelated to the IPC boundary.
>
> I am also unhappy that, after multiple review requests saying "turn this
> into a pointer", its remained being passed by value.  It is not ok to
> hack things like this up simply because its the easier cause of action.

Passing tiny structures by value is not a hack - it is perfectly valid 
C.  Bare in mind that a pointer is not a zero
sized entity - it itself needs to be copied.  Passing by value here is 
quite possibly faster, and use less memory.   Furthermore, the multiple 
reviews concluded that this was related to IPC boundary, and that the 
tiny struct size was acceptable.

Maybe you could elaborate on why you do not think it is related to the 
IPC boundary.

Instead, we could pass each element of the structure, as an individual 
parameters.  This would seem a retrograde
step to me, but  would address your sensitivities.

-jenny

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v3 2/3] Introduce migration precopy policy
  2017-09-26 11:02   ` Andrew Cooper
@ 2017-09-26 11:49     ` Jennifer Herbert
  0 siblings, 0 replies; 11+ messages in thread
From: Jennifer Herbert @ 2017-09-26 11:49 UTC (permalink / raw)
  To: Andrew Cooper, Ian Jackson, Wei Liu, xen-devel, jtotto


On 26/09/17 12:02, Andrew Cooper wrote:
> On 25/09/17 19:55, Jennifer Herbert wrote:
>> @@ -46,7 +60,22 @@ struct save_callbacks {
>>        */
>>       int (*suspend)(void* data);
>>   
>> -    /* Called after the guest's dirty pages have been
>> +    /*
>> +     * Called before and after every batch of page data sent during
>> +     * the precopy phase of a live migration to ask the caller what
>> +     * to do next based on the current state of the precopy migration.
> How is the callback supposed to determine whether it is before or ahead
> of the data batch?
>
> As far as I can tell, its not possible.
>
> ~Andrew

You look at the dirty_count.  It works well for me.
I can add that info to the comment.

-jenny

>> +     *
>> +     * Should return one of the values listed below:
>> +     */
>> +#define XGS_POLICY_ABORT          (-1) /* Abandon the migration entirely
>> +                                        * and tidy up. */
>> +#define XGS_POLICY_CONTINUE_PRECOPY 0  /* Remain in the precopy phase. */
>> +#define XGS_POLICY_STOP_AND_COPY    1  /* Immediately suspend and transmit the
>> +                                        * remaining dirty pages. */
>> +    precopy_policy_t precopy_policy;
>> +
>> +    /*
>> +     * Called after the guest's dirty pages have been
>>        *  copied into an output buffer.
>>        * Callback function resumes the guest & the device model,
>>        *  returns to xc_domain_save.
>>


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2017-09-26 11:49 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-25 18:55 [PATCH v3 0/3] Introduce migration precopy policy Jennifer Herbert
2017-09-25 18:55 ` [PATCH v3 1/3] Tidy libxc xc_domain_save Jennifer Herbert
2017-09-25 18:55 ` [PATCH v3 2/3] Introduce migration precopy policy Jennifer Herbert
2017-09-26  8:36   ` Wei Liu
2017-09-26 10:58   ` Andrew Cooper
2017-09-26 11:38     ` Jennifer Herbert
2017-09-26 11:02   ` Andrew Cooper
2017-09-26 11:49     ` Jennifer Herbert
2017-09-25 18:55 ` [PATCH v3 3/3] RFC: migration: defer precopy policy to libxl Jennifer Herbert
2017-09-26  8:48   ` Wei Liu
2017-09-26  9:42     ` Jennifer Herbert

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.