diff options
| author |  Sean Christopherson <seanjc@google.com>
| 2022-12-13 06:23:04 +0000 |
|---|---|---|
| committer |  Paolo Bonzini <pbonzini@redhat.com>
| 2022-12-23 12:32:03 -0500 |
| commit | a0860d68a25dee4e51e7d3e067a66ca765776fe8 (patch) | |
| tree | 765cabf8654e150df3129fc7ccbbb623a5cf2732 /arch/x86 | |
| parent | KVM: nVMX: Properly expose ENABLE_USR_WAIT_PAUSE control to L1 (diff) | |
| download | linux-a0860d68a25dee4e51e7d3e067a66ca765776fe8.tar.gz linux-a0860d68a25dee4e51e7d3e067a66ca765776fe8.tar.bz2 linux-a0860d68a25dee4e51e7d3e067a66ca765776fe8.zip | |
KVM: nVMX: Don't stuff secondary execution control if it's not supported
When stuffing the allowed secondary execution controls for nested VMX in
response to CPUID updates, don't set the allowed-1 bit for a feature that
isn't supported by KVM, i.e. isn't allowed by the canonical vmcs_config.
WARN if KVM attempts to manipulate a feature that isn't supported. All
features that are currently stuffed are always advertised to L1 for
nested VMX if they are supported in KVM's base configuration, and no
additional features should ever be added to the CPUID-induced stuffing
(updating VMX MSRs in response to CPUID updates is a long-standing KVM
flaw that is slowly being fixed).
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20221213062306.667649-3-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/vmx/vmx.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index fe5615fd8295..fc9008dbed33 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -4459,6 +4459,13 @@ vmx_adjust_secondary_exec_control(struct vcpu_vmx *vmx, u32 *exec_control, * controls for features that are/aren't exposed to the guest. */ if (nested) { + /* + * All features that can be added or removed to VMX MSRs must + * be supported in the first place for nested virtualization. + */ + if (WARN_ON_ONCE(!(vmcs_config.nested.secondary_ctls_high & control))) + enabled = false; + if (enabled) vmx->nested.msrs.secondary_ctls_high |= control; else |