diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-02-10 18:15:48 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-02-10 18:15:48 +0000 |
| commit | a40373b6360303daaa7cd266b2e8c42a26425508 (patch) | |
| tree | 85244444c4eb3a3eea46503b252c072eb6f5634d /pkg/sentry/platform | |
| parent | 549583ee9f2782807cc4144e64ff7db5fdb71b71 (diff) | |
| parent | b9db7db3bdfe1405d14465bb7ad8fb33637fd840 (diff) | |
Merge release-20210201.0-75-gb9db7db3b (automated)
Diffstat (limited to 'pkg/sentry/platform')
| -rw-r--r-- | pkg/sentry/platform/kvm/bluepill_arm64.go | 8 | ||||
| -rw-r--r-- | pkg/sentry/platform/kvm/machine_arm64_unsafe.go | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/pkg/sentry/platform/kvm/bluepill_arm64.go b/pkg/sentry/platform/kvm/bluepill_arm64.go index 35298135a..6846abee9 100644 --- a/pkg/sentry/platform/kvm/bluepill_arm64.go +++ b/pkg/sentry/platform/kvm/bluepill_arm64.go @@ -111,8 +111,8 @@ func (c *vCPU) KernelSyscall() { regs.Pc -= 4 // Rewind. } - vfpEnable := ring0.CPACREL1() - if vfpEnable != 0 { + fpDisableTrap := ring0.CPACREL1() + if fpDisableTrap != 0 { fpsimd := fpsimdPtr((*byte)(c.floatingPointState)) fpcr := ring0.GetFPCR() fpsr := ring0.GetFPSR() @@ -135,8 +135,8 @@ func (c *vCPU) KernelException(vector ring0.Vector) { regs.Pc = 0 } - vfpEnable := ring0.CPACREL1() - if vfpEnable != 0 { + fpDisableTrap := ring0.CPACREL1() + if fpDisableTrap != 0 { fpsimd := fpsimdPtr((*byte)(c.floatingPointState)) fpcr := ring0.GetFPCR() fpsr := ring0.GetFPSR() diff --git a/pkg/sentry/platform/kvm/machine_arm64_unsafe.go b/pkg/sentry/platform/kvm/machine_arm64_unsafe.go index dca0cdb60..78cbd9701 100644 --- a/pkg/sentry/platform/kvm/machine_arm64_unsafe.go +++ b/pkg/sentry/platform/kvm/machine_arm64_unsafe.go @@ -70,14 +70,6 @@ func (c *vCPU) initArchState() error { panic(fmt.Sprintf("error setting KVM_ARM_VCPU_INIT failed: %v", errno)) } - // cpacr_el1 - reg.id = _KVM_ARM64_REGS_CPACR_EL1 - // It is off by default, and it is turned on only when in use. - data = 0 // Disable fpsimd. - if err := c.setOneRegister(®); err != nil { - return err - } - // tcr_el1 data = _TCR_TXSZ_VA48 | _TCR_CACHE_FLAGS | _TCR_SHARED | _TCR_TG_FLAGS | _TCR_ASID16 | _TCR_IPS_40BITS reg.id = _KVM_ARM64_REGS_TCR_EL1 |