From nobody Thu Oct 30 18:25:55 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=1753846497; cv=none; d=zohomail.com; s=zohoarc; b=dVifC2ElcIKZGFZq+f87pSJoC7GZ1q3eFgw1tyjFhlplb7xZxHhKOOjgEjzlpvYfZ1EdXetEZ/8IxlbVkCTlKqXb1xbV81vjtqxcnuTNuR5ZctDqBrNp1nJ7n8dxJi6wCaTfMQeCcGLKklxwJHX9qb0omaSx6aX8zjNsGytBGUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753846497; 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=CGfMnAvp3YIMjBjYnrpwR+gpZYz86SYj90rBP9szovA=; b=QuPdHVkXg/SC+7X1PWauMpMPM3P9RezXakkI2qGvP6lJeXbN9LXHUwEpUpiOPvZmfmcKexW9oz4uLnwStZ56ES8178+SO1S/d6Ru0Huz/bF6yNnX3txldLpCni0tCPzk9NBYyaR4HFzqJJ/M1BJiVZQR9WkbzA9DbRGpxA6fkZs= 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 1753846497922230.53509292888498; Tue, 29 Jul 2025 20:34:57 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1063331.1429083 (Exim 4.92) (envelope-from ) id 1ugxaS-0003TL-E7; Wed, 30 Jul 2025 03:34:40 +0000 Received: by outflank-mailman (output) from mailman id 1063331.1429083; Wed, 30 Jul 2025 03:34:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ugxaS-0003TE-AX; Wed, 30 Jul 2025 03:34:40 +0000 Received: by outflank-mailman (input) for mailman id 1063331; Wed, 30 Jul 2025 03:34:39 +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 1ugxaR-0003DL-9E for xen-devel@lists.xenproject.org; Wed, 30 Jul 2025 03:34:39 +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 1bd7cea9-6cf6-11f0-a320-13f23c93f187; Wed, 30 Jul 2025 05:34: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: 1bd7cea9-6cf6-11f0-a320-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1753846472; x=1754105672; bh=CGfMnAvp3YIMjBjYnrpwR+gpZYz86SYj90rBP9szovA=; 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=j42VtN8oLh/T9l3ZCdRjSbhTofLNt+Utr5KLa8MtsGq11ktHzXgeSFl3hCqi+ADXx 2oAlnhuEqTwC/GrBYQxaOQIERrYAwDjem7YDBS2AD+0XSHum3VwS/i5JE+tx8yJutZ XftcSGJCCkSFQDmnZRsAbcv3U/Ny1skdmqZb+RYWiswK0S+af159sxmanwRhm8+gti /ee8aCmNSCmlMT/irRbZTNDAZ68ePa5DYvMnuPFdtuv7JjuQZySaOLJPNO1rhp+UHT sqR8T48kouQyZsID0xUeduDVgsx5PqIeJPkJ9mYsIWPJoJXYhrvn01X3VHwHHlTnDJ cgFqzGiX9Zr6A== Date: Wed, 30 Jul 2025 03:34:28 +0000 To: xen-devel@lists.xenproject.org From: dmkhn@proton.me Cc: alejandro.garciavallejo@amd.com, 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 v12 1/3] xen/domain: unify domain ID allocation Message-ID: <20250730033414.1614441-2-dmukhin@ford.com> In-Reply-To: <20250730033414.1614441-1-dmukhin@ford.com> References: <20250730033414.1614441-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: 87b555a3cf4785a86557a2fafa0f201e2f8dd90a MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @proton.me) X-ZM-MESSAGEID: 1753846498547116600 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. IDs are not wrapped around in dom0less ca= se. 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 --- Changes since v11: - fixed commentaries - dropped cf_check for new calls - dropped ifdef-ry from domid_alloc(), max_init_domid check in create_domUs= () preserved - added ASSERT() to domid_free() --- 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 | 42 ++--------- xen/common/domid.c | 94 +++++++++++++++++++++++++ xen/include/xen/domain.h | 3 + 8 files changed, 124 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 463ae4474d30..789f2b9d3ce7 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..2ff7c28c277b 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 %d\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..12fbab01cd8e 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1473,6 +1473,8 @@ void domain_destroy(struct domain *d) /* Remove from the domlist/hash. */ domlist_remove(d); =20 + domid_free(d->domain_id); + /* Schedule RCU asynchronous completion of domain destroy. */ call_rcu(&d->rcu, complete_domain_destroy); } diff --git a/xen/common/domctl.c b/xen/common/domctl.c index f2a7caaf853c..5509998aa139 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,18 @@ 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; + domid_t domid =3D domid_alloc(op->domain); =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..155fef4236ad --- /dev/null +++ b/xen/common/domid.c @@ -0,0 +1,94 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Domain ID allocator. + * + * Covers dom0 or late hwdom, predefined domains, post-boot domains. + * Excludes Xen 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. IDs are not wrapped around in dom0less + * case. 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. + * @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 =3D find_next_zero_bit(domid_bitmap, + DOMID_FIRST_RESERVED, + domid_last + 1); + if ( domid =3D=3D DOMID_FIRST_RESERVED ) + domid =3D find_next_zero_bit(domid_bitmap, + DOMID_FIRST_RESERVED, + 1); + + ASSERT(domid <=3D DOMID_FIRST_RESERVED); + if ( domid < DOMID_FIRST_RESERVED ) + { + __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 18:25:55 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=1753846498; cv=none; d=zohomail.com; s=zohoarc; b=QWSrsottiq+RTbWvweyqRLdex16VEYFF+U3THdECJAFyarP2npcV8BF/y3Uw0eWvxVKTxhypAcD3Ua2r7QZoWmCpgqfk+i4K7v6rFd0mgqMBOcvXgx/7lNen+M/wunDfcU177+2YP2/2mzPKYtAbhIhSr3zvvbv7Mm8/MK8HRLc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753846498; 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=eFcCdi4VQJ6uLDXcUDx0W8BYekwPXxolpGbj+YcNLMI=; b=dU1ARIobDy+VSWZZy8OHJROAjoe4D8YvvB8gcMeKutDpeNtWaASEapQTYirHXqlLurQiwKsZmmO2zXC7GzsThGBMu4VRg5BDRTFaSxrIkwjho3N3qYaK7u5ema54dT31jX2Gi+1IIY9ksz7G2ku/0dClG9g+vhcSmv2SFr53vOg= 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 1753846498111929.1733206364669; Tue, 29 Jul 2025 20:34:58 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1063332.1429093 (Exim 4.92) (envelope-from ) id 1ugxaU-0003iw-Ri; Wed, 30 Jul 2025 03:34:42 +0000 Received: by outflank-mailman (output) from mailman id 1063332.1429093; Wed, 30 Jul 2025 03:34: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 1ugxaU-0003ip-Os; Wed, 30 Jul 2025 03:34:42 +0000 Received: by outflank-mailman (input) for mailman id 1063332; Wed, 30 Jul 2025 03:34: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 1ugxaU-0003i8-5D for xen-devel@lists.xenproject.org; Wed, 30 Jul 2025 03:34:42 +0000 Received: from mail-10631.protonmail.ch (mail-10631.protonmail.ch [79.135.106.31]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1fbc657d-6cf6-11f0-b895-0df219b8e170; Wed, 30 Jul 2025 05:34:40 +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: 1fbc657d-6cf6-11f0-b895-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1753846478; x=1754105678; bh=eFcCdi4VQJ6uLDXcUDx0W8BYekwPXxolpGbj+YcNLMI=; 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=a2qn7Uif/5hi0z/hQeNg7ipJX3D3WIeH/F+muujDA7a9poIDQOBbHyQ4uTCOYMIW+ D81ea1wcQOUlz1TBdxA4+y5VvwDWnd+RFGIVQ+nOxB7txSDEKOKJz/iAf6/3htbsmI SOk2jfaAayppN76iRoQfeZwqNj53lYrxLvNu33K+GtNWkDwAppr7CEUoVrODu7w+pw B3XUciS+VxXZDQwY2Fp+5luRyAs/1Rnfl45s9gWLipqB3jd1ObKsxyanyQL96Tet8t 2EI8IFKHdw/Aw2yZ0KRMOwjcPkRCuJevM/NpCLHK2VEifDJcCkMhsXyOeMYD4Xa9rt L0svRVBBbeUlQ== Date: Wed, 30 Jul 2025 03:34:33 +0000 To: xen-devel@lists.xenproject.org From: dmkhn@proton.me Cc: alejandro.garciavallejo@amd.com, 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 v12 2/3] tools/tests: introduce unit tests for domain ID allocator Message-ID: <20250730033414.1614441-3-dmukhin@ford.com> In-Reply-To: <20250730033414.1614441-1-dmukhin@ford.com> References: <20250730033414.1614441-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: e80cab9eabea58675da2878e51b52734838cc843 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @proton.me) X-ZM-MESSAGEID: 1753846502622116600 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. Signed-off-by: Denis Mukhin --- Changes since v11: - simplified test, dropped dom0less variant --- tools/tests/Makefile | 2 +- tools/tests/domid/.gitignore | 2 + tools/tests/domid/Makefile | 51 ++++++++++ tools/tests/domid/include/xen/domain.h | 135 +++++++++++++++++++++++++ tools/tests/domid/test-domid.c | 78 ++++++++++++++ 5 files changed, 267 insertions(+), 1 deletion(-) create mode 100644 tools/tests/domid/.gitignore create mode 100644 tools/tests/domid/Makefile create mode 100644 tools/tests/domid/include/xen/domain.h create mode 100644 tools/tests/domid/test-domid.c diff --git a/tools/tests/Makefile b/tools/tests/Makefile index 36928676a666..ff1666425436 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -1,7 +1,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..91ac43232518 --- /dev/null +++ b/tools/tests/domid/.gitignore @@ -0,0 +1,2 @@ +*.o +test-domid-* diff --git a/tools/tests/domid/Makefile b/tools/tests/domid/Makefile new file mode 100644 index 000000000000..9a817bb70c36 --- /dev/null +++ b/tools/tests/domid/Makefile @@ -0,0 +1,51 @@ +# 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 + +vpath domid.c $(XEN_ROOT)/xen/common/ + +.PHONY: all +all: $(TESTS) + +.PHONY: run +run: $(TESTS) + $(foreach t,$(TESTS),./$(t);) + +.PHONY: clean +clean: + $(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__ +CFLAGS +=3D $(APPEND_CFLAGS) +CFLAGS +=3D $(CFLAGS_xeninclude) +CFLAGS +=3D -I./include/ + +LDFLAGS +=3D $(APPEND_LDFLAGS) + +%.o: %.c + $(CC) $(CFLAGS) -c $^ -o $@ $(LDFLAGS) + +test-domid: domid.o test-domid.o + $(CC) $^ -o $@ $(LDFLAGS) + +-include $(DEPS_INCLUDE) diff --git a/tools/tests/domid/include/xen/domain.h b/tools/tests/domid/inc= lude/xen/domain.h new file mode 100644 index 000000000000..396c3bab9d26 --- /dev/null +++ b/tools/tests/domid/include/xen/domain.h @@ -0,0 +1,135 @@ +/* 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 +#include +#include + +#include + +#define BUG_ON(x) assert(!(x)) +#define ASSERT(x) assert(x) + +#define __xen_mk_uint(x) x ## U +#define xen_mk_uint(x) __xen_mk_uint(x) + +#define DOMID_FIRST_RESERVED xen_mk_uint(10) +#define DOMID_INVALID xen_mk_uint(11) + +#define DEFINE_SPINLOCK(x) unsigned long *(x) +#define spin_lock(x) ((*(x))++) +#define spin_unlock(x) ((*(x))--) + +#define BITS_PER_LONG sizeof(unsigned long) +#define BITS_PER_WORD (8U * 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)] + +static inline int __test_and_set_bit(unsigned int nr, unsigned long *addr) +{ + unsigned long mask =3D 1UL << (nr % BITS_PER_WORD); + unsigned long *p =3D addr + (nr / BITS_PER_WORD); + int old =3D (*p & mask) !=3D 0; + + *p |=3D mask; + + return old; +} + +static inline int __test_and_clear_bit(unsigned int nr, unsigned long *add= r) +{ + unsigned long mask =3D 1UL << (nr % BITS_PER_WORD); + unsigned long *p =3D addr + (nr / BITS_PER_WORD); + int old =3D (*p & mask) !=3D 0; + + *p &=3D ~mask; + + return old; +} + +static inline void __set_bit(unsigned int nr, volatile unsigned long *addr) +{ + unsigned long mask =3D 1UL << (nr % BITS_PER_WORD); + unsigned long *p =3D (unsigned long *)addr + (nr / BITS_PER_WORD); + + *p |=3D mask; +} + +static inline void __clear_bit(unsigned int nr, volatile unsigned long *ad= dr) +{ + unsigned long mask =3D 1UL << (nr % BITS_PER_WORD); + unsigned long *p =3D (unsigned long *)addr + (nr / BITS_PER_WORD); + + *p &=3D ~mask; +} + +static inline unsigned long find_next_zero_bit(const unsigned long *addr, + unsigned long size, + unsigned long offset) +{ + unsigned long idx =3D offset / BITS_PER_WORD; + unsigned long bit =3D offset % BITS_PER_WORD; + + if (offset >=3D size) + return size; + + while (offset < size) + { + unsigned long val =3D addr[idx] | (~0UL >> (BITS_PER_WORD - bit)); + + if (~val) + { + unsigned long pos =3D __builtin_ffsl(~val); + + if (pos > 0) + { + unsigned long rc =3D idx * BITS_PER_WORD + (pos - 1); + + if (rc < size) + return rc; + } + } + + offset =3D (idx + 1) * BITS_PER_WORD; + idx++; + bit =3D 0; + } + + return size; +} + +#define printk printf + +#define cf_check + +typedef bool spinlock_t; +typedef uint16_t domid_t; + +/* See include/xen/domain.h */ +extern domid_t domid_alloc(domid_t domid); +extern void domid_free(domid_t domid); + +#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..ed041bb56d89 --- /dev/null +++ b/tools/tests/domid/test-domid.c @@ -0,0 +1,78 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Unit tests for domain ID allocator. + * + * Copyright 2025 Ford Motor Company + */ + +/* Local test include replicating hypervisor includes. */ +#include + +int main(int argc, char **argv) +{ + domid_t expected, allocated; + + printk("%s DOMID_FIRST_RESERVED=3D%u DOMID_INVALID=3D%u\n", + argv[0], DOMID_FIRST_RESERVED, DOMID_INVALID); + + /* Test ID#0 cannot be allocated twice. */ + allocated =3D domid_alloc(0); + printk("TEST 1: expected %u allocated %u\n", 0, allocated); + ASSERT(allocated =3D=3D 0); + allocated =3D domid_alloc(0); + printk("TEST 1: expected %u allocated %u\n", DOMID_INVALID, allocated); + ASSERT(allocated =3D=3D DOMID_INVALID); + + /* Ensure ID is not allocated. */ + domid_free(0); + + /* + * 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 0; expected < DOMID_FIRST_RESERVED - 1; expected++ ) + { + allocated =3D domid_alloc(DOMID_INVALID); + printk("TEST 2: expected %u allocated %u\n", expected + 1, allocat= ed); + ASSERT(allocated =3D=3D expected + 1); + } + for ( expected =3D 0; expected < DOMID_FIRST_RESERVED; expected++ ) + { + allocated =3D domid_alloc(DOMID_INVALID); + printk("TEST 2: expected %u allocated %u\n", DOMID_INVALID, alloca= ted); + ASSERT(allocated =3D=3D DOMID_INVALID); + } + + /* Re-allocate first ID from [1..DOMID_FIRST_RESERVED - 1]. */ + expected =3D 1; + domid_free(1); + allocated =3D domid_alloc(DOMID_INVALID); + printk("TEST 3: expected %u allocated %u\n", expected, allocated); + ASSERT(allocated =3D=3D expected); + + /* 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); + printk("TEST 4: expected %u allocated %u\n", expected, allocated); + ASSERT(allocated =3D=3D expected); + + /* Allocate an invalid ID. */ + expected =3D DOMID_INVALID; + allocated =3D domid_alloc(DOMID_FIRST_RESERVED); + printk("TEST 5: expected %u allocated %u\n", expected, allocated); + ASSERT(allocated =3D=3D expected); + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ --=20 2.34.1 From nobody Thu Oct 30 18:25:55 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=1753846500; cv=none; d=zohomail.com; s=zohoarc; b=V7AAFak8yBBBSc/Xx6PAffGo2sZDAyRGZI0N/eHZ3UTY11oTTxHierKPMZs51P2QKcKlk5plfeJ2CzQAtwhWFNGR5zBAtmB+AEvE6XrsteJfktYbAnV5O/2fqjq1FjyAc4qLDGZGP7fGJcNbNahmo/Ru4lfhuuFlY65z8RGbPPM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753846500; 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=21CGfiduzpziIV4mA/drtwkCome57ET0jYrlmwr6ITs=; b=LvH8ACswd08Z/yENAar3z8S/SycLCCDspp/gKuPF6lNZxBpcn8fBj561eLebveztVYe1TOCtpmNUtXQUERn7s7ipaDiYWPeDLm4Pa6lNjFDf9jj4/OVPuc/DT5LcRIuzgNl27nYvdX2RrAwVDNIKVmueJ0iwQJMBnIL2i81I338= 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 1753846500153968.2075026689638; Tue, 29 Jul 2025 20:35:00 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1063334.1429104 (Exim 4.92) (envelope-from ) id 1ugxaa-00041l-5L; Wed, 30 Jul 2025 03:34:48 +0000 Received: by outflank-mailman (output) from mailman id 1063334.1429104; Wed, 30 Jul 2025 03:34:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ugxaZ-00041Y-Vs; Wed, 30 Jul 2025 03:34:47 +0000 Received: by outflank-mailman (input) for mailman id 1063334; Wed, 30 Jul 2025 03:34:46 +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 1ugxaY-0003i8-RG for xen-devel@lists.xenproject.org; Wed, 30 Jul 2025 03:34:46 +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 22437bfa-6cf6-11f0-b895-0df219b8e170; Wed, 30 Jul 2025 05:34:44 +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: 22437bfa-6cf6-11f0-b895-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=vg5hr7guqrfxlpvl67q6zfy2ja.protonmail; t=1753846483; x=1754105683; bh=21CGfiduzpziIV4mA/drtwkCome57ET0jYrlmwr6ITs=; 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=WiFHUwxEEjBO03ZPJ2c/k+oadeibgcj/mX6HgLmkuVeq/VbCAAvNPmVUVq9aQJLnC +MQnJssIOqoFNcqAHkBnVzkEwYTmLI9qCfgMx0MKUtvS5y9dX4bRypDFSdmfAXq2jk jfOx/2b659F0qXhz1qkjWDDFW+nRGvWQ1+I3Hn8yXtq8KJYc00exXiFlPCdArEddJx iVq9e7U48uRZrcQ0TT2DH5zg+92MG2Bt3mYFdl/23pcwRZenacDtt88HjXhF5N8OTh uPEiqW9nlaOLiFzXNRAUeEkBkis7ErQMZs2swEYVGzy4KbKZVA6m8FfUAdvjHJQTvI pjD8XkyPnh87w== Date: Wed, 30 Jul 2025 03:34:39 +0000 To: xen-devel@lists.xenproject.org From: dmkhn@proton.me Cc: alejandro.garciavallejo@amd.com, 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 v12 3/3] xen/domain: update create_dom0() messages Message-ID: <20250730033414.1614441-4-dmukhin@ford.com> In-Reply-To: <20250730033414.1614441-1-dmukhin@ford.com> References: <20250730033414.1614441-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: ad6cd2a0ffe990e49d884ba362a8d9c3697519c2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @proton.me) X-ZM-MESSAGEID: 1753846502443116600 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 --- Changes since v11: - Dropped use of %pd for non-existing domain in Arm's code - Added Jan's A-b --- 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 789f2b9d3ce7..02a15d160962 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 2ff7c28c277b..a740c6f60c63 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