From nobody Fri Oct 31 03:42:54 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=pass; 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=pass(p=quarantine dis=none) header.from=proton.me ARC-Seal: i=1; a=rsa-sha256; t=1750642497; cv=none; d=zohomail.com; s=zohoarc; b=b1ivq2MHBBYOvyf696Lczu/YUyRbCD115P9z3fV49DSRjes2O5PFfcuO2cUczs70ntDi1zCP1dgYzFPcor5H3pOuTl5Rexj2fxASWPwD+TApvH2bNxFhW1gAm7Q7ctWwV+T0VIvxvSclDqI3amLEY2JBn29yW1WqkE033F9nB7Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750642497; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=McCYuwAalEKxynNEPuCPOFPsq1xeYHW/pDy3ENrirhQ=; b=j+alfgB24uv3m5E/rSYz7Ez0DSVwLWMelbulsRGz/G34YOzBIsgsnKcmcVGeWvAJoT2WC5mJgtDZZQec46RnzoNBn4/yrKrelYySXrtrAU5GKeTdFtyON3HaF0+emL+Gj5awJa72f8GM9mau9a+OXEQey89nLOrE1gPxIkVSRnw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1750642497968508.3073536470404; Sun, 22 Jun 2025 18:34:57 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1021989.1397701 (Exim 4.92) (envelope-from ) id 1uTW50-0006xS-Gg; Mon, 23 Jun 2025 01:34:38 +0000 Received: by outflank-mailman (output) from mailman id 1021989.1397701; Mon, 23 Jun 2025 01:34:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uTW50-0006xL-Dw; Mon, 23 Jun 2025 01:34:38 +0000 Received: by outflank-mailman (input) for mailman id 1021989; Mon, 23 Jun 2025 01:34:37 +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 1uTW4z-0006xF-EU for xen-devel@lists.xenproject.org; Mon, 23 Jun 2025 01:34:37 +0000 Received: from mail-10628.protonmail.ch (mail-10628.protonmail.ch [79.135.106.28]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 37eda73a-4fd2-11f0-b894-0df219b8e170; Mon, 23 Jun 2025 03:34:35 +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: 37eda73a-4fd2-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1750642473; x=1750901673; bh=McCYuwAalEKxynNEPuCPOFPsq1xeYHW/pDy3ENrirhQ=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=gLVoOxJ3grPfNs5qER7YhPYCH6p9SWRTaQ+h3xBHsRxjBm8HR0x8wuFP8N258O/yi iqJzRGx1e+94mjFO2poV5Pyfsr4TxjrM/EGlz8IpKapmxYHp/o2gSHnu0uZU4xB2KY 6ugNCXHSZ2tJBEygivyrajds/pWXVZ/JDdqv4Itu0bgjCUg2wnJ8/SFzefzzC3Km/E ylNOFGorBOhkF/cOb/BhthGI5kFDF8bKUpJiFWNmnGH9oGD7PtdEp32WP7zNhAcnHb WzZ5ds4DgYMNJky5MIhD2Jpo+KF78bm+VTEgCkLuxPJwkpu58igIQxrxJENyLKs2+K Ta6Ayl6bpT2qg== Date: Mon, 23 Jun 2025 01:34: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] xen/console: introduce domain_console struct Message-ID: <20250623013406.174027-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: 0c34475fa538f8363cb3a6bdb6e3bf01df10b076 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @proton.me) X-ZM-MESSAGEID: 1750642500114116600 Content-Type: text/plain; charset="utf-8" From: Denis Mukhin Introduce domain_console for grouping data structures used for integrating domain's diagnostic console with Xen's console driver. Group all pbuf-related data structures under domain_console. Rename the mov= ed fields to plain .buf, .idx and .lock names, since all uses of the fields are touched. Bump the domain console buffer size to the closest power of 2 (256) and rename the symbol to DOMAIN_CONSOLE_BUF_SIZE. Finally, update the domain_console allocation and initialization code. No functional change. Signed-off-by: Denis Mukhin --- Changes since v2: - fixed domain_console definition - dropped changes under CONFIG_VERBOSE_DEBUG - fixed domain_console allocation/initilization in domain_create() - switched hvm_print_line() to use `d` for domain pointer Link to v2: https://lore.kernel.org/r/20250617012713.57074-1-dmukhin@ford.c= om --- xen/arch/arm/vpl011.c | 2 +- xen/arch/x86/hvm/hvm.c | 17 +++++++++-------- xen/arch/x86/pv/shim.c | 2 +- xen/common/domain.c | 19 +++++++++---------- xen/drivers/char/console.c | 22 ++++++++++++---------- xen/include/xen/sched.h | 25 +++++++++++++++---------- 6 files changed, 47 insertions(+), 40 deletions(-) diff --git a/xen/arch/arm/vpl011.c b/xen/arch/arm/vpl011.c index 2b6f2a09bca6..f4a840da10c5 100644 --- a/xen/arch/arm/vpl011.c +++ b/xen/arch/arm/vpl011.c @@ -713,7 +713,7 @@ int domain_vpl011_init(struct domain *d, struct vpl011_= init_info *info) } else { - d->console.input_allowed =3D true; + d->console->input_allowed =3D true; vpl011->backend_in_domain =3D false; =20 vpl011->backend.xen =3D xzalloc(struct vpl011_xen_backend); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 056360d5fe50..7d599eab73f2 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -559,7 +559,8 @@ void hvm_do_resume(struct vcpu *v) static int cf_check hvm_print_line( int dir, unsigned int port, unsigned int bytes, uint32_t *val) { - struct domain *cd =3D current->domain; + const struct domain *d =3D current->domain; + struct domain_console *cons =3D d->console; char c =3D *val; =20 ASSERT(bytes =3D=3D 1 && port =3D=3D XEN_HVM_DEBUGCONS_IOPORT); @@ -571,16 +572,16 @@ static int cf_check hvm_print_line( if ( !is_console_printable(c) ) return X86EMUL_OKAY; =20 - spin_lock(&cd->pbuf_lock); + spin_lock(&cons->lock); if ( c !=3D '\n' ) - cd->pbuf[cd->pbuf_idx++] =3D c; - if ( (cd->pbuf_idx =3D=3D (DOMAIN_PBUF_SIZE - 1)) || (c =3D=3D '\n') ) + cons->buf[cons->idx++] =3D c; + if ( (cons->idx =3D=3D (DOMAIN_CONSOLE_BUF_SIZE - 1)) || (c =3D=3D '\n= ') ) { - cd->pbuf[cd->pbuf_idx] =3D '\0'; - guest_printk(cd, XENLOG_G_DEBUG "%s\n", cd->pbuf); - cd->pbuf_idx =3D 0; + cons->buf[cons->idx] =3D '\0'; + guest_printk(d, XENLOG_G_DEBUG "%s\n", cons->buf); + cons->idx =3D 0; } - spin_unlock(&cd->pbuf_lock); + spin_unlock(&cons->lock); =20 return X86EMUL_OKAY; } diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c index bc2a7dd5fae5..bd29c53a2d34 100644 --- a/xen/arch/x86/pv/shim.c +++ b/xen/arch/x86/pv/shim.c @@ -239,7 +239,7 @@ void __init pv_shim_setup_dom(struct domain *d, l4_pgen= try_t *l4start, */ d->max_pages =3D domain_tot_pages(d); =20 - d->console.input_allowed =3D true; + d->console->input_allowed =3D true; } =20 static void write_start_info(struct domain *d) diff --git a/xen/common/domain.c b/xen/common/domain.c index 434d32901b1b..2f6b0af50dd3 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -669,7 +669,7 @@ static void _domain_destroy(struct domain *d) BUG_ON(!d->is_dying); BUG_ON(atomic_read(&d->refcnt) !=3D DOMAIN_DESTROYED); =20 - xfree(d->pbuf); + xfree(d->console); =20 argo_destroy(d); =20 @@ -832,8 +832,6 @@ struct domain *domain_create(domid_t domid, flags |=3D CDF_hardware; if ( old_hwdom ) old_hwdom->cdf &=3D ~CDF_hardware; - - d->console.input_allowed =3D true; } =20 /* Holding CDF_* internal flags. */ @@ -863,8 +861,6 @@ struct domain *domain_create(domid_t domid, spin_lock_init(&d->shutdown_lock); d->shutdown_code =3D SHUTDOWN_CODE_INVALID; =20 - spin_lock_init(&d->pbuf_lock); - rwlock_init(&d->vnuma_rwlock); =20 #ifdef CONFIG_HAS_PCI @@ -874,6 +870,14 @@ struct domain *domain_create(domid_t domid, =20 /* All error paths can depend on the above setup. */ =20 + err =3D -ENOMEM; + d->console =3D xvzalloc(typeof(*d->console)); + if ( !d->console ) + goto fail; + + spin_lock_init(&d->console->lock); + d->console->input_allowed =3D is_hardware_domain(d); + /* * Allocate d->vcpu[] and set ->max_vcpus up early. Various per-domain * resources want to be sized based on max_vcpus. @@ -956,11 +960,6 @@ struct domain *domain_create(domid_t domid, if ( (err =3D argo_init(d)) !=3D 0 ) goto fail; =20 - err =3D -ENOMEM; - d->pbuf =3D xzalloc_array(char, DOMAIN_PBUF_SIZE); - if ( !d->pbuf ) - goto fail; - if ( (err =3D sched_init_domain(d, config->cpupool_id)) !=3D 0 ) goto fail; =20 diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 5d3681b16aee..5188ee761dd2 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -524,7 +524,7 @@ struct domain *console_get_domain(void) if ( !d ) return NULL; =20 - if ( d->console.input_allowed ) + if ( d->console->input_allowed ) return d; =20 rcu_unlock_domain(d); @@ -567,7 +567,7 @@ static void console_switch_input(void) { rcu_unlock_domain(d); =20 - if ( !d->console.input_allowed ) + if ( !d->console->input_allowed ) continue; =20 console_rx =3D next_rx; @@ -757,6 +757,7 @@ static long guest_console_write(XEN_GUEST_HANDLE_PARAM(= char) buffer, else { char *kin =3D kbuf, *kout =3D kbuf, c; + struct domain_console *cons =3D cd->console; =20 /* Strip non-printable characters */ do @@ -769,22 +770,23 @@ static long guest_console_write(XEN_GUEST_HANDLE_PARA= M(char) buffer, } while ( --kcount > 0 ); =20 *kout =3D '\0'; - spin_lock(&cd->pbuf_lock); + spin_lock(&cons->lock); kcount =3D kin - kbuf; if ( c !=3D '\n' && - (cd->pbuf_idx + (kout - kbuf) < (DOMAIN_PBUF_SIZE - 1)) ) + cons->idx + kout - kbuf < DOMAIN_CONSOLE_BUF_SIZE - 1 ) { /* buffer the output until a newline */ - memcpy(cd->pbuf + cd->pbuf_idx, kbuf, kout - kbuf); - cd->pbuf_idx +=3D (kout - kbuf); + memcpy(cons->buf + cons->idx, kbuf, kout - kbuf); + cons->idx +=3D (kout - kbuf); } else { - cd->pbuf[cd->pbuf_idx] =3D '\0'; - guest_printk(cd, XENLOG_G_DEBUG "%s%s\n", cd->pbuf, kbuf); - cd->pbuf_idx =3D 0; + cons->buf[cons->idx] =3D '\0'; + guest_printk(cd, + XENLOG_G_DEBUG "%s%s\n", cons->buf, kbuf); + cons->idx =3D 0; } - spin_unlock(&cd->pbuf_lock); + spin_unlock(&cons->lock); } =20 guest_handle_add_offset(buffer, kcount); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index fe53d4fab7ba..252f0e8c4aa8 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -371,6 +371,20 @@ struct evtchn_port_ops; =20 #define MAX_NR_IOREQ_SERVERS 8 =20 +/* Arbitrary value. */ +#define DOMAIN_CONSOLE_BUF_SIZE 256 + +/* Domain console settings. */ +struct domain_console { + /* hvm_print_line() and guest_console_write() logging. */ + char buf[DOMAIN_CONSOLE_BUF_SIZE]; + unsigned int idx; + spinlock_t lock; + + /* Permission to take ownership of the physical console input. */ + bool input_allowed; +}; + struct domain { domid_t domain_id; @@ -562,12 +576,6 @@ struct domain /* Control-plane tools handle for this domain. */ xen_domain_handle_t handle; =20 - /* hvm_print_line() and guest_console_write() logging. */ -#define DOMAIN_PBUF_SIZE 200 - char *pbuf; - unsigned int pbuf_idx; - spinlock_t pbuf_lock; - /* OProfile support. */ struct xenoprof *xenoprof; =20 @@ -653,10 +661,7 @@ struct domain #endif =20 /* Console settings. */ - struct { - /* Permission to take ownership of the physical console input. */ - bool input_allowed; - } console; + struct domain_console *console; } __aligned(PAGE_SIZE); =20 static inline struct page_list_head *page_to_list( --=20 2.34.1