summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-06-16 20:02:07 +0000
committergVisor bot <gvisor-bot@google.com>2021-06-16 20:02:07 +0000
commit455c458013e952101b39296af612b79702b54078 (patch)
treeeadde3aac718bda6d566b40a873e7047a95c95d3
parent507a227d53e47cd3f5e9895e46052ad3b7bb771d (diff)
parent47149b7c4275ddd4404d86eddab6feab4f059ed3 (diff)
Merge release-20210607.0-50-g47149b7c4 (automated)
-rw-r--r--pkg/sentry/platform/kvm/machine_amd64.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/platform/kvm/machine_amd64.go b/pkg/sentry/platform/kvm/machine_amd64.go
index 7c063c7f5..7a10fd812 100644
--- a/pkg/sentry/platform/kvm/machine_amd64.go
+++ b/pkg/sentry/platform/kvm/machine_amd64.go
@@ -485,7 +485,7 @@ func (m *machine) mapUpperHalf(pageTable *pagetables.PageTables) {
pageTable.Map(
hostarch.Addr(ring0.KernelStartAddress|r.virtual),
r.length,
- pagetables.MapOpts{AccessType: hostarch.Execute},
+ pagetables.MapOpts{AccessType: hostarch.Execute, Global: true},
physical)
}
})
@@ -498,7 +498,7 @@ func (m *machine) mapUpperHalf(pageTable *pagetables.PageTables) {
pageTable.Map(
hostarch.Addr(ring0.KernelStartAddress|start),
regionLen,
- pagetables.MapOpts{AccessType: hostarch.ReadWrite},
+ pagetables.MapOpts{AccessType: hostarch.ReadWrite, Global: true},
physical)
}
}