From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: wei.liu2@citrix.com, Ian.Jackson@eu.citrix.com,
Ian.Campbell@citrix.com,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PATCH v3 3/6] [WIP] libxl: xsrestrict QEMU
Date: Wed, 10 Jun 2015 11:09:51 +0100 [thread overview]
Message-ID: <1433930994-32527-3-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1506101107510.21829@kaball.uk.xensource.com>
Check whether QEMU supports the xsrestrict option, by parsing its --help
output. Store the result on xenstore for future reference on a per QEMU
binary basis, so that device_model_override still works fine with it.
Replace / with _ in the QEMU binary path before writing it to xenstore,
so that it doesn't get confused with xenstore paths.
If QEMU supports xsrestrict and emulator_id, pass xsrestrict=on to it.
Statically reserve two emulator_ids, one for device models and another
for pv qemus. Use the emulator_ids appropriately.
WIP: direct use of fork is forbidden in libxl
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
Changes in v3:
- add emulator_ids
- mark as WIP
---
tools/libxl/libxl_dm.c | 72 ++++++++++++++++++++++++++++++++++++++++++
tools/libxl/libxl_internal.h | 7 ++++
tools/libxl/libxl_utils.c | 10 ++++++
3 files changed, 89 insertions(+)
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 2809ba0..bf77f50 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -446,6 +446,65 @@ retry:
return 0;
}
+int libxl__check_qemu_supported(libxl__gc *gc, const char *dm, char *opt)
+{
+ libxl_ctx *ctx = libxl__gc_owner(gc);
+ pid_t pid;
+ int pipefd[2], status;
+ FILE *fp;
+ char *buf;
+ ssize_t buf_size = 512;
+ int ret = 0;
+ char *s;
+
+ s = libxl__strdup(gc, dm);
+ libxl__replace_chr(gc, s, '/', '_');
+ s = libxl__sprintf(gc, "libxl/%s/%s", s, opt);
+ buf = libxl__xs_read(gc, XBT_NULL, s);
+ if (buf != NULL)
+ return !strcmp(buf, "1");
+
+ if (access(dm, X_OK) < 0) {
+ LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
+ "device model %s is not executable", dm);
+ return ERROR_FAIL;
+ }
+
+ if (libxl_pipe(ctx, pipefd) < 0)
+ return ERROR_FAIL;
+
+ pid = fork();
+ if (pid < 0)
+ return ERROR_FAIL;
+
+ /* child spawn QEMU */
+ if (!pid) {
+ char *args[] = {(char*)dm, "--help", NULL};
+ close(pipefd[0]);
+ libxl__exec(gc, -1, pipefd[1], pipefd[1], dm, args, NULL);
+ exit(1);
+ }
+
+ /* parent parses the output */
+ close(pipefd[1]);
+ fp = fdopen(pipefd[0], "r");
+ buf = libxl__malloc(gc, buf_size);
+ while (fgets(buf, buf_size, fp) != NULL) {
+ if (strstr(buf, opt) != NULL) {
+ ret = 1;
+ goto out;
+ }
+ }
+out:
+ close(pipefd[0]);
+ waitpid(pid, &status, pid);
+ libxl_report_child_exitstatus(ctx, XTL_WARN, dm, pid, status);
+
+ ret = libxl__xs_write(gc, XBT_NULL, s, "%d", ret);
+
+ return ret;
+}
+
static char ** libxl__build_device_model_args_new(libxl__gc *gc,
const char *dm, int guest_domid,
const libxl_domain_config *guest_config,
@@ -931,6 +990,14 @@ end_search:
if (user) {
flexarray_append(dm_args, "-runas");
flexarray_append(dm_args, user);
+ if (libxl__check_qemu_supported(gc, dm, "xsrestrict") &&
+ libxl__check_qemu_supported(gc, dm, "emulator_id")) {
+ flexarray_append(dm_args, "-xenopts");
+ flexarray_append(dm_args,
+ GCSPRINTF("xsrestrict=on,emulator_id=%u",
+ (b_info->type == LIBXL_DOMAIN_TYPE_PV) ?
+ QEMU_XEN_PV_ID : QEMU_XEN_DEVICE_MODEL_ID));
+ }
}
}
flexarray_append(dm_args, NULL);
@@ -1666,6 +1733,11 @@ void libxl__spawn_qdisk_backend(libxl__egc *egc, libxl__dm_spawn_state *dmss)
flexarray_vappend(dm_args, "-monitor", "/dev/null", NULL);
flexarray_vappend(dm_args, "-serial", "/dev/null", NULL);
flexarray_vappend(dm_args, "-parallel", "/dev/null", NULL);
+ if (libxl__check_qemu_supported(gc, dm, "emulator_id")) {
+ flexarray_append(dm_args, "-xenopts");
+ flexarray_append(dm_args,
+ GCSPRINTF("emulator_id=%u", QEMU_XEN_PV_ID));
+ }
flexarray_append(dm_args, NULL);
args = (char **) flexarray_contents(dm_args);
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 7d0af40..b4bae2f 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -106,6 +106,10 @@
#define TAP_DEVICE_SUFFIX "-emu"
#define DISABLE_UDEV_PATH "libxl/disable_udev"
#define DOMID_XS_PATH "domid"
+/* Reserved QEMU emulator_ids. For the moment assume max two QEMUs: one
+ * device model and one PV backends provider. */
+#define QEMU_XEN_DEVICE_MODEL_ID 0
+#define QEMU_XEN_PV_ID 1
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
@@ -1505,6 +1509,7 @@ _hidden int libxl__need_xenpv_qemu(libxl__gc *gc,
int nr_vfbs, libxl_device_vfb *vfbs,
int nr_disks, libxl_device_disk *disks,
int nr_channels, libxl_device_channel *channels);
+_hidden int libxl__check_qemu_supported(libxl__gc *gc, const char *dm, char *opt);
/*
* This function will cause the whole libxl process to hang
@@ -3554,6 +3559,8 @@ int libxl__string_parse_json(libxl__gc *gc, const libxl__json_object *o,
char **p);
int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len);
+/* replace all occurrences of old with new inside s */
+void libxl__replace_chr(libxl__gc *gc, char *s, char old, char new);
/*
* Compile time assertion
diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c
index 67c0b1c..ea08473 100644
--- a/tools/libxl/libxl_utils.c
+++ b/tools/libxl/libxl_utils.c
@@ -1158,6 +1158,16 @@ int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len)
return ret;
}
+void libxl__replace_chr(libxl__gc *gc, char *s, char old, char new)
+{
+ int i = 0;
+
+ for (i = 0; s[i] != '\0'; i++) {
+ if (s[i] == old)
+ s[i] = new;
+ }
+}
+
/*
* Local variables:
* mode: C
--
1.7.10.4
next prev parent reply other threads:[~2015-06-10 10:09 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-10 10:07 [PATCH v3 0/6] libxl: xs_restrict QEMU Stefano Stabellini
2015-06-10 10:09 ` [PATCH v3 1/6] libxl: allow /local/domain/$LIBXL_TOOLSTACK_DOMID/device-model/$DOMID to be written by $DOMID Stefano Stabellini
2015-06-16 14:52 ` Wei Liu
2015-06-29 17:50 ` Stefano Stabellini
2015-06-25 16:16 ` Ian Campbell
2015-06-29 17:52 ` Stefano Stabellini
2015-06-30 8:49 ` Ian Campbell
2015-06-30 13:49 ` Stefano Stabellini
2015-06-30 14:04 ` Ian Campbell
2015-06-30 15:00 ` Stefano Stabellini
2015-07-03 14:37 ` Ian Campbell
2015-07-23 17:13 ` Stefano Stabellini
2015-06-30 9:06 ` Ian Jackson
2015-06-10 10:09 ` [PATCH v3 2/6] libxl: do not add a vkb backend to hvm guests Stefano Stabellini
2015-06-16 14:57 ` Wei Liu
2015-06-16 15:39 ` Stefano Stabellini
2015-06-25 16:19 ` Ian Campbell
2015-06-29 17:59 ` Stefano Stabellini
2015-06-30 8:51 ` Ian Campbell
2015-06-30 11:21 ` Stefano Stabellini
2015-06-30 13:32 ` Ian Campbell
2015-06-30 14:02 ` Stefano Stabellini
2015-06-30 14:13 ` Ian Campbell
2015-06-30 20:38 ` Konrad Rzeszutek Wilk
2015-07-01 10:29 ` Stefano Stabellini
2015-07-01 10:55 ` Roger Pau Monné
2015-07-01 10:56 ` Stefano Stabellini
2015-07-01 11:14 ` Roger Pau Monné
2015-07-01 11:10 ` Fabio Fantoni
2015-07-01 18:41 ` Konrad Rzeszutek Wilk
2015-07-02 11:04 ` Stefano Stabellini
2015-07-02 14:31 ` Konrad Rzeszutek Wilk
2015-06-10 10:09 ` Stefano Stabellini [this message]
2015-06-25 16:24 ` [PATCH v3 3/6] [WIP] libxl: xsrestrict QEMU Ian Campbell
2015-06-29 18:07 ` Stefano Stabellini
2015-06-30 8:53 ` Ian Campbell
2015-06-30 13:53 ` Stefano Stabellini
2015-06-10 10:09 ` [PATCH v3 4/6] libxl: change xs path for QEMU Stefano Stabellini
2015-06-25 16:21 ` Ian Campbell
2015-06-29 18:26 ` Stefano Stabellini
2015-06-10 10:09 ` [PATCH v3 5/6] libxl: change qdisk-backend-pid path on xenstore Stefano Stabellini
2015-06-10 10:09 ` [PATCH v3 6/6] libxl: spawns two QEMUs for HVM guests Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433930994-32527-3-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).