diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-30 14:07:43 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-30 14:07:43 -0700 |
| commit | 9751044a964d82de9d59d2366e5a98b7b2605ada (patch) | |
| tree | 2a7cdc9b53eca9ad065c146d78a75109738aef06 /pkg/sentry/platform/kvm/kvm.go | |
| parent | 694d6ae32fbed0a62bc9d73f279db205815681e3 (diff) | |
| parent | 9cae407b270b20ff78370d33602191d37ddf5530 (diff) | |
Merge pull request #2256 from laijs:kpti
PiperOrigin-RevId: 334674481
Diffstat (limited to 'pkg/sentry/platform/kvm/kvm.go')
| -rw-r--r-- | pkg/sentry/platform/kvm/kvm.go | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/pkg/sentry/platform/kvm/kvm.go b/pkg/sentry/platform/kvm/kvm.go index ae813e24e..d46946402 100644 --- a/pkg/sentry/platform/kvm/kvm.go +++ b/pkg/sentry/platform/kvm/kvm.go @@ -156,15 +156,7 @@ func (*KVM) MaxUserAddress() usermem.Addr { func (k *KVM) NewAddressSpace(_ interface{}) (platform.AddressSpace, <-chan struct{}, error) { // Allocate page tables and install system mappings. pageTables := pagetables.New(newAllocator()) - applyPhysicalRegions(func(pr physicalRegion) bool { - // Map the kernel in the upper half. - pageTables.Map( - usermem.Addr(ring0.KernelStartAddress|pr.virtual), - pr.length, - pagetables.MapOpts{AccessType: usermem.AnyAccess}, - pr.physical) - return true // Keep iterating. - }) + k.machine.mapUpperHalf(pageTables) // Return the new address space. return &addressSpace{ |