From patchwork Fri Feb 21 22:10:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Mukhin X-Patchwork-Id: 13986370 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 41C8AC021B3 for ; Fri, 21 Feb 2025 22:11:12 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.894670.1303386 (Exim 4.92) (envelope-from ) id 1tlbEI-0000gp-VG; Fri, 21 Feb 2025 22:10:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 894670.1303386; Fri, 21 Feb 2025 22:10:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tlbEI-0000gi-SH; Fri, 21 Feb 2025 22:10:42 +0000 Received: by outflank-mailman (input) for mailman id 894670; Fri, 21 Feb 2025 22:10:42 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tlbEH-0000fE-28 for xen-devel@lists.xenproject.org; Fri, 21 Feb 2025 22:10:41 +0000 Received: from mail-10629.protonmail.ch (mail-10629.protonmail.ch [79.135.106.29]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id a6b1919a-f0a0-11ef-9896-31a8f345e629; Fri, 21 Feb 2025 23:10:25 +0100 (CET) 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: a6b1919a-f0a0-11ef-9896-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1740175824; x=1740435024; bh=dA3eGRZctvKPvDt7sKPH2JkRLh8aLqvd/MYKS5OYnug=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector: List-Unsubscribe:List-Unsubscribe-Post; b=TM2e/CyGkInUBdaQNcd+i98WC6ttY4dSREA2WLAZMSqpCY9OM1IDuHE8sRScSsaeP 2/K0306Yaj7/R4KmOJCstTF111jHLhH8moMP/9YXYkkP+vAZhDWX4FlrgXmO0iz77C vCej6uy2RXNj4ymGaN70HctRhUM5EC2Xufu9kW5r9DRbU6WP07kFYGsYKL/ymhztnC 8wHSHOQKigADMHDlTIG0DXJ6CZa+8BjR1Wh8jGX/7K5NG6QsFsLspP4JZtUVtWWT9T 52nU1ywrAKrXlJHZDmKJ3te5hBiPGxJalStwyQc/PN4fW8OUleG6H0KzOIY0sLAAvy StfCXaE2WCDCQ== Date: Fri, 21 Feb 2025 22:10:18 +0000 To: xen-devel@lists.xenproject.org From: dmkhn@proton.me Cc: andrew.cooper3@citrix.com, anthony.perard@vates.tech, jbeulich@suse.com, julien@xen.org, michal.orzel@amd.com, roger.pau@citrix.com, sstabellini@kernel.org, dmukhin@ford.com Subject: [PATCH v6] xen/console: print Xen version via keyhandler Message-ID: <20250221220925.1391144-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: 2550b2e8887c0c4048ec580d23449603c5f7eaca MIME-Version: 1.0 Add Xen version printout to 'h' keyhandler output. That is useful for debugging systems that have been left intact for a long time. Signed-off-by: Denis Mukhin Reviewed-by: Jan Beulich --- Changes since v5: - moved new code outside of #ifdef BUILD_ID --- xen/common/keyhandler.c | 4 ++++ xen/common/version.c | 23 +++++++++++++++++++++-- xen/drivers/char/console.c | 8 +++----- xen/include/xen/lib.h | 3 +++ 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 6ea54838d4..0bb842ec00 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -129,6 +129,10 @@ static void cf_check show_handlers(unsigned char key) unsigned int i; printk("'%c' pressed -> showing installed handlers\n", key); + + print_version(); + print_build_id(); + for ( i = 0; i < ARRAY_SIZE(key_table); i++ ) if ( key_table[i].fn ) printk(" key '%c' (ascii '%02x') => %s\n", diff --git a/xen/common/version.c b/xen/common/version.c index bc3714b45f..be3906de79 100644 --- a/xen/common/version.c +++ b/xen/common/version.c @@ -210,10 +210,29 @@ void __init xen_build_init(void) } } #endif /* CONFIG_X86 */ - if ( !rc ) - printk(XENLOG_INFO "build-id: %*phN\n", build_id_len, build_id_p); } #endif /* BUILD_ID */ + +void print_version(void) +{ + printk("Xen version %d.%d%s (%s@%s) (%s) %s %s\n", + xen_major_version(), xen_minor_version(), xen_extra_version(), + xen_compile_by(), xen_compile_domain(), xen_compiler(), + xen_build_info(), xen_compile_date()); + + printk("Latest ChangeSet: %s\n", xen_changeset()); +} + +void print_build_id(void) +{ + /* + * NB: build_id_len may be 0 if XEN_HAS_BUILD_ID=n. + * Do not print empty build-id. + */ + if ( build_id_len ) + printk("build-id: %*phN\n", build_id_len, build_id_p); +} + /* * Local variables: * mode: C diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 07b14b7b3f..2e23910dfa 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1020,14 +1020,12 @@ void __init console_init_preirq(void) nrspin_lock(&console_lock); __putstr(xen_banner()); nrspin_unlock(&console_lock); - printk("Xen version %d.%d%s (%s@%s) (%s) %s %s\n", - xen_major_version(), xen_minor_version(), xen_extra_version(), - xen_compile_by(), xen_compile_domain(), xen_compiler(), - xen_build_info(), xen_compile_date()); - printk("Latest ChangeSet: %s\n", xen_changeset()); + + print_version(); /* Locate and print the buildid, if applicable. */ xen_build_init(); + print_build_id(); if ( opt_sync_console ) { diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 81b722ea3e..686899a63e 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -47,6 +47,9 @@ int parse_signed_integer(const char *name, const char *s, const char *e, */ int cmdline_strcmp(const char *frag, const char *name); +void print_version(void); +void print_build_id(void); + #ifdef CONFIG_DEBUG_TRACE extern void debugtrace_dump(void); extern void debugtrace_printk(const char *fmt, ...)