diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-09 21:42:06 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-09 21:42:06 +0000 |
| commit | f35bbb8679b268055e302a7e530131981782796a (patch) | |
| tree | 5df4035d28d7333e345a90fb0d3176c09e6e08c1 /pkg/sentry | |
| parent | ebcdc297e24973790f01b1457ddb775ca93bcb22 (diff) | |
| parent | a0ffc84adfe345e52a249bd1bac9c9f883bf0fe7 (diff) | |
Merge release-20200928.0-86-ga0ffc84ad (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/platform/kvm/bluepill_impl_amd64.s | 7 | ||||
| -rw-r--r-- | pkg/sentry/platform/ring0/defs_impl_amd64.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/platform/ring0/entry_impl_amd64.s | 7 | ||||
| -rw-r--r-- | pkg/sentry/platform/ring0/entry_impl_arm64.s | 7 |
4 files changed, 9 insertions, 14 deletions
diff --git a/pkg/sentry/platform/kvm/bluepill_impl_amd64.s b/pkg/sentry/platform/kvm/bluepill_impl_amd64.s index 3851b5017..2bbf06b18 100644 --- a/pkg/sentry/platform/kvm/bluepill_impl_amd64.s +++ b/pkg/sentry/platform/kvm/bluepill_impl_amd64.s @@ -10,10 +10,9 @@ // CPU entry offsets. #define ENTRY_SCRATCH0 0x100 -#define ENTRY_SCRATCH1 0x108 -#define ENTRY_STACK_TOP 0x110 -#define ENTRY_CPU_SELF 0x118 -#define ENTRY_KERNEL_CR3 0x120 +#define ENTRY_STACK_TOP 0x108 +#define ENTRY_CPU_SELF 0x110 +#define ENTRY_KERNEL_CR3 0x118 // Bits. #define _RFLAGS_IF 0x200 diff --git a/pkg/sentry/platform/ring0/defs_impl_amd64.go b/pkg/sentry/platform/ring0/defs_impl_amd64.go index 795cf86ba..7c612fcb0 100644 --- a/pkg/sentry/platform/ring0/defs_impl_amd64.go +++ b/pkg/sentry/platform/ring0/defs_impl_amd64.go @@ -171,7 +171,6 @@ type kernelEntry struct { // scratch space for temporary usage. scratch0 uint64 - scratch1 uint64 // stackTop is the top of the stack. stackTop uint64 @@ -263,7 +262,6 @@ func Emit(w io.Writer) { e := &kernelEntry{} fmt.Fprintf(w, "\n// CPU entry offsets.\n") fmt.Fprintf(w, "#define ENTRY_SCRATCH0 0x%02x\n", reflect.ValueOf(&e.scratch0).Pointer()-reflect.ValueOf(e).Pointer()) - fmt.Fprintf(w, "#define ENTRY_SCRATCH1 0x%02x\n", reflect.ValueOf(&e.scratch1).Pointer()-reflect.ValueOf(e).Pointer()) fmt.Fprintf(w, "#define ENTRY_STACK_TOP 0x%02x\n", reflect.ValueOf(&e.stackTop).Pointer()-reflect.ValueOf(e).Pointer()) fmt.Fprintf(w, "#define ENTRY_CPU_SELF 0x%02x\n", reflect.ValueOf(&e.cpuSelf).Pointer()-reflect.ValueOf(e).Pointer()) fmt.Fprintf(w, "#define ENTRY_KERNEL_CR3 0x%02x\n", reflect.ValueOf(&e.kernelCR3).Pointer()-reflect.ValueOf(e).Pointer()) diff --git a/pkg/sentry/platform/ring0/entry_impl_amd64.s b/pkg/sentry/platform/ring0/entry_impl_amd64.s index 1216f3843..9a5d6c064 100644 --- a/pkg/sentry/platform/ring0/entry_impl_amd64.s +++ b/pkg/sentry/platform/ring0/entry_impl_amd64.s @@ -10,10 +10,9 @@ // CPU entry offsets. #define ENTRY_SCRATCH0 0x100 -#define ENTRY_SCRATCH1 0x108 -#define ENTRY_STACK_TOP 0x110 -#define ENTRY_CPU_SELF 0x118 -#define ENTRY_KERNEL_CR3 0x120 +#define ENTRY_STACK_TOP 0x108 +#define ENTRY_CPU_SELF 0x110 +#define ENTRY_KERNEL_CR3 0x118 // Bits. #define _RFLAGS_IF 0x200 diff --git a/pkg/sentry/platform/ring0/entry_impl_arm64.s b/pkg/sentry/platform/ring0/entry_impl_arm64.s index af2bdefcb..485cf9bbb 100644 --- a/pkg/sentry/platform/ring0/entry_impl_arm64.s +++ b/pkg/sentry/platform/ring0/entry_impl_arm64.s @@ -10,10 +10,9 @@ // CPU entry offsets. #define ENTRY_SCRATCH0 0x100 -#define ENTRY_SCRATCH1 0x108 -#define ENTRY_STACK_TOP 0x110 -#define ENTRY_CPU_SELF 0x118 -#define ENTRY_KERNEL_CR3 0x120 +#define ENTRY_STACK_TOP 0x108 +#define ENTRY_CPU_SELF 0x110 +#define ENTRY_KERNEL_CR3 0x118 // Bits. #define _RFLAGS_IF 0x200 |