From nobody Thu Apr 25 00:39:44 2024 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; 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=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1617875339; cv=none; d=zohomail.com; s=zohoarc; b=azv1GpsOUwRsd3XpuxSGEX1YWICgXwoQ1oipyj2h8sr5vlUEK5BW1pM67Jljk+fGKGi8S6h+WPvolpzP6JnRIZslBLRiU6syyeSPWR8xkrVp8QDIMkDJxAJUjoaMfq+9WjIWxWfi/nkMkciof5DqjJhZsg5C0MQa9aHwo/vINEk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617875339; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=xl5Zbs8nKMXWbv9iMl4HLDXmOBtJLdV+BaDDNDVZ4iU=; b=IJ0fUcp7YOerUxDlYF3jwMdTft8gkOQw4uIJeMoTQqqP3o2m6tRlnm+pb2HqBv+hiJL/9PqOtK3SxrKxQcA2sT8m9X1lTLMuMfswgNWl2gwT2e6aHeCYAGxT51TjEfUTAQ/Gj5SAih0MHhFyLR+Y3xoacd2vty0/38TGnVxy4OU= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617875339357277.7710687398978; Thu, 8 Apr 2021 02:48:59 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.107103.204706 (Exim 4.92) (envelope-from ) id 1lURH7-0004Wc-Rp; Thu, 08 Apr 2021 09:48:33 +0000 Received: by outflank-mailman (output) from mailman id 107103.204706; Thu, 08 Apr 2021 09:48: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 1lURH7-0004WV-Ok; Thu, 08 Apr 2021 09:48:33 +0000 Received: by outflank-mailman (input) for mailman id 107103; Thu, 08 Apr 2021 09:48:32 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lURH6-0004WL-Mv for xen-devel@lists.xenproject.org; Thu, 08 Apr 2021 09:48:32 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id aaa26d65-9060-46f9-8271-5e5f6ea52be3; Thu, 08 Apr 2021 09:48:31 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CBD10106F; Thu, 8 Apr 2021 02:48:30 -0700 (PDT) Received: from e125770.cambridge.arm.com (e125770.cambridge.arm.com [10.1.197.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DD9843F694; Thu, 8 Apr 2021 02:48:29 -0700 (PDT) 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: aaa26d65-9060-46f9-8271-5e5f6ea52be3 From: Luca Fancellu To: xen-devel@lists.xenproject.org Cc: bertrand.marquis@arm.com, wei.chen@arm.com, Stefano Stabellini , Julien Grall , Volodymyr Babchuk Subject: [PATCH v2 1/4] xen/arm: Move dom0 creation in domain_build.c Date: Thu, 8 Apr 2021 10:48:15 +0100 Message-Id: <20210408094818.8173-2-luca.fancellu@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210408094818.8173-1-luca.fancellu@arm.com> References: <20210408094818.8173-1-luca.fancellu@arm.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Move dom0 creation and start from setup.c to domain_build.c on a dedicate function. Signed-off-by: Luca Fancellu --- xen/arch/arm/domain_build.c | 36 ++++++++++++++++++++++++++++++++++++ xen/arch/arm/setup.c | 29 +---------------------------- xen/include/asm-arm/setup.h | 1 + 3 files changed, 38 insertions(+), 28 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 374bf655ee..d7c9c7f4d1 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -2520,6 +2521,41 @@ void __init create_domUs(void) } } =20 +struct domain* __init create_dom0(void) +{ + struct domain *dom0; + struct xen_domctl_createdomain dom0_cfg =3D { + .flags =3D XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap, + .max_evtchn_port =3D -1, + .max_grant_frames =3D gnttab_dom0_frames(), + .max_maptrack_frames =3D -1, + }; + + /* The vGIC for DOM0 is exactly emulating the hardware GIC */ + dom0_cfg.arch.gic_version =3D XEN_DOMCTL_CONFIG_GIC_NATIVE; + /* + * Xen vGIC supports a maximum of 992 interrupt lines. + * 32 are substracted to cover local IRQs. + */ + dom0_cfg.arch.nr_spis =3D min(gic_number_lines(), (unsigned int) 992) = - 32; + if ( gic_number_lines() > 992 ) + printk(XENLOG_WARNING "Maximum number of vGIC IRQs exceeded.\n"); + dom0_cfg.arch.tee_type =3D tee_get_type(); + dom0_cfg.max_vcpus =3D dom0_max_vcpus(); + + if ( iommu_enabled ) + dom0_cfg.flags |=3D XEN_DOMCTL_CDF_iommu; + + dom0 =3D domain_create(0, &dom0_cfg, true); + if ( IS_ERR(dom0) || (alloc_dom0_vcpu0(dom0) =3D=3D NULL) ) + panic("Error creating domain 0\n"); + + if ( construct_dom0(dom0) !=3D 0) + panic("Could not set up DOM0 guest OS\n"); + + return dom0; +} + int __init construct_dom0(struct domain *d) { struct kernel_info kinfo =3D {}; diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 2532ec9739..b405f58996 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #include =20 @@ -805,12 +804,6 @@ void __init start_xen(unsigned long boot_phys_offset, const char *cmdline; struct bootmodule *xen_bootmodule; struct domain *dom0; - struct xen_domctl_createdomain dom0_cfg =3D { - .flags =3D XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap, - .max_evtchn_port =3D -1, - .max_grant_frames =3D gnttab_dom0_frames(), - .max_maptrack_frames =3D -1, - }; int rc; =20 dcache_line_bytes =3D read_dcache_line_bytes(); @@ -965,27 +958,7 @@ void __init start_xen(unsigned long boot_phys_offset, enable_errata_workarounds(); =20 /* Create initial domain 0. */ - /* The vGIC for DOM0 is exactly emulating the hardware GIC */ - dom0_cfg.arch.gic_version =3D XEN_DOMCTL_CONFIG_GIC_NATIVE; - /* - * Xen vGIC supports a maximum of 992 interrupt lines. - * 32 are substracted to cover local IRQs. - */ - dom0_cfg.arch.nr_spis =3D min(gic_number_lines(), (unsigned int) 992) = - 32; - if ( gic_number_lines() > 992 ) - printk(XENLOG_WARNING "Maximum number of vGIC IRQs exceeded.\n"); - dom0_cfg.arch.tee_type =3D tee_get_type(); - dom0_cfg.max_vcpus =3D dom0_max_vcpus(); - - if ( iommu_enabled ) - dom0_cfg.flags |=3D XEN_DOMCTL_CDF_iommu; - - dom0 =3D domain_create(0, &dom0_cfg, true); - if ( IS_ERR(dom0) || (alloc_dom0_vcpu0(dom0) =3D=3D NULL) ) - panic("Error creating domain 0\n"); - - if ( construct_dom0(dom0) !=3D 0) - panic("Could not set up DOM0 guest OS\n"); + dom0 =3D create_dom0(); =20 heap_init_late(); =20 diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 28bf622aa1..e5f5c7ebc6 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -95,6 +95,7 @@ int acpi_make_efi_nodes(void *fdt, struct membank tbl_add= []); =20 int construct_dom0(struct domain *d); void create_domUs(void); +struct domain* create_dom0(void); =20 void discard_initial_modules(void); void fw_unreserved_regions(paddr_t s, paddr_t e, --=20 2.17.1 From nobody Thu Apr 25 00:39:44 2024 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; 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=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1617875340; cv=none; d=zohomail.com; s=zohoarc; b=ioFK1h4l/PwYN5v9Ubn2N7A+7EMiyHNltcWs1fT3Co2N8UESv4zPqQNZNcbOrU6rL9P2/s3fJ3cLni1bz5BTtvLHy3Tmaze1Rqj6WfHoqZzk1yeMETtN0bq+niAyP0Q2JMkDDMvpQQijt4pVEW+gaAVH6iTbLykerKFnf1Mpt94= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617875340; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=u7Os9V3c2p+Qq9REavA/5HrIrB0zS5855CuBAhixa/g=; b=hcDzOKSMGInw7yRSHG52CxJCoLg+xOj2gEjabjAGEuUZOML6GazD9QDLWMURlb8HJE8sn3kG3fczv1EkQU5uXCRiyvXebQ2SdHjDBiZQEUuHQv5aubpKbtMvp1US3/prHDQ1o0FVtwbFs+fTFWHd97EmxdzqWRpY4mnK2mNUdA4= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617875340171452.7025083089951; Thu, 8 Apr 2021 02:49:00 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.107106.204736 (Exim 4.92) (envelope-from ) id 1lURHD-0004ad-NU; Thu, 08 Apr 2021 09:48:39 +0000 Received: by outflank-mailman (output) from mailman id 107106.204736; Thu, 08 Apr 2021 09:48:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lURHD-0004aR-Hg; Thu, 08 Apr 2021 09:48:39 +0000 Received: by outflank-mailman (input) for mailman id 107106; Thu, 08 Apr 2021 09:48:37 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lURHB-0004WM-P1 for xen-devel@lists.xenproject.org; Thu, 08 Apr 2021 09:48:37 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 36a3e47c-9081-4c70-b092-c6ecab5b98b2; Thu, 08 Apr 2021 09:48:33 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A11E0106F; Thu, 8 Apr 2021 02:48:32 -0700 (PDT) Received: from e125770.cambridge.arm.com (e125770.cambridge.arm.com [10.1.197.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0C6213F694; Thu, 8 Apr 2021 02:48:30 -0700 (PDT) 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: 36a3e47c-9081-4c70-b092-c6ecab5b98b2 From: Luca Fancellu To: xen-devel@lists.xenproject.org Cc: bertrand.marquis@arm.com, wei.chen@arm.com, Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Wei Liu , Rahul Singh Subject: [PATCH v2 2/4] xen/arm: Handle cases when hardware_domain is NULL Date: Thu, 8 Apr 2021 10:48:16 +0100 Message-Id: <20210408094818.8173-3-luca.fancellu@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210408094818.8173-1-luca.fancellu@arm.com> References: <20210408094818.8173-1-luca.fancellu@arm.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The function is_hardware_domain() returns true if the hardware_domain and the passed domain is NULL, here we add a check to return false if there is no hardware_domain. Among the common and arm codebase there are few cases where the hardware_domain variable is checked to see if the current domain is equal to the hardware_domain, change this cases to use is_hardware_domain() function instead. Signed-off-by: Luca Fancellu --- xen/arch/arm/irq.c | 2 +- xen/common/domain.c | 4 ++-- xen/drivers/passthrough/arm/ipmmu-vmsa.c | 2 +- xen/drivers/passthrough/arm/smmu-v3.c | 2 +- xen/drivers/passthrough/arm/smmu.c | 2 +- xen/include/asm-arm/domain.h | 2 +- xen/include/xen/sched.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index b71b099e6f..b761d90c40 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -412,7 +412,7 @@ bool is_assignable_irq(unsigned int irq) */ bool irq_type_set_by_domain(const struct domain *d) { - return (d =3D=3D hardware_domain); + return is_hardware_domain(d); } =20 /* diff --git a/xen/common/domain.c b/xen/common/domain.c index d85984638a..e8ec3ba445 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -308,7 +308,7 @@ static int late_hwdom_init(struct domain *d) struct domain *dom0; int rv; =20 - if ( d !=3D hardware_domain || d->domain_id =3D=3D 0 ) + if ( !is_hardware_domain(d) || d->domain_id =3D=3D 0 ) return 0; =20 rv =3D xsm_init_hardware_domain(XSM_HOOK, d); @@ -705,7 +705,7 @@ struct domain *domain_create(domid_t domid, err =3D err ?: -EILSEQ; /* Release build safety. */ =20 d->is_dying =3D DOMDYING_dead; - if ( hardware_domain =3D=3D d ) + if ( is_hardware_domain(d) ) hardware_domain =3D old_hwdom; atomic_set(&d->refcnt, DOMAIN_DESTROYED); =20 diff --git a/xen/drivers/passthrough/arm/ipmmu-vmsa.c b/xen/drivers/passthr= ough/arm/ipmmu-vmsa.c index aef358d880..8b8e3a00ba 100644 --- a/xen/drivers/passthrough/arm/ipmmu-vmsa.c +++ b/xen/drivers/passthrough/arm/ipmmu-vmsa.c @@ -1168,7 +1168,7 @@ static int ipmmu_reassign_device(struct domain *s, st= ruct domain *t, int ret =3D 0; =20 /* Don't allow remapping on other domain than hwdom */ - if ( t && t !=3D hardware_domain ) + if ( t && !is_hardware_domain(t) ) return -EPERM; =20 if ( t =3D=3D s ) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthroug= h/arm/smmu-v3.c index 53d150cdb6..d115df7320 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -3366,7 +3366,7 @@ static int arm_smmu_reassign_dev(struct domain *s, st= ruct domain *t, int ret =3D 0; =20 /* Don't allow remapping on other domain than hwdom */ - if (t && t !=3D hardware_domain) + if ( t && !is_hardware_domain(t) ) return -EPERM; =20 if (t =3D=3D s) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/a= rm/smmu.c index 3e8aa37866..932fdfd6dd 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -2670,7 +2670,7 @@ static int arm_smmu_reassign_dev(struct domain *s, st= ruct domain *t, int ret =3D 0; =20 /* Don't allow remapping on other domain than hwdom */ - if (t && t !=3D hardware_domain) + if ( t && !is_hardware_domain(t) ) return -EPERM; =20 if (t =3D=3D s) diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 1da90f207d..738bda5ef3 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -30,7 +30,7 @@ enum domain_type { #endif =20 /* The hardware domain has always its memory direct mapped. */ -#define is_domain_direct_mapped(d) ((d) =3D=3D hardware_domain) +#define is_domain_direct_mapped(d) (is_hardware_domain(d)) =20 struct vtimer { struct vcpu *v; diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 5485d08afb..bfc9d2577c 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -1022,7 +1022,7 @@ static always_inline bool is_hardware_domain(const st= ruct domain *d) if ( IS_ENABLED(CONFIG_PV_SHIM_EXCLUSIVE) ) return false; =20 - return evaluate_nospec(d =3D=3D hardware_domain); + return evaluate_nospec((hardware_domain !=3D NULL) && (d =3D=3D hardwa= re_domain)); } =20 /* This check is for functionality specific to a control domain */ --=20 2.17.1 From nobody Thu Apr 25 00:39:44 2024 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; 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=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1617875339; cv=none; d=zohomail.com; s=zohoarc; b=jdLFHyPUUSKVB4MwA0sypD3OWFqgV36Ldk0q8LZ8ZU5nCz9OR6vc2ADuZJz2ej40yNlNUSvKXy2Lb3N1PS0tPgBKnkZwKheDzKf086oWaSm75mEEsrvRf0cUp4gkGUmSPGR4+uoufQBNgJTP8mrr/apMZQzkXczQJmHD88nPfAM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617875339; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=BvFB2j6a8xFhw8wQgYNiTzp9vwUCZ12yT3GpmRc3Yts=; b=T7bBSSLFuCNoHJJ3QAYGoeA06pIAGlS62zA0vHCFjhR3/pHzQ2LUgce6iS86yARmtYpK0Or1AhuHa+TUgGd8+aFJgq8i+A3sXBFPaRP3gaWkgCqHxspC29AGt+Tkpx9kN52n+YrfUnsPPbrwnKNs5SiQwusG1ug7J40KzuVRyGc= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617875339768442.8208680455489; Thu, 8 Apr 2021 02:48:59 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.107107.204754 (Exim 4.92) (envelope-from ) id 1lURHI-0004gt-A2; Thu, 08 Apr 2021 09:48:44 +0000 Received: by outflank-mailman (output) from mailman id 107107.204754; Thu, 08 Apr 2021 09:48:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lURHI-0004ge-4G; Thu, 08 Apr 2021 09:48:44 +0000 Received: by outflank-mailman (input) for mailman id 107107; Thu, 08 Apr 2021 09:48:42 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lURHG-0004WM-PL for xen-devel@lists.xenproject.org; Thu, 08 Apr 2021 09:48:42 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 01058904-8bb3-44bc-a1ec-534ffde50552; Thu, 08 Apr 2021 09:48:34 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4D38711B3; Thu, 8 Apr 2021 02:48:34 -0700 (PDT) Received: from e125770.cambridge.arm.com (e125770.cambridge.arm.com [10.1.197.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D4EE73F694; Thu, 8 Apr 2021 02:48:32 -0700 (PDT) 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: 01058904-8bb3-44bc-a1ec-534ffde50552 From: Luca Fancellu To: xen-devel@lists.xenproject.org Cc: bertrand.marquis@arm.com, wei.chen@arm.com, Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Wei Liu Subject: [PATCH v2 3/4] xen/arm: Reserve domid 0 for Dom0 Date: Thu, 8 Apr 2021 10:48:17 +0100 Message-Id: <20210408094818.8173-4-luca.fancellu@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210408094818.8173-1-luca.fancellu@arm.com> References: <20210408094818.8173-1-luca.fancellu@arm.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch ensure that the domid 0 is allocated only during start_xen() function by the create_dom0(). Add a comment in create_domUs() right before domain_create() to explain the importance of the pre-increment operator on the variable max_init_domid. Add an additional check in do_domctl() to make sure domid 0 is never used when calling domain_create(). Signed-off-by: Luca Fancellu --- xen/arch/arm/domain_build.c | 5 +++++ xen/common/domctl.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index d7c9c7f4d1..3fa5c8e54c 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2508,6 +2508,11 @@ void __init create_domUs(void) GUEST_VPL011_SPI - 32 + 1); } =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) + */ d =3D domain_create(++max_init_domid, &d_cfg, false); if ( IS_ERR(d) ) panic("Error creating domain %s\n", dt_node_name(node)); diff --git a/xen/common/domctl.c b/xen/common/domctl.c index af044e2eda..8258f157ef 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -419,7 +419,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_d= omctl) { if ( dom =3D=3D DOMID_FIRST_RESERVED ) dom =3D 1; - if ( is_free_domid(dom) ) + if ( (dom !=3D 0) && is_free_domid(dom) ) break; } =20 --=20 2.17.1 From nobody Thu Apr 25 00:39:44 2024 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; 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=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1617875340; cv=none; d=zohomail.com; s=zohoarc; b=fw093c46c3EXmhExqEE3xj0/P8Pgbp8m9v/XEP0jTfMuQRQbwp8+v2Drfvr57kOPBMnJB8wXoGCGeyoltk7hGVVchTj6BsfuTE+KBdzTnEJltzPQ4pwhX4YGCb5ZZ/dWhM/m+vhQhEG7NqOVP0ZJ+eQUwm0koKIJDtJ/5y+IH34= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617875340; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=xePH81Rr1ExVB2EFjlGq/J095Aez5S5dSJcz4QmX45g=; b=FBU+CpsI7THOyhTbIFLEZsWxusUchFHyT1QscaMDCRsiU+1SuXfJ3iZhb/f4+Gu4J6xJz2MUc9v2A4begTlk0KX0YLkg0fFL283JhG9tqg1FwRXVA9qKRpQS+ZG+qNih5XgfupuuLTfwC6v8VO3nGUwVar+27Dcteq8CRVIYCJ0= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 161787534032360.70539798382049; Thu, 8 Apr 2021 02:49:00 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.107105.204730 (Exim 4.92) (envelope-from ) id 1lURHD-0004a2-Co; Thu, 08 Apr 2021 09:48:39 +0000 Received: by outflank-mailman (output) from mailman id 107105.204730; Thu, 08 Apr 2021 09:48:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lURHD-0004Zv-8n; Thu, 08 Apr 2021 09:48:39 +0000 Received: by outflank-mailman (input) for mailman id 107105; Thu, 08 Apr 2021 09:48:37 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lURHB-0004WL-I9 for xen-devel@lists.xenproject.org; Thu, 08 Apr 2021 09:48:37 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id c98eba5c-4240-4f77-8728-5866cfd18407; Thu, 08 Apr 2021 09:48:36 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0D58E11D4; Thu, 8 Apr 2021 02:48:36 -0700 (PDT) Received: from e125770.cambridge.arm.com (e125770.cambridge.arm.com [10.1.197.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8F95A3F694; Thu, 8 Apr 2021 02:48:34 -0700 (PDT) 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: c98eba5c-4240-4f77-8728-5866cfd18407 From: Luca Fancellu To: xen-devel@lists.xenproject.org Cc: bertrand.marquis@arm.com, wei.chen@arm.com, Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu , Volodymyr Babchuk Subject: [PATCH v2 4/4] xen/arm: Prevent Dom0 to be loaded when using dom0less Date: Thu, 8 Apr 2021 10:48:18 +0100 Message-Id: <20210408094818.8173-5-luca.fancellu@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210408094818.8173-1-luca.fancellu@arm.com> References: <20210408094818.8173-1-luca.fancellu@arm.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch prevents the dom0 to be loaded skipping its building and going forward to build domUs when the dom0 kernel is not found and at least one domU is present. Signed-off-by: Luca Fancellu --- docs/features/dom0less.pandoc | 7 +++--- xen/arch/arm/setup.c | 42 ++++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/docs/features/dom0less.pandoc b/docs/features/dom0less.pandoc index d798596cdf..a5eb5bcda0 100644 --- a/docs/features/dom0less.pandoc +++ b/docs/features/dom0less.pandoc @@ -16,9 +16,10 @@ Multiboot specification has been extended to allow for m= ultiple domains to be passed to Xen. See docs/misc/arm/device-tree/booting.txt for more information about the Multiboot specification and how to use it. =20 -Currently, a control domain ("dom0") is still required, but in the -future it will become unnecessary when all domains are created -directly from Xen. Instead of waiting for the control domain to be fully +Currently, a control domain ("dom0") is still required to manage the DomU +domains, but the system can start also without dom0 if the hypervisor +Device Tree doesn't specify it and it declares one or more domUs. +Instead of waiting for the control domain (when declared) to be fully booted and the Xen tools to become available, domains created by Xen this way are started right away in parallel. Hence, their boot time is typically much shorter. diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index b405f58996..ecc4f0ae98 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -793,6 +793,38 @@ static void __init setup_mm(void) } #endif =20 +static bool __init is_dom0less_mode(void) +{ + struct bootmodules *mods =3D &bootinfo.modules; + struct bootmodule *mod; + unsigned int i; + bool dom0found =3D false; + bool domUfound =3D false; + + /* Look into the bootmodules */ + for ( i =3D 0 ; i < mods->nr_mods ; i++ ) + { + mod =3D &mods->module[i]; + /* Find if dom0 and domU kernels are present */ + if ( mod->kind =3D=3D BOOTMOD_KERNEL ) + { + if ( mod->domU =3D=3D false ) + { + dom0found =3D true; + break; + } + else + domUfound =3D true; + } + } + + /* + * If there is no dom0 kernel but at least one domU, then we are in + * dom0less mode + */ + return ( !dom0found && domUfound ); +} + size_t __read_mostly dcache_line_bytes; =20 /* C entry point for boot CPU */ @@ -803,7 +835,7 @@ void __init start_xen(unsigned long boot_phys_offset, int cpus, i; const char *cmdline; struct bootmodule *xen_bootmodule; - struct domain *dom0; + struct domain *dom0 =3D NULL; int rc; =20 dcache_line_bytes =3D read_dcache_line_bytes(); @@ -958,7 +990,10 @@ void __init start_xen(unsigned long boot_phys_offset, enable_errata_workarounds(); =20 /* Create initial domain 0. */ - dom0 =3D create_dom0(); + if ( !is_dom0less_mode() ) + dom0 =3D create_dom0(); + else + printk(XENLOG_INFO "Xen dom0less mode detected\n"); =20 heap_init_late(); =20 @@ -976,7 +1011,8 @@ void __init start_xen(unsigned long boot_phys_offset, if ( acpi_disabled ) create_domUs(); =20 - domain_unpause_by_systemcontroller(dom0); + if ( dom0 ) + domain_unpause_by_systemcontroller(dom0); =20 /* Switch on to the dynamically allocated stack for the idle vcpu * since the static one we're running on is about to be freed. */ --=20 2.17.1