From: Bertrand Marquis <Bertrand.Marquis@arm.com>
To: Luca Fancellu <Luca.Fancellu@arm.com>
Cc: Xen-devel <xen-devel@lists.xenproject.org>,
Wei Chen <Wei.Chen@arm.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Julien Grall <julien@xen.org>,
Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
Subject: Re: [PATCH v4 1/4] xen/arm: Move dom0 creation in domain_build.c
Date: Wed, 14 Apr 2021 10:14:04 +0000 [thread overview]
Message-ID: <0C0DD0B8-D009-4E7D-9C92-1D009B832AED@arm.com> (raw)
In-Reply-To: <20210414091404.14215-2-luca.fancellu@arm.com>
Hi Luca,
> On 14 Apr 2021, at 10:14, Luca Fancellu <Luca.Fancellu@arm.com> wrote:
>
> Move dom0 create and start from setup.c to a dedicated
> function in domain_build.c.
>
> With this change, the function construct_dom0() is not
> used outside of domain_build.c anymore.
> So it is now a static function.
>
> No functional changes intended.
>
> Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
> Reviewed-by: Julien Grall <jgrall@amazon.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
Cheers,
Bertrand
> ---
> v4 changes:
> - changes to the commit message
> v3 changes:
> - move create_dom0 function after construct_dom0 and
> make construct_dom0 static
> ---
> xen/arch/arm/domain_build.c | 38 ++++++++++++++++++++++++++++++++++++-
> xen/arch/arm/setup.c | 29 +---------------------------
> xen/include/asm-arm/setup.h | 2 +-
> 3 files changed, 39 insertions(+), 30 deletions(-)
>
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index 374bf655ee..359957dc1b 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -21,6 +21,7 @@
> #include <asm/device.h>
> #include <asm/kernel.h>
> #include <asm/setup.h>
> +#include <asm/tee/tee.h>
> #include <asm/platform.h>
> #include <asm/psci.h>
> #include <asm/setup.h>
> @@ -2520,7 +2521,7 @@ void __init create_domUs(void)
> }
> }
>
> -int __init construct_dom0(struct domain *d)
> +static int __init construct_dom0(struct domain *d)
> {
> struct kernel_info kinfo = {};
> int rc;
> @@ -2578,6 +2579,41 @@ int __init construct_dom0(struct domain *d)
> return construct_domain(d, &kinfo);
> }
>
> +struct domain* __init create_dom0(void)
> +{
> + struct domain *dom0;
> + struct xen_domctl_createdomain dom0_cfg = {
> + .flags = XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap,
> + .max_evtchn_port = -1,
> + .max_grant_frames = gnttab_dom0_frames(),
> + .max_maptrack_frames = -1,
> + };
> +
> + /* The vGIC for DOM0 is exactly emulating the hardware GIC */
> + dom0_cfg.arch.gic_version = 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 = 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 = tee_get_type();
> + dom0_cfg.max_vcpus = dom0_max_vcpus();
> +
> + if ( iommu_enabled )
> + dom0_cfg.flags |= XEN_DOMCTL_CDF_iommu;
> +
> + dom0 = domain_create(0, &dom0_cfg, true);
> + if ( IS_ERR(dom0) || (alloc_dom0_vcpu0(dom0) == NULL) )
> + panic("Error creating domain 0\n");
> +
> + if ( construct_dom0(dom0) != 0)
> + panic("Could not set up DOM0 guest OS\n");
> +
> + return dom0;
> +}
> +
> /*
> * Local variables:
> * mode: C
> 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 <asm/platform.h>
> #include <asm/procinfo.h>
> #include <asm/setup.h>
> -#include <asm/tee/tee.h>
> #include <xsm/xsm.h>
> #include <asm/acpi.h>
>
> @@ -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 = {
> - .flags = XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap,
> - .max_evtchn_port = -1,
> - .max_grant_frames = gnttab_dom0_frames(),
> - .max_maptrack_frames = -1,
> - };
> int rc;
>
> dcache_line_bytes = read_dcache_line_bytes();
> @@ -965,27 +958,7 @@ void __init start_xen(unsigned long boot_phys_offset,
> enable_errata_workarounds();
>
> /* Create initial domain 0. */
> - /* The vGIC for DOM0 is exactly emulating the hardware GIC */
> - dom0_cfg.arch.gic_version = 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 = 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 = tee_get_type();
> - dom0_cfg.max_vcpus = dom0_max_vcpus();
> -
> - if ( iommu_enabled )
> - dom0_cfg.flags |= XEN_DOMCTL_CDF_iommu;
> -
> - dom0 = domain_create(0, &dom0_cfg, true);
> - if ( IS_ERR(dom0) || (alloc_dom0_vcpu0(dom0) == NULL) )
> - panic("Error creating domain 0\n");
> -
> - if ( construct_dom0(dom0) != 0)
> - panic("Could not set up DOM0 guest OS\n");
> + dom0 = create_dom0();
>
> heap_init_late();
>
> diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h
> index 28bf622aa1..5283244015 100644
> --- a/xen/include/asm-arm/setup.h
> +++ b/xen/include/asm-arm/setup.h
> @@ -93,8 +93,8 @@ void acpi_create_efi_mmap_table(struct domain *d,
>
> int acpi_make_efi_nodes(void *fdt, struct membank tbl_add[]);
>
> -int construct_dom0(struct domain *d);
> void create_domUs(void);
> +struct domain* create_dom0(void);
>
> void discard_initial_modules(void);
> void fw_unreserved_regions(paddr_t s, paddr_t e,
> --
> 2.17.1
>
next prev parent reply other threads:[~2021-04-14 10:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 9:14 [PATCH v4 0/4] xen/arm: Prevent Dom0 to be loaded when using dom0less Luca Fancellu
2021-04-14 9:14 ` [PATCH v4 1/4] xen/arm: Move dom0 creation in domain_build.c Luca Fancellu
2021-04-14 10:14 ` Bertrand Marquis [this message]
2021-04-14 9:14 ` [PATCH v4 2/4] xen/arm: Handle cases when hardware_domain is NULL Luca Fancellu
2021-04-14 10:14 ` Bertrand Marquis
2021-04-14 11:16 ` Julien Grall
2021-04-14 11:29 ` Luca Fancellu
2021-04-14 13:45 ` Julien Grall
2021-04-14 13:47 ` Luca Fancellu
2021-04-14 20:35 ` Stefano Stabellini
2021-04-15 17:17 ` Julien Grall
2021-04-14 9:14 ` [PATCH v4 3/4] xen/arm: Clarify how the domid is decided in create_domUs() Luca Fancellu
2021-04-14 10:14 ` Bertrand Marquis
2021-04-14 11:17 ` Julien Grall
2021-04-14 9:14 ` [PATCH v4 4/4] xen/arm: Prevent Dom0 to be loaded when using dom0less Luca Fancellu
2021-04-14 10:14 ` Bertrand Marquis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0C0DD0B8-D009-4E7D-9C92-1D009B832AED@arm.com \
--to=bertrand.marquis@arm.com \
--cc=Luca.Fancellu@arm.com \
--cc=Volodymyr_Babchuk@epam.com \
--cc=Wei.Chen@arm.com \
--cc=julien@xen.org \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).