KVM: x86: cleanup CR3 reserved bits checks
Paolo Bonzini
maintainerPATCH 1/1 KVM: x86: cleanup CR3 reserved bits checks
If not in long mode, the low bits of CR3 are reserved but not enforced to be zero, so remove those checks. If in long mode, however, the MBZ bits extend down to the highest physical address bit of the guest, excluding the encryption bit.
Make the checks consistent with the above, and match them between nested_vmcb_checks and KVM_SET_SREGS.
--- arch/x86/kvm/svm/nested.c | 12 ++---------- arch/x86/kvm/svm/svm.h | 3 --- arch/x86/kvm/x86.c | 2 ++ 3 files changed, 4 insertions(+), 13 deletions(-)
arch/x86/kvm/svm/nested.c +2 -10
@@ -244,18 +244,10 @@ static bool nested_vmcb_checks(struct vcpu_svm *svm, struct vmcb *vmcb12) vmcb12_lma = (vmcb12->save.efer &EFER_LME ) && (vmcb12->save.cr0 &X86_CR0_PG ); -if (!vmcb12_lma) { -if (vmcb12->save.cr4 &X86_CR4_PAE ) { -if (vmcb12->save.cr3 &MSR_CR3_LEGACY_PAE_RESERVED_MASK ) -return false; - }else { -if (vmcb12->save.cr3 &MSR_CR3_LEGACY_RESERVED_MASK ) -return false; - } - }else { +if (vmcb12_lma) {if (!(vmcb12->save.cr4 &X86_CR4_PAE ) || !(vmcb12->save.cr0 &X86_CR0_PE ) || - (vmcb12->save.cr3 &MSR_CR3_LONG_MBZ_MASK )) + (vmcb12->save.cr3 & svm->vcpu.arch.cr3_lm_rsvd_bits))return false; }if (!kvm_is_valid_cr4 (&svm->vcpu, vmcb12->save.cr4))
arch/x86/kvm/svm/svm.h +0 -3
@@ -403,9 +403,6 @@ static inline bool gif_set(struct vcpu_svm *svm) }/* svm.c */ -#define MSR_CR3_LEGACY_RESERVED_MASK 0xfe7U -#define MSR_CR3_LEGACY_PAE_RESERVED_MASK 0x7U -#define MSR_CR3_LONG_MBZ_MASK 0xfff0000000000000U#define MSR_INVALID 0xffffffffUextern int sev;
arch/x86/kvm/x86.c +2 -0
@@ -9660,6 +9660,8 @@ static bool kvm_is_valid_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)*/ if (!(sregs->cr4 &X86_CR4_PAE ) || !(sregs->efer &EFER_LMA ))return false; +if (sregs->cr3 & vcpu->arch.cr3_lm_rsvd_bits) +return false; }else {/* * Not in 64-bit mode: EFER.LMA is clear and the code
Signature · 1 line
2.26.2
Quoted 8 lines · Paolo Bonzini
If not in long mode, the low bits of CR3 are reserved but not enforced to be zero, so remove those checks. If in long mode, however, the MBZ bits extend down to the highest physical address bit of the guest, excluding the encryption bit.
Make the checks consistent with the above, and match them between
nested_vmcb_checksandKVM_SET_SREGS.
Fixes + Cc:stable@?
Quoted 1 line
Signed-off-by Paolo Bonzini <[email protected]>
Quoted 18 lines
--- arch/x86/kvm/svm/nested.c | 12 ++---------- arch/x86/kvm/svm/svm.h | 3 --- arch/x86/kvm/x86.c | 2 ++ 3 files changed, 4 insertions(+), 13 deletions(-)arch/x86/kvm/svm/nested.c +0
-4@@ -244,18 +244,10 @@ static bool nested_vmcb_checks(struct vcpu_svm *svm, struct vmcb *vmcb12) vmcb12_lma = (vmcb12->save.efer &EFER_LME ) && (vmcb12->save.cr0 &X86_CR0_PG ); -if (!vmcb12_lma) { -if (vmcb12->save.cr4 &X86_CR4_PAE ) { -if (vmcb12->save.cr3 &MSR_CR3_LEGACY_PAE_RESERVED_MASK ) -return false;
arch/x86/kvm/svm/nested.c static bool nested_vmcb_checks(struct vcpu_svm *svm, struct vmcb *vmcb12) · line 250
Quoted 10 lines
arch/x86/kvm/svm/nested.c +2
-6- }else { -if (vmcb12->save.cr3 &MSR_CR3_LEGACY_RESERVED_MASK ) -return false; - } - }else { +if (vmcb12_lma) {if (!(vmcb12->save.cr4 &X86_CR4_PAE ) || !(vmcb12->save.cr0 &X86_CR0_PE ) || - (vmcb12->save.cr3 &MSR_CR3_LONG_MBZ_MASK )) + (vmcb12->save.cr3 & svm->vcpu.arch.cr3_lm_rsvd_bits))
Gah, I was too slow as usual. I have a series to clean up GPA validity checks, this one included. I'll base that series on this patch, if I get it sent before this hits kvm/queue...
Quoted 33 lines
arch/x86/kvm/svm/nested.c +0
-0return false; }if (!kvm_is_valid_cr4 (&svm->vcpu, vmcb12->save.cr4))arch/x86/kvm/svm/svm.h +0
-3@@ -403,9 +403,6 @@ static inline bool gif_set(struct vcpu_svm *svm) }/* svm.c */ -#define MSR_CR3_LEGACY_RESERVED_MASK 0xfe7U -#define MSR_CR3_LEGACY_PAE_RESERVED_MASK 0x7U -#define MSR_CR3_LONG_MBZ_MASK 0xfff0000000000000U#define MSR_INVALID 0xffffffffUextern int sev;arch/x86/kvm/x86.c +2
-0@@ -9660,6 +9660,8 @@ static bool kvm_is_valid_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)*/ if (!(sregs->cr4 &X86_CR4_PAE ) || !(sregs->efer &EFER_LMA ))return false; +if (sregs->cr3 & vcpu->arch.cr3_lm_rsvd_bits) +return false; }else {/* * Not in 64-bit mode: EFER.LMA is clear and the code Signature · 1 line
2.26.2
Paolo Bonzini
maintainerQuoted 10 lines · Sean Christopherson
Quoted 8 lines · Paolo Bonzini
If not in long mode, the low bits of CR3 are reserved but not enforced to be zero, so remove those checks. If in long mode, however, the MBZ bits extend down to the highest physical address bit of the guest, excluding the encryption bit.
Make the checks consistent with the above, and match them between
nested_vmcb_checksandKVM_SET_SREGS.Fixes + Cc:stable@?
Difficult to say what it fixes, it's been there forever for KVM_SET_SREGS.
For the nSVM part I'll go with
Paolo
Quoted 3 lines
Quoted 1 line
Signed-off-by Paolo Bonzini<[email protected]>Reviewed-by Sean Christopherson<[email protected]>