From nobody Fri Oct 31 04:13:25 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 1749240703059142.9611574675514; Fri, 6 Jun 2025 13:11:43 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1008812.1387981 (Exim 4.92) (envelope-from ) id 1uNdPW-0000As-JC; Fri, 06 Jun 2025 20:11:30 +0000 Received: by outflank-mailman (output) from mailman id 1008812.1387981; Fri, 06 Jun 2025 20:11:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uNdPW-0000Ai-Gg; Fri, 06 Jun 2025 20:11:30 +0000 Received: by outflank-mailman (input) for mailman id 1008812; Fri, 06 Jun 2025 20:11:28 +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 1uNdPU-00009b-DZ for xen-devel@lists.xenproject.org; Fri, 06 Jun 2025 20:11:28 +0000 Received: from mail-24416.protonmail.ch (mail-24416.protonmail.ch [109.224.244.16]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6b281b22-4312-11f0-b894-0df219b8e170; Fri, 06 Jun 2025 22:11:23 +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: 6b281b22-4312-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=ifubwuzdrngs7k2lxbfr5quiby.protonmail; t=1749240681; x=1749499881; bh=GdEbK8D2ZDN7Lr8LitkKUBGodl297aVwXtvJS3LFQEE=; 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=dxJKsf2KYlnsgOS0HqmrmgLopO40zDwgsWN4j5QYgvjNTiMZEudh67hVi8pFTPiPr xMpYOS/lGlFTxqRVY8Ho6RWV5IZ+qGwIwTnporf6ztbZl1Sw/2x+/4+dyVgTMNygVJ rQIQiB18gDJUFKJst3HEd6bYd/7UgmA+JXpKm/zfaCMX1randC8DMM0XZMp0v35aC0 Y/vk38l9/dpC8ofoR+taD1XRJpSONu7wEyJ3G+g8bpzqTOik3mkHawW/wCxAbzCQ3X EYTfk6fiSEPDB2KT/qu8pnf6sFw3iJXbUFBSwTRiKmIwXbxixcluQPWZmDDNICSZLG bVgzFqvALYamg== Date: Fri, 06 Jun 2025 20:11: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 v3 1/2] xen/console: introduce CONSOLE_PREFIX Message-ID: <20250606201102.2414022-2-dmukhin@ford.com> In-Reply-To: <20250606201102.2414022-1-dmukhin@ford.com> References: <20250606201102.2414022-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: e1dd58d38b52f9c478d11af804f89d4558dcda61 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1749240704498116600 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 Reviewed-by: Stefano Stabellini --- Changes since v2: - 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 e3731bf174..6e77b4af82 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. */ @@ -1017,7 +1020,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, ...) @@ -1288,7 +1291,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:13:25 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 1749240712004988.9218361765936; Fri, 6 Jun 2025 13:11:52 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1008814.1387991 (Exim 4.92) (envelope-from ) id 1uNdPc-0000Sz-QR; Fri, 06 Jun 2025 20:11:36 +0000 Received: by outflank-mailman (output) from mailman id 1008814.1387991; Fri, 06 Jun 2025 20:11:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uNdPc-0000Ss-NB; Fri, 06 Jun 2025 20:11:36 +0000 Received: by outflank-mailman (input) for mailman id 1008814; Fri, 06 Jun 2025 20:11:35 +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 1uNdPb-00009b-IW for xen-devel@lists.xenproject.org; Fri, 06 Jun 2025 20:11:35 +0000 Received: from mail-4316.protonmail.ch (mail-4316.protonmail.ch [185.70.43.16]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 71233d18-4312-11f0-b894-0df219b8e170; Fri, 06 Jun 2025 22:11:33 +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: 71233d18-4312-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1749240692; x=1749499892; bh=w1aYox814ENiGX0kzo/wv0psYSfdQIkk6c5aSghtUUw=; 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=jilGMtNfSwS7UfclOajsb05eshx9elibnWNZ0dLxs2VaJ2CfG13Iuef4Paye2ViCz eoUi+k+jDP2QAWWPooH1DXCxhnULWYBvjuPxmwJmTbpm2AUmdfG3OgyyGcwvaTYbyx qWGk7g2IEfpMQULjolj50UP4QBd79ju1n75gZi/UrXeVerI13ZwxCLSRMtRMn/rxsO dr+8xemqv2Z81yPlHX+RoTFD4D8j5mmU54rhJbKJ/2MfnRU+B8rTvE4F+uwBHzMueH +ANN/8BkJBx/2LSUvOpJJ+XYFmTnkR7jkhLkrsnUh2OzrT1AwrxK7nvm/DtoP5zy1j bDRVhTWVba6ug== Date: Fri, 06 Jun 2025 20:11:26 +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 v3 2/2] xen/console: unify printout behavior for UART emulators Message-ID: <20250606201102.2414022-3-dmukhin@ford.com> In-Reply-To: <20250606201102.2414022-1-dmukhin@ford.com> References: <20250606201102.2414022-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: cadaa70cd81e68ac9141d280fefdfcb0acf2c0a5 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1749240712555116600 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() 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() w= as 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 v2: - dropped rate-limiting change for vuart --- 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..6641f9d775 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, XENLOG_G_DEBUG "%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 6e77b4af82..3855962af7 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); } @@ -1032,12 +1042,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