From nobody Fri Oct 31 04:17:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=quarantine dis=quarantine) header.from=proton.me Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1749084411015230.98804333441763; Wed, 4 Jun 2025 17:46:51 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1006089.1385347 (Exim 4.92) (envelope-from ) id 1uMykW-0003ic-R8; Thu, 05 Jun 2025 00:46:28 +0000 Received: by outflank-mailman (output) from mailman id 1006089.1385347; Thu, 05 Jun 2025 00:46:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMykW-0003iT-Oa; Thu, 05 Jun 2025 00:46:28 +0000 Received: by outflank-mailman (input) for mailman id 1006089; Thu, 05 Jun 2025 00:46:27 +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 1uMykV-0003dI-U2 for xen-devel@lists.xenproject.org; Thu, 05 Jun 2025 00:46:27 +0000 Received: from mail-10628.protonmail.ch (mail-10628.protonmail.ch [79.135.106.28]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8219daa8-41a6-11f0-a300-13f23c93f187; Thu, 05 Jun 2025 02:46:25 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 8219daa8-41a6-11f0-a300-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1749084383; x=1749343583; bh=ytJlHdADwkkLmr+mgrJUrJhb0F+8LfeAiZe0wZX+P8A=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=EP6C7l8fDk2SwJtGOgSdTXBfj0wrG/AVrppMfyQE44MTZmrM3JLHDgfhQPk8HnxUq scVEGoWLjHzM4dAbro+EvoEj6hfF2EpwiESi/o7htny+2KBdoIGgY8VqsDbgLJHRLf QfQL36Yc38v+1a+9/qeNS6hqWpT+uAwiVlbqRoezFQX5NYPXbct1mcNuLaJ2zDO5s5 QQ0gF8BMgiKrYO8yn1rc4PyP43mQY71Fv4+Egumd3mGw8QiEgAYW5XELmxNihQWKjl Qi+PwUqZOCw1KwpyOkDxDhgzJTSpGfaXMKZQCHRjU0LdNKkA5R5yvCvjz3bCK7QCk1 aU64wecrYevPg== Date: Thu, 05 Jun 2025 00:46:17 +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 v2 1/2] xen/console: introduce CONSOLE_PREFIX Message-ID: <20250605004601.1142090-2-dmukhin@ford.com> In-Reply-To: <20250605004601.1142090-1-dmukhin@ford.com> References: <20250605004601.1142090-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: fe120c6f48d95d38ba42437ca80885342328b0b0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1749084412823116600 Content-Type: text/plain; charset="utf-8" From: Denis Mukhin Add CONSOLE_PREFIX symbol to keep the prefix of the hypervisor's diagnostic messages. No functional change. Signed-off-by: Denis Mukhin --- Changes since v1: - n/a --- xen/drivers/char/console.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 9a9836ba91..a8cb6363ea 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -61,6 +61,9 @@ enum { CONSOLE_ALL =3D CONSOLE_DEFAULT | CONSOLE_RING, }; =20 +/* Prefix for hypervisor's diagnostic console messages. */ +#define CONSOLE_PREFIX "(XEN) " + static void console_send(const char *str, size_t len, unsigned int flags); =20 /* console: comma-separated list of console outputs. */ @@ -1014,7 +1017,7 @@ static void vprintk_common(const char *fmt, va_list a= rgs, const char *prefix) =20 void vprintk(const char *fmt, va_list args) { - vprintk_common(fmt, args, "(XEN) "); + vprintk_common(fmt, args, CONSOLE_PREFIX); } =20 void printk(const char *fmt, ...) @@ -1285,7 +1288,7 @@ int __printk_ratelimit(int ratelimit_ms, int ratelimi= t_burst) snprintf(lost_str, sizeof(lost_str), "%d", lost); /* console_lock may already be acquired by printk(). */ rspin_lock(&console_lock); - printk_start_of_line("(XEN) "); + printk_start_of_line(CONSOLE_PREFIX); __putstr("printk: "); __putstr(lost_str); __putstr(" messages suppressed.\n"); --=20 2.34.1 From nobody Fri Oct 31 04:17:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=quarantine dis=quarantine) header.from=proton.me Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 174908441209753.566457979420306; Wed, 4 Jun 2025 17:46:52 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1006090.1385356 (Exim 4.92) (envelope-from ) id 1uMykb-0003xh-1y; Thu, 05 Jun 2025 00:46:33 +0000 Received: by outflank-mailman (output) from mailman id 1006090.1385356; Thu, 05 Jun 2025 00:46:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMyka-0003xa-Uv; Thu, 05 Jun 2025 00:46:32 +0000 Received: by outflank-mailman (input) for mailman id 1006090; Thu, 05 Jun 2025 00:46:31 +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 1uMykZ-0003dI-Ox for xen-devel@lists.xenproject.org; Thu, 05 Jun 2025 00:46:31 +0000 Received: from mail-4316.protonmail.ch (mail-4316.protonmail.ch [185.70.43.16]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 85806f2c-41a6-11f0-a300-13f23c93f187; Thu, 05 Jun 2025 02:46:31 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 85806f2c-41a6-11f0-a300-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1749084390; x=1749343590; bh=9smI6UqtAGVdne0R3e2rtMBynR9rK4/XlXYqfjo4GgM=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=EOHAc1s/hRHY6RAFcNVziAL7IfSuCMtYXXQmUVtwAsFXeG6D7Wl2oyvTzUbP9UZWr pdyRYReQGJ4cSLyW7r7flv7CVLqKomL24gfj13n5vM6YtuqPmCgz2fMcXkZrZQgy0z 50cafQQGoQVOuelkAEZl8wSdzRQTuJ6/vN4d5SAAqF0BIeDFvxsqhJPkZU/ucbuGlw grp7QP2Ues7r7ZLAh157S3jl1OMzUyMmRWw0od/mWp1z4yiPKZNeKJIPJfKAHhETwn jV4YZjnYEK+WDj+ao6ZPK/NG5UgFrKGfChipWsPlQGzafelKMPmP8Hoebx5BDD2aQA VcUoZw9hHBuyA== Date: Thu, 05 Jun 2025 00:46:25 +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 v2 2/2] xen/console: unify printout behavior for UART emulators Message-ID: <20250605004601.1142090-3-dmukhin@ford.com> In-Reply-To: <20250605004601.1142090-1-dmukhin@ford.com> References: <20250605004601.1142090-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: 0def410e3d0ccdb8d9d0833aa67447765c7cbd6a MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1749084414585116600 Content-Type: text/plain; charset="utf-8" From: Denis Mukhin If virtual UART from domain X prints on the physical console, the behavior = is updated to (see [1]): - console focus in domain X: do not prefix messages; - no console focus in domain X: prefix all messages with "(dX)". Use guest_printk() without rate-limiting in all current in-hypervisor UART emulators. That aligns the behavior with debug I/O port 0xe9 handler on x86= and slightly improves the logging since guest_printk() already prints the domain ID. guest_printk() was modified to account for console focus ownership. Modify guest_console_write() for hardware domain case by adding domain ID to the message when hwdom does not have console focus. [1] https://lore.kernel.org/xen-devel/alpine.DEB.2.22.394.2412121655360.463= 523@ubuntu-linux-20-04-desktop/ Signed-off-by: Denis Mukhin --- Changes since v1: - dropped change for debug port and for HYPERVISOR_console_io hypercall --- xen/arch/arm/vpl011.c | 6 +++--- xen/arch/arm/vuart.c | 2 +- xen/drivers/char/console.c | 23 +++++++++++++++++++++-- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/vpl011.c b/xen/arch/arm/vpl011.c index 480fc664fc..2b6f2a09bc 100644 --- a/xen/arch/arm/vpl011.c +++ b/xen/arch/arm/vpl011.c @@ -87,7 +87,7 @@ static void vpl011_write_data_xen(struct domain *d, uint8= _t data) { if ( intf->out_prod =3D=3D 1 ) { - printk("%c", data); + guest_printk(d, "%c", data); intf->out_prod =3D 0; } else @@ -95,7 +95,7 @@ static void vpl011_write_data_xen(struct domain *d, uint8= _t data) if ( data !=3D '\n' ) intf->out[intf->out_prod++] =3D '\n'; intf->out[intf->out_prod++] =3D '\0'; - printk("%s", intf->out); + guest_printk(d, "%s", intf->out); intf->out_prod =3D 0; } } @@ -107,7 +107,7 @@ static void vpl011_write_data_xen(struct domain *d, uin= t8_t data) if ( data !=3D '\n' ) intf->out[intf->out_prod++] =3D '\n'; intf->out[intf->out_prod++] =3D '\0'; - printk("DOM%u: %s", d->domain_id, intf->out); + guest_printk(d, "%s", intf->out); intf->out_prod =3D 0; } } diff --git a/xen/arch/arm/vuart.c b/xen/arch/arm/vuart.c index bd2f425214..8c9f9e2182 100644 --- a/xen/arch/arm/vuart.c +++ b/xen/arch/arm/vuart.c @@ -89,7 +89,7 @@ static void vuart_print_char(struct vcpu *v, char c) if ( c !=3D '\n' ) uart->buf[uart->idx++] =3D '\n'; uart->buf[uart->idx] =3D '\0'; - printk(XENLOG_G_DEBUG "DOM%u: %s", d->domain_id, uart->buf); + guest_printk(d, "%s", uart->buf); uart->idx =3D 0; } spin_unlock(&uart->lock); diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index a8cb6363ea..616f4968b0 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -740,7 +740,17 @@ static long guest_console_write(XEN_GUEST_HANDLE_PARAM= (char) buffer, if ( is_hardware_domain(cd) ) { /* Use direct console output as it could be interactive */ + char prefix[16] =3D ""; + struct domain *consd; + + consd =3D console_get_domain(); + if ( consd !=3D cd ) + snprintf(prefix, sizeof(prefix), "(d%d) ", cd->domain_id); + console_put_domain(consd); + nrspin_lock_irq(&console_lock); + if ( prefix[0] !=3D '\0' ) + console_send(prefix, strlen(prefix), flags); console_send(kbuf, kcount, flags); nrspin_unlock_irq(&console_lock); } @@ -1029,12 +1039,21 @@ void printk(const char *fmt, ...) va_end(args); } =20 +/* + * Print message from the guest on the diagnostic console. + * Prefixes all messages w/ "(dX)" if domain X does not own physical conso= le + * focus. + */ void guest_printk(const struct domain *d, const char *fmt, ...) { va_list args; - char prefix[16]; + char prefix[16] =3D ""; + struct domain *consd; =20 - snprintf(prefix, sizeof(prefix), "(d%d) ", d->domain_id); + consd =3D console_get_domain(); + if ( consd !=3D d ) + snprintf(prefix, sizeof(prefix), "(d%d) ", d->domain_id); + console_put_domain(consd); =20 va_start(args, fmt); vprintk_common(fmt, args, prefix); --=20 2.34.1