Exception handling in HYP mode on ARMv7-A
Subsystems (5)
v2 cover Exception handling in HYP mode on ARMv7-A
Currently, when U-Boot is running in hypervisor mode on ARMv7-A CPUs with virtualization extensions, the exception handling does not work. A couple things need to change which are detailed in my earlier message to the u-boot mailing list with the subject "Exception handling in HYP mode on ARMv7-A".
I have verified that this patch series works on the ODroid XU4 and the Raspberry Pi 3B in Aarch32 mode when running in hypervisor mode. One simple way to verify is by running the miscellaneous "exception" command (CMD_EXCEPTION).
This can be tested with QEMU now. Configure with qemu_arm_defconfig and add CMD_EXCEPTION and QEMU_ARM_32BIT_HAS_VIRT. Then run
qemu-system-arm \
-machine virt,virtualization \
-nographic -serial mon:stdio \
-bios u-boot.binU-Boot 2021.10-...
...
=> exception undefined
Changes in v2:
- Fix CP15 register written to in start.S
- Check processor mode as HVBAR register is only accessible in HYP mode
- Add QEMU config option for ARM32 with virtualization extensions
Jim Posen (6):
Compile for ARMv7-A with virtualization extensions Hypervisor mode interrupt vector table
Set HVBAR register correctly
Remove dead code
Fix PC adjustment logic in exception handlers Config to target QEMU virt machine with virtualization
arch/arm/Makefile | 4 + arch/arm/cpu/armv7/start.S | 8 ++ arch/arm/include/asm/u-boot-arm.h | 14 ++-- arch/arm/lib/interrupts.c | 26 +++--- arch/arm/lib/relocate.S | 13 +++ arch/arm/lib/vectors.S | 129 +++++++++++++++++++++++------- arch/arm/mach-bcm283x/Kconfig | 3 + arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-qemu/Kconfig | 6 ++ 9 files changed, 153 insertions(+), 51 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/6 Compile for ARMv7-A with virtualization extensions
In order to assemble instructions that read the ELR_hyp register, which is part of the ARMv7-A virtualization extensions, the assembler target architecture needs to be changed.
---
(no changes since v1)
arch/arm/Makefile | 4 ++++ arch/arm/mach-bcm283x/Kconfig | 3 +++ arch/arm/mach-exynos/Kconfig | 1 + 3 files changed, 8 insertions(+)
arch/arm/Makefile +4 -0
@@ -14,8 +14,12 @@ arch-$(CONFIG_CPU_SA1100) =-march=armv4 arch-$(CONFIG_CPU_PXA) = arch-$(CONFIG_CPU_ARM1136) =-march=armv5t arch-$(CONFIG_CPU_ARM1176) =-march=armv5t +ifeq ($(CONFIG_CPU_V7_HAS_VIRT),y) +arch-$(CONFIG_CPU_V7A) =-march=armv7ve +else arch-$(CONFIG_CPU_V7A) =$(call cc-option, -march=armv7-a, \ $(call cc-option, -march=armv7)) +endif arch-$(CONFIG_CPU_V7M) =-march=armv7-m arch-$(CONFIG_CPU_V7R) =-march=armv7-r ifeq ($(CONFIG_ARM64_CRC32),y)
arch/arm/mach-bcm283x/Kconfig +3 -0
@@ -8,6 +8,7 @@ config BCM2836 depends on ARCH_BCM283X select ARMV7_LPAE select CPU_V7A + select CPU_V7_HAS_VIRT config BCM2837 bool "Broadcom BCM2837 SoC support"
@@ -19,6 +20,7 @@ config BCM2837_32B select BCM2837 select ARMV7_LPAE select CPU_V7A + select CPU_V7_HAS_VIRT config BCM2837_64B bool "Broadcom BCM2837 SoC 64-bit support"
@@ -36,6 +38,7 @@ config BCM2711_32B select BCM2711 select ARMV7_LPAE select CPU_V7A + select CPU_V7_HAS_VIRT select PHYS_64BIT config BCM2711_64B
arch/arm/mach-exynos/Kconfig +1 -0
@@ -19,6 +19,7 @@ config ARCH_EXYNOS5 bool "Exynos5 SoC family" select BOARD_EARLY_INIT_F select CPU_V7A + select CPU_V7_HAS_VIRT select SHA_HW_ACCEL imply CMD_HASH imply CRC32_VERIFY
Signature · 1 line
2.25.1
PATCH v2 2/6 Hypervisor mode interrupt vector table
In reply to Jim PosenCreate separate vector table for exceptions taken to PL2, which happens when U-Boot is running in hypervisor mode. The handler logic is different enough that a separate vector table is the simplest way to handle it.
---
(no changes since v1)
arch/arm/lib/vectors.S | 95 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+)
arch/arm/lib/vectors.S +95 -0
@@ -117,6 +117,39 @@ _not_used: .word not_used _irq: .word irq _fiq: .word fiq +#ifdef CONFIG_CPU_V7_HAS_VIRT +/* + ************************************************************************* + * + * Hypervisor mode interrupt vectors table + * + ************************************************************************* + */ + + .globl hyp_vector_table + + .align 5 +hyp_vector_table: + ldr pc, _hyp_reset + ldr pc, _hyp_undefined_instruction + ldr pc, _hyp_software_interrupt + ldr pc, _hyp_prefetch_abort + ldr pc, _hyp_data_abort + ldr pc, _hyp_not_used + ldr pc, _hyp_irq + ldr pc, _hyp_fiq + +_hyp_reset: .word reset +_hyp_undefined_instruction: .word hyp_undefined_instruction +_hyp_software_interrupt: .word hyp_software_interrupt +_hyp_prefetch_abort: .word hyp_prefetch_abort +_hyp_data_abort: .word hyp_data_abort +_hyp_not_used: .word hyp_not_used +_hyp_irq: .word hyp_irq +_hyp_fiq: .word hyp_fiq + +#endif /* CONFIG_CPU_V7_HAS_VIR + .balignl 16,0xdeadbeef /*
@@ -139,6 +172,15 @@ data_abort: not_used: irq: fiq: +#ifdef CONFIG_CPU_V7_HAS_VIRT +hyp_undefined_instruction: +hyp_software_interrupt: +hyp_prefetch_abort: +hyp_data_abort: +hyp_not_used: +hyp_irq: +hyp_fiq: +#endif /* CONFIG_CPU_V7_HAS_VIRT 1: b 1b /* hang and never return */
@@ -289,4 +331,57 @@ fiq: bad_save_user_regs bl do_fiq +#ifdef CONFIG_CPU_V7_HAS_VIRT + +/** + * Hypervisor mode exception handlers + * + * If exception is taken to EL2, U-Boot must have been running in hypervisor + * mode. Use the existing stack to save register values onto because + * overwriting the stack pointer would leave no way to inspect its value. + */ + + .macro hyp_enter_exception + str sp, [sp, #(-S_FRAME_SIZE + S_SP)] + sub sp, sp, #S_FRAME_SIZE + stmia sp, {r0 - r12} + mrs r1, elr_hyp + mrs r2, spsr + str lr, [sp, #S_LR] + str r1, [sp, #S_PC] + str r2, [sp, #S_PSR] + str r0, [sp, #S_OLD_R0] + mov r0, sp + .endm + +hyp_undefined_instruction: + hyp_enter_exception + bl do_undefined_instruction + +hyp_software_interrupt: + hyp_enter_exception + bl do_software_interrupt + +hyp_prefetch_abort: + hyp_enter_exception + bl do_prefetch_abort + +hyp_data_abort: + hyp_enter_exception + bl do_data_abort + +hyp_not_used: + hyp_enter_exception + bl do_not_used + +hyp_irq: + hyp_enter_exception + bl do_irq + +hyp_fiq: + hyp_enter_exception + bl do_fiq + +#endif /* CONFIG_CPU_V7_HAS_VIRT */ + #endif /* CONFIG_SPL_BUILD */
Signature · 1 line
2.25.1
PATCH v2 3/6 Set HVBAR register correctly
In reply to Jim PosenThis is the base address register for the vector table when in hypervisor mode.
---
Changes in v2:
- Fix CP15 register written to in start.S
- Check processor mode as HVBAR register is only accessible in HYP mode
arch/arm/cpu/armv7/start.S | 8 ++++++++ arch/arm/lib/relocate.S | 13 +++++++++++++ 2 files changed, 21 insertions(+)
arch/arm/cpu/armv7/start.S +8 -0
@@ -113,6 +113,14 @@ switch_to_hypervisor_ret: ldr r0, =_start mcr p15, 0, r0, c12, c0, 0 @Set VBAR #endif +#ifdef CONFIG_CPU_V7_HAS_VIRT + /* Z flag is still set from HYP mode test */ + bne skip_set_hvbar + /* Set hyp vector address in CP15 HVBAR register */ + ldr r0, =hyp_vector_table + mcr p15, 4, r0, c12, c0, 0 @Set HVBAR +skip_set_hvbar: +#endif #endif /* the mask ROM code should have PLL and others stable */
arch/arm/lib/relocate.S +13 -0
@@ -60,6 +60,19 @@ ENTRY(relocate_vectors) ldmia r0!, {r2-r8,r10} stmia r1!, {r2-r8,r10} #endif +#ifdef CONFIG_CPU_V7_HAS_VIRT + /* + * If the ARM processor has the virtualization extensions and running in HYP + * mode, use HVBAR to relocate the EL2 exception vectors. + */ + mrs r1, cpsr + and r1, r1, #0x1f @ mask mode bits + teq r1, #0x1a @ test for HYP mode + bne skip_relocate_hvbar + ldr r0, =hyp_vector_table /* load dynamically relocated address */ + mcr p15, 4, r0, c12, c0, 0 /* Set HVBAR */ +skip_relocate_hvbar: +#endif #endif bx lr
Signature · 1 line
2.25.1
PATCH v2 4/6 Remove dead code
In reply to Jim PosenThis code was missed in commit 01abae4d0486 ("Remove various unused interrupt related code")
---
(no changes since v1)
arch/arm/lib/vectors.S | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-)
arch/arm/lib/vectors.S +1 -31
@@ -224,8 +224,7 @@ IRQ_STACK_START_IN: #define I_BIT 0x80 /* - * use bad_save_user_regs for abort/prefetch/undef/swi ... - * use irq_save_user_regs / irq_restore_user_regs for IRQ/FIQ handling + * use bad_save_user_regs for all exception types */ .macro bad_save_user_regs
@@ -242,27 +241,6 @@ IRQ_STACK_START_IN: mov r0, sp @ save current stack into r0 (param register) .endm - .macro irq_save_user_regs - sub sp, sp, #S_FRAME_SIZE - stmia sp, {r0 - r12} @ Calling r0-r12 - @ !!!! R8 NEEDS to be saved !!!! a reserved stack spot would be good. - add r8, sp, #S_PC - stmdb r8, {sp, lr}^ @ Calling SP, LR - str lr, [r8, #0] @ Save calling PC - mrs r6, spsr - str r6, [r8, #4] @ Save CPSR - str r0, [r8, #8] @ Save OLD_R0 - mov r0, sp - .endm - - .macro irq_restore_user_regs - ldmia sp, {r0 - lr}^ @ Calling r0 - lr - mov r0, r0 - ldr lr, [sp, #S_PC] @ Get PC - add sp, sp, #S_FRAME_SIZE - subs pc, lr, #4 @ return & move spsr_svc into cpsr - .endm - .macro get_bad_stack ldr r13, IRQ_STACK_START_IN @ setup our mode stack
@@ -276,14 +254,6 @@ IRQ_STACK_START_IN: movs pc, lr @ jump to next instruction & switch modes. .endm - .macro get_irq_stack @ setup IRQ stack - ldr sp, IRQ_STACK_START - .endm - - .macro get_fiq_stack @ setup FIQ stack - ldr sp, FIQ_STACK_START - .endm - /* * exception handlers */
Signature · 1 line
2.25.1
PATCH v2 5/6 Fix PC adjustment logic in exception handlers
In reply to Jim PosenThe link register is at a different offset depending on processor mode, so ensure it applies the correct adjustment.
---
(no changes since v1)
arch/arm/include/asm/u-boot-arm.h | 14 +++++++------- arch/arm/lib/interrupts.c | 26 +++++++++++++------------- arch/arm/lib/vectors.S | 4 +++- 3 files changed, 23 insertions(+), 21 deletions(-)
arch/arm/include/asm/u-boot-arm.h +7 -7
@@ -41,17 +41,17 @@ int board_init(void);struct pt_regs ;void bad_mode (void ); -void do_undefined_instruction (struct pt_regs *pt_regs); -void do_software_interrupt (struct pt_regs *pt_regs); -void do_prefetch_abort (struct pt_regs *pt_regs); -void do_data_abort (struct pt_regs *pt_regs); -void do_not_used (struct pt_regs *pt_regs); +void do_undefined_instruction (struct pt_regs *pt_regs,bool hyp_mode); +void do_software_interrupt (struct pt_regs *pt_regs,bool hyp_mode); +void do_prefetch_abort (struct pt_regs *pt_regs,bool hyp_mode); +void do_data_abort (struct pt_regs *pt_regs,bool hyp_mode); +void do_not_used (struct pt_regs *pt_regs,bool hyp_mode);#ifdef CONFIG_ARM64 void do_fiq (struct pt_regs *pt_regs,unsigned int esr);void do_irq (struct pt_regs *pt_regs,unsigned int esr);#else -void do_fiq (struct pt_regs *pt_regs); -void do_irq (struct pt_regs *pt_regswq); +void do_fiq (struct pt_regs *pt_regs,bool hyp_mode); +void do_irq (struct pt_regs *pt_regswq,bool hyp_mode);#endif void reset_misc (void );
arch/arm/lib/interrupts.c +13 -13
@@ -135,17 +135,17 @@ static inline void fixup_pc(struct pt_regs *regs, int offset) regs->ARM_pc = pc | (regs->ARM_pc &PCMASK ); } -void do_undefined_instruction (struct pt_regs *pt_regs) +void do_undefined_instruction (struct pt_regs *pt_regs,bool hyp_mode) {efi_restore_gd ();printf ("undefined instruction\n" ); -fixup_pc (pt_regs,-4 ); +fixup_pc (pt_regs, hyp_mode ?0 :thumb_mode (regs) ?-2 :-4 );show_regs (pt_regs);show_efi_loaded_images (pt_regs);bad_mode (); } -void do_software_interrupt (struct pt_regs *pt_regs) +void do_software_interrupt (struct pt_regs *pt_regs,bool _hyp_mode) {efi_restore_gd ();printf ("software interrupt\n" );
@@ -155,51 +155,51 @@ void do_software_interrupt (struct pt_regs *pt_regs)bad_mode (); } -void do_prefetch_abort (struct pt_regs *pt_regs) +void do_prefetch_abort (struct pt_regs *pt_regs,bool hyp_mode) {efi_restore_gd ();printf ("prefetch abort\n" ); -fixup_pc (pt_regs,-8 ); +fixup_pc (pt_regs, hyp_mode ?0 :-4 );show_regs (pt_regs);show_efi_loaded_images (pt_regs);bad_mode (); } -void do_data_abort (struct pt_regs *pt_regs) +void do_data_abort (struct pt_regs *pt_regs,bool hyp_mode) {efi_restore_gd ();printf ("data abort\n" ); -fixup_pc (pt_regs,-8 ); +fixup_pc (pt_regs, hyp_mode ?0 :-8 );show_regs (pt_regs);show_efi_loaded_images (pt_regs);bad_mode (); } -void do_not_used (struct pt_regs *pt_regs) +void do_not_used (struct pt_regs *pt_regs,bool hyp_mode) {efi_restore_gd ();printf ("not used\n" ); -fixup_pc (pt_regs,-8 ); +fixup_pc (pt_regs, hyp_mode ?0 :-8 );show_regs (pt_regs);show_efi_loaded_images (pt_regs);bad_mode (); } -void do_fiq (struct pt_regs *pt_regs) +void do_fiq (struct pt_regs *pt_regs,bool hyp_mode) {efi_restore_gd ();printf ("fast interrupt request\n" ); -fixup_pc (pt_regs,-8 ); +fixup_pc (pt_regs, hyp_mode ?0 :-4 );show_regs (pt_regs);show_efi_loaded_images (pt_regs);bad_mode (); } -void do_irq (struct pt_regs *pt_regs) +void do_irq (struct pt_regs *pt_regs,bool hyp_mode) {efi_restore_gd ();printf ("interrupt request\n" ); -fixup_pc (pt_regs,-8 ); +fixup_pc (pt_regs, hyp_mode ?0 :-4 );show_regs (pt_regs);show_efi_loaded_images (pt_regs);bad_mode ();
arch/arm/lib/vectors.S +3 -1
@@ -239,6 +239,7 @@ IRQ_STACK_START_IN: mov r1, lr stmia r5, {r0 - r3} @ save sp_SVC, lr_SVC, pc, cpsr mov r0, sp @ save current stack into r0 (param register) + mov r1, #0 @ set r1 param to 0, not hypervisor mode .endm .macro get_bad_stack
@@ -321,7 +322,8 @@ fiq: str r1, [sp, #S_PC] str r2, [sp, #S_PSR] str r0, [sp, #S_OLD_R0] - mov r0, sp + mov r0, sp @ set r0 param to struct pt_regs on stack + mov r1, #1 @ set r1 param to 1, hypervisor mode .endm hyp_undefined_instruction:
Signature · 1 line
2.25.1
PATCH v2 6/6 Config to target QEMU virt machine with virtualization
In reply to Jim PosenThis machine is run with "qemu-system-arm -M virt,virtualization".
---
Changes in v2:
- Add QEMU config option for ARM32 with virtualization extensions
arch/arm/mach-qemu/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/mach-qemu/Kconfig +6 -0
@@ -27,4 +27,10 @@ config TARGET_QEMU_ARM_64BIT endchoice +config QEMU_ARM_32BIT_HAS_VIRT + bool "Virtualization Extensions for ARMv7-A" + depends on TARGET_QEMU_ARM_32BIT + select CPU_V7_HAS_VIRT + select ARMV7_LPAE + endif
Signature · 1 line
2.25.1
Quoted 29 lines · Jim Posen
Currently, when U-Boot is running in hypervisor mode on ARMv7-A CPUs with virtualization extensions, the exception handling does not work. A couple things need to change which are detailed in my earlier message to the u-boot mailing list with the subject "Exception handling in HYP mode on ARMv7-A".
I have verified that this patch series works on the ODroid XU4 and the Raspberry Pi 3B in Aarch32 mode when running in hypervisor mode. One simple way to verify is by running the miscellaneous "exception" command (
CMD_EXCEPTION).This can be tested with QEMU now. Configure with
qemu_arm_defconfigand addCMD_EXCEPTIONandQEMU_ARM_32BIT_HAS_VIRT. Then runqemu-system-arm \ -machine virt,virtualization \ -nographic -serial mon:stdio \ -bios u-boot.binU-Boot 2021.10-...
...
=> exception undefinedChanges in v2:
- Fix CP15 register written to instart.S
- Check processor mode as HVBAR register is only accessible in HYP mode
- Add QEMU config option for ARM32 with virtualization extensions
Quoted 7 lines
Jim Posen (6):
Compile for ARMv7-A with virtualization extensions Hypervisor mode interrupt vector table
Set HVBAR register correctly
Remove dead code
Fix PC adjustment logic in exception handlers Config to target QEMU virt machine with virtualization
Hey, sorry for the delay. Can you please rebase this to current master? It no longer builds on say am335x_evm, thanks!
Signature · 1 line
Tom