From patchwork Wed Mar 22 07:29:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 13183639 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E98C8C6FD1F for ; Wed, 22 Mar 2023 07:30:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.513116.793651 (Exim 4.92) (envelope-from ) id 1pesun-0002qX-Al; Wed, 22 Mar 2023 07:29:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 513116.793651; Wed, 22 Mar 2023 07:29:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pesun-0002qQ-60; Wed, 22 Mar 2023 07:29:45 +0000 Received: by outflank-mailman (input) for mailman id 513116; Wed, 22 Mar 2023 07:29:44 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pesum-0002pm-29 for xen-devel@lists.xenproject.org; Wed, 22 Mar 2023 07:29:44 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 4f7466e7-c883-11ed-85db-49a42c6b2330; Wed, 22 Mar 2023 08:29:42 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 86F4420ACD; Wed, 22 Mar 2023 07:29:41 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5DF0F13416; Wed, 22 Mar 2023 07:29:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id TjV4FWWuGmS8BQAAMHmgww (envelope-from ); Wed, 22 Mar 2023 07:29:41 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 4f7466e7-c883-11ed-85db-49a42c6b2330 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1679470181; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=JOKOOvRMYBast+P2ovuw88gKbObE7cL5tW4oNrKJdGQ=; b=UrF5XDI+jQfpduXz/iM0LcZ7/j04Q+Dz32XuuDhRYDJC/EKz8bi9np3tlNgbhR5PZRHQpY pigPPHr8R6zodXUQUtnwooglCS8o8jmeQVTsZKu+LozZditzo+zagXjLdu4FiGiEoSKrdD q6XyAziy6lWbXChehSwH31pOqTCOJG0= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Anthony PERARD Subject: [PATCH v2] tools: use libxenlight for writing xenstore-stubdom console nodes Date: Wed, 22 Mar 2023 08:29:39 +0100 Message-Id: <20230322072939.7413-1-jgross@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Instead of duplicating libxl__device_console_add() work in init-xenstore-domain.c, just use libxenlight. This requires to add a small wrapper function to libxenlight, as libxl__device_console_add() is an internal function. This at once removes a theoretical race between starting xenconsoled and xenstore-stubdom, as the old code wasn't using a single transaction for writing all the entries, leading to the possibility that xenconsoled would see only some of the entries being written. Signed-off-by: Juergen Gross Reviewed-by: Anthony PERARD --- V2: - make libxl_console_add_xenstore() async capable (Anthony Perard) - change function parameter types (Anthony Perard) --- tools/helpers/init-xenstore-domain.c | 42 +++++++++------------------- tools/include/libxl.h | 14 ++++++++++ tools/libs/light/libxl_console.c | 23 +++++++++++++++ 3 files changed, 50 insertions(+), 29 deletions(-) diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c index 85cc9e8381..0950ba7dc5 100644 --- a/tools/helpers/init-xenstore-domain.c +++ b/tools/helpers/init-xenstore-domain.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -403,15 +404,6 @@ 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]; @@ -425,9 +417,10 @@ int main(int argc, char** argv) int opt; xc_interface *xch; struct xs_handle *xsh; - char buf[16], be_path[64], fe_path[64]; + char buf[16]; int rv, fd; char *maxmem_str = NULL; + libxl_ctx *ctx; while ( (opt = getopt_long(argc, argv, "v", options, NULL)) != -1 ) { @@ -528,27 +521,18 @@ 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_gfn); - do_xs_write_dir_node(xsh, fe_path, "ring-ref", buf); xs_close(xsh); + if ( libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, logger)) + { + fprintf(stderr, "libxl_ctx_alloc() failed.\n"); + rv = 3; + goto out; + } + libxl_console_add_xenstore(ctx, domid, 0, console_evtchn, console_gfn, + NULL); + libxl_ctx_free(ctx); + fd = creat(XEN_RUN_DIR "/xenstored.pid", 0666); if ( fd < 0 ) { diff --git a/tools/include/libxl.h b/tools/include/libxl.h index 5c65222f1e..cfa1a19131 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -547,6 +547,11 @@ */ #define LIBXL_HAVE_DEVICE_DISK_SPECIFICATION 1 +/* + * LIBXL_HAVE_CONSOLE_ADD_XENSTORE indicates presence of the function + * libxl_console_add_xenstore() in libxl. + */ +#define LIBXL_HAVE_CONSOLE_ADD_XENSTORE 1 /* * libxl ABI compatibility * @@ -1987,6 +1992,15 @@ int libxl_console_get_tty(libxl_ctx *ctx, uint32_t domid, int cons_num, */ int libxl_primary_console_get_tty(libxl_ctx *ctx, uint32_t domid_vm, char **path); +/* libxl_console_add_xenstore writes the Xenstore entries for a domain's + * primary console based on domid, event channel port and the guest frame + * number of the PV console's ring page. + */ +int libxl_console_add_xenstore(libxl_ctx *ctx, uint32_t domid, uint32_t backend, + unsigned int evtch, unsigned long gfn, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; + /* May be called with info_r == NULL to check for domain's existence. * Returns ERROR_DOMAIN_NOTFOUND if domain does not exist (used to return * ERROR_INVAL for this scenario). */ diff --git a/tools/libs/light/libxl_console.c b/tools/libs/light/libxl_console.c index d8b2bc5465..f497be141b 100644 --- a/tools/libs/light/libxl_console.c +++ b/tools/libs/light/libxl_console.c @@ -346,6 +346,29 @@ out: return rc; } +int libxl_console_add_xenstore(libxl_ctx *ctx, uint32_t domid, uint32_t backend, + unsigned int evtch, unsigned long gfn, + const libxl_asyncop_how *ao_how) +{ + AO_CREATE(ctx, domid, ao_how); + int rc; + libxl__device_console console = { .backend_domid = backend, + .output = "pty", + .consback = LIBXL__CONSOLE_BACKEND_XENCONSOLED, + }; + libxl__domain_build_state state = { .console_port = evtch, + .console_mfn = gfn, + }; + libxl__device device = { }; + + rc = libxl__device_console_add(gc, domid, &console, &state, &device); + if (rc < 0) + LOGED(ERROR, domid, "Adding console Xenstore entries"); + + libxl__ao_complete(egc, ao, rc); + return AO_INPROGRESS; +} + int libxl__device_vuart_add(libxl__gc *gc, uint32_t domid, libxl__device_console *console, libxl__domain_build_state *state)