KVM: x86: Move vendor CR4 validity check to dedicated kvm_x86_ops hook

Browse source

Split out VMX's checks on CR4.VMXE to a dedicated hook, .is_valid_cr4(),
and invoke the new hook from kvm_valid_cr4().  This fixes an issue where
KVM_SET_SREGS would return success while failing to actually set CR4.

Fixing the issue by explicitly checking kvm_x86_ops.set_cr4()'s return
in __set_sregs() is not a viable option as KVM has already stuffed a
variety of vCPU state.

Note, kvm_valid_cr4() and is_valid_cr4() have different return types and
inverted semantics.  This will be remedied in a future patch.

Fixes: 5e1746d620 ("KVM: nVMX: Allow setting the VMXE bit in CR4")
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20201007014417.29276-5-sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

...

This commit is contained in:

Sean Christopherson 2020-10-06 18:44:15 -07:00 • committed by Paolo Bonzini

parent 311a06593b

commit c2fe3cd460

7 changed files with 34 additions and 21 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

arch/x86/include/asm/kvm_host.h

View file

9

arch/x86/kvm/svm/svm.c

View file

2

arch/x86/kvm/svm/svm.h

View file

2

arch/x86/kvm/vmx/nested.c

View file

31

arch/x86/kvm/vmx/vmx.c

View file

2

arch/x86/kvm/vmx/vmx.h

View file

6

arch/x86/kvm/x86.c

View file