From c534c91b86b5190a367174db97c4a14fe0d0ffae Mon Sep 17 00:00:00 2001 From: Min Le Date: Mon, 26 Oct 2020 11:18:10 +0800 Subject: arm64: need to restore the sentry's TLS when in EL1 Signed-off-by: Min Le --- pkg/sentry/platform/ring0/entry_arm64.s | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkg/sentry/platform') diff --git a/pkg/sentry/platform/ring0/entry_arm64.s b/pkg/sentry/platform/ring0/entry_arm64.s index 1079a024b..f9278b653 100644 --- a/pkg/sentry/platform/ring0/entry_arm64.s +++ b/pkg/sentry/platform/ring0/entry_arm64.s @@ -516,6 +516,10 @@ TEXT ·kernelExitToEl1(SB),NOSPLIT,$0 MOVD CPU_REGISTERS+PTRACE_PC(RSV_REG), R1 MSR R1, ELR_EL1 + // restore sentry's tls. + MOVD CPU_REGISTERS+PTRACE_TLS(RSV_REG), R1 + MSR R1, TPIDR_EL0 + MOVD CPU_REGISTERS+PTRACE_SP(RSV_REG), R1 MOVD R1, RSP -- cgit v1.2.3