Skip to contentSkip to conversation

Enable early bootup of Armv8-R AArch32 systems

PATCH Superseded Ayan Kumar Halder 4 participants 16 messages Apr 3, 2025 – Apr 7, 2025

v4 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#12 lore raw

PATCH v4 3/3 xen/arm32: mpu: Stubs to build MPU for arm32

In reply to Ayan Kumar Halder

Add stubs to enable compilation

---

Changes from :-

v1, v2 -
1. New patch introduced in v3.
2. Should be applied on top of
https://patchwork.kernel.org/project/xen-devel/cover/[email protected]/

v3 -
1. Add stubs for map_domain_page() and similar functions.

2. 'BUG_ON("unimplemented")' is kept in all the stubs.

 xen/arch/arm/arm32/mpu/Makefile  |  2 ++
 xen/arch/arm/arm32/mpu/p2m.c     | 18 ++++++++++++++
 xen/arch/arm/arm32/mpu/smpboot.c | 23 ++++++++++++++++++
 xen/arch/arm/include/asm/mm.h    |  5 ++++
 xen/arch/arm/mpu/Makefile        |  1 +
 xen/arch/arm/mpu/domain_page.c   | 40 ++++++++++++++++++++++++++++++++
 6 files changed, 89 insertions(+)
 create mode 100644 xen/arch/arm/arm32/mpu/p2m.c
 create mode 100644 xen/arch/arm/arm32/mpu/smpboot.c
 create mode 100644 xen/arch/arm/mpu/domain_page.c
xen/arch/arm/arm32/mpu/Makefile +2 -0
index 3340058c08..38797f28af 100644
@@ -1 +1,3 @@
 obj-y += head.o
+obj-y += smpboot.o
+obj-y += p2m.o
xen/arch/arm/arm32/mpu/p2m.c new file +18 -0
new file mode 100644
index 0000000000..df8de5c7d8
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <xen/init.h>
+#include <asm/p2m.h>
+
+void __init setup_virt_paging(void)
+{
+    BUG_ON("unimplemented");
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
xen/arch/arm/arm32/mpu/smpboot.c new file +23 -0
new file mode 100644
index 0000000000..3f3e54294e
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <xen/mm.h>
+
+int prepare_secondary_mm(int cpu)
+{
+    BUG_ON("unimplemented");
+    return -EINVAL;
+}
+
+void update_boot_mapping(bool enable)
+{
+    BUG_ON("unimplemented");
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
xen/arch/arm/include/asm/mm.h +5 -0
index fbffaccef4..2a52cf530f 100644
@@ -171,12 +171,17 @@ struct page_info
 #define PGC_need_scrub    PGC_allocated
 
 #ifdef CONFIG_ARM_32
+#ifdef CONFIG_MPU
+#define is_xen_heap_page(page) ({ BUG_ON("unimplemented"); false; })
+#define is_xen_heap_mfn(mfn) ({ BUG_ON("unimplemented"); false; })
+#else /* !CONFIG_MPU */
 #define is_xen_heap_page(page) is_xen_heap_mfn(page_to_mfn(page))
 #define is_xen_heap_mfn(mfn) ({                                 \
     unsigned long mfn_ = mfn_x(mfn);                            \
     (mfn_ >= mfn_x(directmap_mfn_start) &&                      \
      mfn_ < mfn_x(directmap_mfn_end));                          \
 })
+#endif /* !CONFIG_MPU */
 #else
 #define is_xen_heap_page(page) ((page)->count_info & PGC_xen_heap)
 #define is_xen_heap_mfn(mfn) \
xen/arch/arm/mpu/Makefile +1 -0
index 21bbc517b5..ff221011d5 100644
@@ -2,3 +2,4 @@ obj-y += mm.o
 obj-y += p2m.o
 obj-y += setup.init.o
 obj-y += vmap.o
+obj-$(CONFIG_ARM_32) += domain_page.o
xen/arch/arm/mpu/domain_page.c new file +40 -0
new file mode 100644
index 0000000000..b9ebb03d67
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+#include <xen/domain_page.h>
+
+void *map_domain_page_global(mfn_t mfn)
+{
+    BUG_ON("unimplemented");
+    return (void*)0;
+}
+
+/* Map a page of domheap memory */
+void *map_domain_page(mfn_t mfn)
+{
+    BUG_ON("unimplemented");
+    return (void*)0;
+}
+
+/* Release a mapping taken with map_domain_page() */
+void unmap_domain_page(const void *ptr)
+{
+    BUG_ON("unimplemented");
+}
+
+mfn_t domain_page_map_to_mfn(const void *ptr)
+{
+    BUG_ON("unimplemented");
+}
+
+void unmap_domain_page_global(const void *va)
+{
+    BUG_ON("unimplemented");
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
Signature · 1 line
2.25.1
#0 lore raw

v4 cover Enable early bootup of Armv8-R AArch32 systems

Enable early booting of Armv8-R AArch32 based systems.

Ayan Kumar Halder (3):
xen/arm: Move some of the functions to common file xen/arm32: Create the same boot-time MPU regions as arm64 xen/arm32: mpu: Stubs to build MPU for arm32

 xen/arch/arm/arm32/Makefile                   |  1 +
 xen/arch/arm/arm32/mpu/Makefile               |  3 +
 xen/arch/arm/arm32/mpu/head.S                 | 91 +++++++++++++++++++
 xen/arch/arm/arm32/mpu/p2m.c                  | 18 ++++
 xen/arch/arm/arm32/mpu/smpboot.c              | 23 +++++
 xen/arch/arm/arm64/mpu/head.S                 | 88 +-----------------
 xen/arch/arm/include/asm/arm64/sysregs.h      | 11 +++
 xen/arch/arm/include/asm/cpregs.h             |  4 +
 xen/arch/arm/include/asm/mm.h                 |  5 +
 xen/arch/arm/include/asm/mpu/cpregs.h         | 30 ++++++
 .../include/asm/mpu/prepare_xen_region.inc    | 89 ++++++++++++++++++
 xen/arch/arm/mpu/Makefile                     |  1 +
 xen/arch/arm/mpu/domain_page.c                | 40 ++++++++
 13 files changed, 317 insertions(+), 87 deletions(-)
 create mode 100644 xen/arch/arm/arm32/mpu/Makefile
 create mode 100644 xen/arch/arm/arm32/mpu/head.S
 create mode 100644 xen/arch/arm/arm32/mpu/p2m.c
 create mode 100644 xen/arch/arm/arm32/mpu/smpboot.c
 create mode 100644 xen/arch/arm/include/asm/mpu/cpregs.h
 create mode 100644 xen/arch/arm/include/asm/mpu/prepare_xen_region.inc
 create mode 100644 xen/arch/arm/mpu/domain_page.c
Signature · 1 line
2.25.1
#1 lore raw

PATCH v4 1/3 xen/arm: Move some of the functions to common file

Added a new file prepare_xen_region.inc to hold the common earlyboot MPU regions configurations across arm64 and arm32.

prepare_xen_region, fail_insufficient_regions() will be used by both arm32 and arm64. Thus, they have been moved to prepare_xen_region.inc.

enable_secondary_cpu_mm() is a stub which is moved to prepare_xen_region.inc as SMP is currently not supported for MPU.

*_PRBAR are moved to arm64/sysregs.h.
*_PRLAR are moved to prepare_xen_region.inc as they are common between arm32 and arm64.

Introduce WRITE_SYSREG_ASM to write to the system registers from the common asm file.

---
Changes from

v1 -

1. enable_mpu() now sets HMAIR{0,1} registers. This is similar to what is being done in enable_mmu(). All the mm related configurations happen in this function.

2. Fixed some typos.

v2 -
1. Extracted the arm64 head.S functions/macros in a common file.

v3 -
1. Moved *_PRLAR are moved to prepare_xen_region.inc

2. enable_boot_cpu_mm() is preserved in mpu/head.S.

3. STORE_SYSREG is renamed as WRITE_SYSREG_ASM()

4. LOAD_SYSREG is removed.

5. No need to save/restore lr in enable_boot_cpu_mm(). IOW, keep it as it was in the original code.

 xen/arch/arm/arm64/mpu/head.S                 | 88 +-----------------
 xen/arch/arm/include/asm/arm64/sysregs.h      | 11 +++
 .../include/asm/mpu/prepare_xen_region.inc    | 89 +++++++++++++++++++
 3 files changed, 101 insertions(+), 87 deletions(-)
 create mode 100644 xen/arch/arm/include/asm/mpu/prepare_xen_region.inc
xen/arch/arm/arm64/mpu/head.S +1 -87
index ed01993d85..8cd8107a13 100644
@@ -3,83 +3,7 @@
  * Start-of-day code for an Armv8-R MPU system.
  */
 
-#include <asm/early_printk.h>
-#include <asm/mpu.h>
-
-/* Backgroud region enable/disable */
-#define SCTLR_ELx_BR    BIT(17, UL)
-
-#define REGION_TEXT_PRBAR       0x38    /* SH=11 AP=10 XN=00 */
-#define REGION_RO_PRBAR         0x3A    /* SH=11 AP=10 XN=10 */
-#define REGION_DATA_PRBAR       0x32    /* SH=11 AP=00 XN=10 */
-#define REGION_DEVICE_PRBAR     0x22    /* SH=10 AP=00 XN=10 */
-
-#define REGION_NORMAL_PRLAR     0x0f    /* NS=0 ATTR=111 EN=1 */
-#define REGION_DEVICE_PRLAR     0x09    /* NS=0 ATTR=100 EN=1 */
-
-/*
- * Macro to prepare and set a EL2 MPU memory region.
- * We will also create an according MPU memory region entry, which
- * is a structure of pr_t,  in table \prmap.
- *
- * sel:         region selector
- * base:        reg storing base address
- * limit:       reg storing limit address
- * prbar:       store computed PRBAR_EL2 value
- * prlar:       store computed PRLAR_EL2 value
- * maxcount:    maximum number of EL2 regions supported
- * attr_prbar:  PRBAR_EL2-related memory attributes. If not specified it will be
- *              REGION_DATA_PRBAR
- * attr_prlar:  PRLAR_EL2-related memory attributes. If not specified it will be
- *              REGION_NORMAL_PRLAR
- *
- * Preserves \maxcount
- * Output:
- *  \sel: Next available region selector index.
- * Clobbers \base, \limit, \prbar, \prlar
- *
- * Note that all parameters using registers should be distinct.
- */
-.macro prepare_xen_region, sel, base, limit, prbar, prlar, maxcount, attr_prbar=REGION_DATA_PRBAR, attr_prlar=REGION_NORMAL_PRLAR
-    /* Check if the region is empty */
-    cmp   \base, \limit
-    beq   1f
-
-    /* Check if the number of regions exceeded the count specified in MPUIR_EL2 */
-    cmp   \sel, \maxcount
-    bge   fail_insufficient_regions
-
-    /* Prepare value for PRBAR_EL2 reg and preserve it in \prbar.*/
-    and   \base, \base, #MPU_REGION_MASK
-    mov   \prbar, #\attr_prbar
-    orr   \prbar, \prbar, \base
-
-    /* Limit address should be inclusive */
-    sub   \limit, \limit, #1
-    and   \limit, \limit, #MPU_REGION_MASK
-    mov   \prlar, #\attr_prlar
-    orr   \prlar, \prlar, \limit
-
-    msr   PRSELR_EL2, \sel
-    isb
-    msr   PRBAR_EL2, \prbar
-    msr   PRLAR_EL2, \prlar
-    dsb   sy
-    isb
-
-    add   \sel, \sel, #1
-
-1:
-.endm
-
-/*
- * Failure caused due to insufficient MPU regions.
- */
-FUNC_LOCAL(fail_insufficient_regions)
-    PRINT("- Selected MPU region is above the implemented number in MPUIR_EL2 -\r\n")
-1:  wfe
-    b   1b
-END(fail_insufficient_regions)
+#include <asm/mpu/prepare_xen_region.inc>
 
 /*
  * Enable EL2 MPU and data cache
@@ -154,16 +78,6 @@ FUNC(enable_boot_cpu_mm)
     ret
 END(enable_boot_cpu_mm)
 
-/*
- * We don't yet support secondary CPUs bring-up. Implement a dummy helper to
- * please the common code.
- */
-FUNC(enable_secondary_cpu_mm)
-    PRINT("- SMP not enabled yet -\r\n")
-1:  wfe
-    b 1b
-END(enable_secondary_cpu_mm)
-
 /*
  * Local variables:
  * mode: ASM
xen/arch/arm/include/asm/arm64/sysregs.h +11 -0
index b593e4028b..3ee3715430 100644
@@ -462,6 +462,15 @@
 #define ZCR_ELx_LEN_SIZE             9
 #define ZCR_ELx_LEN_MASK             0x1ff
 
+#define REGION_TEXT_PRBAR       0x38    /* SH=11 AP=10 XN=00 */
+#define REGION_RO_PRBAR         0x3A    /* SH=11 AP=10 XN=10 */
+#define REGION_DATA_PRBAR       0x32    /* SH=11 AP=00 XN=10 */
+#define REGION_DEVICE_PRBAR     0x22    /* SH=10 AP=00 XN=10 */
+
+#define WRITE_SYSREG_ASM(v, name) "msr " __stringify(name,) #v;
+
+#ifndef __ASSEMBLY__
+
 /* Access to system registers */
 
 #define WRITE_SYSREG64(v, name) do {                    \
@@ -481,6 +490,8 @@
 #define WRITE_SYSREG_LR(v, index)  WRITE_SYSREG(v, ICH_LR_REG(index))
 #define READ_SYSREG_LR(index)      READ_SYSREG(ICH_LR_REG(index))
 
+#endif /* __ASSEMBLY__ */
+
 #endif /* _ASM_ARM_ARM64_SYSREGS_H */
 
 /*
xen/arch/arm/include/asm/mpu/prepare_xen_region.inc new file +89 -0

89 lines not on this page · raw message

Signature · 1 line
2.25.1
#11 lore raw

PATCH v4 2/3 xen/arm32: Create the same boot-time MPU regions as arm64

In reply to Ayan Kumar Halder

We have created the same boot-time MPU protection regions as Armv8-R AArch64. Also, we have defined *_PRBAR macros for arm32. The only difference from arm64 is that XN is 1-bit for arm32.
The macros have been defined in mpu/cpregs.h.

Also defined WRITE_SYSREG_ASM() to write to system registers in assembly.

---
Changes from

v1 -

1. enable_mpu() now sets HMAIR{0,1} registers. This is similar to what is being done in enable_mmu(). All the mm related configurations happen in this function.

2. Fixed some typos.

v2 -
1. Include the common prepare_xen_region.inc in head.S.

2. Define LOAD_SYSREG()/STORE_SYSREG() for arm32.

v3 -
1. Rename STORE_SYSREG() as WRITE_SYSREG_ASM()

2. enable_boot_cpu_mm() is defined in head.S

 xen/arch/arm/arm32/Makefile           |  1 +
 xen/arch/arm/arm32/mpu/Makefile       |  1 +
 xen/arch/arm/arm32/mpu/head.S         | 91 +++++++++++++++++++++++++++
 xen/arch/arm/include/asm/cpregs.h     |  4 ++
 xen/arch/arm/include/asm/mpu/cpregs.h | 30 +++++++++
 5 files changed, 127 insertions(+)
 create mode 100644 xen/arch/arm/arm32/mpu/Makefile
 create mode 100644 xen/arch/arm/arm32/mpu/head.S
 create mode 100644 xen/arch/arm/include/asm/mpu/cpregs.h
xen/arch/arm/arm32/Makefile +1 -0
index 40a2b4803f..537969d753 100644
@@ -1,5 +1,6 @@
 obj-y += lib/
 obj-$(CONFIG_MMU) += mmu/
+obj-$(CONFIG_MPU) += mpu/
 
 obj-$(CONFIG_EARLY_PRINTK) += debug.o
 obj-y += domctl.o
xen/arch/arm/arm32/mpu/Makefile new file +1 -0
new file mode 100644
index 0000000000..3340058c08
@@ -0,0 +1 @@
+obj-y += head.o
xen/arch/arm/arm32/mpu/head.S new file +91 -0

91 lines not on this page · raw message

xen/arch/arm/include/asm/cpregs.h +4 -0
index aec9e8f329..6019a2cbdd 100644
@@ -1,6 +1,10 @@
 #ifndef __ASM_ARM_CPREGS_H
 #define __ASM_ARM_CPREGS_H
 
+#ifdef CONFIG_MPU
+#include <asm/mpu/cpregs.h>
+#endif
+
 /*
  * AArch32 Co-processor registers.
  *
xen/arch/arm/include/asm/mpu/cpregs.h new file +30 -0
new file mode 100644
index 0000000000..66871379a5
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __ASM_ARM_MPU_CPREGS_H
+#define __ASM_ARM_MPU_CPREGS_H
+
+#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */
+#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
+#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
+#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
+
+#define HMPUIR          p15,4,c0,c0,4
+
+/* CP15 CR6: MPU Protection Region Base/Limit/Select Address Register */
+#define HPRSELR         p15,4,c6,c2,1
+#define PRBAR_EL2       p15,4,c6,c3,0
+#define PRLAR_EL2       p15,4,c6,c8,1
+
+#define MPUIR_EL2       HMPUIR
+#define PRSELR_EL2      HPRSELR
+
+#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)
+
+#endif /* __ASM_ARM_MPU_CPREGS_H */
+
+/*
+ * Local variables:
+ * mode: ASM
+ * indent-tabs-mode: nil
+ * End:
+ */
Signature · 1 line
2.25.1
#15 lore raw
In reply to Ayan Kumar Halder

Hi Ayan,

Quoted 8 lines · Ayan Kumar Halder

Enable early booting of Armv8-R AArch32 based systems.

Ayan Kumar Halder (3):
xen/arm: Move some of the functions to common file xen/arm32: Create the same boot-time MPU regions as arm64 xen/arm32: mpu: Stubs to build MPU for arm32

the serie is breaking the compilation of Arm64 MPU:

[…]
xen/arch/arm/include/asm/mpu/cpregs.h:6: error: "REGION_TEXT_PRBAR" redefined [-Werror]

    6 | #define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */
      | 

[…]

Cheers,
Luca

#2 lore raw

Re: [PATCH v4 1/3] xen/arm: Move some of the functions to common file

In reply to Ayan Kumar Halder

Hi Ayan,

Quoted 15 lines · Ayan Kumar Halder

Added a new file prepare_xen_region.inc to hold the common earlyboot MPU regions configurations across arm64 and arm32.

prepare_xen_region, fail_insufficient_regions() will be used by both arm32 and arm64. Thus, they have been moved to prepare_xen_region.inc.

enable_secondary_cpu_mm() is a stub which is moved to prepare_xen_region.inc as SMP is currently not supported for MPU.

*_PRBAR are moved to arm64/sysregs.h.
*_PRLAR are moved to prepare_xen_region.inc as they are common between arm32 and arm64.

Quoted 5 lines

Introduce WRITE_SYSREG_ASM to write to the system registers from the common asm file.

---

The split for the common code seems ok to me, but this patch is introducing an issue for the arm64 compilation, I’ve done an experiment and with these changes I’m able to compile both, but feel free to ignore if it’s no what you had in mind.

xen/arch/arm/include/asm/arm32/sysregs.h +7 -0
index 22871999afb3..a90d1610a155 100644
@@ -20,6 +20,13 @@
  * uses r0 as a placeholder register. */
 #define CMD_CP32(name...)      "mcr " __stringify(CP32(r0, name)) ";"
 
+#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */
+#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
+#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
+#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
+
+#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)
+
 #ifndef __ASSEMBLY__
 
 /* C wrappers */
xen/arch/arm/include/asm/cpregs.h +6 -4
index 6019a2cbdd89..b909adc102a5 100644
@@ -1,10 +1,6 @@
 #ifndef __ASM_ARM_CPREGS_H
 #define __ASM_ARM_CPREGS_H
 
-#ifdef CONFIG_MPU
-#include <asm/mpu/cpregs.h>
-#endif
-
 /*
  * AArch32 Co-processor registers.
  *
@@ -502,6 +498,12 @@
 #define MVFR0_EL1               MVFR0
 #define MVFR1_EL1               MVFR1
 #define MVFR2_EL1               MVFR2
+#define HMPUIR                  p15,4,c0,c0,4
+#define HPRSELR                 p15,4,c6,c2,1
+#define PRBAR_EL2               p15,4,c6,c3,0
+#define PRLAR_EL2               p15,4,c6,c8,1
+#define MPUIR_EL2               HMPUIR
+#define PRSELR_EL2              HPRSELR
 #endif
 
 #endif
xen/arch/arm/include/asm/mpu/cpregs.h deleted +0 -30
deleted file mode 100644
index 66871379a53b..000000000000
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef __ASM_ARM_MPU_CPREGS_H
-#define __ASM_ARM_MPU_CPREGS_H
-
-#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */
-#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
-#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
-#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
-
-#define HMPUIR          p15,4,c0,c0,4
-
-/* CP15 CR6: MPU Protection Region Base/Limit/Select Address Register */
-#define HPRSELR         p15,4,c6,c2,1
-#define PRBAR_EL2       p15,4,c6,c3,0
-#define PRLAR_EL2       p15,4,c6,c8,1
-
-#define MPUIR_EL2       HMPUIR
-#define PRSELR_EL2      HPRSELR
-
-#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)
-
-#endif /* __ASM_ARM_MPU_CPREGS_H */
-
-/*
- * Local variables:
- * mode: ASM
- * indent-tabs-mode: nil
- * End:
- */
#13 lore raw

Re: [PATCH v4 3/3] xen/arm32: mpu: Stubs to build MPU for arm32

In reply to Ayan Kumar Halder

Hi Ayan,

Quoted 44 lines · Ayan Kumar Halder

Add stubs to enable compilation

---

Changes from :-

v1, v2 -
1. New patch introduced in v3.
2. Should be applied on top of
https://patchwork.kernel.org/project/xen-devel/cover/[email protected]/

v3 -
1. Add stubs for map_domain_page() and similar functions.

2. 'BUG_ON("unimplemented")' is kept in all the stubs.

xen/arch/arm/arm32/mpu/Makefile  |  2 ++
xen/arch/arm/arm32/mpu/p2m.c     | 18 ++++++++++++++
xen/arch/arm/arm32/mpu/smpboot.c | 23 ++++++++++++++++++
xen/arch/arm/include/asm/mm.h    |  5 ++++
xen/arch/arm/mpu/Makefile        |  1 +
xen/arch/arm/mpu/domain_page.c   | 40 ++++++++++++++++++++++++++++++++
6 files changed, 89 insertions(+)

create mode 100644 xen/arch/arm/arm32/mpu/p2m.c create mode 100644 xen/arch/arm/arm32/mpu/smpboot.c create mode 100644 xen/arch/arm/mpu/domain_page.c

xen/arch/arm/include/asm/mm.h +4 -0
index fbffaccef4..2a52cf530f 100644
@@ -171,12 +171,17 @@ struct page_info
 #define PGC_need_scrub    PGC_allocated
 
 #ifdef CONFIG_ARM_32
+#ifdef CONFIG_MPU
+#define is_xen_heap_page(page) ({ BUG_ON("unimplemented"); false; })
+#define is_xen_heap_mfn(mfn) ({ BUG_ON("unimplemented"); false; })
+#else /* !CONFIG_MPU */

xen/arch/arm/include/asm/mm.h struct page_info · line 187

Quoted 10 lines
xen/arch/arm/include/asm/mm.h +1 -0
 #define is_xen_heap_page(page) is_xen_heap_mfn(page_to_mfn(page))
 #define is_xen_heap_mfn(mfn) ({                                 \
    unsigned long mfn_ = mfn_x(mfn);                            \
    (mfn_ >= mfn_x(directmap_mfn_start) &&                      \
     mfn_ < mfn_x(directmap_mfn_end));                          \
 })
+#endif /* !CONFIG_MPU */
 #else
 #define is_xen_heap_page(page) ((page)->count_info & PGC_xen_heap)
 #define is_xen_heap_mfn(mfn) \

I’ve had a look on this, if we want to get rid of some #ifdef we could do this:

xen/arch/arm/include/asm/mm.h +1 -13
index 2a52cf530f25..5b67c0f8bb1c 100644
@@ -170,19 +170,7 @@ struct page_info
 #define _PGC_need_scrub   _PGC_allocated
 #define PGC_need_scrub    PGC_allocated
 
-#ifdef CONFIG_ARM_32
-#ifdef CONFIG_MPU
-#define is_xen_heap_page(page) ({ BUG_ON("unimplemented"); false; })
-#define is_xen_heap_mfn(mfn) ({ BUG_ON("unimplemented"); false; })
-#else /* !CONFIG_MPU */
-#define is_xen_heap_page(page) is_xen_heap_mfn(page_to_mfn(page))
-#define is_xen_heap_mfn(mfn) ({                                 \
-    unsigned long mfn_ = mfn_x(mfn);                            \
-    (mfn_ >= mfn_x(directmap_mfn_start) &&                      \
-     mfn_ < mfn_x(directmap_mfn_end));                          \
-})
-#endif /* !CONFIG_MPU */
-#else
+#ifdef CONFIG_ARM_64
 #define is_xen_heap_page(page) ((page)->count_info & PGC_xen_heap)
 #define is_xen_heap_mfn(mfn) \
     (mfn_valid(mfn) && is_xen_heap_page(mfn_to_page(mfn)))
xen/arch/arm/include/asm/mmu/mm.h +9 -0
index caba987edc85..9b98d12b076b 100644
@@ -21,6 +21,15 @@ extern unsigned long directmap_base_pdx;
 
 #define frame_table ((struct page_info *)FRAMETABLE_VIRT_START)
 
+#ifdef CONFIG_ARM_32
+#define is_xen_heap_page(page) is_xen_heap_mfn(page_to_mfn(page))
+#define is_xen_heap_mfn(mfn) ({                                 \
+    unsigned long mfn_ = mfn_x(mfn);                            \
+    (mfn_ >= mfn_x(directmap_mfn_start) &&                      \
+     mfn_ < mfn_x(directmap_mfn_end));                          \
+})
+#endif
+
 #define virt_to_maddr(va) ({                                                   \
     vaddr_t va_ = (vaddr_t)(va);                                               \
     (paddr_t)((va_to_par(va_) & PADDR_MASK & PAGE_MASK) | (va_ & ~PAGE_MASK)); \
xen/arch/arm/include/asm/mpu/mm.h +5 -0
index 86f33d9836b7..bfd840fa5d31 100644
@@ -13,6 +13,11 @@ extern struct page_info *frame_table;
 
 #define virt_to_maddr(va) ((paddr_t)((vaddr_t)(va) & PADDR_MASK))
 
+#ifdef CONFIG_ARM_32
+#define is_xen_heap_page(page) ({ BUG_ON("unimplemented"); false; })
+#define is_xen_heap_mfn(mfn) ({ BUG_ON("unimplemented"); false; })
+#endif
+
 /* On MPU systems there is no translation, ma == va. */
 static inline void *maddr_to_virt(paddr_t ma)
 {

But feel free to ignore if it’s not desirable.

Quoted 15 lines
xen/arch/arm/mpu/Makefile +0 -0
index 21bbc517b5..ff221011d5 100644
@@ -2,3 +2,4 @@ obj-y += mm.o

obj-y += p2m.o
obj-y += setup.init.o
obj-y += vmap.o

xen/arch/arm/mpu/Makefile +1 -0
+obj-$(CONFIG_ARM_32) += domain_page.o
xen/arch/arm/mpu/domain_page.c new file +0 -0
new file mode 100644
index 0000000000..b9ebb03d67

xen/arch/arm/mpu/domain_page.c line 7

Quoted 7 lines
xen/arch/arm/mpu/domain_page.c new file +7 -0
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+#include <xen/domain_page.h>
+
+void *map_domain_page_global(mfn_t mfn)
+{
+    BUG_ON("unimplemented");
+    return (void*)0;

return NULL? here and below

Quoted 8 lines
xen/arch/arm/mpu/domain_page.c new file +8 -0
+}
+
+/* Map a page of domheap memory */
+void *map_domain_page(mfn_t mfn)
+{
+    BUG_ON("unimplemented");
+    return (void*)0;
+}

xen/arch/arm/mpu/domain_page.c line 25

Quoted 10 lines
xen/arch/arm/mpu/domain_page.c new file +10 -0
+
+/* Release a mapping taken with map_domain_page() */
+void unmap_domain_page(const void *ptr)
+{
+    BUG_ON("unimplemented");
+}
+
+mfn_t domain_page_map_to_mfn(const void *ptr)
+{
+    BUG_ON("unimplemented");

Not really necessary, but if you want: return INVALID_MFN;

Quoted 19 lines
xen/arch/arm/mpu/domain_page.c new file +15 -0
+}
+
+void unmap_domain_page_global(const void *va)
+{
+    BUG_ON("unimplemented");
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
Signature · 1 line
2.25.1
#6 lore raw

Re: [PATCH v4 1/3] xen/arm: Move some of the functions to common file

In reply to Ayan Kumar Halder
Quoted 8 lines · Ayan Kumar Halder

Added a new file prepare_xen_region.inc to hold the common earlyboot MPU regions configurations across arm64 and arm32.

prepare_xen_region, fail_insufficient_regions() will be used by both arm32 and arm64. Thus, they have been moved to prepare_xen_region.inc.

enable_secondary_cpu_mm() is a stub which is moved to prepare_xen_region.inc as SMP is currently not supported for MPU.

This does not sound right. If you want a place to keep some common MPU stuff between Arm64 and Arm32, you need to come up with better name for a file. SMP has nothing to do here with preparing regions so it feels odd to have enable_secondary_cpu_mm stub there.

Also, new files should use dashes '-' and not underscores '_'.

~Michal

#7 lore raw

Re: [PATCH v4 1/3] xen/arm: Move some of the functions to common file

Hi Michal,

Quoted 8 lines · Michal
Quoted 6 lines · Ayan Kumar Halder

Added a new file prepare_xen_region.inc to hold the common earlyboot MPU regions configurations across arm64 and arm32.

prepare_xen_region, fail_insufficient_regions() will be used by both arm32 and arm64. Thus, they have been moved to prepare_xen_region.inc.

Quoted 6 lines
Quoted 2 lines

enable_secondary_cpu_mm() is a stub which is moved to prepare_xen_region.inc as SMP is currently not supported for MPU.

This does not sound right. If you want a place to keep some common MPU stuff between Arm64 and Arm32, you need to come up with better name for a file. SMP has nothing to do here with preparing regions so it feels odd to have enable_secondary_cpu_mm stub there.

Can I rename prepare-xen-region.inc to mpu.inc ?

Julien/Luca - any thoughts ?

Quoted 2 lines

Also, new files should use dashes '-' and not underscores '_'.

Ack

- Ayan

Quoted 3 lines

~Michal

#8 lore raw

Re: [PATCH v4 1/3] xen/arm: Move some of the functions to common file

Hi Ayan,

Quoted 15 lines · Ayan Kumar Halder

Hi Michal,

Quoted 10 lines · Michal
Quoted 8 lines · Ayan Kumar Halder

Added a new file prepare_xen_region.inc to hold the common earlyboot MPU regions configurations across arm64 and arm32.

prepare_xen_region, fail_insufficient_regions() will be used by both arm32 and arm64. Thus, they have been moved to prepare_xen_region.inc.

enable_secondary_cpu_mm() is a stub which is moved to prepare_xen_region.inc as SMP is currently not supported for MPU.

Quoted 8 lines
Quoted 4 lines

This does not sound right. If you want a place to keep some common MPU stuff between Arm64 and Arm32, you need to come up with better name for a file. SMP has nothing to do here with preparing regions so it feels odd to have enable_secondary_cpu_mm stub there.

Can I rename prepare-xen-region.inc to mpu.inc ?

Julien/Luca - any thoughts ?

I would say we leave the SMP stuff out from the common file, at some point we could start working on the SMP support and maybe there would be difference between arm64 and arm32.

what about common-cpu.inc?

Quoted 12 lines
Quoted 3 lines

Also, new files should use dashes '-' and not underscores '_'.

Ack

- Ayan

Quoted 3 lines

~Michal

Cheers,
Luca

#9 lore raw

Re: [PATCH v4 1/3] xen/arm: Move some of the functions to common file

Quoted 1 line · Luca Fancellu

Hi Ayan,

Hi,

Quoted 19 lines
Quoted 19 lines · Ayan Kumar Halder

Hi Michal,

Quoted 13 lines · Michal
Quoted 8 lines · Ayan Kumar Halder

Added a new file prepare_xen_region.inc to hold the common earlyboot MPU regions configurations across arm64 and arm32.

prepare_xen_region, fail_insufficient_regions() will be used by both arm32 and arm64. Thus, they have been moved to prepare_xen_region.inc.

enable_secondary_cpu_mm() is a stub which is moved to prepare_xen_region.inc as SMP is currently not supported for MPU.

This does not sound right. If you want a place to keep some common MPU stuff between Arm64 and Arm32, you need to come up with better name for a file. SMP has nothing to do here with preparing regions so it feels odd to have enable_secondary_cpu_mm stub there.

Quoted 5 lines
Quoted 3 lines

Can I rename prepare-xen-region.inc to mpu.inc ?

Julien/Luca - any thoughts ?

I would say we leave the SMP stuff out from the common file, at some point we could start working on the SMP support and maybe there would be difference between arm64 and arm32.

Do you want to duplicate enable_secondary_cpu_mm() in arm32 and arm64 ? I am fine with that.

Quoted 2 lines

what about common-cpu.inc?

Sounds ok.

Michal or Julien should comment as well.

- Ayan

Quoted 11 lines
Quoted 8 lines
Quoted 2 lines

Also, new files should use dashes '-' and not underscores '_'.

Ack

- Ayan

Quoted 2 lines

~Michal

Cheers,
Luca

#3 lore raw

Re: [PATCH v4 1/3] xen/arm: Move some of the functions to common file

In reply to Luca Fancellu

Hi Luca,

Quoted 17 lines · Luca Fancellu

Hi Ayan,

Quoted 15 lines · Ayan Kumar Halder

Added a new file prepare_xen_region.inc to hold the common earlyboot MPU regions configurations across arm64 and arm32.

prepare_xen_region, fail_insufficient_regions() will be used by both arm32 and arm64. Thus, they have been moved to prepare_xen_region.inc.

enable_secondary_cpu_mm() is a stub which is moved to prepare_xen_region.inc as SMP is currently not supported for MPU.

*_PRBAR are moved to arm64/sysregs.h.
*_PRLAR are moved to prepare_xen_region.inc as they are common between arm32 and arm64.

Quoted 6 lines
Quoted 5 lines

Introduce WRITE_SYSREG_ASM to write to the system registers from the common asm file.

---

The split for the common code seems ok to me, but this patch is introducing an issue for the arm64 compilation,

Sorry, I moved something at the last moment without testing. :(

Quoted 2 lines

I’ve done an experiment and with these changes I’m able to compile both, but feel free to ignore if it’s no what you had in mind.

The change looks good. However, ...

Quoted 35 lines
xen/arch/arm/include/asm/arm32/sysregs.h +7 -0
index 22871999afb3..a90d1610a155 100644
@@ -20,6 +20,13 @@
   * uses r0 as a placeholder register. */
  #define CMD_CP32(name...)      "mcr " __stringify(CP32(r0, name)) ";"
 
+#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */
+#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
+#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
+#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
+
+#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)
+
  #ifndef __ASSEMBLY__
 
  /* C wrappers */
xen/arch/arm/include/asm/cpregs.h +0 -4
index 6019a2cbdd89..b909adc102a5 100644
@@ -1,10 +1,6 @@
  #ifndef __ASM_ARM_CPREGS_H
  #define __ASM_ARM_CPREGS_H
 
-#ifdef CONFIG_MPU
-#include <asm/mpu/cpregs.h>
-#endif
-
  /*
   * AArch32 Co-processor registers.
   *

xen/arch/arm/include/asm/cpregs.h line 506

Quoted 9 lines
xen/arch/arm/include/asm/cpregs.h +6 -0
@@ -502,6 +498,12 @@
  #define MVFR0_EL1               MVFR0
  #define MVFR1_EL1               MVFR1
  #define MVFR2_EL1               MVFR2
+#define HMPUIR                  p15,4,c0,c0,4
+#define HPRSELR                 p15,4,c6,c2,1
+#define PRBAR_EL2               p15,4,c6,c3,0
+#define PRLAR_EL2               p15,4,c6,c8,1
+#define MPUIR_EL2               HMPUIR
+#define PRSELR_EL2              HPRSELR

Considering that there will be lots of arm32 MPU specific registers, do you want to move them to mpu/cpregs.h ?

That would be my style preference.

This issue does not occur with arm64 as compiler provides most of them.

Michal or Julien - thoughts ?

Rest look ok.

- Ayan

Quoted 42 lines
xen/arch/arm/include/asm/cpregs.h +0 -0
  #endif
 
  #endif
xen/arch/arm/include/asm/mpu/cpregs.h deleted +0 -30
deleted file mode 100644
index 66871379a53b..000000000000
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef __ASM_ARM_MPU_CPREGS_H
-#define __ASM_ARM_MPU_CPREGS_H
-
-#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */
-#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
-#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
-#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
-
-#define HMPUIR          p15,4,c0,c0,4
-
-/* CP15 CR6: MPU Protection Region Base/Limit/Select Address Register */
-#define HPRSELR         p15,4,c6,c2,1
-#define PRBAR_EL2       p15,4,c6,c3,0
-#define PRLAR_EL2       p15,4,c6,c8,1
-
-#define MPUIR_EL2       HMPUIR
-#define PRSELR_EL2      HPRSELR
-
-#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)
-
-#endif /* __ASM_ARM_MPU_CPREGS_H */
-
-/*
- * Local variables:
- * mode: ASM
- * indent-tabs-mode: nil
- * End:
- */
#4 lore raw

Re: [PATCH v4 1/3] xen/arm: Move some of the functions to common file

Hi Ayan,

Quoted 76 lines · Ayan Kumar Halder

Hi Luca,

Quoted 17 lines · Luca Fancellu

Hi Ayan,

Quoted 15 lines · Ayan Kumar Halder

Added a new file prepare_xen_region.inc to hold the common earlyboot MPU regions configurations across arm64 and arm32.

prepare_xen_region, fail_insufficient_regions() will be used by both arm32 and arm64. Thus, they have been moved to prepare_xen_region.inc.

enable_secondary_cpu_mm() is a stub which is moved to prepare_xen_region.inc as SMP is currently not supported for MPU.

*_PRBAR are moved to arm64/sysregs.h.
*_PRLAR are moved to prepare_xen_region.inc as they are common between arm32 and arm64.

Quoted 6 lines
Quoted 5 lines

Introduce WRITE_SYSREG_ASM to write to the system registers from the common asm file.

---

The split for the common code seems ok to me, but this patch is introducing an issue for the arm64 compilation,

Sorry, I moved something at the last moment without testing. :(

Quoted 2 lines

I’ve done an experiment and with these changes I’m able to compile both, but feel free to ignore if it’s no what you had in mind.

The change looks good. However, ...

Quoted 32 lines
xen/arch/arm/include/asm/arm32/sysregs.h +6 -0
index 22871999afb3..a90d1610a155 100644
@@ -20,6 +20,13 @@
  * uses r0 as a placeholder register. */
 #define CMD_CP32(name...)      "mcr " __stringify(CP32(r0, name)) ";"
 +#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */
+#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
+#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
+#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
+
+#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)
+
 #ifndef __ASSEMBLY__
   /* C wrappers */
xen/arch/arm/include/asm/cpregs.h +0 -3
index 6019a2cbdd89..b909adc102a5 100644
@@ -1,10 +1,6 @@
 #ifndef __ASM_ARM_CPREGS_H
 #define __ASM_ARM_CPREGS_H
 -#ifdef CONFIG_MPU
-#include <asm/mpu/cpregs.h>
-#endif
-
 /*
  * AArch32 Co-processor registers.
  *

xen/arch/arm/include/asm/cpregs.h line 506

Quoted 9 lines
xen/arch/arm/include/asm/cpregs.h +6 -0
@@ -502,6 +498,12 @@
 #define MVFR0_EL1               MVFR0
 #define MVFR1_EL1               MVFR1
 #define MVFR2_EL1               MVFR2
+#define HMPUIR                  p15,4,c0,c0,4
+#define HPRSELR                 p15,4,c6,c2,1
+#define PRBAR_EL2               p15,4,c6,c3,0
+#define PRLAR_EL2               p15,4,c6,c8,1
+#define MPUIR_EL2               HMPUIR
+#define PRSELR_EL2              HPRSELR

Considering that there will be lots of arm32 MPU specific registers, do you want to move them to mpu/cpregs.h ?

Quoted 1 line

That would be my style preference.

I don’t have any strong opinion so it’s fine if you want them in cpregs.h.

Cheers,
Luca

#10 lore raw

Re: [PATCH v4 1/3] xen/arm: Move some of the functions to common file

In reply to Ayan Kumar Halder
Quoted 23 lines · Ayan Kumar Halder
Quoted 1 line · Luca Fancellu

Hi Ayan,

Hi,

Quoted 19 lines
Quoted 19 lines · Ayan Kumar Halder

Hi Michal,

Quoted 13 lines · Michal
Quoted 8 lines · Ayan Kumar Halder

Added a new file prepare_xen_region.inc to hold the common earlyboot MPU regions configurations across arm64 and arm32.

prepare_xen_region, fail_insufficient_regions() will be used by both arm32 and arm64. Thus, they have been moved to prepare_xen_region.inc.

enable_secondary_cpu_mm() is a stub which is moved to prepare_xen_region.inc as SMP is currently not supported for MPU.

This does not sound right. If you want a place to keep some common MPU stuff between Arm64 and Arm32, you need to come up with better name for a file. SMP has nothing to do here with preparing regions so it feels odd to have enable_secondary_cpu_mm stub there.

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

Can I rename prepare-xen-region.inc to mpu.inc ?

Julien/Luca - any thoughts ?

I would say we leave the SMP stuff out from the common file, at some point we could start working on the SMP support and maybe there would be difference between arm64 and arm32.

Do you want to duplicate enable_secondary_cpu_mm() in arm32 and arm64 ? I am fine with that.

+1

Quoted 4 lines
Quoted 2 lines

what about common-cpu.inc?

Sounds ok.

common.inc should suffice. Let's not split hairs.

~Michal

#5 lore raw

Re: [PATCH v4 1/3] xen/arm: Move some of the functions to common file

In reply to Luca Fancellu
Quoted 81 lines · Luca Fancellu

Hi Ayan,

Quoted 76 lines · Ayan Kumar Halder

Hi Luca,

Quoted 17 lines · Luca Fancellu

Hi Ayan,

Quoted 15 lines · Ayan Kumar Halder

Added a new file prepare_xen_region.inc to hold the common earlyboot MPU regions configurations across arm64 and arm32.

prepare_xen_region, fail_insufficient_regions() will be used by both arm32 and arm64. Thus, they have been moved to prepare_xen_region.inc.

enable_secondary_cpu_mm() is a stub which is moved to prepare_xen_region.inc as SMP is currently not supported for MPU.

*_PRBAR are moved to arm64/sysregs.h.
*_PRLAR are moved to prepare_xen_region.inc as they are common between arm32 and arm64.

Quoted 6 lines
Quoted 5 lines

Introduce WRITE_SYSREG_ASM to write to the system registers from the common asm file.

---

The split for the common code seems ok to me, but this patch is introducing an issue for the arm64 compilation,

Sorry, I moved something at the last moment without testing. :(

Quoted 2 lines

I’ve done an experiment and with these changes I’m able to compile both, but feel free to ignore if it’s no what you had in mind.

The change looks good. However, ...

Quoted 32 lines
xen/arch/arm/include/asm/arm32/sysregs.h +6 -0
index 22871999afb3..a90d1610a155 100644
@@ -20,6 +20,13 @@
  * uses r0 as a placeholder register. */
 #define CMD_CP32(name...)      "mcr " __stringify(CP32(r0, name)) ";"
 +#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */
+#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
+#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
+#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
+
+#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)
+
 #ifndef __ASSEMBLY__
   /* C wrappers */
xen/arch/arm/include/asm/cpregs.h +0 -3
index 6019a2cbdd89..b909adc102a5 100644
@@ -1,10 +1,6 @@
 #ifndef __ASM_ARM_CPREGS_H
 #define __ASM_ARM_CPREGS_H
 -#ifdef CONFIG_MPU
-#include <asm/mpu/cpregs.h>
-#endif
-
 /*
  * AArch32 Co-processor registers.
  *

xen/arch/arm/include/asm/cpregs.h line 506

Quoted 9 lines
xen/arch/arm/include/asm/cpregs.h +6 -0
@@ -502,6 +498,12 @@
 #define MVFR0_EL1               MVFR0
 #define MVFR1_EL1               MVFR1
 #define MVFR2_EL1               MVFR2
+#define HMPUIR                  p15,4,c0,c0,4
+#define HPRSELR                 p15,4,c6,c2,1
+#define PRBAR_EL2               p15,4,c6,c3,0
+#define PRLAR_EL2               p15,4,c6,c8,1
+#define MPUIR_EL2               HMPUIR
+#define PRSELR_EL2              HPRSELR

Considering that there will be lots of arm32 MPU specific registers, do you want to move them to mpu/cpregs.h ?

Quoted 3 lines
Quoted 1 line

That would be my style preference.

I don’t have any strong opinion so it’s fine if you want them in cpregs.h.

If there are really a lot of new additions and the movement improves readability, I'm ok with them being stored in mpu/cpregs.h

~Michal

#14 lore raw

Re: [PATCH v4 3/3] xen/arm32: mpu: Stubs to build MPU for arm32

In reply to Luca Fancellu
Quoted 1 line · Luca Fancellu

Hi Ayan,

Hi Luca,

Quoted 118 lines
Quoted 44 lines · Ayan Kumar Halder

Add stubs to enable compilation

---

Changes from :-

v1, v2 -
1. New patch introduced in v3.
2. Should be applied on top of
https://patchwork.kernel.org/project/xen-devel/cover/[email protected]/

v3 -
1. Add stubs for map_domain_page() and similar functions.

2. 'BUG_ON("unimplemented")' is kept in all the stubs.

xen/arch/arm/arm32/mpu/Makefile  |  2 ++
xen/arch/arm/arm32/mpu/p2m.c     | 18 ++++++++++++++
xen/arch/arm/arm32/mpu/smpboot.c | 23 ++++++++++++++++++
xen/arch/arm/include/asm/mm.h    |  5 ++++
xen/arch/arm/mpu/Makefile        |  1 +
xen/arch/arm/mpu/domain_page.c   | 40 ++++++++++++++++++++++++++++++++
6 files changed, 89 insertions(+)

create mode 100644 xen/arch/arm/arm32/mpu/p2m.c create mode 100644 xen/arch/arm/arm32/mpu/smpboot.c create mode 100644 xen/arch/arm/mpu/domain_page.c

xen/arch/arm/include/asm/mm.h +4 -0
index fbffaccef4..2a52cf530f 100644
@@ -171,12 +171,17 @@ struct page_info
 #define PGC_need_scrub    PGC_allocated
 
 #ifdef CONFIG_ARM_32
+#ifdef CONFIG_MPU
+#define is_xen_heap_page(page) ({ BUG_ON("unimplemented"); false; })
+#define is_xen_heap_mfn(mfn) ({ BUG_ON("unimplemented"); false; })
+#else /* !CONFIG_MPU */

xen/arch/arm/include/asm/mm.h struct page_info · line 187

Quoted 10 lines
xen/arch/arm/include/asm/mm.h +1 -0
 #define is_xen_heap_page(page) is_xen_heap_mfn(page_to_mfn(page))
 #define is_xen_heap_mfn(mfn) ({                                 \
     unsigned long mfn_ = mfn_x(mfn);                            \
     (mfn_ >= mfn_x(directmap_mfn_start) &&                      \
      mfn_ < mfn_x(directmap_mfn_end));                          \
 })
+#endif /* !CONFIG_MPU */
 #else
 #define is_xen_heap_page(page) ((page)->count_info & PGC_xen_heap)
 #define is_xen_heap_mfn(mfn) \

I’ve had a look on this, if we want to get rid of some #ifdef we could do this:

xen/arch/arm/include/asm/mm.h +1 -13
index 2a52cf530f25..5b67c0f8bb1c 100644
@@ -170,19 +170,7 @@ struct page_info
  #define _PGC_need_scrub   _PGC_allocated
  #define PGC_need_scrub    PGC_allocated
 
-#ifdef CONFIG_ARM_32
-#ifdef CONFIG_MPU
-#define is_xen_heap_page(page) ({ BUG_ON("unimplemented"); false; })
-#define is_xen_heap_mfn(mfn) ({ BUG_ON("unimplemented"); false; })
-#else /* !CONFIG_MPU */
-#define is_xen_heap_page(page) is_xen_heap_mfn(page_to_mfn(page))
-#define is_xen_heap_mfn(mfn) ({                                 \
-    unsigned long mfn_ = mfn_x(mfn);                            \
-    (mfn_ >= mfn_x(directmap_mfn_start) &&                      \
-     mfn_ < mfn_x(directmap_mfn_end));                          \
-})
-#endif /* !CONFIG_MPU */
-#else
+#ifdef CONFIG_ARM_64
  #define is_xen_heap_page(page) ((page)->count_info & PGC_xen_heap)
  #define is_xen_heap_mfn(mfn) \
      (mfn_valid(mfn) && is_xen_heap_page(mfn_to_page(mfn)))
xen/arch/arm/include/asm/mmu/mm.h +9 -0
index caba987edc85..9b98d12b076b 100644
@@ -21,6 +21,15 @@ extern unsigned long directmap_base_pdx;
 
  #define frame_table ((struct page_info *)FRAMETABLE_VIRT_START)
 
+#ifdef CONFIG_ARM_32
+#define is_xen_heap_page(page) is_xen_heap_mfn(page_to_mfn(page))
+#define is_xen_heap_mfn(mfn) ({                                 \
+    unsigned long mfn_ = mfn_x(mfn);                            \
+    (mfn_ >= mfn_x(directmap_mfn_start) &&                      \
+     mfn_ < mfn_x(directmap_mfn_end));                          \
+})
+#endif
+
  #define virt_to_maddr(va) ({                                                   \
      vaddr_t va_ = (vaddr_t)(va);                                               \
      (paddr_t)((va_to_par(va_) & PADDR_MASK & PAGE_MASK) | (va_ & ~PAGE_MASK)); \
xen/arch/arm/include/asm/mpu/mm.h +5 -0
index 86f33d9836b7..bfd840fa5d31 100644
@@ -13,6 +13,11 @@ extern struct page_info *frame_table;
 
  #define virt_to_maddr(va) ((paddr_t)((vaddr_t)(va) & PADDR_MASK))
 
+#ifdef CONFIG_ARM_32
+#define is_xen_heap_page(page) ({ BUG_ON("unimplemented"); false; })
+#define is_xen_heap_mfn(mfn) ({ BUG_ON("unimplemented"); false; })
+#endif
+
  /* On MPU systems there is no translation, ma == va. */
  static inline void *maddr_to_virt(paddr_t ma)
  {
Quoted 1 line

But feel free to ignore if it’s not desirable.

Actually, makes sense. I have included this in my v5.

Quoted 37 lines
Quoted 17 lines
xen/arch/arm/mpu/Makefile +0 -0
index 21bbc517b5..ff221011d5 100644
@@ -2,3 +2,4 @@ obj-y += mm.o

obj-y += p2m.o
obj-y += setup.init.o
obj-y += vmap.o

xen/arch/arm/mpu/Makefile +1 -0
+obj-$(CONFIG_ARM_32) += domain_page.o
xen/arch/arm/mpu/domain_page.c new file +0 -0
new file mode 100644
index 0000000000..b9ebb03d67

xen/arch/arm/mpu/domain_page.c line 7

Quoted 7 lines
xen/arch/arm/mpu/domain_page.c new file +7 -0
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+#include <xen/domain_page.h>
+
+void *map_domain_page_global(mfn_t mfn)
+{
+    BUG_ON("unimplemented");
+    return (void*)0;

return NULL? here and below

Quoted 11 lines
xen/arch/arm/mpu/domain_page.c new file +11 -0
+}
+
+/* Map a page of domheap memory */
+void *map_domain_page(mfn_t mfn)
+{
+    BUG_ON("unimplemented");
+    return (void*)0;
+}
+
+/* Release a mapping taken with map_domain_page() */
+void unmap_domain_page(const void *ptr)
Quoted 8 lines

xen/arch/arm/mpu/domain_page.c line 25

Quoted 7 lines
xen/arch/arm/mpu/domain_page.c new file +7 -0
+{
+    BUG_ON("unimplemented");
+}
+
+mfn_t domain_page_map_to_mfn(const void *ptr)
+{
+    BUG_ON("unimplemented");

Not really necessary, but if you want: return INVALID_MFN;

The function is still technically unimplemented, so I will keep that and add return INVALID_MFN;

The rest of your suggestions are perfect. :)

I have incorporated them in v5.

- Ayan

Quoted 20 lines
Quoted 20 lines
xen/arch/arm/mpu/domain_page.c new file +15 -0
+}
+
+void unmap_domain_page_global(const void *va)
+{
+    BUG_ON("unimplemented");
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
Signature · 1 line
2.25.1