Second series for R82 MPU Support
v4 cover Second series for R82 MPU Support
Hi all,
This series is the second set of patches in the ongoing work to introduce support for MPU systems and Cortex R82 in Xen.
The patches in this series implement the necessary logic to map and unmap the Device Tree Blob in the early stages of the boot process.
Changes from v3:
- Changes mentioned in individual patches
Cheers,
Hari
Luca Fancellu (4):
arm/mpu: Find MPU region by range
xen/arm: Introduce flags_has_rwx helper arm/mpu: Implement early_fdt_map support in MPU systems arm/mpu: Implement remove_early_mappings for MPU systems
Penny Zheng (2):
arm/mpu: Populate a new region in Xen MPU mapping table arm/mpu: Destroy an existing entry in Xen MPU memory mapping table
xen/arch/arm/include/asm/mm.h | 2 + xen/arch/arm/include/asm/mpu.h | 2 + xen/arch/arm/include/asm/mpu/cpregs.h | 4 + xen/arch/arm/include/asm/mpu/mm.h | 41 +++++ xen/arch/arm/mm.c | 15 ++ xen/arch/arm/mmu/pt.c | 9 +- xen/arch/arm/mpu/mm.c | 235 ++++++++++++++++++++++++++ xen/arch/arm/mpu/setup.c | 79 ++++++++- 8 files changed, 376 insertions(+), 11 deletions(-)
Signature · 1 line
2.34.1
PATCH v4 1/6 arm/mpu: Find MPU region by range
From: Luca Fancellu <[email protected]>
Implement a function to find the index of a MPU region in the xen_mpumap MPU region array. This function will be used in future commits to implement creating and destroying MPU regions.
---
Changes from v1:
- Update commit message
- Remove internal _index variable
- Simplify logic by disallowing NULL index parameter
- Use normal printk
- Reorder conditional checks
- Update some comments
Changes from v2:
- Replace conditional with assert
- Improve comments regarding base and limit
- Space between ( and uint8_t.
Changes from v3:
- Add Michal's R-b
--- xen/arch/arm/include/asm/mpu/mm.h | 29 ++++++++++++++++ xen/arch/arm/mpu/mm.c | 55 +++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+)
xen/arch/arm/include/asm/mpu/mm.h +29 -0
@@ -10,6 +10,13 @@#include <asm/mm.h> #include <asm/mpu.h> +#define MPUMAP_REGION_OVERLAP -1 +#define MPUMAP_REGION_NOTFOUND 0 +#define MPUMAP_REGION_FOUND 1 +#define MPUMAP_REGION_INCLUSIVE 2 + +#define INVALID_REGION_IDX 0xFFU +extern struct page_info *frame_table;extern uint8_t max_mpu_regions;
@@ -75,6 +82,28 @@ void write_protection_region(const pr_t *pr_write, uint8_t sel);*/ pr_t pr_of_addr (paddr_t base,paddr_t limit,unsigned int flags); +/* +* Checks whether a given memory range is present in the provided table of +* MPU protection regions. +* +* @param table Array of pr_t protection regions. +* @param r_regions Number of elements in `table`. +* @param base Start of the memory region to be checked (inclusive). +* @param limit End of the memory region to be checked (exclusive). +* @param index Set to the index of the region if an exact or inclusive +* match is found, and INVALID_REGION otherwise. +* @return: Return code indicating the result of the search: +* MPUMAP_REGION_NOTFOUND: no part of the range is present in `table` +* MPUMAP_REGION_FOUND: found an exact match in `table` +* MPUMAP_REGION_INCLUSIVE: found an inclusive match in `table` +* MPUMAP_REGION_OVERLAP: found an overlap with a mapping in `table` +* +* Note: make sure that the range [`base`, `limit`) refers to the memory region +* inclusive of `base` and exclusive of `limit`. +*/ +int mpumap_contains_region (pr_t *table,uint8_t nr_regions,paddr_t base, +paddr_t limit,uint8_t *index); +#endif /* __ARM_MPU_MM_H__ */ /*
xen/arch/arm/mpu/mm.c +55 -0
61 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v4 2/6 xen/arm: Introduce flags_has_rwx helper
In reply to Hari LimayeFrom: Luca Fancellu <[email protected]>
Introduce flags_has_rwx() function that will check if a mapping is both writable and executable when modifying or updating the mapping.
This check was already present in pt.c but since it will be used also for MPU systems, it's wrapped into a function now.
---
Changes from v1:
- Add Ayan and Michal's R-b
- Fix typos
--- xen/arch/arm/include/asm/mm.h | 2 ++ xen/arch/arm/mm.c | 15 +++++++++++++++ xen/arch/arm/mmu/pt.c | 9 +-------- 3 files changed, 18 insertions(+), 8 deletions(-)
xen/arch/arm/include/asm/mm.h +2 -0
@@ -192,6 +192,8 @@ extern unsigned long frametable_base_pdx;/* Boot-time pagetable setup */ extern void setup_pagetables (void ); +/* Check that the mapping flag has no W and X together */ +bool flags_has_rwx (unsigned int flags);/* Map FDT in boot pagetable */ extern void *early_fdt_map (paddr_t fdt_paddr);/* Remove early mappings */
xen/arch/arm/mm.c +15 -0
@@ -24,6 +24,21 @@unsigned long frametable_base_pdx__read_mostly ; +bool flags_has_rwx (unsigned int flags) +{ +/* +* The hardware was configured to forbid mapping both writable and +* executable. +* When modifying/creating mapping (i.e _PAGE_PRESENT is set), +* prevent any update if this happen. +*/ +if ( (flags & _PAGE_PRESENT) && !PAGE_RO_MASK (flags) && + !PAGE_XN_MASK (flags) ) +return true; +else +return false; +} +void flush_page_to_ram (unsigned long mfn,bool sync_icache) {void *v =map_domain_page (_mfn (mfn));
xen/arch/arm/mmu/pt.c +1 -8
@@ -610,14 +610,7 @@ static int xen_pt_update(unsigned long virt,*/ const mfn_t root =maddr_to_mfn (READ_SYSREG64 (TTBR0_EL2 )); -/* -* The hardware was configured to forbid mapping both writeable and -* executable. -* When modifying/creating mapping (i.e _PAGE_PRESENT is set), -* prevent any update if this happen. -*/ -if ( (flags & _PAGE_PRESENT) && !PAGE_RO_MASK (flags) && - !PAGE_XN_MASK (flags) ) +if (flags_has_rwx (flags) ) {mm_printk ("Mappings should not be both Writeable and Executable.\n" );return -EINVAL ;
Signature · 1 line
2.34.1
PATCH v4 3/6 arm/mpu: Populate a new region in Xen MPU mapping table
In reply to Hari LimayeFrom: Penny Zheng <[email protected]>
Introduce map_pages_to_xen() that is implemented using a new helper, xen_mpumap_update(), which is responsible for updating Xen MPU memory mapping table(xen_mpumap), including creating a new entry, updating or destroying an existing one, it is equivalent to xen_pt_update in MMU.
This commit only implements populating a new entry in Xen MPU memory mapping table(xen_mpumap).
---
Changes from v1:
- Simplify if condition
- Use normal printk
- Use %# over 0x%
- Add same asserts as in Patch 4
Changes from v2:
- Improve clarity in xen_mpumap_alloc_entry comment
- Simplify if condition
- Remove redundant ASSERT statements
- Add check for base >= limit
- Pass virt directly in map_pages_to_xen
- Move call to context_sync_mpu inside locked section of xen_mpumap_update
- Move _PAGE_PRESENT check before calling mpumap_contains_region
Changes from v3:
- Add Michal's R-b
--- xen/arch/arm/include/asm/mpu/mm.h | 12 ++++ xen/arch/arm/mpu/mm.c | 103 ++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+)
xen/arch/arm/include/asm/mpu/mm.h +12 -0
@@ -64,6 +64,7 @@ static inline void context_sync_mpu(void)* The following API requires context_sync_mpu() after being used to modify MPU * regions: * - write_protection_region +* - xen_mpumap_update */ /* Reads the MPU region (into @pr_read) with index @sel from the HW */
@@ -72,6 +73,17 @@ void read_protection_region(pr_t *pr_read, uint8_t sel);/* Writes the MPU region (from @pr_write) with index @sel to the HW */ void write_protection_region (const pr_t *pr_write,uint8_t sel); +/* +* Maps an address range into the MPU data structure and updates the HW. +* Equivalent to xen_pt_update in an MMU system. +* +* @param base Base address of the range to map (inclusive). +* @param limit Limit address of the range to map (exclusive). +* @param flags Flags for the memory range to map. +* @return 0 on success, negative on error. +*/ +int xen_mpumap_update (paddr_t base,paddr_t limit,unsigned int flags); +/* * Creates a pr_t structure describing a protection region. *
xen/arch/arm/mpu/mm.c +103 -0
121 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v4 4/6 arm/mpu: Destroy an existing entry in Xen MPU memory mapping table
In reply to Hari LimayeFrom: Penny Zheng <[email protected]>
This commit expands xen_mpumap_update/xen_mpumap_update_entry to include destroying an existing entry.
We define a new helper "disable_mpu_region_from_index" to disable the MPU region based on index. If region is within [0, 31], we could quickly disable the MPU region through PRENR_EL2 which provides direct access to the PRLAR_EL2.EN bits of EL2 MPU regions.
Rignt now, we only support destroying a *WHOLE* MPU memory region, part-region removing is not supported, as in worst case, it will leave two fragments behind.
---
Changes from v1:
- Move check for part-region removal outside if condition
- Use normal printk
Changes from v2:
- Fix assert from ASSERT(s <= e) -> ASSERT(s < e)
- Remove call to context_sync_mpu
- Use register_t
- Improve sanity checking to catch modification & removing non-existent entries
- Update check for MPUMAP_REGION_INCLUSIVE to be generic
Changes from v3:
- Move early return for modifying case above MPUMAP_REGION_INCLUSIVE check
- Add bool variable to store flags & _PAGE_PRESENT
- Remove calls to virt_to_maddr
--- xen/arch/arm/include/asm/mpu.h | 2 + xen/arch/arm/include/asm/mpu/cpregs.h | 4 ++ xen/arch/arm/mpu/mm.c | 95 ++++++++++++++++++++++++--- 3 files changed, 92 insertions(+), 9 deletions(-)
xen/arch/arm/include/asm/mpu.h +2 -0
@@ -23,6 +23,8 @@#define NUM_MPU_REGIONS_MASK (NUM_MPU_REGIONS - 1)#define MAX_MPU_REGION_NR NUM_MPU_REGIONS_MASK +#define PRENR_MASK GENMASK(31, 0) +#ifndef __ASSEMBLY__/*
xen/arch/arm/include/asm/mpu/cpregs.h +4 -0
@@ -6,6 +6,9 @@/* CP15 CR0: MPU Type Register */ #define HMPUIR p15,4,c0,c0,4 +/* CP15 CR6: Protection Region Enable Register */ +#define HPRENR p15,4,c6,c1,1 +/* CP15 CR6: MPU Protection Region Base/Limit/Select Address Register */ #define HPRSELR p15,4,c6,c2,1#define HPRBAR p15,4,c6,c3,0
@@ -82,6 +85,7 @@/* Alphabetically... */ #define MPUIR_EL2 HMPUIR#define PRBAR_EL2 HPRBAR +#define PRENR_EL2 HPRENR#define PRLAR_EL2 HPRLAR#define PRSELR_EL2 HPRSELR#endif /* CONFIG_ARM_32 */
xen/arch/arm/mpu/mm.c +86 -9
125 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v4 4/6] arm/mpu: Destroy an existing entry in Xen MPU memory mapping table
Quoted 89 lines · Hari Limaye
From: Penny Zheng <[email protected]>
This commit expands xen_mpumap_update/xen_mpumap_update_entry to include destroying an existing entry.
We define a new helper "
disable_mpu_region_from_index" to disable the MPU region based on index. If region is within [0, 31], we could quickly disable the MPU region throughPRENR_EL2which provides direct access to the PRLAR_EL2.EN bits of EL2 MPU regions.Rignt now, we only support destroying a *WHOLE* MPU memory region, part-region removing is not supported, as in worst case, it will leave two fragments behind.
Signed-off-by Penny Zheng <[email protected]>Signed-off-by Wei Chen <[email protected]>Signed-off-by Luca Fancellu <[email protected]>Signed-off-by Hari Limaye <[email protected]>---
Changes from v1:
- Move check for part-region removal outside if condition
- Use normal printkChanges from v2:
- Fix assert fromASSERT(s <= e)->ASSERT(s < e)
- Remove call tocontext_sync_mpu
- Useregister_t
- Improve sanity checking to catch modification & removing non-existent entries
- Update check forMPUMAP_REGION_INCLUSIVEto be genericChanges from v3:
- Move early return for modifying case aboveMPUMAP_REGION_INCLUSIVEcheck
- Add bool variable to storeflags & _PAGE_PRESENT
- Remove calls tovirt_to_maddr--- xen/arch/arm/include/asm/mpu.h | 2 + xen/arch/arm/include/asm/mpu/cpregs.h | 4 ++ xen/arch/arm/mpu/mm.c | 95 ++++++++++++++++++++++++--- 3 files changed, 92 insertions(+), 9 deletions(-)xen/arch/arm/include/asm/mpu.h +2
-0@@ -23,6 +23,8 @@#define NUM_MPU_REGIONS_MASK (NUM_MPU_REGIONS - 1)#define MAX_MPU_REGION_NR NUM_MPU_REGIONS_MASK +#define PRENR_MASK GENMASK(31, 0) +#ifndef __ASSEMBLY__/* xen/arch/arm/include/asm/mpu/cpregs.h +4
-0@@ -6,6 +6,9 @@/* CP15 CR0: MPU Type Register */ #define HMPUIR p15,4,c0,c0,4 +/* CP15 CR6: Protection Region Enable Register */ +#define HPRENR p15,4,c6,c1,1 +/* CP15 CR6: MPU Protection Region Base/Limit/Select Address Register */ #define HPRSELR p15,4,c6,c2,1#define HPRBAR p15,4,c6,c3,0@@ -82,6 +85,7 @@/* Alphabetically... */ #define MPUIR_EL2 HMPUIR#define PRBAR_EL2 HPRBAR +#define PRENR_EL2 HPRENR#define PRLAR_EL2 HPRLAR#define PRSELR_EL2 HPRSELR#endif /* CONFIG_ARM_32 */ xen/arch/arm/mpu/mm.c +4
-0@@ -189,6 +189,42 @@ static int xen_mpumap_alloc_entry(uint8_t *idx)return 0 ; } +/* +* Disable and remove an MPU region from the data structure and MPU registers. +* +* @param index Index of the MPU region to be disabled.
xen/arch/arm/mpu/mm.c static int xen_mpumap_alloc_entry(uint8_t *idx) · line 205
Quoted 10 lines
xen/arch/arm/mpu/mm.c +10
-0+*/ +static void disable_mpu_region_from_index (uint8_t index) +{ +ASSERT (spin_is_locked (&xen_mpumap_lock)); +ASSERT (index !=INVALID_REGION_IDX ); + +if ( !region_is_valid (&xen_mpumap[index]) ) + { +printk (XENLOG_WARNING +"mpu: MPU memory region[%u] is already disabled\n" , index);
NIT: In this patch you start adding mpu: prefix, even though other messages do not have it. I don't think it's needed.
Otherwise:
~Michal
Re: [PATCH v4 4/6] arm/mpu: Destroy an existing entry in Xen MPU memory mapping table
Hi Michal,
Quoted 8 lines
NIT: In this patch you start adding mpu: prefix, even though other messages do not have it. I don't think it's needed.
Otherwise:
Reviewed-by Michal Orzel <[email protected]>~Michal
Would you like me to respin for this change, or can it be addressed on commit?
Many thanks,
Hari
Re: [PATCH v4 4/6] arm/mpu: Destroy an existing entry in Xen MPU memory mapping table
Quoted 5 lines · Hari Limaye
Hi Michal,
Quoted 3 lines
NIT: In this patch you start adding mpu: prefix, even though other messages do not have it. I don't think it's needed.
Quoted 7 lines
Quoted 5 lines
Otherwise:
Reviewed-by Michal Orzel <[email protected]>~Michal
Would you like me to respin for this change, or can it be addressed on commit?
Provided no remarks from others in a few days, I can address it on commit.
~Michal
PATCH v4 5/6 arm/mpu: Implement early_fdt_map support in MPU systems
In reply to Hari LimayeFrom: Luca Fancellu <[email protected]>
Implement the function early_fdt_map(), which is responsible for mapping the Device Tree Blob in the early stages of the boot process, for MPU systems.
We make use of the map_pages_to_xen() and destroy_xen_mappings() APIs. In particular the latter function is necessary in the case that the initial mapping of the fdt_header is insufficient to cover the entire DTB, as we must destroy and then remap the region due to the APIs no providing support for extending the size of an existing region.
---
Changes from v1:
- Add Ayan's R-b
Changes from v2:
- Rename mapped_fdt_paddr -> mapped_fdt_base
- Remove full stops
- Add sanity check for MAX_FDT_SIZE
- Improve comment regarding early return when DTB already mapped
Changes from v3:
- Use ASSERT instead of conditional check that
mapped_fdt_base == INVALID_PADDR
--- xen/arch/arm/mpu/setup.c | 73 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 2 deletions(-)
xen/arch/arm/mpu/setup.c +71 -2
@@ -1,17 +1,86 @@/* SPDX-License-Identifier: GPL-2.0-only */ +#include <xen/bootfdt.h> #include <xen/bug.h> #include <xen/init.h> +#include <xen/libfdt/libfdt.h> #include <xen/mm.h> +#include <xen/pfn.h> #include <xen/types.h> +#include <xen/sizes.h> #include <asm/setup.h> +static paddr_t __initdata mapped_fdt_base =INVALID_PADDR ; +static paddr_t __initdata mapped_fdt_limit =INVALID_PADDR ; +void __init setup_pagetables (void ) {}void *__init early_fdt_map (paddr_t fdt_paddr) { -BUG_ON ("unimplemented" ); -return NULL ; +/* Map at least a page containing the DTB address, exclusive range */ +paddr_t base =round_pgdown (fdt_paddr); +paddr_t limit =round_pgup (fdt_paddr +sizeof (struct fdt_header )); +unsigned int flags =PAGE_HYPERVISOR_RO ; +void *fdt_virt = (void *)fdt_paddr;/* virt == paddr for MPU */ +int rc; +uint32_t size; +unsigned long nr_mfns; + +/* +* Check whether the physical FDT address is set and meets the minimum +* alignment requirement. Since we are relying on MIN_FDT_ALIGN to be at +* least 8 bytes so that we always access the magic and size fields +* of the FDT header after mapping the first chunk, double check if +* that is indeed the case. +*/ +BUILD_BUG_ON (MIN_FDT_ALIGN <8 ); +if ( !fdt_paddr || fdt_paddr %MIN_FDT_ALIGN ) +return NULL ; + +/* +* DTB at this address has already been mapped.`start_xen` calls this twice, +* before and after `setup_page_tables`, which is a no-op on MPU. +*/ +if ( mapped_fdt_base == fdt_paddr ) +return fdt_virt; + +ASSERT (mapped_fdt_base ==INVALID_PADDR ); + + nr_mfns = (limit - base) >>PAGE_SHIFT ; + + rc =map_pages_to_xen (base,maddr_to_mfn (base), nr_mfns, flags); +if ( rc ) +panic ("Unable to map the device-tree\n" ); + + mapped_fdt_base = fdt_paddr; + mapped_fdt_limit = limit; + +if (fdt_magic (fdt_virt) !=FDT_MAGIC ) +return NULL ; + + size =fdt_totalsize (fdt_virt); +if ( size >MAX_FDT_SIZE ) +return NULL ; + + limit =round_pgup (fdt_paddr + size); + +/* If the mapped range is not enough, map the rest of the DTB. */ +if ( limit > mapped_fdt_limit ) + { + rc =destroy_xen_mappings (base, mapped_fdt_limit); +if ( rc ) +panic ("Unable to unmap the device-tree header\n" ); + + nr_mfns = (limit - base) >>PAGE_SHIFT ; + + rc =map_pages_to_xen (base,maddr_to_mfn (base), nr_mfns, flags); +if ( rc ) +panic ("Unable to map the device-tree\n" ); + + mapped_fdt_limit = limit; + } + +return fdt_virt; }/*
Signature · 1 line
2.34.1
Re: [PATCH v4 5/6] arm/mpu: Implement early_fdt_map support in MPU systems
Quoted 12 lines · Hari Limaye
From: Luca Fancellu <[email protected]>
Implement the function
early_fdt_map(), which is responsible for mapping the Device Tree Blob in the early stages of the boot process, for MPU systems.We make use of the
map_pages_to_xen()anddestroy_xen_mappings()APIs. In particular the latter function is necessary in the case that the initial mapping of thefdt_headeris insufficient to cover the entire DTB, as we must destroy and then remap the region due to the APIs no providing support for extending the size of an existing region.
Quoted 3 lines
Signed-off-by Luca Fancellu <[email protected]>Signed-off-by Hari Limaye <[email protected]>Reviewed-by Ayan Kumar Halder <[email protected]>
~Michal
PATCH v4 6/6 arm/mpu: Implement remove_early_mappings for MPU systems
In reply to Hari LimayeFrom: Luca Fancellu <[email protected]>
Implement remove_early_mappings for MPU systems.
---
Changes from v1:
- Add Ayan's R-b
Changes from v2:
- Remove full stop
- Remove sanity check for mapped_fdt_paddr == INVALID_PADDR
Changes from v3:
- Drop Ayan's R-b
- Add Michals's R-b
--- xen/arch/arm/mpu/setup.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
xen/arch/arm/mpu/setup.c +5 -1
@@ -96,7 +96,11 @@ void __init copy_from_paddr(void *dst, paddr_t paddr, unsigned long len)void __init remove_early_mappings (void ) { -BUG_ON ("unimplemented" ); +int rc =destroy_xen_mappings (round_pgdown (mapped_fdt_base), + mapped_fdt_limit); + +if ( rc ) +panic ("Unable to unmap the device-tree\n" ); }/*
Signature · 1 line
2.34.1