* [Xen-devel] [PATCH v2 1/3] xenstore: setup xenstore stubdom console interface properly
2020-02-12 7:41 [Xen-devel] [PATCH v2 0/3] tools/xenstore Juergen Gross
@ 2020-02-12 7:41 ` Juergen Gross
2020-02-13 12:01 ` Wei Liu
2020-02-12 7:41 ` [Xen-devel] [PATCH v2 2/3] xenstore: add console xenstore entries for xenstore stubdom Juergen Gross
2020-02-12 7:41 ` [Xen-devel] [PATCH v2 3/3] xenstore: remove not applicable control commands in stubdom Juergen Gross
2 siblings, 1 reply; 7+ messages in thread
From: Juergen Gross @ 2020-02-12 7:41 UTC (permalink / raw)
To: xen-devel; +Cc: Juergen Gross, Ian Jackson, Wei Liu
In order to be able to get access to the console of Xenstore stubdom
we need an appropriate granttab entry. So call xc_dom_gnttab_init()
when constructing the domain and preset some information needed
for that function in the dom structure.
We need to create the event channel for the console, too. Do that and
store all necessary data locally.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
tools/helpers/init-xenstore-domain.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c
index adb8408b63..3a8ca64741 100644
--- a/tools/helpers/init-xenstore-domain.c
+++ b/tools/helpers/init-xenstore-domain.c
@@ -24,6 +24,7 @@ static char *param;
static char *name = "Xenstore";
static int memory;
static int maxmem;
+static xc_evtchn_port_or_error_t console_evtchn;
static struct option options[] = {
{ "kernel", 1, NULL, 'k' },
@@ -113,6 +114,12 @@ static int build(xc_interface *xch)
fprintf(stderr, "xc_domain_setmaxmem failed\n");
goto err;
}
+ console_evtchn = xc_evtchn_alloc_unbound(xch, domid, 0);
+ if ( console_evtchn < 0 )
+ {
+ fprintf(stderr, "xc_evtchn_alloc_unbound failed\n");
+ goto err;
+ }
rv = xc_domain_set_memmap_limit(xch, domid, limit_kb);
if ( rv )
{
@@ -133,6 +140,15 @@ static int build(xc_interface *xch)
snprintf(cmdline, 512, "--event %d --internal-db", rv);
dom = xc_dom_allocate(xch, cmdline, NULL);
+ if ( !dom )
+ {
+ fprintf(stderr, "xc_dom_allocate failed\n");
+ goto err;
+ }
+ dom->container_type = XC_DOM_PV_CONTAINER;
+ dom->xenstore_domid = domid;
+ dom->console_evtchn = console_evtchn;
+
rv = xc_dom_kernel_file(dom, kernel);
if ( rv )
{
@@ -186,6 +202,12 @@ static int build(xc_interface *xch)
fprintf(stderr, "xc_dom_boot_image failed\n");
goto err;
}
+ rv = xc_dom_gnttab_init(dom);
+ if ( rv )
+ {
+ fprintf(stderr, "xc_dom_gnttab_init failed\n");
+ goto err;
+ }
rv = xc_domain_set_virq_handler(xch, domid, VIRQ_DOM_EXC);
if ( rv )
--
2.16.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Xen-devel] [PATCH v2 2/3] xenstore: add console xenstore entries for xenstore stubdom
2020-02-12 7:41 [Xen-devel] [PATCH v2 0/3] tools/xenstore Juergen Gross
2020-02-12 7:41 ` [Xen-devel] [PATCH v2 1/3] xenstore: setup xenstore stubdom console interface properly Juergen Gross
@ 2020-02-12 7:41 ` Juergen Gross
2020-02-13 12:03 ` Wei Liu
2020-02-12 7:41 ` [Xen-devel] [PATCH v2 3/3] xenstore: remove not applicable control commands in stubdom Juergen Gross
2 siblings, 1 reply; 7+ messages in thread
From: Juergen Gross @ 2020-02-12 7:41 UTC (permalink / raw)
To: xen-devel; +Cc: Juergen Gross, Ian Jackson, Wei Liu
In order to be able to connect to the console of Xenstore stubdom we
need to create the appropriate entries in Xenstore.
For the moment we don't support xenconsoled living in another domain
than dom0, as this information isn't available other then via
Xenstore which we are just setting up.
Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
tools/helpers/init-xenstore-domain.c | 33 ++++++++++++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c
index 3a8ca64741..4ce8299c3c 100644
--- a/tools/helpers/init-xenstore-domain.c
+++ b/tools/helpers/init-xenstore-domain.c
@@ -12,6 +12,7 @@
#include <xenstore.h>
#include <xen/sys/xenbus_dev.h>
#include <xen-xsm/flask/flask.h>
+#include <xen/io/xenbus.h>
#include "init-dom-json.h"
#include "_paths.h"
@@ -24,6 +25,7 @@ static char *param;
static char *name = "Xenstore";
static int memory;
static int maxmem;
+static xen_pfn_t console_mfn;
static xc_evtchn_port_or_error_t console_evtchn;
static struct option options[] = {
@@ -223,6 +225,7 @@ static int build(xc_interface *xch)
}
rv = 0;
+ console_mfn = xc_dom_p2m(dom, dom->console_pfn);
err:
if ( dom )
@@ -321,6 +324,15 @@ static void do_xs_write(struct xs_handle *xsh, char *path, char *val)
fprintf(stderr, "writing %s to xenstore failed.\n", path);
}
+static void do_xs_write_dir_node(struct xs_handle *xsh, char *dir, char *node,
+ char *val)
+{
+ char full_path[100];
+
+ snprintf(full_path, 100, "%s/%s", dir, node);
+ do_xs_write(xsh, full_path, val);
+}
+
static void do_xs_write_dom(struct xs_handle *xsh, char *path, char *val)
{
char full_path[64];
@@ -334,7 +346,7 @@ int main(int argc, char** argv)
int opt;
xc_interface *xch;
struct xs_handle *xsh;
- char buf[16];
+ char buf[16], be_path[64], fe_path[64];
int rv, fd;
char *maxmem_str = NULL;
@@ -423,6 +435,25 @@ int main(int argc, char** argv)
if (maxmem)
snprintf(buf, 16, "%d", maxmem * 1024);
do_xs_write_dom(xsh, "memory/static-max", buf);
+ snprintf(be_path, 64, "/local/domain/0/backend/console/%d/0", domid);
+ snprintf(fe_path, 64, "/local/domain/%d/console", domid);
+ snprintf(buf, 16, "%d", domid);
+ do_xs_write_dir_node(xsh, be_path, "frontend-id", buf);
+ do_xs_write_dir_node(xsh, be_path, "frontend", fe_path);
+ do_xs_write_dir_node(xsh, be_path, "online", "1");
+ snprintf(buf, 16, "%d", XenbusStateInitialising);
+ do_xs_write_dir_node(xsh, be_path, "state", buf);
+ do_xs_write_dir_node(xsh, be_path, "protocol", "vt100");
+ do_xs_write_dir_node(xsh, fe_path, "backend", be_path);
+ do_xs_write_dir_node(xsh, fe_path, "backend-id", "0");
+ do_xs_write_dir_node(xsh, fe_path, "limit", "1048576");
+ do_xs_write_dir_node(xsh, fe_path, "type", "xenconsoled");
+ do_xs_write_dir_node(xsh, fe_path, "output", "pty");
+ do_xs_write_dir_node(xsh, fe_path, "tty", "");
+ snprintf(buf, 16, "%d", console_evtchn);
+ do_xs_write_dir_node(xsh, fe_path, "port", buf);
+ snprintf(buf, 16, "%ld", console_mfn);
+ do_xs_write_dir_node(xsh, fe_path, "ring-ref", buf);
xs_close(xsh);
fd = creat(XEN_RUN_DIR "/xenstored.pid", 0666);
--
2.16.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Xen-devel] [PATCH v2 3/3] xenstore: remove not applicable control commands in stubdom
2020-02-12 7:41 [Xen-devel] [PATCH v2 0/3] tools/xenstore Juergen Gross
2020-02-12 7:41 ` [Xen-devel] [PATCH v2 1/3] xenstore: setup xenstore stubdom console interface properly Juergen Gross
2020-02-12 7:41 ` [Xen-devel] [PATCH v2 2/3] xenstore: add console xenstore entries for xenstore stubdom Juergen Gross
@ 2020-02-12 7:41 ` Juergen Gross
2020-02-13 12:04 ` Wei Liu
2 siblings, 1 reply; 7+ messages in thread
From: Juergen Gross @ 2020-02-12 7:41 UTC (permalink / raw)
To: xen-devel; +Cc: Juergen Gross, Ian Jackson, Wei Liu
When run in a stubdom environment Xenstore can't select a logfile or
emit memory statistics to a specific file.
So remove or modify those control commands accordingly.
Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
tools/xenstore/xenstored_control.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c
index e4b8aa95ab..8d48ab4820 100644
--- a/tools/xenstore/xenstored_control.c
+++ b/tools/xenstore/xenstored_control.c
@@ -61,6 +61,19 @@ static int do_control_log(void *ctx, struct connection *conn,
return 0;
}
+#ifdef __MINIOS__
+static int do_control_memreport(void *ctx, struct connection *conn,
+ char **vec, int num)
+{
+ if (num)
+ return EINVAL;
+
+ talloc_report_full(NULL, stdout);
+
+ send_ack(conn, XS_CONTROL);
+ return 0;
+}
+#else
static int do_control_logfile(void *ctx, struct connection *conn,
char **vec, int num)
{
@@ -114,6 +127,7 @@ static int do_control_memreport(void *ctx, struct connection *conn,
send_ack(conn, XS_CONTROL);
return 0;
}
+#endif
static int do_control_print(void *ctx, struct connection *conn,
char **vec, int num)
@@ -132,8 +146,12 @@ static int do_control_help(void *, struct connection *, char **, int);
static struct cmd_s cmds[] = {
{ "check", do_control_check, "" },
{ "log", do_control_log, "on|off" },
+#ifdef __MINIOS__
+ { "memreport", do_control_memreport, "" },
+#else
{ "logfile", do_control_logfile, "<file>" },
{ "memreport", do_control_memreport, "[<file>]" },
+#endif
{ "print", do_control_print, "<string>" },
{ "help", do_control_help, "" },
};
--
2.16.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread