From: Stefano Stabellini <stefano.stabellini@xilinx.com>
Implement extended regions for dom0less domUs. The implementation is
based on the libxl implementation.
Also update docs for the ext_regions command line option.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>
CC: olekstysh@gmail.com
---
Changes in v6:
- add reviewed-by
- address 2 NITs
- update docs
Changes in v5:
- print the domain
- coding style
- simplify the code in find_domU_holes
- return error if no regions allocated in find_domU_holes
- use ROUNDUP
- uint64_t/paddr_t
---
docs/misc/xen-command-line.pandoc | 9 ++---
xen/arch/arm/domain_build.c | 60 ++++++++++++++++++++++++++-----
2 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc
index 1dc7e1ca07..881fe409ac 100644
--- a/docs/misc/xen-command-line.pandoc
+++ b/docs/misc/xen-command-line.pandoc
@@ -1110,11 +1110,12 @@ to use the default.
> Default : `true`
-Flag to enable or disable support for extended regions for Dom0.
+Flag to enable or disable support for extended regions for Dom0 and
+Dom0less DomUs.
-Extended regions are ranges of unused address space exposed to Dom0 as
-"safe to use" for special memory mappings. Disable if your board device
-tree is incomplete.
+Extended regions are ranges of unused address space exposed to the guest
+as "safe to use" for special memory mappings. Disable if your board
+device tree is incomplete.
### flask
> `= permissive | enforcing | late | disabled`
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 1472ca4972..f22450b4b7 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -35,7 +35,10 @@
static unsigned int __initdata opt_dom0_max_vcpus;
integer_param("dom0_max_vcpus", opt_dom0_max_vcpus);
-/* If true, the extended regions support is enabled for dom0 */
+/*
+ * If true, the extended regions support is enabled for dom0 and
+ * dom0less domUs.
+ */
static bool __initdata opt_ext_regions = true;
boolean_param("ext_regions", opt_ext_regions);
@@ -1324,6 +1327,36 @@ out:
return res;
}
+static int __init find_domU_holes(const struct kernel_info *kinfo,
+ struct meminfo *ext_regions)
+{
+ unsigned int i;
+ paddr_t bankend;
+ const paddr_t bankbase[] = GUEST_RAM_BANK_BASES;
+ const paddr_t banksize[] = GUEST_RAM_BANK_SIZES;
+ int res = -ENOENT;
+
+ for ( i = 0; i < GUEST_RAM_BANKS; i++ )
+ {
+ struct membank *ext_bank = &(ext_regions->bank[ext_regions->nr_banks]);
+
+ ext_bank->start = ROUNDUP(bankbase[i] + kinfo->mem.bank[i].size, SZ_2M);
+
+ bankend = ~0ULL >> (64 - p2m_ipa_bits);
+ bankend = min(bankend, bankbase[i] + banksize[i] - 1);
+ if ( bankend > ext_bank->start )
+ ext_bank->size = bankend - ext_bank->start + 1;
+
+ /* 64MB is the minimum size of an extended region */
+ if ( ext_bank->size < MB(64) )
+ continue;
+ ext_regions->nr_banks++;
+ res = 0;
+ }
+
+ return res;
+}
+
static int __init make_hypervisor_node(struct domain *d,
const struct kernel_info *kinfo,
int addrcells, int sizecells)
@@ -1360,12 +1393,13 @@ static int __init make_hypervisor_node(struct domain *d,
if ( !opt_ext_regions )
{
- printk(XENLOG_INFO "The extended regions support is disabled\n");
+ printk(XENLOG_INFO "%pd: extended regions support is disabled\n", d);
nr_ext_regions = 0;
}
else if ( is_32bit_domain(d) )
{
- printk(XENLOG_WARNING "The extended regions are only supported for 64-bit guest currently\n");
+ printk(XENLOG_WARNING
+ "%pd: extended regions not supported for 32-bit guests\n", d);
nr_ext_regions = 0;
}
else
@@ -1374,13 +1408,21 @@ static int __init make_hypervisor_node(struct domain *d,
if ( !ext_regions )
return -ENOMEM;
- if ( !is_iommu_enabled(d) )
- res = find_unallocated_memory(kinfo, ext_regions);
+ if ( is_domain_direct_mapped(d) )
+ {
+ if ( !is_iommu_enabled(d) )
+ res = find_unallocated_memory(kinfo, ext_regions);
+ else
+ res = find_memory_holes(kinfo, ext_regions);
+ }
else
- res = find_memory_holes(kinfo, ext_regions);
+ {
+ res = find_domU_holes(kinfo, ext_regions);
+ }
if ( res )
- printk(XENLOG_WARNING "Failed to allocate extended regions\n");
+ printk(XENLOG_WARNING "%pd: failed to allocate extended regions\n",
+ d);
nr_ext_regions = ext_regions->nr_banks;
}
@@ -1401,8 +1443,8 @@ static int __init make_hypervisor_node(struct domain *d,
u64 start = ext_regions->bank[i].start;
u64 size = ext_regions->bank[i].size;
- printk("Extended region %d: %#"PRIx64"->%#"PRIx64"\n",
- i, start, start + size);
+ printk("%pd: extended region %d: %#"PRIx64"->%#"PRIx64"\n",
+ d, i, start, start + size);
dt_child_set_range(&cells, addrcells, sizecells, start, size);
}
--
2.25.1On 05/05/2022 01:16, Stefano Stabellini wrote: > From: Stefano Stabellini <stefano.stabellini@xilinx.com> > > Implement extended regions for dom0less domUs. The implementation is > based on the libxl implementation. > > Also update docs for the ext_regions command line option. > > Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com> > Reviewed-by: Luca Fancellu <luca.fancellu@arm.com> Acked-by: Julien Grall <jgrall@amazon.com> Cheers, -- Julien Grall
On 05.05.22 03:16, Stefano Stabellini wrote:
Hello Stefano
> From: Stefano Stabellini <stefano.stabellini@xilinx.com>
>
> Implement extended regions for dom0less domUs. The implementation is
> based on the libxl implementation.
>
> Also update docs for the ext_regions command line option.
>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
> Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>
> CC: olekstysh@gmail.com
Reviewed-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Thanks!
> ---
> Changes in v6:
> - add reviewed-by
> - address 2 NITs
> - update docs
>
> Changes in v5:
> - print the domain
> - coding style
> - simplify the code in find_domU_holes
> - return error if no regions allocated in find_domU_holes
> - use ROUNDUP
> - uint64_t/paddr_t
> ---
> docs/misc/xen-command-line.pandoc | 9 ++---
> xen/arch/arm/domain_build.c | 60 ++++++++++++++++++++++++++-----
> 2 files changed, 56 insertions(+), 13 deletions(-)
>
> diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc
> index 1dc7e1ca07..881fe409ac 100644
> --- a/docs/misc/xen-command-line.pandoc
> +++ b/docs/misc/xen-command-line.pandoc
> @@ -1110,11 +1110,12 @@ to use the default.
>
> > Default : `true`
>
> -Flag to enable or disable support for extended regions for Dom0.
> +Flag to enable or disable support for extended regions for Dom0 and
> +Dom0less DomUs.
>
> -Extended regions are ranges of unused address space exposed to Dom0 as
> -"safe to use" for special memory mappings. Disable if your board device
> -tree is incomplete.
> +Extended regions are ranges of unused address space exposed to the guest
> +as "safe to use" for special memory mappings. Disable if your board
> +device tree is incomplete.
>
> ### flask
> > `= permissive | enforcing | late | disabled`
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index 1472ca4972..f22450b4b7 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -35,7 +35,10 @@
> static unsigned int __initdata opt_dom0_max_vcpus;
> integer_param("dom0_max_vcpus", opt_dom0_max_vcpus);
>
> -/* If true, the extended regions support is enabled for dom0 */
> +/*
> + * If true, the extended regions support is enabled for dom0 and
> + * dom0less domUs.
> + */
> static bool __initdata opt_ext_regions = true;
> boolean_param("ext_regions", opt_ext_regions);
>
> @@ -1324,6 +1327,36 @@ out:
> return res;
> }
>
> +static int __init find_domU_holes(const struct kernel_info *kinfo,
> + struct meminfo *ext_regions)
> +{
> + unsigned int i;
> + paddr_t bankend;
> + const paddr_t bankbase[] = GUEST_RAM_BANK_BASES;
> + const paddr_t banksize[] = GUEST_RAM_BANK_SIZES;
> + int res = -ENOENT;
> +
> + for ( i = 0; i < GUEST_RAM_BANKS; i++ )
> + {
> + struct membank *ext_bank = &(ext_regions->bank[ext_regions->nr_banks]);
> +
> + ext_bank->start = ROUNDUP(bankbase[i] + kinfo->mem.bank[i].size, SZ_2M);
> +
> + bankend = ~0ULL >> (64 - p2m_ipa_bits);
> + bankend = min(bankend, bankbase[i] + banksize[i] - 1);
> + if ( bankend > ext_bank->start )
> + ext_bank->size = bankend - ext_bank->start + 1;
> +
> + /* 64MB is the minimum size of an extended region */
> + if ( ext_bank->size < MB(64) )
> + continue;
> + ext_regions->nr_banks++;
> + res = 0;
> + }
> +
> + return res;
> +}
> +
> static int __init make_hypervisor_node(struct domain *d,
> const struct kernel_info *kinfo,
> int addrcells, int sizecells)
> @@ -1360,12 +1393,13 @@ static int __init make_hypervisor_node(struct domain *d,
>
> if ( !opt_ext_regions )
> {
> - printk(XENLOG_INFO "The extended regions support is disabled\n");
> + printk(XENLOG_INFO "%pd: extended regions support is disabled\n", d);
> nr_ext_regions = 0;
> }
> else if ( is_32bit_domain(d) )
> {
> - printk(XENLOG_WARNING "The extended regions are only supported for 64-bit guest currently\n");
> + printk(XENLOG_WARNING
> + "%pd: extended regions not supported for 32-bit guests\n", d);
> nr_ext_regions = 0;
> }
> else
> @@ -1374,13 +1408,21 @@ static int __init make_hypervisor_node(struct domain *d,
> if ( !ext_regions )
> return -ENOMEM;
>
> - if ( !is_iommu_enabled(d) )
> - res = find_unallocated_memory(kinfo, ext_regions);
> + if ( is_domain_direct_mapped(d) )
> + {
> + if ( !is_iommu_enabled(d) )
> + res = find_unallocated_memory(kinfo, ext_regions);
> + else
> + res = find_memory_holes(kinfo, ext_regions);
> + }
> else
> - res = find_memory_holes(kinfo, ext_regions);
> + {
> + res = find_domU_holes(kinfo, ext_regions);
> + }
>
> if ( res )
> - printk(XENLOG_WARNING "Failed to allocate extended regions\n");
> + printk(XENLOG_WARNING "%pd: failed to allocate extended regions\n",
> + d);
> nr_ext_regions = ext_regions->nr_banks;
> }
>
> @@ -1401,8 +1443,8 @@ static int __init make_hypervisor_node(struct domain *d,
> u64 start = ext_regions->bank[i].start;
> u64 size = ext_regions->bank[i].size;
>
> - printk("Extended region %d: %#"PRIx64"->%#"PRIx64"\n",
> - i, start, start + size);
> + printk("%pd: extended region %d: %#"PRIx64"->%#"PRIx64"\n",
> + d, i, start, start + size);
>
> dt_child_set_range(&cells, addrcells, sizecells, start, size);
> }
--
Regards,
Oleksandr Tyshchenko
© 2016 - 2024 Red Hat, Inc.