* [Xen-devel] [PATCH v2 1/6] libxl: add definition of INVALID_DOMID to the API
2020-01-09 11:48 [Xen-devel] [PATCH v2 0/6] xl/libxl: domid allocation/preservation changes Paul Durrant
@ 2020-01-09 11:48 ` Paul Durrant
2020-01-09 11:48 ` [Xen-devel] [PATCH v2 2/6] libxl_create: make 'soft reset' explicit Paul Durrant
` (4 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Paul Durrant @ 2020-01-09 11:48 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Paul Durrant, Ian Jackson, Wei Liu
Currently both xl and libxl have internal definitions of INVALID_DOMID
which happen to be identical. However, for the purposes of describing the
behaviour of libxl_domain_create_new/restore() it is useful to have a
specified invalid value for a domain id.
This patch therefore moves the libxl definition from libxl_internal.h to
libxl.h and removes the internal definition from xl_utils.h. The hardcoded
'-1' passed back via domcreate_complete() is then updated to INVALID_DOMID
and comment above libxl_domain_create_new/restore() is accordingly
modified.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
Cc: Wei Liu <wl@xen.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>
---
tools/libxl/libxl.h | 4 +++-
tools/libxl/libxl_create.c | 2 +-
tools/libxl/libxl_internal.h | 1 -
tools/xl/xl_utils.h | 2 --
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index 54abb9db1f..18c1a2d6bf 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -1527,9 +1527,11 @@ int libxl_ctx_free(libxl_ctx *ctx /* 0 is OK */);
/* domain related functions */
+#define INVALID_DOMID ~0
+
/* If the result is ERROR_ABORTED, the domain may or may not exist
* (in a half-created state). *domid will be valid and will be the
- * domain id, or -1, as appropriate */
+ * domain id, or INVALID_DOMID, as appropriate */
int libxl_domain_create_new(libxl_ctx *ctx, libxl_domain_config *d_config,
uint32_t *domid,
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 32d45dcef0..bc425fee32 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -1773,7 +1773,7 @@ static void domcreate_complete(libxl__egc *egc,
libxl__domain_destroy(egc, &dcs->dds);
return;
}
- dcs->guest_domid = -1;
+ dcs->guest_domid = INVALID_DOMID;
}
dcs->callback(egc, dcs, rc, dcs->guest_domid);
}
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index ba8c9b41ab..3b708fba8f 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -121,7 +121,6 @@
#define STUBDOM_SPECIAL_CONSOLES 3
#define TAP_DEVICE_SUFFIX "-emu"
#define DOMID_XS_PATH "domid"
-#define INVALID_DOMID ~0
#define PVSHIM_BASENAME "xen-shim"
#define PVSHIM_CMDLINE "pv-shim console=xen,pv"
diff --git a/tools/xl/xl_utils.h b/tools/xl/xl_utils.h
index 7b9ccca30a..d98b419f10 100644
--- a/tools/xl/xl_utils.h
+++ b/tools/xl/xl_utils.h
@@ -52,8 +52,6 @@
#define STR_SKIP_PREFIX( a, b ) \
( STR_HAS_PREFIX(a, b) ? ((a) += strlen(b), 1) : 0 )
-#define INVALID_DOMID ~0
-
#define LOG(_f, _a...) dolog(__FILE__, __LINE__, __func__, _f "\n", ##_a)
/*
--
2.20.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Xen-devel] [PATCH v2 2/6] libxl_create: make 'soft reset' explicit
2020-01-09 11:48 [Xen-devel] [PATCH v2 0/6] xl/libxl: domid allocation/preservation changes Paul Durrant
2020-01-09 11:48 ` [Xen-devel] [PATCH v2 1/6] libxl: add definition of INVALID_DOMID to the API Paul Durrant
@ 2020-01-09 11:48 ` Paul Durrant
2020-01-09 11:48 ` [Xen-devel] [PATCH v2 3/6] libxl: add infrastructure to track and query 'retired' domids Paul Durrant
` (3 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Paul Durrant @ 2020-01-09 11:48 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Paul Durrant, Ian Jackson, Wei Liu
The 'soft reset' code path in libxl__domain_make() is currently taken if a
valid domid is passed into the function. A subsequent patch will enable
higher levels of the toolstack to determine the domid of newly created or
restored domains and therefore this criteria for choosing 'soft reset'
will no longer be usable.
This patch adds an extra boolean option to libxl__domain_make() to specify
whether it is being invoked in soft reset context and appropriately
modifies callers to choose the right value. To facilitate this, a new
'soft_reset' boolean field is added to struct libxl__domain_create_state
and the 'domid_soft_reset' field is renamed to 'domid' in anticipation of
its wider remit. For the moment do_domain_create() will always set
domid to INVALID_DOMID and hence we can add an assertion into
libxl__domain_create() that, if it is not called in soft reset context,
the passed in domid is exactly that value.
Whilst in the neighbourhood, some checks of 'restore_fd > -1' have been
replaced by 'restore_fd >= 0' to be more conventional and consistent with
checks of 'restore_fd < 0'.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
Cc: Wei Liu <wl@xen.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>
---
tools/libxl/libxl_create.c | 56 ++++++++++++++++++++++--------------
tools/libxl/libxl_dm.c | 2 +-
tools/libxl/libxl_internal.h | 5 ++--
3 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index bc425fee32..1835a5502c 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -538,7 +538,7 @@ out:
int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config,
libxl__domain_build_state *state,
- uint32_t *domid)
+ uint32_t *domid, bool soft_reset)
{
libxl_ctx *ctx = libxl__gc_owner(gc);
int ret, rc, nb_vm;
@@ -555,14 +555,15 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config,
libxl_domain_create_info *info = &d_config->c_info;
libxl_domain_build_info *b_info = &d_config->b_info;
+ assert(soft_reset || *domid == INVALID_DOMID);
+
uuid_string = libxl__uuid2string(gc, info->uuid);
if (!uuid_string) {
rc = ERROR_NOMEM;
goto out;
}
- /* Valid domid here means we're soft resetting. */
- if (!libxl_domid_valid_guest(*domid)) {
+ if (!soft_reset) {
struct xen_domctl_createdomain create = {
.ssidref = info->ssidref,
.max_vcpus = b_info->max_vcpus,
@@ -611,6 +612,14 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config,
goto out;
}
+ /*
+ * If soft_reset is set the the domid will have been valid on entry.
+ * If it was not set then xc_domain_create() should have assigned a
+ * valid value. Either way, if we reach this point, domid should be
+ * valid.
+ */
+ assert(libxl_domid_valid_guest(*domid));
+
ret = xc_cpupool_movedomain(ctx->xch, info->poolid, *domid);
if (ret < 0) {
LOGED(ERROR, *domid, "domain move fail");
@@ -1091,13 +1100,14 @@ static void initiate_domain_create(libxl__egc *egc,
libxl_domain_config *const d_config = dcs->guest_config;
const int restore_fd = dcs->restore_fd;
- domid = dcs->domid_soft_reset;
+ domid = dcs->domid;
libxl__domain_build_state_init(&dcs->build_state);
ret = libxl__domain_config_setdefault(gc,d_config,domid);
if (ret) goto error_out;
- ret = libxl__domain_make(gc, d_config, &dcs->build_state, &domid);
+ ret = libxl__domain_make(gc, d_config, &dcs->build_state, &domid,
+ dcs->soft_reset);
if (ret) {
LOGD(ERROR, domid, "cannot make domain: %d", ret);
dcs->guest_domid = domid;
@@ -1141,7 +1151,7 @@ static void initiate_domain_create(libxl__egc *egc,
if (ret)
goto error_out;
- if (restore_fd >= 0 || dcs->domid_soft_reset != INVALID_DOMID) {
+ if (restore_fd >= 0 || dcs->soft_reset) {
LOGD(DEBUG, domid, "restoring, not running bootloader");
domcreate_bootloader_done(egc, &dcs->bl, 0);
} else {
@@ -1217,7 +1227,7 @@ static void domcreate_bootloader_done(libxl__egc *egc,
dcs->sdss.dm.callback = domcreate_devmodel_started;
dcs->sdss.callback = domcreate_devmodel_started;
- if (restore_fd < 0 && dcs->domid_soft_reset == INVALID_DOMID) {
+ if (restore_fd < 0 && !dcs->soft_reset) {
rc = libxl__domain_build(gc, d_config, domid, state);
domcreate_rebuild_done(egc, dcs, rc);
return;
@@ -1827,7 +1837,7 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config,
libxl_domain_config_copy(ctx, &cdcs->dcs.guest_config_saved, d_config);
cdcs->dcs.restore_fd = cdcs->dcs.libxc_fd = restore_fd;
cdcs->dcs.send_back_fd = send_back_fd;
- if (restore_fd > -1) {
+ if (restore_fd >= 0) {
cdcs->dcs.restore_params = *params;
rc = libxl__fd_flags_modify_save(gc, cdcs->dcs.restore_fd,
~(O_NONBLOCK|O_NDELAY), 0,
@@ -1835,7 +1845,8 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config,
if (rc < 0) goto out_err;
}
cdcs->dcs.callback = domain_create_cb;
- cdcs->dcs.domid_soft_reset = INVALID_DOMID;
+ cdcs->dcs.domid = INVALID_DOMID;
+ cdcs->dcs.soft_reset = false;
if (cdcs->dcs.restore_params.checkpointed_stream ==
LIBXL_CHECKPOINTED_STREAM_COLO) {
@@ -1905,7 +1916,7 @@ static void soft_reset_dm_suspended(libxl__egc *egc,
int rc);
static int do_domain_soft_reset(libxl_ctx *ctx,
libxl_domain_config *d_config,
- uint32_t domid_soft_reset,
+ uint32_t domid,
const libxl_asyncop_how *ao_how,
const libxl_asyncprogress_how
*aop_console_how)
@@ -1933,15 +1944,16 @@ static int do_domain_soft_reset(libxl_ctx *ctx,
libxl_domain_config_copy(ctx, &srs->cdcs.dcs.guest_config_saved,
d_config);
cdcs->dcs.restore_fd = -1;
- cdcs->dcs.domid_soft_reset = domid_soft_reset;
+ cdcs->dcs.domid = domid;
+ cdcs->dcs.soft_reset = true;
cdcs->dcs.callback = domain_create_cb;
libxl__ao_progress_gethow(&srs->cdcs.dcs.aop_console_how,
aop_console_how);
cdcs->domid_out = &domid_out;
- dom_path = libxl__xs_get_dompath(gc, domid_soft_reset);
+ dom_path = libxl__xs_get_dompath(gc, domid);
if (!dom_path) {
- LOGD(ERROR, domid_soft_reset, "failed to read domain path");
+ LOGD(ERROR, domid, "failed to read domain path");
rc = ERROR_FAIL;
goto out;
}
@@ -1950,7 +1962,7 @@ static int do_domain_soft_reset(libxl_ctx *ctx,
GCSPRINTF("%s/store/ring-ref", dom_path),
&xs_store_mfn);
if (rc) {
- LOGD(ERROR, domid_soft_reset, "failed to read store/ring-ref.");
+ LOGD(ERROR, domid, "failed to read store/ring-ref.");
goto out;
}
state->store_mfn = xs_store_mfn ? atol(xs_store_mfn): 0;
@@ -1959,7 +1971,7 @@ static int do_domain_soft_reset(libxl_ctx *ctx,
GCSPRINTF("%s/console/ring-ref", dom_path),
&xs_console_mfn);
if (rc) {
- LOGD(ERROR, domid_soft_reset, "failed to read console/ring-ref.");
+ LOGD(ERROR, domid, "failed to read console/ring-ref.");
goto out;
}
state->console_mfn = xs_console_mfn ? atol(xs_console_mfn): 0;
@@ -1968,20 +1980,20 @@ static int do_domain_soft_reset(libxl_ctx *ctx,
GCSPRINTF("%s/console/tty", dom_path),
&console_tty);
if (rc) {
- LOGD(ERROR, domid_soft_reset, "failed to read console/tty.");
+ LOGD(ERROR, domid, "failed to read console/tty.");
goto out;
}
state->console_tty = libxl__strdup(gc, console_tty);
dss->ao = ao;
- dss->domid = dss->dsps.domid = domid_soft_reset;
+ dss->domid = dss->dsps.domid = domid;
dss->dsps.dm_savefile = GCSPRINTF(LIBXL_DEVICE_MODEL_SAVE_FILE".%d",
- domid_soft_reset);
+ domid);
rc = libxl__save_emulator_xenstore_data(dss, &srs->toolstack_buf,
&srs->toolstack_len);
if (rc) {
- LOGD(ERROR, domid_soft_reset, "failed to save toolstack record.");
+ LOGD(ERROR, domid, "failed to save toolstack record.");
goto out;
}
@@ -2010,10 +2022,10 @@ static void soft_reset_dm_suspended(libxl__egc *egc,
* xenstore again with probably different store/console/...
* channels.
*/
- xs_release_domain(CTX->xsh, cdcs->dcs.domid_soft_reset);
+ xs_release_domain(CTX->xsh, cdcs->dcs.domid);
srs->dds.ao = ao;
- srs->dds.domid = cdcs->dcs.domid_soft_reset;
+ srs->dds.domid = cdcs->dcs.domid;
srs->dds.callback = domain_soft_reset_cb;
srs->dds.soft_reset = true;
libxl__domain_destroy(egc, &srs->dds);
@@ -2029,7 +2041,7 @@ static void domain_create_cb(libxl__egc *egc,
*cdcs->domid_out = domid;
- if (dcs->restore_fd > -1) {
+ if (dcs->restore_fd >= 0) {
flrc = libxl__fd_flags_restore(gc,
dcs->restore_fd, dcs->restore_fdfl);
/*
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index e92e412c1b..f758daf3b6 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -2193,7 +2193,7 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss)
/* fixme: this function can leak the stubdom if it fails */
ret = libxl__domain_make(gc, dm_config, stubdom_state,
- &sdss->pvqemu.guest_domid);
+ &sdss->pvqemu.guest_domid, false);
if (ret)
goto out;
uint32_t dm_domid = sdss->pvqemu.guest_domid;
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 3b708fba8f..cb23490c59 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1957,7 +1957,7 @@ _hidden void libxl__exec(libxl__gc *gc, int stdinfd, int stdoutfd,
_hidden int libxl__domain_make(libxl__gc *gc,
libxl_domain_config *d_config,
libxl__domain_build_state *state,
- uint32_t *domid);
+ uint32_t *domid, bool soft_reset);
_hidden int libxl__domain_build(libxl__gc *gc,
libxl_domain_config *d_config,
@@ -4134,7 +4134,8 @@ struct libxl__domain_create_state {
int restore_fdfl; /* original flags of restore_fd */
int send_back_fd;
libxl_domain_restore_params restore_params;
- uint32_t domid_soft_reset;
+ uint32_t domid;
+ bool soft_reset;
libxl__domain_create_cb *callback;
libxl_asyncprogress_how aop_console_how;
/* private to domain_create */
--
2.20.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Xen-devel] [PATCH v2 3/6] libxl: add infrastructure to track and query 'retired' domids
2020-01-09 11:48 [Xen-devel] [PATCH v2 0/6] xl/libxl: domid allocation/preservation changes Paul Durrant
2020-01-09 11:48 ` [Xen-devel] [PATCH v2 1/6] libxl: add definition of INVALID_DOMID to the API Paul Durrant
2020-01-09 11:48 ` [Xen-devel] [PATCH v2 2/6] libxl_create: make 'soft reset' explicit Paul Durrant
@ 2020-01-09 11:48 ` Paul Durrant
2020-01-09 11:48 ` [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains with a specified or random domid Paul Durrant
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Paul Durrant @ 2020-01-09 11:48 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Paul Durrant, Ian Jackson, Wei Liu
A domid is considered retired if the domain it represents was destroyed
less than a specified number of seconds ago. The number can be set using
the environment variable LIBXL_DOMID_MAX_RETIREMENT. If the variable does
not exist then a default value of 60s is used.
Whenever a domain is destroyed, a time-stamped record will be written into
a history file (/var/run/xen/domid-history). To avoid the history file
growing too large, any records with time-stamps that indicate that the
domid has exceeded maximum retirement will also be purged.
A new utility function, libxl__is_retired_domid(), has been added. This
function reads the same history file checking whether a specified domid
has a record that does not exceed maximum retirement. Since this utility
function does not write to the file, no records are actually purged by it.
NOTE: Since the history file is hosted by a tmpfs file system, it is
automatically purged on boot thus allowing safe use of
CLOCK_MONOTONIC as a time source.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wl@xen.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>
v2:
- New in v2
---
tools/libxl/libxl_domain.c | 132 +++++++++++++++++++++++++++++++++++
tools/libxl/libxl_internal.h | 10 +++
2 files changed, 142 insertions(+)
diff --git a/tools/libxl/libxl_domain.c b/tools/libxl/libxl_domain.c
index 5714501778..7f255f184c 100644
--- a/tools/libxl/libxl_domain.c
+++ b/tools/libxl/libxl_domain.c
@@ -1268,6 +1268,137 @@ static void dm_destroy_cb(libxl__egc *egc,
libxl__devices_destroy(egc, &dis->drs);
}
+static unsigned int libxl__get_max_retirement(void)
+{
+ const char *env_max_retirement = getenv("LIBXL_DOMID_MAX_RETIREMENT");
+
+ return env_max_retirement ? strtol(env_max_retirement, NULL, 0) :
+ LIBXL_DOMID_MAX_RETIREMENT;
+}
+
+static int libxl__open_domid_history(libxl__gc *gc)
+{
+ const char *name;
+ int fd;
+ int ret;
+
+ name = GCSPRINTF("%s/domid-history", libxl__run_dir_path());
+
+ fd = open(name, O_RDWR|O_CREAT, 0644);
+ if (fd < 0) {
+ LOGE(ERROR, "unexpected error while trying open %s, errno=%d",
+ name, errno);
+ goto fail;
+ }
+
+ for (;;) {
+ ret = flock(fd, LOCK_EX);
+ if (!ret)
+ break;
+ if (errno != EINTR) {
+ /* All other errno: EBADF, EINVAL, ENOLCK, EWOULDBLOCK */
+ LOGE(ERROR,
+ "unexpected error while trying to lock %s, fd=%d, errno=%d",
+ name, fd, errno);
+ goto fail;
+ }
+ }
+
+ return fd;
+
+fail:
+ if (fd >= 0)
+ close(fd);
+
+ return -1;
+}
+
+/* Write a domid retirement record */
+static void libxl__retire_domid(libxl__gc *gc, uint32_t domid)
+{
+ long max_retirement = libxl__get_max_retirement();
+ int fd;
+ FILE *f;
+ long roff, woff;
+ char line[64];
+ struct timespec ts;
+
+ fd = libxl__open_domid_history(gc);
+ if (fd < 0)
+ return;
+
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+
+ /* Purge old retirement records */
+
+ f = fdopen(fd, "r+");
+ woff = ftell(f);
+
+ while (fgets(line, sizeof(line), f)) {
+ unsigned long sec;
+ unsigned int ignored;
+
+ roff = ftell(f);
+
+ if (sscanf(line, "%lu %u", &sec, &ignored) != 2)
+ continue; /* Purge malformed lines */
+
+ if (ts.tv_sec - sec > max_retirement)
+ continue;
+
+ fseek(f, woff, SEEK_SET);
+ fputs(line, f);
+ woff = ftell(f);
+
+ fseek(f, roff, SEEK_SET);
+ }
+
+ fseek(f, woff, SEEK_SET);
+ fprintf(f, "%lu %u\n", ts.tv_sec, domid);
+ woff = ftell(f);
+ fflush(f);
+
+ ftruncate(fd, woff); /* may now be fewer records */
+
+ close(fd);
+}
+
+bool libxl__is_retired_domid(libxl__gc *gc, uint32_t domid)
+{
+ long max_retirement = libxl__get_max_retirement();
+ bool retired = false;
+ int fd;
+ FILE *f;
+ char line[64];
+ struct timespec ts;
+
+ fd = libxl__open_domid_history(gc);
+ if (fd < 0)
+ return false;
+
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+
+ f = fdopen(fd, "r");
+
+ while (fgets(line, sizeof(line), f)) {
+ unsigned long sec;
+ unsigned int check;
+
+ if (sscanf(line, "%lu %u", &sec, &check) != 2)
+ continue;
+
+ if (check == domid &&
+ ts.tv_sec - sec <= max_retirement) {
+ retired = true;
+ break;
+ }
+ }
+
+ close(fd);
+
+ return retired;
+}
+
static void devices_destroy_cb(libxl__egc *egc,
libxl__devices_remove_state *drs,
int rc)
@@ -1331,6 +1462,7 @@ static void devices_destroy_cb(libxl__egc *egc,
if (!ctx->xch) goto badchild;
if (!dis->soft_reset) {
+ libxl__retire_domid(gc, domid);
rc = xc_domain_destroy(ctx->xch, domid);
} else {
rc = xc_domain_pause(ctx->xch, domid);
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index cb23490c59..fcac8a93c5 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -4770,6 +4770,16 @@ _hidden int libxl__domain_pvcontrol(libxl__egc *egc,
libxl__xswait_state *pvcontrol,
domid_t domid, const char *cmd);
+/*
+ * Maximum number of seconds a domid remains in retirement after domain
+ * destruction. This can be overidden by the environment variable of the
+ * same name.
+ */
+#define LIBXL_DOMID_MAX_RETIREMENT 60
+
+/* Check whether a domid is in retirement */
+bool libxl__is_retired_domid(libxl__gc *gc, uint32_t domid);
+
#endif
/*
--
2.20.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains with a specified or random domid
2020-01-09 11:48 [Xen-devel] [PATCH v2 0/6] xl/libxl: domid allocation/preservation changes Paul Durrant
` (2 preceding siblings ...)
2020-01-09 11:48 ` [Xen-devel] [PATCH v2 3/6] libxl: add infrastructure to track and query 'retired' domids Paul Durrant
@ 2020-01-09 11:48 ` Paul Durrant
2020-01-13 16:16 ` Jason Andryuk
2020-01-09 11:48 ` [Xen-devel] [PATCH v2 5/6] xl.conf: introduce 'domid_policy' Paul Durrant
2020-01-09 11:48 ` [Xen-devel] [PATCH v2 6/6] xl: allow domid to be preserved on save/restore or migrate Paul Durrant
5 siblings, 1 reply; 13+ messages in thread
From: Paul Durrant @ 2020-01-09 11:48 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Paul Durrant, Ian Jackson, Wei Liu
This patch adds a 'domid' field to libxl_domain_create_info and then
modifies do_domain_create() to use that value if it is valid. Any valid
domid will be checked against the retired domid list before being passed
to libxl__domain_make().
If the domid value is invalid then Xen will choose the domid, as before,
unless the value is the new special RANDOM_DOMID value added to the API.
This value instructs libxl__domain_make() to select a random domid value,
check it for validity, verify it does not match a retired domain, and then
pass it to Xen's XEN_DOMCTL_createdomain operation. If Xen determines that
it co-incides with an existing domain, a new random value will be
selected and the operation will be re-tried.
NOTE: libxl__logv() is also modified to only log valid domid values in
messages rather than any domid, valid or otherwise, that is not
INVALID_DOMID.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wl@xen.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>
v2:
- Re-worked to use a value from libxl_domain_create_info
---
tools/libxl/libxl.h | 9 +++++++++
tools/libxl/libxl_create.c | 32 +++++++++++++++++++++++++++++++-
tools/libxl/libxl_internal.c | 2 +-
tools/libxl/libxl_types.idl | 1 +
4 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index 18c1a2d6bf..7e60ee1c8b 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -1268,6 +1268,14 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, const libxl_mac *src);
*/
#define LIBXL_HAVE_DOMAIN_NEED_MEMORY_CONFIG
+/*
+ * LIBXL_HAVE_CREATEINFO_DOMID
+ *
+ * libxl_domain_create_new() and libxl_domain_create_restore() will use
+ * a domid specified in libxl_domain_create_info().
+ */
+#define LIBXL_HAVE_CREATEINFO_DOMID
+
typedef char **libxl_string_list;
void libxl_string_list_dispose(libxl_string_list *sl);
int libxl_string_list_length(const libxl_string_list *sl);
@@ -1528,6 +1536,7 @@ int libxl_ctx_free(libxl_ctx *ctx /* 0 is OK */);
/* domain related functions */
#define INVALID_DOMID ~0
+#define RANDOM_DOMID (INVALID_DOMID - 1)
/* If the result is ERROR_ABORTED, the domain may or may not exist
* (in a half-created state). *domid will be valid and will be the
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 1835a5502c..ee76dee364 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -600,9 +600,39 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config,
goto out;
}
- ret = xc_domain_create(ctx->xch, domid, &create);
+ if (libxl_domid_valid_guest(info->domid)) {
+ *domid = info->domid;
+
+ if (libxl__is_retired_domid(gc, *domid)) {
+ LOGED(ERROR, *domid, "domain id is retired");
+ rc = ERROR_FAIL;
+ goto out;
+ }
+ } else if (info->domid == RANDOM_DOMID) {
+ *domid = 0; /* Zero-out initial value */
+ }
+
+ for (;;) {
+ if (info->domid == RANDOM_DOMID) {
+ /* Randomize lower order bytes */
+ ret = libxl__random_bytes(gc, (void *)domid,
+ sizeof(uint16_t));
+ if (ret < 0)
+ break;
+
+ if (!libxl_domid_valid_guest(*domid) ||
+ libxl__is_retired_domid(gc, *domid))
+ continue;
+ }
+
+ ret = xc_domain_create(ctx->xch, domid, &create);
+ if (ret == 0 || errno != EEXIST || info->domid != RANDOM_DOMID)
+ break;
+ }
+
if (ret < 0) {
LOGED(ERROR, *domid, "domain creation fail");
+ *domid = INVALID_DOMID;
rc = ERROR_FAIL;
goto out;
}
diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c
index ba5637358e..dc6aaa9c9f 100644
--- a/tools/libxl/libxl_internal.c
+++ b/tools/libxl/libxl_internal.c
@@ -234,7 +234,7 @@ void libxl__logv(libxl_ctx *ctx, xentoollog_level msglevel, int errnoval,
fileline[sizeof(fileline)-1] = 0;
domain[0] = 0;
- if (domid != INVALID_DOMID)
+ if (libxl_domid_valid_guest(domid))
snprintf(domain, sizeof(domain), "Domain %"PRIu32":", domid);
x:
xtl_log(ctx->lg, msglevel, errnoval, "libxl",
diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
index 7921950f6a..d0d431614f 100644
--- a/tools/libxl/libxl_types.idl
+++ b/tools/libxl/libxl_types.idl
@@ -409,6 +409,7 @@ libxl_domain_create_info = Struct("domain_create_info",[
("ssidref", uint32),
("ssid_label", string),
("name", string),
+ ("domid", libxl_domid),
("uuid", libxl_uuid),
("xsdata", libxl_key_value_list),
("platformdata", libxl_key_value_list),
--
2.20.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains with a specified or random domid
2020-01-09 11:48 ` [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains with a specified or random domid Paul Durrant
@ 2020-01-13 16:16 ` Jason Andryuk
2020-01-13 16:54 ` Durrant, Paul
0 siblings, 1 reply; 13+ messages in thread
From: Jason Andryuk @ 2020-01-13 16:16 UTC (permalink / raw)
To: Paul Durrant; +Cc: Anthony PERARD, xen-devel, Ian Jackson, Wei Liu
On Thu, Jan 9, 2020 at 6:50 AM Paul Durrant <pdurrant@amazon.com> wrote:
>
> This patch adds a 'domid' field to libxl_domain_create_info and then
> modifies do_domain_create() to use that value if it is valid. Any valid
> domid will be checked against the retired domid list before being passed
> to libxl__domain_make().
> If the domid value is invalid then Xen will choose the domid, as before,
> unless the value is the new special RANDOM_DOMID value added to the API.
> This value instructs libxl__domain_make() to select a random domid value,
> check it for validity, verify it does not match a retired domain, and then
> pass it to Xen's XEN_DOMCTL_createdomain operation. If Xen determines that
> it co-incides with an existing domain, a new random value will be
> selected and the operation will be re-tried.
>
> NOTE: libxl__logv() is also modified to only log valid domid values in
> messages rather than any domid, valid or otherwise, that is not
> INVALID_DOMID.
>
> Signed-off-by: Paul Durrant <pdurrant@amazon.com>
> ---
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Wei Liu <wl@xen.org>
> Cc: Anthony PERARD <anthony.perard@citrix.com>
>
> v2:
> - Re-worked to use a value from libxl_domain_create_info
> ---
> tools/libxl/libxl.h | 9 +++++++++
> tools/libxl/libxl_create.c | 32 +++++++++++++++++++++++++++++++-
> tools/libxl/libxl_internal.c | 2 +-
> tools/libxl/libxl_types.idl | 1 +
> 4 files changed, 42 insertions(+), 2 deletions(-)
>
<snip>
> diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
> index 1835a5502c..ee76dee364 100644
> --- a/tools/libxl/libxl_create.c
> +++ b/tools/libxl/libxl_create.c
> @@ -600,9 +600,39 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config,
> goto out;
> }
>
> - ret = xc_domain_create(ctx->xch, domid, &create);
> + if (libxl_domid_valid_guest(info->domid)) {
> + *domid = info->domid;
> +
> + if (libxl__is_retired_domid(gc, *domid)) {
> + LOGED(ERROR, *domid, "domain id is retired");
> + rc = ERROR_FAIL;
> + goto out;
> + }
> + } else if (info->domid == RANDOM_DOMID) {
> + *domid = 0; /* Zero-out initial value */
> + }
> +
> + for (;;) {
> + if (info->domid == RANDOM_DOMID) {
> + /* Randomize lower order bytes */
> + ret = libxl__random_bytes(gc, (void *)domid,
> + sizeof(uint16_t));
Casting to void * assumes little endian. Using a temporary uint16_t
would avoid that assumption. Also, masking down to 0x7fff would clear
the top bit which is never valid.
Regards,
Jason
> + if (ret < 0)
> + break;
> +
> + if (!libxl_domid_valid_guest(*domid) ||
> + libxl__is_retired_domid(gc, *domid))
> + continue;
> + }
> +
> + ret = xc_domain_create(ctx->xch, domid, &create);
> + if (ret == 0 || errno != EEXIST || info->domid != RANDOM_DOMID)
> + break;
> + }
> +
> if (ret < 0) {
> LOGED(ERROR, *domid, "domain creation fail");
> + *domid = INVALID_DOMID;
> rc = ERROR_FAIL;
> goto out;
> }
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains with a specified or random domid
2020-01-13 16:16 ` Jason Andryuk
@ 2020-01-13 16:54 ` Durrant, Paul
2020-01-13 18:34 ` Jason Andryuk
2020-01-13 21:23 ` Julien Grall
0 siblings, 2 replies; 13+ messages in thread
From: Durrant, Paul @ 2020-01-13 16:54 UTC (permalink / raw)
To: jandryuk; +Cc: Anthony PERARD, xen-devel, Ian Jackson, Wei Liu
> -----Original Message-----
> From: jandryuk@gmail.com <jandryuk@gmail.com>
> Sent: 13 January 2020 16:16
> To: Durrant, Paul <pdurrant@amazon.co.uk>
> Cc: xen-devel <xen-devel@lists.xenproject.org>; Anthony PERARD
> <anthony.perard@citrix.com>; Ian Jackson <ian.jackson@eu.citrix.com>; Wei
> Liu <wl@xen.org>
> Subject: Re: [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains
> with a specified or random domid
>
> On Thu, Jan 9, 2020 at 6:50 AM Paul Durrant <pdurrant@amazon.com> wrote:
> >
> > This patch adds a 'domid' field to libxl_domain_create_info and then
> > modifies do_domain_create() to use that value if it is valid. Any valid
> > domid will be checked against the retired domid list before being passed
> > to libxl__domain_make().
> > If the domid value is invalid then Xen will choose the domid, as before,
> > unless the value is the new special RANDOM_DOMID value added to the API.
> > This value instructs libxl__domain_make() to select a random domid
> value,
> > check it for validity, verify it does not match a retired domain, and
> then
> > pass it to Xen's XEN_DOMCTL_createdomain operation. If Xen determines
> that
> > it co-incides with an existing domain, a new random value will be
> > selected and the operation will be re-tried.
> >
> > NOTE: libxl__logv() is also modified to only log valid domid values in
> > messages rather than any domid, valid or otherwise, that is not
> > INVALID_DOMID.
> >
> > Signed-off-by: Paul Durrant <pdurrant@amazon.com>
> > ---
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > Cc: Wei Liu <wl@xen.org>
> > Cc: Anthony PERARD <anthony.perard@citrix.com>
> >
> > v2:
> > - Re-worked to use a value from libxl_domain_create_info
> > ---
> > tools/libxl/libxl.h | 9 +++++++++
> > tools/libxl/libxl_create.c | 32 +++++++++++++++++++++++++++++++-
> > tools/libxl/libxl_internal.c | 2 +-
> > tools/libxl/libxl_types.idl | 1 +
> > 4 files changed, 42 insertions(+), 2 deletions(-)
> >
>
> <snip>
>
> > diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
> > index 1835a5502c..ee76dee364 100644
> > --- a/tools/libxl/libxl_create.c
> > +++ b/tools/libxl/libxl_create.c
> > @@ -600,9 +600,39 @@ int libxl__domain_make(libxl__gc *gc,
> libxl_domain_config *d_config,
> > goto out;
> > }
> >
> > - ret = xc_domain_create(ctx->xch, domid, &create);
> > + if (libxl_domid_valid_guest(info->domid)) {
> > + *domid = info->domid;
> > +
> > + if (libxl__is_retired_domid(gc, *domid)) {
> > + LOGED(ERROR, *domid, "domain id is retired");
> > + rc = ERROR_FAIL;
> > + goto out;
> > + }
> > + } else if (info->domid == RANDOM_DOMID) {
> > + *domid = 0; /* Zero-out initial value */
> > + }
> > +
> > + for (;;) {
> > + if (info->domid == RANDOM_DOMID) {
> > + /* Randomize lower order bytes */
> > + ret = libxl__random_bytes(gc, (void *)domid,
> > + sizeof(uint16_t));
>
> Casting to void * assumes little endian.
I think that's a fairly safe assumption as far as Xen goes...
> Using a temporary uint16_t
...but, yes, that might be neater.
> would avoid that assumption. Also, masking down to 0x7fff would clear
> the top bit which is never valid.
That seems like a bit of a layering violation and the check in libxl_domid_valid_guest() is going to cause a pretty fast turn round the loop if the top bit is set so masking is not going to gain that much.
Paul
>
> Regards,
> Jason
>
> > + if (ret < 0)
> > + break;
> > +
> > + if (!libxl_domid_valid_guest(*domid) ||
> > + libxl__is_retired_domid(gc, *domid))
> > + continue;
> > + }
> > +
> > + ret = xc_domain_create(ctx->xch, domid, &create);
> > + if (ret == 0 || errno != EEXIST || info->domid !=
> RANDOM_DOMID)
> > + break;
> > + }
> > +
> > if (ret < 0) {
> > LOGED(ERROR, *domid, "domain creation fail");
> > + *domid = INVALID_DOMID;
> > rc = ERROR_FAIL;
> > goto out;
> > }
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains with a specified or random domid
2020-01-13 16:54 ` Durrant, Paul
@ 2020-01-13 18:34 ` Jason Andryuk
2020-01-14 10:05 ` Durrant, Paul
2020-01-13 21:23 ` Julien Grall
1 sibling, 1 reply; 13+ messages in thread
From: Jason Andryuk @ 2020-01-13 18:34 UTC (permalink / raw)
To: Durrant, Paul; +Cc: Anthony PERARD, xen-devel, Ian Jackson, Wei Liu
On Mon, Jan 13, 2020 at 11:55 AM Durrant, Paul <pdurrant@amazon.co.uk> wrote:
>
> > -----Original Message-----
> > From: jandryuk@gmail.com <jandryuk@gmail.com>
> > Sent: 13 January 2020 16:16
> > To: Durrant, Paul <pdurrant@amazon.co.uk>
> > Cc: xen-devel <xen-devel@lists.xenproject.org>; Anthony PERARD
> > <anthony.perard@citrix.com>; Ian Jackson <ian.jackson@eu.citrix.com>; Wei
> > Liu <wl@xen.org>
> > Subject: Re: [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains
> > with a specified or random domid
> >
> > On Thu, Jan 9, 2020 at 6:50 AM Paul Durrant <pdurrant@amazon.com> wrote:
> > >
> > > This patch adds a 'domid' field to libxl_domain_create_info and then
> > > modifies do_domain_create() to use that value if it is valid. Any valid
> > > domid will be checked against the retired domid list before being passed
> > > to libxl__domain_make().
> > > If the domid value is invalid then Xen will choose the domid, as before,
> > > unless the value is the new special RANDOM_DOMID value added to the API.
> > > This value instructs libxl__domain_make() to select a random domid
> > value,
> > > check it for validity, verify it does not match a retired domain, and
> > then
> > > pass it to Xen's XEN_DOMCTL_createdomain operation. If Xen determines
> > that
> > > it co-incides with an existing domain, a new random value will be
> > > selected and the operation will be re-tried.
> > >
> > > NOTE: libxl__logv() is also modified to only log valid domid values in
> > > messages rather than any domid, valid or otherwise, that is not
> > > INVALID_DOMID.
> > >
> > > Signed-off-by: Paul Durrant <pdurrant@amazon.com>
> > > ---
> > > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > > Cc: Wei Liu <wl@xen.org>
> > > Cc: Anthony PERARD <anthony.perard@citrix.com>
> > >
> > > v2:
> > > - Re-worked to use a value from libxl_domain_create_info
> > > ---
> > > tools/libxl/libxl.h | 9 +++++++++
> > > tools/libxl/libxl_create.c | 32 +++++++++++++++++++++++++++++++-
> > > tools/libxl/libxl_internal.c | 2 +-
> > > tools/libxl/libxl_types.idl | 1 +
> > > 4 files changed, 42 insertions(+), 2 deletions(-)
> > >
> >
> > <snip>
> >
> > > diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
> > > index 1835a5502c..ee76dee364 100644
> > > --- a/tools/libxl/libxl_create.c
> > > +++ b/tools/libxl/libxl_create.c
> > > @@ -600,9 +600,39 @@ int libxl__domain_make(libxl__gc *gc,
> > libxl_domain_config *d_config,
> > > goto out;
> > > }
> > >
> > > - ret = xc_domain_create(ctx->xch, domid, &create);
> > > + if (libxl_domid_valid_guest(info->domid)) {
> > > + *domid = info->domid;
> > > +
> > > + if (libxl__is_retired_domid(gc, *domid)) {
> > > + LOGED(ERROR, *domid, "domain id is retired");
> > > + rc = ERROR_FAIL;
> > > + goto out;
> > > + }
> > > + } else if (info->domid == RANDOM_DOMID) {
> > > + *domid = 0; /* Zero-out initial value */
> > > + }
> > > +
> > > + for (;;) {
> > > + if (info->domid == RANDOM_DOMID) {
> > > + /* Randomize lower order bytes */
> > > + ret = libxl__random_bytes(gc, (void *)domid,
> > > + sizeof(uint16_t));
> >
> > Casting to void * assumes little endian.
>
> I think that's a fairly safe assumption as far as Xen goes...
>
> > Using a temporary uint16_t
>
> ...but, yes, that might be neater.
>
> > would avoid that assumption. Also, masking down to 0x7fff would clear
> > the top bit which is never valid.
>
> That seems like a bit of a layering violation and the check in libxl_domid_valid_guest() is going to cause a pretty fast turn round the loop if the top bit is set so masking is not going to gain that much.
Yeah, there isn't a define or constant exposed for 0x7fff, so masking
is a little dirty. Since about ~half of random 16bit numbers will
have the high bit set, we'll have to read a second one. My natural
instinct is to avoid those extra reads :)
Regards,
Jason
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains with a specified or random domid
2020-01-13 18:34 ` Jason Andryuk
@ 2020-01-14 10:05 ` Durrant, Paul
0 siblings, 0 replies; 13+ messages in thread
From: Durrant, Paul @ 2020-01-14 10:05 UTC (permalink / raw)
To: jandryuk; +Cc: Anthony PERARD, xen-devel, Ian Jackson, Wei Liu
> -----Original Message-----
> From: jandryuk@gmail.com <jandryuk@gmail.com>
> Sent: 13 January 2020 19:35
> To: Durrant, Paul <pdurrant@amazon.co.uk>
> Cc: xen-devel <xen-devel@lists.xenproject.org>; Anthony PERARD
> <anthony.perard@citrix.com>; Ian Jackson <ian.jackson@eu.citrix.com>; Wei
> Liu <wl@xen.org>
> Subject: Re: [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains
> with a specified or random domid
>
> On Mon, Jan 13, 2020 at 11:55 AM Durrant, Paul <pdurrant@amazon.co.uk>
> wrote:
> >
> > > -----Original Message-----
> > > From: jandryuk@gmail.com <jandryuk@gmail.com>
> > > Sent: 13 January 2020 16:16
> > > To: Durrant, Paul <pdurrant@amazon.co.uk>
> > > Cc: xen-devel <xen-devel@lists.xenproject.org>; Anthony PERARD
> > > <anthony.perard@citrix.com>; Ian Jackson <ian.jackson@eu.citrix.com>;
> Wei
> > > Liu <wl@xen.org>
> > > Subject: Re: [Xen-devel] [PATCH v2 4/6] libxl: allow creation of
> domains
> > > with a specified or random domid
> > >
> > > On Thu, Jan 9, 2020 at 6:50 AM Paul Durrant <pdurrant@amazon.com>
> wrote:
> > > >
> > > > This patch adds a 'domid' field to libxl_domain_create_info and then
> > > > modifies do_domain_create() to use that value if it is valid. Any
> valid
> > > > domid will be checked against the retired domid list before being
> passed
> > > > to libxl__domain_make().
> > > > If the domid value is invalid then Xen will choose the domid, as
> before,
> > > > unless the value is the new special RANDOM_DOMID value added to the
> API.
> > > > This value instructs libxl__domain_make() to select a random domid
> > > value,
> > > > check it for validity, verify it does not match a retired domain,
> and
> > > then
> > > > pass it to Xen's XEN_DOMCTL_createdomain operation. If Xen
> determines
> > > that
> > > > it co-incides with an existing domain, a new random value will be
> > > > selected and the operation will be re-tried.
> > > >
> > > > NOTE: libxl__logv() is also modified to only log valid domid values
> in
> > > > messages rather than any domid, valid or otherwise, that is
> not
> > > > INVALID_DOMID.
> > > >
> > > > Signed-off-by: Paul Durrant <pdurrant@amazon.com>
> > > > ---
> > > > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > > > Cc: Wei Liu <wl@xen.org>
> > > > Cc: Anthony PERARD <anthony.perard@citrix.com>
> > > >
> > > > v2:
> > > > - Re-worked to use a value from libxl_domain_create_info
> > > > ---
> > > > tools/libxl/libxl.h | 9 +++++++++
> > > > tools/libxl/libxl_create.c | 32 +++++++++++++++++++++++++++++++-
> > > > tools/libxl/libxl_internal.c | 2 +-
> > > > tools/libxl/libxl_types.idl | 1 +
> > > > 4 files changed, 42 insertions(+), 2 deletions(-)
> > > >
> > >
> > > <snip>
> > >
> > > > diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
> > > > index 1835a5502c..ee76dee364 100644
> > > > --- a/tools/libxl/libxl_create.c
> > > > +++ b/tools/libxl/libxl_create.c
> > > > @@ -600,9 +600,39 @@ int libxl__domain_make(libxl__gc *gc,
> > > libxl_domain_config *d_config,
> > > > goto out;
> > > > }
> > > >
> > > > - ret = xc_domain_create(ctx->xch, domid, &create);
> > > > + if (libxl_domid_valid_guest(info->domid)) {
> > > > + *domid = info->domid;
> > > > +
> > > > + if (libxl__is_retired_domid(gc, *domid)) {
> > > > + LOGED(ERROR, *domid, "domain id is retired");
> > > > + rc = ERROR_FAIL;
> > > > + goto out;
> > > > + }
> > > > + } else if (info->domid == RANDOM_DOMID) {
> > > > + *domid = 0; /* Zero-out initial value */
> > > > + }
> > > > +
> > > > + for (;;) {
> > > > + if (info->domid == RANDOM_DOMID) {
> > > > + /* Randomize lower order bytes */
> > > > + ret = libxl__random_bytes(gc, (void *)domid,
> > > > + sizeof(uint16_t));
> > >
> > > Casting to void * assumes little endian.
> >
> > I think that's a fairly safe assumption as far as Xen goes...
> >
> > > Using a temporary uint16_t
> >
> > ...but, yes, that might be neater.
> >
> > > would avoid that assumption. Also, masking down to 0x7fff would clear
> > > the top bit which is never valid.
> >
> > That seems like a bit of a layering violation and the check in
> libxl_domid_valid_guest() is going to cause a pretty fast turn round the
> loop if the top bit is set so masking is not going to gain that much.
>
> Yeah, there isn't a define or constant exposed for 0x7fff, so masking
> is a little dirty. Since about ~half of random 16bit numbers will
> have the high bit set, we'll have to read a second one. My natural
> instinct is to avoid those extra reads :)
>
Perhaps I should try adding a DOMID_MASK definition somewhere.
Paul
> Regards,
> Jason
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains with a specified or random domid
2020-01-13 16:54 ` Durrant, Paul
2020-01-13 18:34 ` Jason Andryuk
@ 2020-01-13 21:23 ` Julien Grall
2020-01-14 10:04 ` Durrant, Paul
1 sibling, 1 reply; 13+ messages in thread
From: Julien Grall @ 2020-01-13 21:23 UTC (permalink / raw)
To: Durrant, Paul, jandryuk; +Cc: Anthony PERARD, xen-devel, Ian Jackson, Wei Liu
Hi Paul,
On 13/01/2020 16:54, Durrant, Paul wrote:
>> -----Original Message-----
>> From: jandryuk@gmail.com <jandryuk@gmail.com>
>> Sent: 13 January 2020 16:16
>> To: Durrant, Paul <pdurrant@amazon.co.uk>
>> Cc: xen-devel <xen-devel@lists.xenproject.org>; Anthony PERARD
>> <anthony.perard@citrix.com>; Ian Jackson <ian.jackson@eu.citrix.com>; Wei
>> Liu <wl@xen.org>
>> Subject: Re: [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains
>> with a specified or random domid
>>
>> On Thu, Jan 9, 2020 at 6:50 AM Paul Durrant <pdurrant@amazon.com> wrote:
>>>
>>> This patch adds a 'domid' field to libxl_domain_create_info and then
>>> modifies do_domain_create() to use that value if it is valid. Any valid
>>> domid will be checked against the retired domid list before being passed
>>> to libxl__domain_make().
>>> If the domid value is invalid then Xen will choose the domid, as before,
>>> unless the value is the new special RANDOM_DOMID value added to the API.
>>> This value instructs libxl__domain_make() to select a random domid
>> value,
>>> check it for validity, verify it does not match a retired domain, and
>> then
>>> pass it to Xen's XEN_DOMCTL_createdomain operation. If Xen determines
>> that
>>> it co-incides with an existing domain, a new random value will be
>>> selected and the operation will be re-tried.
>>>
>>> NOTE: libxl__logv() is also modified to only log valid domid values in
>>> messages rather than any domid, valid or otherwise, that is not
>>> INVALID_DOMID.
>>>
>>> Signed-off-by: Paul Durrant <pdurrant@amazon.com>
>>> ---
>>> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
>>> Cc: Wei Liu <wl@xen.org>
>>> Cc: Anthony PERARD <anthony.perard@citrix.com>
>>>
>>> v2:
>>> - Re-worked to use a value from libxl_domain_create_info
>>> ---
>>> tools/libxl/libxl.h | 9 +++++++++
>>> tools/libxl/libxl_create.c | 32 +++++++++++++++++++++++++++++++-
>>> tools/libxl/libxl_internal.c | 2 +-
>>> tools/libxl/libxl_types.idl | 1 +
>>> 4 files changed, 42 insertions(+), 2 deletions(-)
>>>
>>
>> <snip>
>>
>>> diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
>>> index 1835a5502c..ee76dee364 100644
>>> --- a/tools/libxl/libxl_create.c
>>> +++ b/tools/libxl/libxl_create.c
>>> @@ -600,9 +600,39 @@ int libxl__domain_make(libxl__gc *gc,
>> libxl_domain_config *d_config,
>>> goto out;
>>> }
>>>
>>> - ret = xc_domain_create(ctx->xch, domid, &create);
>>> + if (libxl_domid_valid_guest(info->domid)) {
>>> + *domid = info->domid;
>>> +
>>> + if (libxl__is_retired_domid(gc, *domid)) {
>>> + LOGED(ERROR, *domid, "domain id is retired");
>>> + rc = ERROR_FAIL;
>>> + goto out;
>>> + }
>>> + } else if (info->domid == RANDOM_DOMID) {
>>> + *domid = 0; /* Zero-out initial value */
>>> + }
>>> +
>>> + for (;;) {
>>> + if (info->domid == RANDOM_DOMID) {
>>> + /* Randomize lower order bytes */
>>> + ret = libxl__random_bytes(gc, (void *)domid,
>>> + sizeof(uint16_t));
>>
>> Casting to void * assumes little endian.
>
> I think that's a fairly safe assumption as far as Xen goes...
Not really, there are technically nothing (other than bug fixes)
preventing us to use a big endian guest on Xen on Arm.
I actually did play with big endian on Xen in the past and managed to
get a guest running. The main annoying part is Linux as it is assuming
to use the same endian as the hypervisor. But other OS may not have this
issues...
The hypervisor itself is likely going to stay little endian, so does the
interface. For the tools, we should aim to not introduce more assumption
that the software will be little endian.
Cheers,
--
Julien Grall
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains with a specified or random domid
2020-01-13 21:23 ` Julien Grall
@ 2020-01-14 10:04 ` Durrant, Paul
0 siblings, 0 replies; 13+ messages in thread
From: Durrant, Paul @ 2020-01-14 10:04 UTC (permalink / raw)
To: Julien Grall, jandryuk; +Cc: Anthony PERARD, xen-devel, Ian Jackson, Wei Liu
> -----Original Message-----
> From: Julien Grall <julien@xen.org>
> Sent: 13 January 2020 22:24
> To: Durrant, Paul <pdurrant@amazon.co.uk>; jandryuk@gmail.com
> Cc: Anthony PERARD <anthony.perard@citrix.com>; xen-devel <xen-
> devel@lists.xenproject.org>; Ian Jackson <ian.jackson@eu.citrix.com>; Wei
> Liu <wl@xen.org>
> Subject: Re: [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains
> with a specified or random domid
>
> Hi Paul,
>
> On 13/01/2020 16:54, Durrant, Paul wrote:
> >> -----Original Message-----
> >> From: jandryuk@gmail.com <jandryuk@gmail.com>
> >> Sent: 13 January 2020 16:16
> >> To: Durrant, Paul <pdurrant@amazon.co.uk>
> >> Cc: xen-devel <xen-devel@lists.xenproject.org>; Anthony PERARD
> >> <anthony.perard@citrix.com>; Ian Jackson <ian.jackson@eu.citrix.com>;
> Wei
> >> Liu <wl@xen.org>
> >> Subject: Re: [Xen-devel] [PATCH v2 4/6] libxl: allow creation of
> domains
> >> with a specified or random domid
> >>
> >> On Thu, Jan 9, 2020 at 6:50 AM Paul Durrant <pdurrant@amazon.com>
> wrote:
> >>>
> >>> This patch adds a 'domid' field to libxl_domain_create_info and then
> >>> modifies do_domain_create() to use that value if it is valid. Any
> valid
> >>> domid will be checked against the retired domid list before being
> passed
> >>> to libxl__domain_make().
> >>> If the domid value is invalid then Xen will choose the domid, as
> before,
> >>> unless the value is the new special RANDOM_DOMID value added to the
> API.
> >>> This value instructs libxl__domain_make() to select a random domid
> >> value,
> >>> check it for validity, verify it does not match a retired domain, and
> >> then
> >>> pass it to Xen's XEN_DOMCTL_createdomain operation. If Xen determines
> >> that
> >>> it co-incides with an existing domain, a new random value will be
> >>> selected and the operation will be re-tried.
> >>>
> >>> NOTE: libxl__logv() is also modified to only log valid domid values in
> >>> messages rather than any domid, valid or otherwise, that is not
> >>> INVALID_DOMID.
> >>>
> >>> Signed-off-by: Paul Durrant <pdurrant@amazon.com>
> >>> ---
> >>> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> >>> Cc: Wei Liu <wl@xen.org>
> >>> Cc: Anthony PERARD <anthony.perard@citrix.com>
> >>>
> >>> v2:
> >>> - Re-worked to use a value from libxl_domain_create_info
> >>> ---
> >>> tools/libxl/libxl.h | 9 +++++++++
> >>> tools/libxl/libxl_create.c | 32 +++++++++++++++++++++++++++++++-
> >>> tools/libxl/libxl_internal.c | 2 +-
> >>> tools/libxl/libxl_types.idl | 1 +
> >>> 4 files changed, 42 insertions(+), 2 deletions(-)
> >>>
> >>
> >> <snip>
> >>
> >>> diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
> >>> index 1835a5502c..ee76dee364 100644
> >>> --- a/tools/libxl/libxl_create.c
> >>> +++ b/tools/libxl/libxl_create.c
> >>> @@ -600,9 +600,39 @@ int libxl__domain_make(libxl__gc *gc,
> >> libxl_domain_config *d_config,
> >>> goto out;
> >>> }
> >>>
> >>> - ret = xc_domain_create(ctx->xch, domid, &create);
> >>> + if (libxl_domid_valid_guest(info->domid)) {
> >>> + *domid = info->domid;
> >>> +
> >>> + if (libxl__is_retired_domid(gc, *domid)) {
> >>> + LOGED(ERROR, *domid, "domain id is retired");
> >>> + rc = ERROR_FAIL;
> >>> + goto out;
> >>> + }
> >>> + } else if (info->domid == RANDOM_DOMID) {
> >>> + *domid = 0; /* Zero-out initial value */
> >>> + }
> >>> +
> >>> + for (;;) {
> >>> + if (info->domid == RANDOM_DOMID) {
> >>> + /* Randomize lower order bytes */
> >>> + ret = libxl__random_bytes(gc, (void *)domid,
> >>> + sizeof(uint16_t));
> >>
> >> Casting to void * assumes little endian.
> >
> > I think that's a fairly safe assumption as far as Xen goes...
>
> Not really, there are technically nothing (other than bug fixes)
> preventing us to use a big endian guest on Xen on Arm.
>
Ok.
> I actually did play with big endian on Xen in the past and managed to
> get a guest running. The main annoying part is Linux as it is assuming
> to use the same endian as the hypervisor. But other OS may not have this
> issues...
>
> The hypervisor itself is likely going to stay little endian, so does the
> interface. For the tools, we should aim to not introduce more assumption
> that the software will be little endian.
>
Fair enough. If there's a realistic possibility of running a BE tools domain then I'll code accordingly.
Paul
> Cheers,
>
> --
> Julien Grall
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Xen-devel] [PATCH v2 5/6] xl.conf: introduce 'domid_policy'
2020-01-09 11:48 [Xen-devel] [PATCH v2 0/6] xl/libxl: domid allocation/preservation changes Paul Durrant
` (3 preceding siblings ...)
2020-01-09 11:48 ` [Xen-devel] [PATCH v2 4/6] libxl: allow creation of domains with a specified or random domid Paul Durrant
@ 2020-01-09 11:48 ` Paul Durrant
2020-01-09 11:48 ` [Xen-devel] [PATCH v2 6/6] xl: allow domid to be preserved on save/restore or migrate Paul Durrant
5 siblings, 0 replies; 13+ messages in thread
From: Paul Durrant @ 2020-01-09 11:48 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
This patch adds a new global 'domid_policy' configuration option to decide
how domain id values are allocated for new domains. It may be set to one of
two values:
"xen", the default value, will cause an invalid domid value to be passed
to do_domain_create() preserving the existing behaviour of having Xen
choose the domid value during domain_create().
"random" will cause the special RANDOM_DOMID value to be passed to
do_domain_create() such that libxl__domain_make() will select a random
domid value.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wl@xen.org>
v2:
- New in v2
---
docs/man/xl.conf.5.pod | 10 ++++++++++
tools/examples/xl.conf | 4 ++++
tools/xl/xl.c | 10 ++++++++++
tools/xl/xl.h | 1 +
tools/xl/xl_vmcontrol.c | 2 ++
5 files changed, 27 insertions(+)
diff --git a/docs/man/xl.conf.5.pod b/docs/man/xl.conf.5.pod
index 207ab3e77a..41ee428744 100644
--- a/docs/man/xl.conf.5.pod
+++ b/docs/man/xl.conf.5.pod
@@ -45,6 +45,16 @@ The semantics of each C<KEY> defines which form of C<VALUE> is required.
=over 4
+=item B<domid_policy="xen"|"random">
+
+Determines how domain-id is set when creating a new domain.
+
+If set to "xen" then the hypervisor will allocate new domain-id values on a sequential basis.
+
+If set to "random" then a random domain-id value will be chosen.
+
+Default: "xen"
+
=item B<autoballoon="off"|"on"|"auto">
If set to "on" then C<xl> will automatically reduce the amount of
diff --git a/tools/examples/xl.conf b/tools/examples/xl.conf
index 0446deb304..95f2f442d3 100644
--- a/tools/examples/xl.conf
+++ b/tools/examples/xl.conf
@@ -1,5 +1,9 @@
## Global XL config file ##
+# Set domain-id policy. "xen" means that the hypervisor will choose the
+# id of a new domain. "random" means that a random value will be chosen.
+#domid_policy="xen"
+
# Control whether dom0 is ballooned down when xen doesn't have enough
# free memory to create a domain. "auto" means only balloon if dom0
# starts with all the host's memory.
diff --git a/tools/xl/xl.c b/tools/xl/xl.c
index 3d4390a46d..2a5ddd4390 100644
--- a/tools/xl/xl.c
+++ b/tools/xl/xl.c
@@ -54,6 +54,7 @@ int claim_mode = 1;
bool progress_use_cr = 0;
int max_grant_frames = -1;
int max_maptrack_frames = -1;
+libxl_domid domid_policy = INVALID_DOMID;
xentoollog_level minmsglevel = minmsglevel_default;
@@ -228,6 +229,15 @@ static void parse_global_config(const char *configfile,
else
libxl_bitmap_set_any(&global_pv_affinity_mask);
+ if (!xlu_cfg_get_string (config, "domid_policy", &buf, 0)) {
+ if (!strcmp(buf, "xen"))
+ domid_policy = INVALID_DOMID;
+ else if (!strcmp(buf, "random"))
+ domid_policy = RANDOM_DOMID;
+ else
+ fprintf(stderr, "invalid domid_policy option");
+ }
+
xlu_cfg_destroy(config);
}
diff --git a/tools/xl/xl.h b/tools/xl/xl.h
index 60bdad8ffb..2b4709efb2 100644
--- a/tools/xl/xl.h
+++ b/tools/xl/xl.h
@@ -283,6 +283,7 @@ extern int max_maptrack_frames;
extern libxl_bitmap global_vm_affinity_mask;
extern libxl_bitmap global_hvm_affinity_mask;
extern libxl_bitmap global_pv_affinity_mask;
+extern libxl_domid domid_policy;
enum output_format {
OUTPUT_FORMAT_JSON,
diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c
index e520b1da79..39292acfe6 100644
--- a/tools/xl/xl_vmcontrol.c
+++ b/tools/xl/xl_vmcontrol.c
@@ -899,6 +899,8 @@ start:
autoconnect_console_how = 0;
}
+ d_config.c_info.domid = domid_policy;
+
if ( restoring ) {
libxl_domain_restore_params params;
--
2.20.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Xen-devel] [PATCH v2 6/6] xl: allow domid to be preserved on save/restore or migrate
2020-01-09 11:48 [Xen-devel] [PATCH v2 0/6] xl/libxl: domid allocation/preservation changes Paul Durrant
` (4 preceding siblings ...)
2020-01-09 11:48 ` [Xen-devel] [PATCH v2 5/6] xl.conf: introduce 'domid_policy' Paul Durrant
@ 2020-01-09 11:48 ` Paul Durrant
5 siblings, 0 replies; 13+ messages in thread
From: Paul Durrant @ 2020-01-09 11:48 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Wei Liu
This patch adds a '-D' command line option to save and migrate to allow
the domain id to be incorporated into the saved domain configuration and
hence be preserved.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wl@xen.org>
v2:
- Heavily re-worked based on new libxl_domain_create_info
---
docs/man/xl.1.pod.in | 14 ++++++++++++++
tools/xl/xl.h | 1 +
tools/xl/xl_cmdtable.c | 6 ++++--
tools/xl/xl_migrate.c | 15 ++++++++++-----
tools/xl/xl_saverestore.c | 19 ++++++++++++++-----
tools/xl/xl_vmcontrol.c | 3 ++-
6 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in
index d4b5e8e362..937eda690f 100644
--- a/docs/man/xl.1.pod.in
+++ b/docs/man/xl.1.pod.in
@@ -490,6 +490,13 @@ Display huge (!) amount of debug information during the migration process.
Leave the domain on the receive side paused after migration.
+=item B<-D>
+
+Preserve the B<domain-id> in the domain coniguration that is transferred
+such that it will be identical on the destination host, unless that
+configuration is overridden using the B<-C> option. Note that it is not
+possible to use this option for a 'localhost' migration.
+
=back
=item B<remus> [I<OPTIONS>] I<domain-id> I<host>
@@ -692,6 +699,13 @@ Leave the domain running after creating the snapshot.
Leave the domain paused after creating the snapshot.
+=item B<-D>
+
+Preserve the B<domain-id> in the domain coniguration that is embedded in
+the state file such that it will be identical when the domain is restored,
+unless that configuration is overridden. (See the B<restore> operation
+above).
+
=back
=item B<sharing> [I<domain-id>]
diff --git a/tools/xl/xl.h b/tools/xl/xl.h
index 2b4709efb2..06569c6c4a 100644
--- a/tools/xl/xl.h
+++ b/tools/xl/xl.h
@@ -99,6 +99,7 @@ struct save_file_header {
#define SAVEFILE_BYTEORDER_VALUE ((uint32_t)0x01020304UL)
void save_domain_core_begin(uint32_t domid,
+ int preserve_domid,
const char *override_config_file,
uint8_t **config_data_r,
int *config_len_r);
diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c
index 3b302b2f20..08335394e5 100644
--- a/tools/xl/xl_cmdtable.c
+++ b/tools/xl/xl_cmdtable.c
@@ -153,7 +153,8 @@ struct cmd_spec cmd_table[] = {
"[options] <Domain> <CheckpointFile> [<ConfigFile>]",
"-h Print this help.\n"
"-c Leave domain running after creating the snapshot.\n"
- "-p Leave domain paused after creating the snapshot."
+ "-p Leave domain paused after creating the snapshot.\n"
+ "-D Store the domain id in the configration."
},
{ "migrate",
&main_migrate, 0, 1,
@@ -167,7 +168,8 @@ struct cmd_spec cmd_table[] = {
"-e Do not wait in the background (on <host>) for the death\n"
" of the domain.\n"
"--debug Print huge (!) amount of debug during the migration process.\n"
- "-p Do not unpause domain after migrating it."
+ "-p Do not unpause domain after migrating it.\n"
+ "-D Preserve the domain id"
},
{ "restore",
&main_restore, 0, 1,
diff --git a/tools/xl/xl_migrate.c b/tools/xl/xl_migrate.c
index 22f0429b84..0813beb801 100644
--- a/tools/xl/xl_migrate.c
+++ b/tools/xl/xl_migrate.c
@@ -176,7 +176,8 @@ static void migrate_do_preamble(int send_fd, int recv_fd, pid_t child,
}
-static void migrate_domain(uint32_t domid, const char *rune, int debug,
+static void migrate_domain(uint32_t domid, int preserve_domid,
+ const char *rune, int debug,
const char *override_config_file)
{
pid_t child = -1;
@@ -187,7 +188,7 @@ static void migrate_domain(uint32_t domid, const char *rune, int debug,
uint8_t *config_data;
int config_len, flags = LIBXL_SUSPEND_LIVE;
- save_domain_core_begin(domid, override_config_file,
+ save_domain_core_begin(domid, preserve_domid, override_config_file,
&config_data, &config_len);
if (!config_len) {
@@ -537,13 +538,14 @@ int main_migrate(int argc, char **argv)
char *rune = NULL;
char *host;
int opt, daemonize = 1, monitor = 1, debug = 0, pause_after_migration = 0;
+ int preserve_domid = 0;
static struct option opts[] = {
{"debug", 0, 0, 0x100},
{"live", 0, 0, 0x200},
COMMON_LONG_OPTS
};
- SWITCH_FOREACH_OPT(opt, "FC:s:ep", opts, "migrate", 2) {
+ SWITCH_FOREACH_OPT(opt, "FC:s:epD", opts, "migrate", 2) {
case 'C':
config_filename = optarg;
break;
@@ -560,6 +562,9 @@ int main_migrate(int argc, char **argv)
case 'p':
pause_after_migration = 1;
break;
+ case 'D':
+ preserve_domid = 1;
+ break;
case 0x100: /* --debug */
debug = 1;
break;
@@ -596,7 +601,7 @@ int main_migrate(int argc, char **argv)
pause_after_migration ? " -p" : "");
}
- migrate_domain(domid, rune, debug, config_filename);
+ migrate_domain(domid, preserve_domid, rune, debug, config_filename);
return EXIT_SUCCESS;
}
@@ -716,7 +721,7 @@ int main_remus(int argc, char **argv)
}
}
- save_domain_core_begin(domid, NULL, &config_data, &config_len);
+ save_domain_core_begin(domid, 0, NULL, &config_data, &config_len);
if (!config_len) {
fprintf(stderr, "No config file stored for running domain and "
diff --git a/tools/xl/xl_saverestore.c b/tools/xl/xl_saverestore.c
index 9be033fe65..953d791d1a 100644
--- a/tools/xl/xl_saverestore.c
+++ b/tools/xl/xl_saverestore.c
@@ -32,6 +32,7 @@
#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME
void save_domain_core_begin(uint32_t domid,
+ int preserve_domid,
const char *override_config_file,
uint8_t **config_data_r,
int *config_len_r)
@@ -62,6 +63,8 @@ void save_domain_core_begin(uint32_t domid,
fprintf(stderr, "unable to retrieve domain configuration\n");
exit(EXIT_FAILURE);
}
+
+ d_config.c_info.domid = preserve_domid ? domid : 0;
}
config_c = libxl_domain_config_to_json(ctx, &d_config);
@@ -120,14 +123,15 @@ void save_domain_core_writeconfig(int fd, const char *source,
hdr.optional_data_len);
}
-static int save_domain(uint32_t domid, const char *filename, int checkpoint,
- int leavepaused, const char *override_config_file)
+static int save_domain(uint32_t domid, int preserve_domid,
+ const char *filename, int checkpoint,
+ int leavepaused, const char *override_config_file)
{
int fd;
uint8_t *config_data;
int config_len;
- save_domain_core_begin(domid, override_config_file,
+ save_domain_core_begin(domid, preserve_domid, override_config_file,
&config_data, &config_len);
if (!config_len) {
@@ -236,15 +240,19 @@ int main_save(int argc, char **argv)
const char *config_filename = NULL;
int checkpoint = 0;
int leavepaused = 0;
+ int preserve_domid = 0;
int opt;
- SWITCH_FOREACH_OPT(opt, "cp", NULL, "save", 2) {
+ SWITCH_FOREACH_OPT(opt, "cpD", NULL, "save", 2) {
case 'c':
checkpoint = 1;
break;
case 'p':
leavepaused = 1;
break;
+ case 'D':
+ preserve_domid = 1;
+ break;
}
if (argc-optind > 3) {
@@ -257,7 +265,8 @@ int main_save(int argc, char **argv)
if ( argc - optind >= 3 )
config_filename = argv[optind + 2];
- save_domain(domid, filename, checkpoint, leavepaused, config_filename);
+ save_domain(domid, preserve_domid, filename, checkpoint, leavepaused,
+ config_filename);
return EXIT_SUCCESS;
}
diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c
index 39292acfe6..2e2d427492 100644
--- a/tools/xl/xl_vmcontrol.c
+++ b/tools/xl/xl_vmcontrol.c
@@ -899,7 +899,8 @@ start:
autoconnect_console_how = 0;
}
- d_config.c_info.domid = domid_policy;
+ if (!libxl_domid_valid_guest(d_config.c_info.domid))
+ d_config.c_info.domid = domid_policy;
if ( restoring ) {
libxl_domain_restore_params params;
--
2.20.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 13+ messages in thread