aboutsummaryrefslogtreecommitdiffstats
path: root/executor/kvm_amd64.S
diff options
context:
space:
mode:
authorAyomide Erinfolami <eayomide@google.com>2021-11-29 12:27:03 +0000
committerDmitry Vyukov <dvyukov@google.com>2021-12-01 08:08:22 +0100
commit5fa3eacc793f3739262224161045fbcb9e9f3d9b (patch)
tree6dd6ac406444ff611ebfaac28ee62b62efa89522 /executor/kvm_amd64.S
parent802705523a89a4675c91a389e2ac5305a29e2ed0 (diff)
executor: changed initialization of VMCS fields
Initializing the VMCS fields Pin-based VM-execution controls and Primary processor-based VM-execution controls to 0 and setting their reserved bits using the appropriate MSRs increase coverage for arch/x86/kvm/vmx/nested.c from 19% to 43%.
Diffstat (limited to 'executor/kvm_amd64.S')
-rw-r--r--executor/kvm_amd64.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/executor/kvm_amd64.S b/executor/kvm_amd64.S
index c3d8ac802..537df853f 100644
--- a/executor/kvm_amd64.S
+++ b/executor/kvm_amd64.S
@@ -148,9 +148,9 @@ kvm_asm64_init_vm:
vmwrite %rax, %rdx; \
/**/
- VMSET_LIMITED(0x00004000, $0x3f, 0x481) // Pin-based VM-execution controls
- //VMSET_LIMITED(0x00004002, $0x61999e84, 0x482) // Primary processor-based VM-execution controls
- VMSET(0x00004002, $0xf3999e84)
+ VMSET_LIMITED(0x00004000, $0, 0x481) // Pin-based VM-execution controls
+ VMSET_LIMITED(0x00004002, $0, 0x482) // Primary processor-based VM-execution controls
+
VMSET(0x0000401E, $((1<<0) | (1<<7))) // Secondary processor-based VM-execution controls
VMSET_LIMITED(0x0000400C, $0x36fff, 0x483) // VM-exit controls (F6FFF)
VMSET_LIMITED(0x00004012, $0x17ff, 0x484) // VM-entry controls (51FF)