go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4079 from lemin9538:arm64_fix 

PiperOrigin-RevId: 335532690
This commit is contained in:
gVisor bot 2020-10-05 17:11:42 -07:00
parent 1bc78d9fda 2c849c72b9
commit 8ef7cebcbb
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/sentry/platform/ring0/entry_arm64.s
View File

@ -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)