diff options
| author | Min Le <lemin.lm@antgroup.com> | 2020-09-24 20:16:41 +0800 |
|---|---|---|
| committer | Min Le <lemin.lm@antgroup.com> | 2020-09-25 12:19:00 +0800 |
| commit | 2c849c72b9414597f00e5ec4239238d9751148d8 (patch) | |
| tree | aada4a1986bdfef438943d2ca71b07694166e3a7 /pkg | |
| parent | 742e58b873dbb8d3c14b2e40f212df90ec837671 (diff) | |
make sure use the kernel space after change ASID
after the SWITCH_TO_APP_PAGETABLE, the ASID is changed
to the application ASID, but there are still some
instruction before ERET, since these instruction is
not use the kernel address space, it may use the application's
TLB, which will cause fault, this patch can make sure that
after SWITCH_TO_APP_PAGETABLE sentry is still use kernel
address space which is mapped as Global.
Signed-off-by: Min Le <lemin.lm@antgroup.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/sentry/platform/ring0/entry_arm64.s | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkg/sentry/platform/ring0/entry_arm64.s b/pkg/sentry/platform/ring0/entry_arm64.s index 5f63cbd45..f3d934996 100644 --- a/pkg/sentry/platform/ring0/entry_arm64.s +++ b/pkg/sentry/platform/ring0/entry_arm64.s @@ -461,6 +461,14 @@ TEXT ·kernelExitToEl0(SB),NOSPLIT,$0 MOVD PTRACE_PSTATE(RSV_REG_APP), R1 WORD $0xd5184001 //MSR R1, SPSR_EL1 + // need use kernel space address to excute below code, since + // after SWITCH_TO_APP_PAGETABLE the ASID is changed to app's + // ASID. + WORD $0x10000061 // ADR R1, do_exit_to_el0 + ORR $0xffff000000000000, R1, R1 + JMP (R1) + +do_exit_to_el0: // RSV_REG & RSV_REG_APP will be loaded at the end. REGISTERS_LOAD(RSV_REG_APP, 0) |