From nobody Fri Oct 31 16:08:39 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 1746367016106793.0564363117721; Sun, 4 May 2025 06:56:56 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.975570.1362966 (Exim 4.92) (envelope-from ) id 1uBZpZ-0003yS-G1; Sun, 04 May 2025 13:56:33 +0000 Received: by outflank-mailman (output) from mailman id 975570.1362966; Sun, 04 May 2025 13:56:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uBZpZ-0003yL-DE; Sun, 04 May 2025 13:56:33 +0000 Received: by outflank-mailman (input) for mailman id 975570; Sun, 04 May 2025 13:56:32 +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 1uBZpY-0003xj-2t for xen-devel@lists.xenproject.org; Sun, 04 May 2025 13:56:32 +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 9202901f-28ef-11f0-9ffb-bf95429c2676; Sun, 04 May 2025 15:56:26 +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: 9202901f-28ef-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1746366985; x=1746626185; bh=w9ckJQdRAD0zaNmswpycxiVeLzH9Wm6su/mpnwt3nQM=; 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=FQ6DYigNCfwk0GyR4HPq6T2emrS2bAs4EQrLm+6MO127eCrMdA2yfMOm1E1b21Dxg BNv/nzT201qmA2jl1f3obgsoIKIOW+7L9jd3W9apm6MODkqLDY0Tp8kkfpvP0OMp65 C1JpFcbcpYFCZkPESv4G9faKV2WDq89jjCKaJyF0iGu/YvYnCKJ2vpBvGDNc9FPeGY Rn0mMP/9zJkArUWe/tJGSPdEy7UNJwjoBSSmx5ajjW7KvGNv8mpo/toLMz8dEm9amH 87OGWmF8jKTwlHS5mLGL/1txbHfFxIULKmbrvQWo62EZLM7pM5t9SF6+xw6ia5hv7t ufbrspoa7Z53Q== Date: Sun, 04 May 2025 13:56:19 +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 v5 1/2] xen/domain: unify domain ID allocation Message-ID: <20250504135544.730906-2-dmukhin@ford.com> In-Reply-To: <20250504135544.730906-1-dmukhin@ford.com> References: <20250504135544.730906-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: d1ee73ced11497387aa6f688008deb6d0012f1ac MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1746367017268019000 Content-Type: text/plain; charset="utf-8" From: Denis Mukhin Currently, hypervisor code has two different non-system domain ID allocation implementations: (a) Sequential IDs allocation in dom0less Arm code based on max_init_domi= d; (b) Sequential IDs allocation in XEN_DOMCTL_createdomain; does not use max_init_domid (both Arm and x86). It makes sense to have a common helper code for such task across architectu= res (Arm and x86) and between dom0less / toolstack domU allocation. Wrap the domain ID allocation as an arch-independent function domid_alloc()= in common/domain.c based on rangeset. Allocation algorithm: - If an explicit domain ID is provided, verify its availability and use it if ID is not used; - Otherwise, perform an exhaustive search starting from the end of the used domain ID range. domid_alloc() guarantees that two subsequent calls will result in different IDs allocation. Initialize the domain IDs rangeset from the new domid_init() which is called from arch setup code. Also, remove is_free_domid() helper as it is not needed now. No functional change intended. Signed-off-by: Denis Mukhin --- Changes since v4: - reworked to rangeset - dropped hardware_domid change --- xen/arch/arm/dom0less-build.c | 10 +++-- xen/arch/arm/domain_build.c | 17 ++++++--- xen/arch/arm/setup.c | 2 + xen/arch/x86/setup.c | 13 +++++-- xen/common/domain.c | 70 +++++++++++++++++++++++++++++++++++ xen/common/domctl.c | 41 ++------------------ xen/include/xen/domain.h | 4 ++ 7 files changed, 107 insertions(+), 50 deletions(-) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index a356fc94fc..9eb64ec60d 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -1038,15 +1038,13 @@ void __init create_domUs(void) }; unsigned int flags =3D 0U; bool has_dtb =3D false; + domid_t domid; uint32_t val; int rc; =20 if ( !dt_device_is_compatible(node, "xen,domain") ) continue; =20 - if ( (max_init_domid + 1) >=3D DOMID_FIRST_RESERVED ) - panic("No more domain IDs available\n"); - if ( dt_property_read_u32(node, "capabilities", &val) ) { if ( val & ~DOMAIN_CAPS_MASK ) @@ -1223,7 +1221,11 @@ void __init create_domUs(void) * 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) */ - d =3D domain_create(++max_init_domid, &d_cfg, flags); + domid =3D domid_alloc(++max_init_domid); + if ( domid =3D=3D DOMID_INVALID ) + panic("Error allocating ID for domain %s\n", dt_node_name(node= )); + + d =3D domain_create(domid, &d_cfg, flags); if ( IS_ERR(d) ) panic("Error creating domain %s (rc =3D %ld)\n", dt_node_name(node), PTR_ERR(d)); diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 270a6b97e4..29e22a8809 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2371,6 +2371,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 */ @@ -2395,19 +2396,25 @@ 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)); + panic("Error creating domain %d (rc =3D %ld)\n", domid, PTR_ERR(do= m0)); =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 domain %pd (rc =3D %d)\= n", + dom0, rc); =20 if ( alloc_dom0_vcpu0(dom0) =3D=3D NULL ) - panic("Error creating domain 0 vcpu0\n"); + panic("Error creating domain %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 guest OS for domain %pd (rc =3D %d)\n", + dom0, rc); =20 set_xs_domain(dom0); } diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 10b46d0684..c3959e8d8e 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -418,6 +418,8 @@ void asmlinkage __init start_xen(unsigned long fdt_padd= r) =20 timer_init(); =20 + domid_init(); + init_idle_domain(); =20 rcu_init(); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 2518954124..02f665f520 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1030,8 +1030,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) ) @@ -1063,7 +1066,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 domain %pd (acpi=3Doff)\n"= , d); safe_strcpy(acpi_param, "off"); } =20 @@ -1078,7 +1081,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 domain %pd\n", d); =20 bd->cmdline =3D NULL; xfree(cmdline); @@ -1915,6 +1918,8 @@ void asmlinkage __init noreturn __start_xen(void) mmio_ro_ranges =3D rangeset_new(NULL, "r/o mmio ranges", RANGESETF_prettyprint_hex); =20 + domid_init(); + xsm_multiboot_init(bi); =20 /* diff --git a/xen/common/domain.c b/xen/common/domain.c index abf1969e60..0ba3cdc47d 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -66,6 +66,74 @@ DEFINE_RCU_READ_LOCK(domlist_read_lock); static struct domain *domain_hash[DOMAIN_HASH_SIZE]; struct domain *domain_list; =20 +/* Non-system domain ID allocator. */ +static DEFINE_SPINLOCK(domid_lock); +static struct rangeset *domid_rangeset; +static unsigned int domid_last; + +void __init domid_init(void) +{ + domid_rangeset =3D rangeset_new(NULL, "domid", RANGESETF_prettyprint_h= ex); + if ( !domid_rangeset ) + panic("cannot allocate domain ID rangeset\n"); + + rangeset_limit(domid_rangeset, DOMID_FIRST_RESERVED); +} + +/* + * Allocate new non-system domain ID based on the hint. + * + * If hint is outside of valid [0..DOMID_FIRST_RESERVED - 1] range of IDs, + * perform an exhaustive search starting from the end of the used domain ID + * range. + */ +domid_t domid_alloc(domid_t domid) +{ + spin_lock(&domid_lock); + + if ( domid < DOMID_FIRST_RESERVED ) + { + if ( rangeset_contains_singleton(domid_rangeset, domid) ) + domid =3D DOMID_INVALID; + } + else + { + for ( domid =3D domid_last + 1; domid !=3D domid_last; domid++ ) + { + if ( domid =3D=3D DOMID_FIRST_RESERVED ) + domid =3D 0; + + if ( !rangeset_contains_singleton(domid_rangeset, domid) ) + break; + } + + if ( domid =3D=3D domid_last ) + domid =3D DOMID_INVALID; + } + + if ( domid !=3D DOMID_INVALID ) + { + ASSERT(!rangeset_add_singleton(domid_rangeset, domid)); + + if ( domid !=3D domid_last ) + domid_last =3D domid; + } + + spin_unlock(&domid_lock); + + return domid; +} + +void domid_free(domid_t domid) +{ + spin_lock(&domid_lock); + + if ( rangeset_contains_singleton(domid_rangeset, domid) ) + ASSERT(!rangeset_remove_singleton(domid_rangeset, domid)); + + spin_unlock(&domid_lock); +} + /* * Insert a domain into the domlist/hash. This allows the domain to be lo= oked * up by domid, and therefore to be the subject of hypercalls/etc. @@ -1449,6 +1517,8 @@ void domain_destroy(struct domain *d) =20 TRACE_TIME(TRC_DOM0_DOM_REM, d->domain_id); =20 + domid_free(d->domain_id); + /* Remove from the domlist/hash. */ domlist_remove(d); =20 diff --git a/xen/common/domctl.c b/xen/common/domctl.c index bfe2e1f9f0..2e02139660 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -49,20 +49,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; @@ -421,34 +407,15 @@ 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) ) { ret =3D PTR_ERR(d); diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index e10baf2615..3bc960e6a4 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -38,6 +38,10 @@ void arch_get_domain_info(const struct domain *d, =20 domid_t get_initial_domain_id(void); =20 +void domid_init(void); +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 Fri Oct 31 16:08:39 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 1746367022202543.910075534535; Sun, 4 May 2025 06:57:02 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.975571.1362971 (Exim 4.92) (envelope-from ) id 1uBZpZ-00041c-Px; Sun, 04 May 2025 13:56:33 +0000 Received: by outflank-mailman (output) from mailman id 975571.1362971; Sun, 04 May 2025 13:56:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uBZpZ-0003zw-Jv; Sun, 04 May 2025 13:56:33 +0000 Received: by outflank-mailman (input) for mailman id 975571; Sun, 04 May 2025 13:56:32 +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 1uBZpY-0003xj-Di for xen-devel@lists.xenproject.org; Sun, 04 May 2025 13:56:32 +0000 Received: from mail-24418.protonmail.ch (mail-24418.protonmail.ch [109.224.244.18]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9344f675-28ef-11f0-9ffb-bf95429c2676; Sun, 04 May 2025 15:56:28 +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: 9344f675-28ef-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1746366987; x=1746626187; bh=Q/Risu0ysxwT1e/+FvDwhLYw5obC4RYhC7xzQWwOX9Q=; 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=B7RzvoAzvLhpaa1x6JXJjl7EtPXi5F13JbXCSwEgcY+t29GZginOc3MvHHEmBuMUo WrNMNtz/WRY3Z9aYzcU0E8JxDLhXeVA8zFN9OraoUgHM5n10DaSfbK5KZm5kjilueR A99SxsRFIKQbY+MjJvYb++kaMgSovScuQYsJMp1adjI30qtYBla7iiEMKsSbmR6S+b kvS6+lXkDFere4FcDURm0NQ1Pjhx1PDlC+3TwOUtCd6YXY/+82/u3yHvFbTLSmdPjo aPYRdwTo1MkfcQckyR0D1gfjVOJUSOlBRcbGm1IHfq/W7Z4lFCqPhjWO7L2VW5fltD xGkFlDCVJR/nA== Date: Sun, 04 May 2025 13:56:24 +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 v5 2/2] xen/domain: adjust domain ID allocation for Arm Message-ID: <20250504135544.730906-3-dmukhin@ford.com> In-Reply-To: <20250504135544.730906-1-dmukhin@ford.com> References: <20250504135544.730906-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: f9edfeb1b897157e447f19a61e3e5127edbfb73a MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1746367023039116600 Content-Type: text/plain; charset="utf-8" From: Denis Mukhin Remove the hardcoded domain ID 0 allocation for hardware domain and replace= it with a call to get_initial_domain_id() (returns the value of hardware_domid= on Arm). Update domid_alloc(DOMID_INVALID) case to ensure that get_initial_domain_id= () ID is skipped during domain ID allocation to cover domU case. Signed-off-by: Denis Mukhin --- Changes since v4: - new patch --- xen/arch/arm/dom0less-build.c | 9 +++------ xen/arch/arm/domain_build.c | 4 ++-- xen/common/domain.c | 5 ++++- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 9eb64ec60d..61e01b7306 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -1216,14 +1216,11 @@ void __init create_domUs(void) if ( !llc_coloring_enabled && llc_colors_str ) panic("'llc-colors' found, but LLC coloring is disabled\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) - */ - domid =3D domid_alloc(++max_init_domid); + domid =3D domid_alloc(DOMID_INVALID); if ( domid =3D=3D DOMID_INVALID ) panic("Error allocating ID for domain %s\n", dt_node_name(node= )); + if ( max_init_domid < domid ) + max_init_domid =3D domid; =20 d =3D domain_create(domid, &d_cfg, flags); if ( IS_ERR(d) ) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 29e22a8809..c85d72fdf1 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2396,9 +2396,9 @@ void __init create_dom0(void) if ( !llc_coloring_enabled ) flags |=3D CDF_directmap; =20 - domid =3D domid_alloc(0); + domid =3D domid_alloc(get_initial_domain_id()); if ( domid =3D=3D DOMID_INVALID ) - panic("Error allocating domain ID 0\n"); + panic("Error allocating domain ID %d\n", get_initial_domain_id()); =20 dom0 =3D domain_create(domid, &dom0_cfg, flags); if ( IS_ERR(dom0) ) diff --git a/xen/common/domain.c b/xen/common/domain.c index 0ba3cdc47d..055397b5aa 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -85,7 +85,7 @@ void __init domid_init(void) * * If hint is outside of valid [0..DOMID_FIRST_RESERVED - 1] range of IDs, * perform an exhaustive search starting from the end of the used domain ID - * range. + * range, excluding get_initial_domain_id() ID. */ domid_t domid_alloc(domid_t domid) { @@ -103,6 +103,9 @@ domid_t domid_alloc(domid_t domid) if ( domid =3D=3D DOMID_FIRST_RESERVED ) domid =3D 0; =20 + if ( domid =3D=3D get_initial_domain_id() ) + continue; + if ( !rangeset_contains_singleton(domid_rangeset, domid) ) break; } --=20 2.34.1