From 7ced03b3831983e35cb25ad0a9d5632ea322f9a4 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Tue, 20 Jul 2021 12:04:47 -0700 Subject: [PATCH] ring0: Initialize sentryXCR0 from Kernel.init() Fixes #6300 PiperOrigin-RevId: 385840917 --- pkg/ring0/kernel_amd64.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkg/ring0/kernel_amd64.go b/pkg/ring0/kernel_amd64.go index b5c4a39e3..a04b60b08 100644 --- a/pkg/ring0/kernel_amd64.go +++ b/pkg/ring0/kernel_amd64.go @@ -19,6 +19,7 @@ package ring0 import ( "encoding/binary" "reflect" + "sync" "gvisor.dev/gvisor/pkg/hostarch" "gvisor.dev/gvisor/pkg/sentry/arch" @@ -30,6 +31,8 @@ func HaltAndWriteFSBase(regs *arch.Registers) // init initializes architecture-specific state. func (k *Kernel) init(maxCPUs int) { + initSentryXCR0() + entrySize := reflect.TypeOf(kernelEntry{}).Size() var ( entries []kernelEntry @@ -257,7 +260,16 @@ func (c *CPU) SwitchToUser(switchOpts SwitchOpts) (vector Vector) { return } -var sentryXCR0 = xgetbv(0) +var ( + sentryXCR0 uintptr + sentryXCR0Once sync.Once +) + +// initSentryXCR0 saves a value of XCR0 in the host mode. It is used to +// initialize XCR0 of guest vCPU-s. +func initSentryXCR0() { + sentryXCR0Once.Do(func() { sentryXCR0 = xgetbv(0) }) +} // startGo is the CPU entrypoint. //