diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-19 09:55:20 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-19 09:55:20 -0700 |
| commit | 5823629442de3762b752afa7cdc204311db21cc8 (patch) | |
| tree | dc440b47ace97659282fa611a398e31f3f8aeb16 | |
| parent | f2f2dec7280e37696550185f291d51cf9e47e281 (diff) | |
| parent | a19c8f0b9224dfd6f43dbb2b9d8efa3917d7a68f (diff) | |
Merge pull request #2687 from lubinszARM:pr_tls_1
PiperOrigin-RevId: 312299234
| -rw-r--r-- | pkg/sentry/platform/ring0/lib_arm64.go | 6 | ||||
| -rw-r--r-- | pkg/sentry/platform/ring0/lib_arm64.s | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkg/sentry/platform/ring0/lib_arm64.go b/pkg/sentry/platform/ring0/lib_arm64.go index 444a83913..a6345010d 100644 --- a/pkg/sentry/platform/ring0/lib_arm64.go +++ b/pkg/sentry/platform/ring0/lib_arm64.go @@ -38,6 +38,12 @@ func SaveVRegs(*byte) // LoadVRegs loads V0-V31 registers. func LoadVRegs(*byte) +// GetTLS returns the value of TPIDR_EL0 register. +func GetTLS() (value uint64) + +// SetTLS writes the TPIDR_EL0 value. +func SetTLS(value uint64) + // Init sets function pointers based on architectural features. // // This must be called prior to using ring0. diff --git a/pkg/sentry/platform/ring0/lib_arm64.s b/pkg/sentry/platform/ring0/lib_arm64.s index 0e6a6235b..b63e14b41 100644 --- a/pkg/sentry/platform/ring0/lib_arm64.s +++ b/pkg/sentry/platform/ring0/lib_arm64.s @@ -15,6 +15,16 @@ #include "funcdata.h" #include "textflag.h" +TEXT ·GetTLS(SB),NOSPLIT,$0-8 + MRS TPIDR_EL0, R1 + MOVD R1, ret+0(FP) + RET + +TEXT ·SetTLS(SB),NOSPLIT,$0-8 + MOVD addr+0(FP), R1 + MSR R1, TPIDR_EL0 + RET + TEXT ·CPACREL1(SB),NOSPLIT,$0-8 WORD $0xd5381041 // MRS CPACR_EL1, R1 MOVD R1, ret+0(FP) |