From nobody Thu Oct 30 22:53:01 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=1755037878; cv=none; d=zohomail.com; s=zohoarc; b=HosnoqcI6CoLDEGpKc5AUnlZINYs6c164tabKdQ31a6kwPfEhKMbsC31tddqZxIcWjwlAfqNKrXHy4vaWbt5qetGNqGAc78YsmL3gk02WRclHormbuTjH1u20A9gZ/0jQGLJMpTg/yhGQLIUUb6hSXSXwcJZlW7TyRWdCC8f6gY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755037878; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HRjyR++qc25j7qESp2laGTQtnu9OAzU8OtuZqm8tqk4=; b=WrkdJpZtyzkQpdj+pPitgy5D2aQQBhFZLgZujg1GoE7PT8oqZW+rTkdBrD3lqap2qK0M1SDZaUQDihrsroDdXFX+J9WFPP353rGIEVxuNOT4JcogZOBLKJ5L3x0evwD2/9LK8wVn3Qzsmq2PbsJwPe7+UB7KhoQAMp+CV8Yd0ys= 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 1755037878785405.8778580342347; Tue, 12 Aug 2025 15:31:18 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1079224.1440208 (Exim 4.92) (envelope-from ) id 1ulxW5-0004Dy-Ax; Tue, 12 Aug 2025 22:30:49 +0000 Received: by outflank-mailman (output) from mailman id 1079224.1440208; Tue, 12 Aug 2025 22:30:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulxW5-0004Dr-7d; Tue, 12 Aug 2025 22:30:49 +0000 Received: by outflank-mailman (input) for mailman id 1079224; Tue, 12 Aug 2025 22:30:47 +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 1ulxW3-00040E-Rg for xen-devel@lists.xenproject.org; Tue, 12 Aug 2025 22:30:47 +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 fd0754c4-77cb-11f0-b898-0df219b8e170; Wed, 13 Aug 2025 00:30:46 +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: fd0754c4-77cb-11f0-b898-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=2nhybwj3wjhifhuk26bdvxuyva.protonmail; t=1755037843; x=1755297043; bh=HRjyR++qc25j7qESp2laGTQtnu9OAzU8OtuZqm8tqk4=; 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; b=WmK/gTrN2r03kKzvGBr3vybG3kC7dIRg/qB1xDsvwWaiCJTpDbqlotMgJihVLUuPF Jq18ghSqa2Z/KNKaJ3OL8N+n7tyyx6QZpW5Wp2q5T+w+BJ21xhtfrgKneXIgX71Rxj ul/BPPFSghIuGnoDWPYT1aPrqPm4FekWoY+enDPfpOgBcYxq0BRPx0xMFMTx3Apbsp 8HAgjNzEOX8kUjxljbOl8ZLtAJQHBiwkoA/sdTpN3N3V64zxED57m2uUeYysEnvq7k dWX1HaEHilOYHw0gIklFYq//MYaKggGMozJnb9ihdCFh8N/uEzAvoquA2QJFuUfDkW dYSu1Bn3hPt/w== Date: Tue, 12 Aug 2025 22:30:39 +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, Julien Grall , Alejandro Vallejo Subject: [PATCH v16 1/4] xen/domain: unify domain ID allocation Message-ID: <20250812223024.2364749-2-dmukhin@ford.com> In-Reply-To: <20250812223024.2364749-1-dmukhin@ford.com> References: <20250812223024.2364749-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: 6bb26d9a16806223e669cf27a8d857da1597e099 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @proton.me) X-ZM-MESSAGEID: 1755037881861124100 Content-Type: text/plain; charset="utf-8" From: Denis Mukhin =20 Currently, there are two different domain ID allocation implementations: 1) Sequential IDs allocation in dom0less Arm code based on max_init_domid; 2) Sequential IDs allocation in XEN_DOMCTL_createdomain; does not use max_init_domid (both Arm and x86). The domain ID allocation covers dom0 or late hwdom, predefined domains, post-boot domains, excluding Xen system domains (domid >=3D DOMID_FIRST_RESERVED). It makes sense to have a common helper code for such task across architectu= res (Arm and x86) and between dom0less / toolstack domU allocation. Note, fixing dependency on max_init_domid is out of scope of this patch. Wrap the domain ID allocation as an arch-independent function domid_alloc()= in new common/domid.c based on the bitmap. Allocation algorithm: - If an explicit domain ID is provided, verify its availability and use it = if ID is not used; - If DOMID_INVALID is provided, search the range [1..DOMID_FIRST_RESERVED-1= ], starting from the last used ID. Implementation guarantees that two consecutive calls will never return the same ID. ID#0 is reserved for the first boot domain (currently, dom0) and excluded from the allocation range. Remove is_free_domid() helper as it is not needed now. No functional change intended. Signed-off-by: Denis Mukhin Reviewed-by: Julien Grall Reviewed-by: Alejandro Vallejo --- Changes since v15: - fixup for check after the first pass in the bitarray in domid_alloc() - trivial renaming for the local variable in domid_alloc() - kept Julien's R-b, added Alejandro's R-b --- xen/arch/arm/domain_build.c | 7 +- xen/arch/x86/setup.c | 7 +- xen/common/Makefile | 1 + xen/common/device-tree/dom0less-build.c | 15 ++-- xen/common/domain.c | 2 + xen/common/domctl.c | 43 ++--------- xen/common/domid.c | 95 +++++++++++++++++++++++++ xen/include/xen/domain.h | 3 + 8 files changed, 126 insertions(+), 47 deletions(-) create mode 100644 xen/common/domid.c diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index a9e4153e3cf9..aca35b8961d6 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2050,6 +2050,7 @@ void __init create_dom0(void) .grant_opts =3D XEN_DOMCTL_GRANT_version(opt_gnttab_max_version), }; unsigned int flags =3D CDF_privileged | CDF_hardware; + domid_t domid; int rc; =20 /* The vGIC for DOM0 is exactly emulating the hardware GIC */ @@ -2074,7 +2075,11 @@ void __init create_dom0(void) if ( !llc_coloring_enabled ) flags |=3D CDF_directmap; =20 - dom0 =3D domain_create(0, &dom0_cfg, flags); + domid =3D domid_alloc(0); + if ( domid =3D=3D DOMID_INVALID ) + panic("Error allocating domain ID 0\n"); + + dom0 =3D domain_create(domid, &dom0_cfg, flags); if ( IS_ERR(dom0) ) panic("Error creating domain 0 (rc =3D %ld)\n", PTR_ERR(dom0)); =20 diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 1543dd251cc6..398da734c0c5 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1047,8 +1047,11 @@ static struct domain *__init create_dom0(struct boot= _info *bi) if ( iommu_enabled ) dom0_cfg.flags |=3D XEN_DOMCTL_CDF_iommu; =20 - /* Create initial domain. Not d0 for pvshim. */ - bd->domid =3D get_initial_domain_id(); + /* Allocate initial domain ID. Not d0 for pvshim. */ + bd->domid =3D domid_alloc(get_initial_domain_id()); + if ( bd->domid =3D=3D DOMID_INVALID ) + panic("Error allocating domain ID %u\n", get_initial_domain_id()); + d =3D domain_create(bd->domid, &dom0_cfg, pv_shim ? 0 : CDF_privileged | CDF_hardware); if ( IS_ERR(d) ) diff --git a/xen/common/Makefile b/xen/common/Makefile index c316957fcb36..0c7d0f5d46e1 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -11,6 +11,7 @@ obj-$(filter-out $(CONFIG_X86),$(CONFIG_ACPI)) +=3D devic= e.o obj-$(CONFIG_DEVICE_TREE_PARSE) +=3D device-tree/ obj-$(CONFIG_IOREQ_SERVER) +=3D dm.o obj-y +=3D domain.o +obj-y +=3D domid.o obj-y +=3D event_2l.o obj-y +=3D event_channel.o obj-$(CONFIG_EVTCHN_FIFO) +=3D event_fifo.o diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tr= ee/dom0less-build.c index 6bb038111de9..f4b6b515d2d2 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -833,6 +833,7 @@ void __init create_domUs(void) { struct kernel_info ki =3D KERNEL_INFO_INIT; int rc =3D parse_dom0less_node(node, &ki.bd); + domid_t domid; =20 if ( rc =3D=3D -ENOENT ) continue; @@ -842,13 +843,13 @@ void __init create_domUs(void) if ( (max_init_domid + 1) >=3D DOMID_FIRST_RESERVED ) panic("No more domain IDs available\n"); =20 - /* - * The variable max_init_domid is initialized with zero, so here i= t's - * very important to use the pre-increment operator to call - * domain_create() with a domid > 0. (domid =3D=3D 0 is reserved f= or Dom0) - */ - ki.bd.d =3D domain_create(++max_init_domid, - &ki.bd.create_cfg, ki.bd.create_flags); + domid =3D domid_alloc(DOMID_INVALID); + if ( domid =3D=3D DOMID_INVALID ) + panic("Error allocating ID for domain %s\n", dt_node_name(node= )); + + max_init_domid =3D max(max_init_domid, domid); + + ki.bd.d =3D domain_create(domid, &ki.bd.create_cfg, ki.bd.create_f= lags); if ( IS_ERR(ki.bd.d) ) panic("Error creating domain %s (rc =3D %ld)\n", dt_node_name(node), PTR_ERR(ki.bd.d)); diff --git a/xen/common/domain.c b/xen/common/domain.c index 5241a1629eeb..a7e303253d1a 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -692,6 +692,8 @@ static void _domain_destroy(struct domain *d) =20 lock_profile_deregister_struct(LOCKPROF_TYPE_PERDOM, d); =20 + domid_free(d->domain_id); + free_domain_struct(d); } =20 diff --git a/xen/common/domctl.c b/xen/common/domctl.c index f2a7caaf853c..71e712c1f316 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -51,20 +51,6 @@ static int xenctl_bitmap_to_nodemask(nodemask_t *nodemas= k, MAX_NUMNODES); } =20 -static inline int is_free_domid(domid_t dom) -{ - struct domain *d; - - if ( dom >=3D DOMID_FIRST_RESERVED ) - return 0; - - if ( (d =3D rcu_lock_domain_by_id(dom)) =3D=3D NULL ) - return 1; - - rcu_unlock_domain(d); - return 0; -} - void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) { struct vcpu *v; @@ -423,36 +409,19 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u= _domctl) =20 case XEN_DOMCTL_createdomain: { - domid_t dom; - static domid_t rover =3D 0; + /* NB: ID#0 is reserved, find the first suitable ID instead. */ + domid_t domid =3D domid_alloc(op->domain ?: DOMID_INVALID); =20 - dom =3D op->domain; - if ( (dom > 0) && (dom < DOMID_FIRST_RESERVED) ) + if ( domid =3D=3D DOMID_INVALID ) { ret =3D -EEXIST; - if ( !is_free_domid(dom) ) - break; - } - else - { - for ( dom =3D rover + 1; dom !=3D rover; dom++ ) - { - if ( dom =3D=3D DOMID_FIRST_RESERVED ) - dom =3D 1; - if ( is_free_domid(dom) ) - break; - } - - ret =3D -ENOMEM; - if ( dom =3D=3D rover ) - break; - - rover =3D dom; + break; } =20 - d =3D domain_create(dom, &op->u.createdomain, false); + d =3D domain_create(domid, &op->u.createdomain, false); if ( IS_ERR(d) ) { + domid_free(domid); ret =3D PTR_ERR(d); d =3D NULL; break; diff --git a/xen/common/domid.c b/xen/common/domid.c new file mode 100644 index 000000000000..2387ddb08300 --- /dev/null +++ b/xen/common/domid.c @@ -0,0 +1,95 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Domain ID allocator. + * + * Covers dom0 or late hwdom, predefined domains, post-boot domains. + * Excludes system domains (ID >=3D DOMID_FIRST_RESERVED). + * + * Copyright 2025 Ford Motor Company + */ + +#include + +static DEFINE_SPINLOCK(domid_lock); +static DECLARE_BITMAP(domid_bitmap, DOMID_FIRST_RESERVED); + +/* + * Allocate domain ID. + * + * @param domid Domain ID hint: + * - If an explicit domain ID is provided, verify its availability and use= it + * if ID is not used; + * - If DOMID_INVALID is provided, search [1..DOMID_FIRST_RESERVED-1] rang= e, + * starting from the last used ID. Implementation guarantees that two + * consecutive calls will never return the same ID. ID#0 is reserved for + * the first boot domain (currently, dom0) and excluded from the allocat= ion + * range. + * @return Valid domain ID in case of successful allocation, + * DOMID_INVALID - otherwise. + */ +domid_t domid_alloc(domid_t domid) +{ + static domid_t domid_last; + + spin_lock(&domid_lock); + + /* Exact match. */ + if ( domid < DOMID_FIRST_RESERVED ) + { + if ( __test_and_set_bit(domid, domid_bitmap) ) + domid =3D DOMID_INVALID; + } + /* + * Exhaustive search. + * + * Domain ID#0 is reserved for the first boot domain (e.g. control dom= ain) + * and excluded from allocation. + */ + else + { + domid_t bound =3D DOMID_FIRST_RESERVED; + + domid =3D find_next_zero_bit(domid_bitmap, bound, domid_last + 1); + if ( domid >=3D bound && domid_last !=3D 0 ) + { + bound =3D domid_last + 1; + domid =3D find_next_zero_bit(domid_bitmap, bound, 1); + } + + ASSERT(domid <=3D DOMID_FIRST_RESERVED); + if ( domid < bound ) + { + __set_bit(domid, domid_bitmap); + domid_last =3D domid; + } + else + domid =3D DOMID_INVALID; + } + + spin_unlock(&domid_lock); + + return domid; +} + +void domid_free(domid_t domid) +{ + int rc; + + ASSERT(domid <=3D DOMID_FIRST_RESERVED); + + spin_lock(&domid_lock); + rc =3D __test_and_clear_bit(domid, domid_bitmap); + spin_unlock(&domid_lock); + + ASSERT(rc); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index e10baf2615fd..8aab05ae93c8 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -38,6 +38,9 @@ void arch_get_domain_info(const struct domain *d, =20 domid_t get_initial_domain_id(void); =20 +domid_t domid_alloc(domid_t domid); +void domid_free(domid_t domid); + /* CDF_* constant. Internal flags for domain creation. */ /* Is this a privileged domain? */ #define CDF_privileged (1U << 0) --=20 2.34.1 From nobody Thu Oct 30 22:53:01 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=1755037874; cv=none; d=zohomail.com; s=zohoarc; b=dWWHf8TJYW3/e3JrM0NoHR1UEvUaQGEt0ulgw4gmqEPKmOZ3eCCg8UfLWLv/P3sfNCF/RSbOlX2ESVFDcHGGVajxtm8+VcqKDEaBuxn+E5fz73eLVgKApPKaroMRlIqkwSx1mNKI67HZ60246luG5fH10MjVvGNw0v2ZRvg4SyA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755037874; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=erBCuTXJ+KpM9oo/ZWWMqnMJkUjUreb879bOnDUb9wU=; b=NGftYy3gtYXyAekGEr8Z7KygTDcYbyCI3GozO7oXGkzXjrkrTZ/7i84esDLwjcXGn6Id0+XTsg6rt2VG1mrgmOKK24nG9AkK+Bv/yXBTMukpDu+ZFWfy6tY97aLkPi49uv+MRwfEdKwiqdMBdzX620I+smX9mhGwaqUS7J+G/lQ= 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 1755037874174406.77724058769616; Tue, 12 Aug 2025 15:31:14 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1079225.1440218 (Exim 4.92) (envelope-from ) id 1ulxWC-0004VG-Oe; Tue, 12 Aug 2025 22:30:56 +0000 Received: by outflank-mailman (output) from mailman id 1079225.1440218; Tue, 12 Aug 2025 22:30:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulxWC-0004V7-Kd; Tue, 12 Aug 2025 22:30:56 +0000 Received: by outflank-mailman (input) for mailman id 1079225; Tue, 12 Aug 2025 22:30:55 +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 1ulxWB-0004TJ-AC for xen-devel@lists.xenproject.org; Tue, 12 Aug 2025 22:30:55 +0000 Received: from mail-24417.protonmail.ch (mail-24417.protonmail.ch [109.224.244.17]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 004180df-77cc-11f0-a328-13f23c93f187; Wed, 13 Aug 2025 00:30:51 +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: 004180df-77cc-11f0-a328-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1755037849; x=1755297049; bh=erBCuTXJ+KpM9oo/ZWWMqnMJkUjUreb879bOnDUb9wU=; 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; b=Ok5S+wc0JVKKpeGNj2t1l3g0uuSPnHZMeL9svUalPghjB6l+uzLNYrLT2jkehgygT WLv9B8eoOXvaST0XjqBofiRqbdjZu4KwmZcyiNW0dFx8ktW/Z7yBXy2MPdH1yM/rQ4 gf9rJj54qxHJgSiZVXlWonhnJgsY4qTGD/OJkrmSwk03L95qDsxjJva+n64viuE3QO t9Jy5RZVOZmBXE7s+TrwjnD8EE1mugIo+HepJ1opBHUiOj6V2YA+F7nnBVbtWFPJhK YlWpUUP52rTGsUL3uWvjs3K7X6GWQhb0FlabhV8igjtJH2dYKJs+sYNESucKgkdQ2K yqX9KPz5ksxSg== Date: Tue, 12 Aug 2025 22:30:45 +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 v16 2/4] tools/include: move xc_bitops.h to xen-tools/bitops.h Message-ID: <20250812223024.2364749-3-dmukhin@ford.com> In-Reply-To: <20250812223024.2364749-1-dmukhin@ford.com> References: <20250812223024.2364749-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: 460210e60e2ec9f441bd75331994d95f23f96e88 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @proton.me) X-ZM-MESSAGEID: 1755037874649116600 Content-Type: text/plain; charset="utf-8" From: Denis Mukhin =20 Move xc_bitops.h to common tools location to be shared between the toolstack and unit test code. Adjust the guard in xen-tools/bitops.h Correct the #include directives and comments referring to the old xc_bitops.h in the toolstack code. Signed-off-by: Denis Mukhin Acked-by: Anthony PERARD --- Changes since v15: - n/a --- .../ctrl/xc_bitops.h =3D> include/xen-tools/bitops.h} | 6 +++--- tools/libs/ctrl/xc_misc.c | 13 +++++++------ tools/libs/guest/xg_dom_elfloader.c | 3 ++- tools/libs/guest/xg_dom_hvmloader.c | 3 ++- tools/libs/guest/xg_private.h | 2 +- tools/libs/guest/xg_sr_common.h | 3 +-- 6 files changed, 16 insertions(+), 14 deletions(-) rename tools/{libs/ctrl/xc_bitops.h =3D> include/xen-tools/bitops.h} (95%) diff --git a/tools/libs/ctrl/xc_bitops.h b/tools/include/xen-tools/bitops.h similarity index 95% rename from tools/libs/ctrl/xc_bitops.h rename to tools/include/xen-tools/bitops.h index 4a776dc3a57f..681482f6759f 100644 --- a/tools/libs/ctrl/xc_bitops.h +++ b/tools/include/xen-tools/bitops.h @@ -1,5 +1,5 @@ -#ifndef XC_BITOPS_H -#define XC_BITOPS_H 1 +#ifndef __XEN_TOOLS_BITOPS_H__ +#define __XEN_TOOLS_BITOPS_H__ =20 /* bitmap operations for single threaded access */ =20 @@ -81,4 +81,4 @@ static inline void bitmap_or(void *_dst, const void *_oth= er, dst[i] |=3D other[i]; } =20 -#endif /* XC_BITOPS_H */ +#endif /* __XEN_TOOLS_BITOPS_H__ */ diff --git a/tools/libs/ctrl/xc_misc.c b/tools/libs/ctrl/xc_misc.c index 33e87bac2868..10ddf85667a9 100644 --- a/tools/libs/ctrl/xc_misc.c +++ b/tools/libs/ctrl/xc_misc.c @@ -17,8 +17,8 @@ * License along with this library; If not, see . */ =20 -#include "xc_bitops.h" #include "xc_private.h" +#include #include =20 int xc_get_max_cpus(xc_interface *xch) @@ -94,11 +94,12 @@ xc_cpumap_t xc_cpumap_alloc(xc_interface *xch) } =20 /* - * xc_bitops.h has macros that do this as well - however they assume that - * the bitmask is word aligned but xc_cpumap_t is only guaranteed to be - * byte aligned and so we need byte versions for architectures which do - * not support misaligned accesses (which is basically everyone - * but x86, although even on x86 it can be inefficient). + * has macros that do this as well - however they + * assume that the bitmask is word aligned but xc_cpumap_t is only + * guaranteed to be byte aligned and so we need byte versions for + * architectures which do not support misaligned accesses (which is + * basically everyone but x86, although even on x86 it can be + * inefficient). * * NOTE: The xc_bitops macros now use byte alignment. * TODO: Clean up the users of this interface. diff --git a/tools/libs/guest/xg_dom_elfloader.c b/tools/libs/guest/xg_dom_= elfloader.c index f17930d98bf7..8531e90f8e21 100644 --- a/tools/libs/guest/xg_dom_elfloader.c +++ b/tools/libs/guest/xg_dom_elfloader.c @@ -25,8 +25,9 @@ #include #include =20 +#include + #include "xg_private.h" -#include "xc_bitops.h" =20 #define XEN_VER "xen-3.0" =20 diff --git a/tools/libs/guest/xg_dom_hvmloader.c b/tools/libs/guest/xg_dom_= hvmloader.c index 39e1e5f579a7..0f569c20c522 100644 --- a/tools/libs/guest/xg_dom_hvmloader.c +++ b/tools/libs/guest/xg_dom_hvmloader.c @@ -24,8 +24,9 @@ #include #include =20 +#include + #include "xg_private.h" -#include "xc_bitops.h" =20 /* -----------------------------------------------------------------------= - */ /* parse elf binary = */ diff --git a/tools/libs/guest/xg_private.h b/tools/libs/guest/xg_private.h index d73947094f2e..285229cf82a3 100644 --- a/tools/libs/guest/xg_private.h +++ b/tools/libs/guest/xg_private.h @@ -28,9 +28,9 @@ #include =20 #include "xc_private.h" -#include "xc_bitops.h" #include "xenguest.h" =20 +#include #include #include #include diff --git a/tools/libs/guest/xg_sr_common.h b/tools/libs/guest/xg_sr_commo= n.h index 2f058ee3a6ff..2e583f2eac72 100644 --- a/tools/libs/guest/xg_sr_common.h +++ b/tools/libs/guest/xg_sr_common.h @@ -2,11 +2,10 @@ #define __COMMON__H =20 #include +#include =20 #include "xg_private.h" #include "xg_save_restore.h" -#include "xc_bitops.h" - #include "xg_sr_stream_format.h" =20 /* String representation of Domain Header types. */ --=20 2.34.1 From nobody Thu Oct 30 22:53:01 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=1755037881; cv=none; d=zohomail.com; s=zohoarc; b=YO5cMIyeO3TBeJbEG2s86Fx0vewCJumdg8j4s6q09Wb8YO+53x9ZDZghGqgnC5XlabYB+JOaOhH0RJfOzw3XMV5dxZpLoYDRIJPEA530TNpkVf9e0lmJ0gg8Id2+CLiRyhghFLOo2ayqBN7kdFtxptnnVsFV0nl9r6QF/fH9lt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755037881; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XixfifFOrDZoa6xOSIH77VDx3GwR4fb7LvpluvJ+FYg=; b=RMjcUhLzblhnYByLw3crenUZoQbjoOZoTwIUkabDMCD9KJ3UtFb9JuvxIn0s65GnIKlljkCZf87crhtsztrmjWZKxTLcfdPNVJGg0b0VoXmmh6E7ToaeVr4EaO61+m+TtYWwr1ji/8RTM0jc8e+LxGtmcw2XjCVEY4wFJPK4rnQ= 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 1755037881791601.3977209694046; Tue, 12 Aug 2025 15:31:21 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1079226.1440224 (Exim 4.92) (envelope-from ) id 1ulxWD-0004YY-1i; Tue, 12 Aug 2025 22:30:57 +0000 Received: by outflank-mailman (output) from mailman id 1079226.1440224; Tue, 12 Aug 2025 22:30:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulxWC-0004Xe-SE; Tue, 12 Aug 2025 22:30:56 +0000 Received: by outflank-mailman (input) for mailman id 1079226; Tue, 12 Aug 2025 22:30:55 +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 1ulxWB-0004TJ-HQ for xen-devel@lists.xenproject.org; Tue, 12 Aug 2025 22:30:55 +0000 Received: from mail-10629.protonmail.ch (mail-10629.protonmail.ch [79.135.106.29]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 0275461e-77cc-11f0-a328-13f23c93f187; Wed, 13 Aug 2025 00:30:54 +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: 0275461e-77cc-11f0-a328-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=drlnfcq6ibai7j3scksxxx3k4u.protonmail; t=1755037853; x=1755297053; bh=XixfifFOrDZoa6xOSIH77VDx3GwR4fb7LvpluvJ+FYg=; 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; b=CzzqokghsJ3fplhix4wp7CjkN4QKyU6vpbPlqZIBHmrCGGDk1supy/UgGmEOI8jV6 U8JsU/lhFhE6zHWtlqNxQtYZ5U1GFbfVeBR+KM706+MNpVC6aV6AD52U8ig2zCwCgx TBUrccpbSd+49LWGP6AzXZVfvpft0RJeICMKAr3SO7DBrjlu8VhezKwxkX40JZ0cju ssttd3NBeWdX4f1b002peyFispSbMhBdI4iXjq6pLwFc4TMZghIKOM/4pz2GBRVT/a ZrJU+CPNOt+gGxBeLyKjATMANi0lZ2t+taGLLw6PxEJhQYFnG8vEdYLcPRL1H2LqLE WrytDsnDqO3AA== Date: Tue, 12 Aug 2025 22:30:50 +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, Julien Grall Subject: [PATCH v16 3/4] tools/tests: introduce unit tests for domain ID allocator Message-ID: <20250812223024.2364749-4-dmukhin@ford.com> In-Reply-To: <20250812223024.2364749-1-dmukhin@ford.com> References: <20250812223024.2364749-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: 11ec6321e7ada1efd5d07ffd845679c38bf3708e MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @proton.me) X-ZM-MESSAGEID: 1755037882887116600 Content-Type: text/plain; charset="utf-8" From: Denis Mukhin =20 Introduce some basic infrastructure for doing domain ID allocation unit tes= ts, and add a few tests that ensure correctness of the domain ID allocator. Use and xen/lib/find-next-bit.c in test hardness code. Adjust find-next-bit.c to be compiled with __XEN_TOOLS__. Signed-off-by: Denis Mukhin Reviewed-by: Julien Grall --- Changes since v15: - fixed generating harness dependencies on the fly during the test build - kept Julien's R-b --- tools/include/xen-tools/bitops.h | 10 ++++ tools/tests/Makefile | 1 + tools/tests/domid/.gitignore | 3 ++ tools/tests/domid/Makefile | 84 +++++++++++++++++++++++++++++ tools/tests/domid/harness.h | 54 +++++++++++++++++++ tools/tests/domid/test-domid.c | 93 ++++++++++++++++++++++++++++++++ xen/lib/find-next-bit.c | 5 ++ 7 files changed, 250 insertions(+) create mode 100644 tools/tests/domid/.gitignore create mode 100644 tools/tests/domid/Makefile create mode 100644 tools/tests/domid/harness.h create mode 100644 tools/tests/domid/test-domid.c diff --git a/tools/include/xen-tools/bitops.h b/tools/include/xen-tools/bit= ops.h index 681482f6759f..3b98fba6d74c 100644 --- a/tools/include/xen-tools/bitops.h +++ b/tools/include/xen-tools/bitops.h @@ -12,6 +12,16 @@ #define BITS_PER_LONG 32 #endif =20 +#define ffsl(x) __builtin_ffsl(x) + +#define BIT_WORD(nr) ((nr) / BITS_PER_LONG) + +#define BITS_TO_LONGS(bits) \ + (((bits) + BITS_PER_LONG - 1) / BITS_PER_LONG) + +#define DECLARE_BITMAP(name, bits) \ + unsigned long name[BITS_TO_LONGS(bits)] + #define BITMAP_ENTRY(_nr,_bmap) ((_bmap))[(_nr) / 8] #define BITMAP_SHIFT(_nr) ((_nr) % 8) =20 diff --git a/tools/tests/Makefile b/tools/tests/Makefile index 97ba2a13894d..ac5737364623 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -2,6 +2,7 @@ XEN_ROOT =3D $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk =20 SUBDIRS-y :=3D +SUBDIRS-y +=3D domid SUBDIRS-y +=3D resource SUBDIRS-$(CONFIG_X86) +=3D cpu-policy SUBDIRS-$(CONFIG_X86) +=3D tsx diff --git a/tools/tests/domid/.gitignore b/tools/tests/domid/.gitignore new file mode 100644 index 000000000000..0e02715159c2 --- /dev/null +++ b/tools/tests/domid/.gitignore @@ -0,0 +1,3 @@ +*.o +generated +test-domid diff --git a/tools/tests/domid/Makefile b/tools/tests/domid/Makefile new file mode 100644 index 000000000000..0a124a8bfc76 --- /dev/null +++ b/tools/tests/domid/Makefile @@ -0,0 +1,84 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Unit tests for domain ID allocator. +# +# Copyright 2025 Ford Motor Company + +XEN_ROOT=3D$(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +TESTS :=3D test-domid + +strip-list =3D $(sort $(strip $(foreach x,$(1),$(strip $(x))))) + +define list-c-headers +$(shell sed -n -r \ + 's/^[ \t]*# *include[ \t]*[<"]([^">]+)[">].*/\1/p' $(1) 2>/dev/null) +endef + +define emit-harness-nested-rule +$(1): $(CURDIR)/harness.h + mkdir -p $$(dir $$@) + ln -sf $$^ $$@ +endef + +define emit-harness-rules +ifneq ($(strip $(3)),) +$(foreach h,$(3),$(call emit-harness-nested-rule,$(CURDIR)/generated/$(h))) +vpath $(1) $(2) +$(1:.c=3D.o): $(addprefix $(CURDIR)/generated/,$(3)) +endif +endef + +define vpath-with-harness-deps +$(call emit-harness-rules,$(1),$(2),\ + $(call strip-list,$(call list-c-headers,$(2)$(1)))) +endef + +.PHONY: all +all: $(TESTS) + +.PHONY: run +run: $(TESTS) + $(foreach t,$(TESTS),./$(t);) + +.PHONY: clean +clean: + $(RM) -rf $(CURDIR)/generated + $(RM) -- *.o $(TESTS) $(DEPS_RM) + +.PHONY: distclean +distclean: clean + $(RM) -- *~ + +.PHONY: install +install: all + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)/tests + $(INSTALL_PROG) test-domid $(DESTDIR)$(LIBEXEC)/tests + +.PHONY: uninstall +uninstall: + $(RM) -- $(DESTDIR)$(LIBEXEC)/tests/test-domid + +CFLAGS +=3D -D__XEN_TOOLS__ +# find-next-bit.c +CFLAGS +=3D '-DEXPORT_SYMBOL(x)=3D' \ + -Dfind_first_bit \ + -Dfind_first_zero_bit \ + -Dfind_next_bit \ + -Dfind_next_bit_le \ + -Dfind_next_zero_bit_le +CFLAGS +=3D $(APPEND_CFLAGS) +CFLAGS +=3D $(CFLAGS_xeninclude) +CFLAGS +=3D -I./generated/ + +LDFLAGS +=3D $(APPEND_LDFLAGS) + +vpath find-next-bit.c $(XEN_ROOT)/xen/lib/ +# Ubuntu {16,18}.04 need single eval at the call site. +$(eval $(call vpath-with-harness-deps,domid.c,$(XEN_ROOT)/xen/common/)) + +test-domid: domid.o find-next-bit.o test-domid.o + $(CC) $^ -o $@ $(LDFLAGS) + +-include $(DEPS_INCLUDE) diff --git a/tools/tests/domid/harness.h b/tools/tests/domid/harness.h new file mode 100644 index 000000000000..17eb22a9a854 --- /dev/null +++ b/tools/tests/domid/harness.h @@ -0,0 +1,54 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Unit test harness for domain ID allocator. + * + * Copyright 2025 Ford Motor Company + */ + +#ifndef _TEST_HARNESS_ +#define _TEST_HARNESS_ + +#include +#include +#include +#include + +#include +#include + +typedef bool spinlock_t; +typedef uint16_t domid_t; + +extern domid_t domid_alloc(domid_t domid); +extern void domid_free(domid_t domid); + +extern unsigned long find_next_zero_bit(const unsigned long *addr, + unsigned long size, + unsigned long offset); + +#define __test_and_set_bit(nr, addr) test_and_set_bit(nr, addr) +#define __test_and_clear_bit(nr, addr) test_and_clear_bit(nr, addr) +#define __set_bit(nr, addr) set_bit(nr, addr) + +#define BUG_ON(x) assert(!(x)) +#define ASSERT(x) assert(x) + +#define DEFINE_SPINLOCK(l) spinlock_t l +#define spin_lock(l) (assert(!*(l)), *(l) =3D true) +#define spin_unlock(l) (assert(*(l)), *(l) =3D false) + +#define printk printf + +#define DOMID_FIRST_RESERVED (100) +#define DOMID_INVALID (101) + +#endif /* _TEST_HARNESS_ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/tests/domid/test-domid.c b/tools/tests/domid/test-domid.c new file mode 100644 index 000000000000..51a88a6a9550 --- /dev/null +++ b/tools/tests/domid/test-domid.c @@ -0,0 +1,93 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Unit tests for domain ID allocator. + * + * Copyright 2025 Ford Motor Company + */ + +#include "harness.h" + +#define verify(exp, fmt, args...) do { \ + if ( !(exp) ) \ + printf(fmt, ## args); \ + assert(exp); \ +} while (0); + +/* + * Fail on the first error, since tests are dependent on each other. + */ +int main(int argc, char **argv) +{ + domid_t expected, allocated; + + /* Test ID cannot be allocated twice. */ + for ( expected =3D 0; expected < DOMID_FIRST_RESERVED; expected++ ) + { + allocated =3D domid_alloc(expected); + verify(allocated =3D=3D expected, + "TEST 1: expected %u allocated %u\n", expected, allocated); + } + for ( expected =3D 0; expected < DOMID_FIRST_RESERVED; expected++ ) + { + allocated =3D domid_alloc(expected); + verify(allocated =3D=3D DOMID_INVALID, + "TEST 2: expected %u allocated %u\n", DOMID_INVALID, alloca= ted); + } + + /* Ensure all IDs, including ID#0 are not allocated. */ + for ( expected =3D 0; expected < DOMID_FIRST_RESERVED; expected++ ) + domid_free(expected); + + /* + * Test that that two consecutive calls of domid_alloc(DOMID_INVALID) + * will never return the same ID. + * NB: ID#0 is reserved and shall not be allocated by + * domid_alloc(DOMID_INVALID). + */ + for ( expected =3D 1; expected < DOMID_FIRST_RESERVED; expected++ ) + { + allocated =3D domid_alloc(DOMID_INVALID); + verify(allocated =3D=3D expected, + "TEST 3: expected %u allocated %u\n", expected, allocated); + } + for ( expected =3D 1; expected < DOMID_FIRST_RESERVED; expected++ ) + { + allocated =3D domid_alloc(DOMID_INVALID); + verify(allocated =3D=3D DOMID_INVALID, + "TEST 4: expected %u allocated %u\n", DOMID_INVALID, alloca= ted); + } + + /* Re-allocate first ID from [1..DOMID_FIRST_RESERVED/2]. */ + for ( expected =3D 1; expected < DOMID_FIRST_RESERVED / 2; expected++ ) + domid_free(expected); + for ( expected =3D 1; expected < DOMID_FIRST_RESERVED / 2; expected++ ) + { + allocated =3D domid_alloc(DOMID_INVALID); + verify(allocated =3D=3D expected, + "TEST 5: expected %u allocated %u\n", expected, allocated); + } + + /* Re-allocate last ID from [1..DOMID_FIRST_RESERVED - 1]. */ + expected =3D DOMID_FIRST_RESERVED - 1; + domid_free(DOMID_FIRST_RESERVED - 1); + allocated =3D domid_alloc(DOMID_INVALID); + verify(allocated =3D=3D expected, + "TEST 6: expected %u allocated %u\n", expected, allocated); + + /* Allocate an invalid ID. */ + expected =3D DOMID_INVALID; + allocated =3D domid_alloc(DOMID_FIRST_RESERVED); + verify(allocated =3D=3D expected, + "TEST 7: expected %u allocated %u\n", expected, allocated); + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/lib/find-next-bit.c b/xen/lib/find-next-bit.c index 9b8d7814f20c..539c7f2022b0 100644 --- a/xen/lib/find-next-bit.c +++ b/xen/lib/find-next-bit.c @@ -8,8 +8,13 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ + +#ifdef __XEN_TOOLS__ +#include +#else #include #include +#endif =20 #define __ffs(x) (ffsl(x) - 1) #define ffz(x) __ffs(~(x)) --=20 2.34.1 From nobody Thu Oct 30 22:53:01 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=1755037882; cv=none; d=zohomail.com; s=zohoarc; b=Lfwr7WrXFgN4k2z57M+oXO7tV0/V06yQF4IU24rQWLMYjRGr7y6sfVHuBbdJHSor/Cg4GX8OZ1+ikSiXl1YZgMk3KLNccRgPC3k9+Go+6/AFB+dtdOXE50nyqc/02kvucgY5FOvlfFOgjznzHUeGbmRsNM259pjbE/lwxQ9g3X0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755037882; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rdQXCVFze6KOyWq6nsTsOEIIqpuCBpCeg3Vc7jqqwuk=; b=SonSQgePMDGoAXShWcGEU3dk6pFnzgfBf5XKrnIjyYTf3qyF3s8EPmGl1CTr8U2emrSq6d7WVuMucRDgvmGtAyQMcBigrMHr1Z7/NwyJ/420reILD7wh9/fxosrAaPTt7tT211jVO7y7DzKxAsChXq1nAkVySmINEvEQYNtV/Bo= 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 1755037882157952.7849268733122; Tue, 12 Aug 2025 15:31:22 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1079228.1440238 (Exim 4.92) (envelope-from ) id 1ulxWJ-00054i-9y; Tue, 12 Aug 2025 22:31:03 +0000 Received: by outflank-mailman (output) from mailman id 1079228.1440238; Tue, 12 Aug 2025 22:31:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ulxWJ-00054T-5p; Tue, 12 Aug 2025 22:31:03 +0000 Received: by outflank-mailman (input) for mailman id 1079228; Tue, 12 Aug 2025 22:31:02 +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 1ulxWI-00040E-CQ for xen-devel@lists.xenproject.org; Tue, 12 Aug 2025 22:31:02 +0000 Received: from mail-4322.protonmail.ch (mail-4322.protonmail.ch [185.70.43.22]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 0603fb4d-77cc-11f0-b898-0df219b8e170; Wed, 13 Aug 2025 00:31:00 +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: 0603fb4d-77cc-11f0-b898-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=k7oph3bys5gy3njxrbdir6chzq.protonmail; t=1755037860; x=1755297060; bh=rdQXCVFze6KOyWq6nsTsOEIIqpuCBpCeg3Vc7jqqwuk=; 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; b=n4UmsL8nvb2m1Qlx7l9qbLyiqN3PiWpF+WLGYF8mRpW0wDpcEG67yUhcAO/SJ9KjQ vBVBE9fsxhEvPbed8s+6qYjCGVM49q93bXoncN0Ki7q6vwO0eAjWwvv5aSliASuGNf uaD9na1XDReGJ3go/NE61LgmMeNWHWgcfhFcFDa3/AgltYXpPWRgKcOpCn7PsNZysR qqQihcOtCf1D98OhlV7aNOQL0FwpAUsqx+kA76eP6XTjjua6ytSvSE14yAdOO2DzKp 03yN43VdG/15KusPNCNK5DsSJFpQIYiHspAsi/UDJ0POqkAVps/nnJawdyWGtfdsUt FL+ii1AgiSuoA== Date: Tue, 12 Aug 2025 22:30:55 +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, Alejandro Vallejo , Julien Grall Subject: [PATCH v16 4/4] xen/domain: update create_dom0() messages Message-ID: <20250812223024.2364749-5-dmukhin@ford.com> In-Reply-To: <20250812223024.2364749-1-dmukhin@ford.com> References: <20250812223024.2364749-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: 988fb461b15465d53a24828d95a121f315ef5de8 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @proton.me) X-ZM-MESSAGEID: 1755037883614124100 Content-Type: text/plain; charset="utf-8" From: Denis Mukhin =20 Use %pd for domain identification in error/panic messages in create_dom0(). No functional change. Signed-off-by: Denis Mukhin Reviewed-by: Alejandro Vallejo Acked-by: Jan Beulich Reviewed-by: Julien Grall --- Changes since v15: - n/a --- xen/arch/arm/domain_build.c | 6 +++--- xen/arch/x86/setup.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index aca35b8961d6..670f634b8b0d 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2084,14 +2084,14 @@ void __init create_dom0(void) panic("Error creating domain 0 (rc =3D %ld)\n", PTR_ERR(dom0)); =20 if ( llc_coloring_enabled && (rc =3D dom0_set_llc_colors(dom0)) ) - panic("Error initializing LLC coloring for domain 0 (rc =3D %d)\n"= , rc); + panic("Error initializing LLC coloring for %pd (rc =3D %d)\n", dom= 0, rc); =20 if ( vcpu_create(dom0, 0) =3D=3D NULL ) - panic("Error creating domain 0 vcpu0\n"); + panic("Error creating %pdv0\n", dom0); =20 rc =3D construct_dom0(dom0); if ( rc ) - panic("Could not set up DOM0 guest OS (rc =3D %d)\n", rc); + panic("Could not set up %pd guest OS (rc =3D %d)\n", dom0, rc); =20 set_xs_domain(dom0); } diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 398da734c0c5..bf21c55f7193 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1084,7 +1084,7 @@ static struct domain *__init create_dom0(struct boot_= info *bi) =20 if ( (strlen(acpi_param) =3D=3D 0) && acpi_disabled ) { - printk("ACPI is disabled, notifying Domain 0 (acpi=3Doff)\n"); + printk("ACPI is disabled, notifying %pd (acpi=3Doff)\n", d); safe_strcpy(acpi_param, "off"); } =20 @@ -1099,7 +1099,7 @@ static struct domain *__init create_dom0(struct boot_= info *bi) =20 bd->d =3D d; if ( construct_dom0(bd) !=3D 0 ) - panic("Could not construct domain 0\n"); + panic("Could not construct %pd\n", d); =20 bd->cmdline =3D NULL; xfree(cmdline); --=20 2.34.1