KVM: nSVM: Add checks for CR3 and CR4 reserved bits to svm_set_nested_state() and test CR3 non-MBZ reserved bits
cover KVM: nSVM: Add checks for CR3 and CR4 reserved bits to svm_set_nested_state() and test CR3 non-MBZ reserved bits
Patch# 1: Fixes the MBZ mask for CR3
Patch# 2: Adds checks for the reserved bits for CR3 and CR4 to
svm_set_nested_state() since these bits need to be checked before VMRUN of the nested guest on the destination.
Patch# 3: Adds a test for the non-MBZ reserved bits in CR3 in long mode.
[PATCH 1/3] KVM: nSVM: CR3 MBZ bits are only 63:52 [PATCH 2/3] KVM: nSVM: Add check for CR3 and CR4 reserved bits to [PATCH 3/3] nSVM: Test non-MBZ reserved bits in CR3 in long mode
arch/x86/kvm/svm/nested.c | 51 +++++++++++++++++++++++++++-------------------- arch/x86/kvm/svm/svm.h | 2 +- 2 files changed, 30 insertions(+), 23 deletions(-)
Krish Sadhukhan (2):
KVM: nSVM: CR3 MBZ bits are only 63:52
KVM: nSVM: Add check for CR3 and CR4 reserved bits to svm_set_nested_state()
x86/svm.h | 3 ++- x86/svm_tests.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 49 insertions(+), 8 deletions(-)
Krish Sadhukhan (1):
KVM: nSVM: Test non-MBZ reserved bits in CR3 in long mode
PATCH 1/3 KVM: nSVM: CR3 MBZ bits are only 63:52
Commit 761e4169346553c180bbd4a383aedd72f905bc9a created a wrong mask for the CR3 MBZ bits. According to APM vol 2, only the upper 12 bits are MBZ.
(Fixes 761e4169346553c180bbd4a383aedd72f905bc9a)
--- arch/x86/kvm/svm/svm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/svm/svm.h +1 -1
@@ -345,7 +345,7 @@ 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_RESERVED_MASK 0xfff0000000000fe7U +#define MSR_CR3_LONG_MBZ_MASK 0xfff0000000000000U#define MSR_INVALID 0xffffffffUu32 svm_msrpm_offset (u32 msr);
Signature · 1 line
2.18.4
PATCH 2/3 KVM: nSVM: Add check for CR3 and CR4 reserved bits to svm_set_nested_state()
In reply to Krish Sadhukhan--- arch/x86/kvm/svm/nested.c | 51 ++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 22 deletions(-)
arch/x86/kvm/svm/nested.c +29 -22
@@ -215,9 +215,35 @@ static bool nested_vmcb_check_controls(struct vmcb_control_area *control)return true; } +static bool nested_vmcb_check_cr3_cr4 (struct vcpu_svm *svm, +struct vmcb_save_area *save) +{ +bool nested_vmcb_lma = + (save->efer &EFER_LME ) && + (save->cr0 &X86_CR0_PG ); + +if (!nested_vmcb_lma) { +if (save->cr4 &X86_CR4_PAE ) { +if (save->cr3 &MSR_CR3_LEGACY_PAE_RESERVED_MASK ) +return false; + }else { +if (save->cr3 &MSR_CR3_LEGACY_RESERVED_MASK ) +return false; + } + }else { +if (!(save->cr4 &X86_CR4_PAE ) || + !(save->cr0 &X86_CR0_PE ) || + (save->cr3 &MSR_CR3_LONG_MBZ_MASK )) +return false; + } +if (kvm_valid_cr4 (&svm->vcpu, save->cr4)) +return false; + +return true; +} +static bool nested_vmcb_checks (struct vcpu_svm *svm,struct vmcb *vmcb) { -bool nested_vmcb_lma;if ((vmcb->save.efer &EFER_SVME ) ==0 )return false;
@@ -228,25 +254,7 @@ static bool nested_vmcb_checks(struct vcpu_svm *svm, struct vmcb *vmcb)if (!kvm_dr6_valid (vmcb->save.dr6) || !kvm_dr7_valid (vmcb->save.dr7))return false; - nested_vmcb_lma = - (vmcb->save.efer &EFER_LME ) && - (vmcb->save.cr0 &X86_CR0_PG ); - -if (!nested_vmcb_lma) { -if (vmcb->save.cr4 &X86_CR4_PAE ) { -if (vmcb->save.cr3 &MSR_CR3_LEGACY_PAE_RESERVED_MASK ) -return false; - }else { -if (vmcb->save.cr3 &MSR_CR3_LEGACY_RESERVED_MASK ) -return false; - } - }else { -if (!(vmcb->save.cr4 &X86_CR4_PAE ) || - !(vmcb->save.cr0 &X86_CR0_PE ) || - (vmcb->save.cr3 &MSR_CR3_LONG_RESERVED_MASK )) -return false; - } -if (kvm_valid_cr4 (&svm->vcpu, vmcb->save.cr4)) +if (!nested_vmcb_check_cr3_cr4 (svm, &(vmcb->save)))return false;return nested_vmcb_check_controls (&vmcb->control);
@@ -1114,9 +1122,8 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,/* * Validate host state saved from before VMRUN (see * nested_svm_check_permissions). -* TODO: validate reserved bits for all saved state. */ -if (!(save.cr0 &X86_CR0_PG )) +if (!nested_vmcb_check_cr3_cr4 (svm, &save))return -EINVAL ;/*
Signature · 1 line
2.18.4
Paolo Bonzini
maintainerRe: [PATCH 2/3] KVM: nSVM: Add check for CR3 and CR4 reserved bits to svm_set_nested_state()
Quoted 74 lines · Krish Sadhukhan
Signed-off-by Krish Sadhukhan <[email protected]>--- arch/x86/kvm/svm/nested.c | 51 ++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 22 deletions(-)arch/x86/kvm/svm/nested.c +28
-20@@ -215,9 +215,35 @@ static bool nested_vmcb_check_controls(struct vmcb_control_area *control)return true; } +static bool nested_vmcb_check_cr3_cr4 (struct vcpu_svm *svm, +struct vmcb_save_area *save) +{ +bool nested_vmcb_lma = + (save->efer &EFER_LME ) && + (save->cr0 &X86_CR0_PG ); + +if (!nested_vmcb_lma) { +if (save->cr4 &X86_CR4_PAE ) { +if (save->cr3 &MSR_CR3_LEGACY_PAE_RESERVED_MASK ) +return false; + }else { +if (save->cr3 &MSR_CR3_LEGACY_RESERVED_MASK ) +return false; + } + }else { +if (!(save->cr4 &X86_CR4_PAE ) || + !(save->cr0 &X86_CR0_PE ) || + (save->cr3 &MSR_CR3_LONG_MBZ_MASK )) +return false; + } +if (kvm_valid_cr4 (&svm->vcpu, save->cr4)) +return false; + +return true; +} +static bool nested_vmcb_checks (struct vcpu_svm *svm,struct vmcb *vmcb) { -bool nested_vmcb_lma;if ((vmcb->save.efer &EFER_SVME ) ==0 )return false;@@ -228,25 +254,7 @@ static bool nested_vmcb_checks(struct vcpu_svm *svm, struct vmcb *vmcb)if (!kvm_dr6_valid (vmcb->save.dr6) || !kvm_dr7_valid (vmcb->save.dr7))return false; - nested_vmcb_lma = - (vmcb->save.efer &EFER_LME ) && - (vmcb->save.cr0 &X86_CR0_PG ); - -if (!nested_vmcb_lma) { -if (vmcb->save.cr4 &X86_CR4_PAE ) { -if (vmcb->save.cr3 &MSR_CR3_LEGACY_PAE_RESERVED_MASK ) -return false; - }else { -if (vmcb->save.cr3 &MSR_CR3_LEGACY_RESERVED_MASK ) -return false; - } - }else { -if (!(vmcb->save.cr4 &X86_CR4_PAE ) || - !(vmcb->save.cr0 &X86_CR0_PE ) || - (vmcb->save.cr3 &MSR_CR3_LONG_RESERVED_MASK )) -return false; - } -if (kvm_valid_cr4 (&svm->vcpu, vmcb->save.cr4)) +if (!nested_vmcb_check_cr3_cr4 (svm, &(vmcb->save)))return false;return nested_vmcb_check_controls (&vmcb->control);
arch/x86/kvm/svm/nested.c static int svm_set_nested_state(struct kvm_vcpu *vcpu, · line 1127
Quoted 8 lines
arch/x86/kvm/svm/nested.c +1
-2@@ -1114,9 +1122,8 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,/* * Validate host state saved from before VMRUN (see * nested_svm_check_permissions). -* TODO: validate reserved bits for all saved state. */ -if (!(save.cr0 &X86_CR0_PG )) +if (!nested_vmcb_check_cr3_cr4 (svm, &save))return -EINVAL ;
Removing the "if" is incorrect. Also are there really no more reserved bits to check?
Paolo
Re: [PATCH 2/3] KVM: nSVM: Add check for CR3 and CR4 reserved bits to svm_set_nested_state()
Quoted 73 lines · Paolo Bonzini
Quoted 72 lines · Krish Sadhukhan
Signed-off-by Krish Sadhukhan <[email protected]>--- arch/x86/kvm/svm/nested.c | 51 ++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 22 deletions(-)arch/x86/kvm/svm/nested.c +28
-20@@ -215,9 +215,35 @@ static bool nested_vmcb_check_controls(struct vmcb_control_area *control)return true; } +static bool nested_vmcb_check_cr3_cr4 (struct vcpu_svm *svm, +struct vmcb_save_area *save) +{ +bool nested_vmcb_lma = + (save->efer &EFER_LME ) && + (save->cr0 &X86_CR0_PG ); + +if (!nested_vmcb_lma) { +if (save->cr4 &X86_CR4_PAE ) { +if (save->cr3 &MSR_CR3_LEGACY_PAE_RESERVED_MASK ) +return false; + }else { +if (save->cr3 &MSR_CR3_LEGACY_RESERVED_MASK ) +return false; + } + }else { +if (!(save->cr4 &X86_CR4_PAE ) || + !(save->cr0 &X86_CR0_PE ) || + (save->cr3 &MSR_CR3_LONG_MBZ_MASK )) +return false; + } +if (kvm_valid_cr4 (&svm->vcpu, save->cr4)) +return false; + +return true; +} +static bool nested_vmcb_checks (struct vcpu_svm *svm,struct vmcb *vmcb) { -bool nested_vmcb_lma;if ((vmcb->save.efer &EFER_SVME ) ==0 )return false;@@ -228,25 +254,7 @@ static bool nested_vmcb_checks(struct vcpu_svm *svm, struct vmcb *vmcb)if (!kvm_dr6_valid (vmcb->save.dr6) || !kvm_dr7_valid (vmcb->save.dr7))return false; - nested_vmcb_lma = - (vmcb->save.efer &EFER_LME ) && - (vmcb->save.cr0 &X86_CR0_PG ); - -if (!nested_vmcb_lma) { -if (vmcb->save.cr4 &X86_CR4_PAE ) { -if (vmcb->save.cr3 &MSR_CR3_LEGACY_PAE_RESERVED_MASK ) -return false; - }else { -if (vmcb->save.cr3 &MSR_CR3_LEGACY_RESERVED_MASK ) -return false; - } - }else { -if (!(vmcb->save.cr4 &X86_CR4_PAE ) || - !(vmcb->save.cr0 &X86_CR0_PE ) || - (vmcb->save.cr3 &MSR_CR3_LONG_RESERVED_MASK )) -return false; - } -if (kvm_valid_cr4 (&svm->vcpu, vmcb->save.cr4)) +if (!nested_vmcb_check_cr3_cr4 (svm, &(vmcb->save)))return false;
Quoted 11 lines
arch/x86/kvm/svm/nested.c static int svm_set_nested_state(struct kvm_vcpu *vcpu, · line 1127
Quoted 10 lines
arch/x86/kvm/svm/nested.c +1
-2return nested_vmcb_check_controls (&vmcb->control);@@ -1114,9 +1122,8 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,/* * Validate host state saved from before VMRUN (see * nested_svm_check_permissions). -* TODO: validate reserved bits for all saved state. */ -if (!(save.cr0 &X86_CR0_PG )) +if (!nested_vmcb_check_cr3_cr4 (svm, &save))return -EINVAL ;Removing the "if" is incorrect.
Sorry, my mistake.
Quoted 2 lines
Also are there really no more reserved
bits to check?
I have sent v2 which has added checks for DR6, DR7 and EFER.
Quoted 3 lines
Paolo
PATCH 3/3 nSVM: Test non-MBZ reserved bits in CR3 in long mode
In reply to Krish SadhukhanAccording to section "CR3" in APM vol. 2, the non-MBZ reserved bits in CR3 need to be set by software as follows:
"Reserved Bits. Reserved fields should be cleared to 0 by software when writing CR3."
--- x86/svm.h | 3 ++- x86/svm_tests.c | 54 ++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 49 insertions(+), 8 deletions(-)
x86/svm.h +2 -1
@@ -325,7 +325,8 @@ struct __attribute__ ((__packed__)) vmcb {#define SVM_CR0_SELECTIVE_MASK (X86_CR0_TS | X86_CR0_MP)#define SVM_CR0_RESERVED_MASK 0xffffffff00000000U -#define SVM_CR3_LONG_RESERVED_MASK 0xfff0000000000000U +#define SVM_CR3_LONG_MBZ_MASK 0xfff0000000000000U +#define SVM_CR3_LONG_RESERVED_MASK 0x0000000000000fe7U#define SVM_CR4_LEGACY_RESERVED_MASK 0xff88f000U#define SVM_CR4_RESERVED_MASK 0xffffffffff88f000U#define SVM_DR6_RESERVED_MASK 0xffffffffffff1ff0U
x86/svm_tests.c +47 -7
95 lines not on this page · raw message
Signature · 1 line
2.18.4
Paolo Bonzini
maintainerQuoted 19 lines · Krish Sadhukhan
Patch# 1: Fixes the MBZ mask for CR3
Patch# 2: Adds checks for the reserved bits for CR3 and CR4 to
svm_set_nested_state()since these bits need to be checked before VMRUN of the nested guest on the destination.
Patch# 3: Adds a test for the non-MBZ reserved bits in CR3 in long mode.[PATCH 1/3] KVM: nSVM: CR3 MBZ bits are only 63:52 [PATCH 2/3] KVM: nSVM: Add check for CR3 and CR4 reserved bits to [PATCH 3/3] nSVM: Test non-MBZ reserved bits in CR3 in long mode
arch/x86/kvm/svm/nested.c | 51 +++++++++++++++++++++++++++-------------------- arch/x86/kvm/svm/svm.h | 2 +- 2 files changed, 30 insertions(+), 23 deletions(-)Krish Sadhukhan (2):
KVM: nSVM: CR3 MBZ bits are only 63:52
KVM: nSVM: Add check for CR3 and CR4 reserved bits tosvm_set_nested_state()
Quoted 7 lines
x86/svm.h | 3 ++- x86/svm_tests.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 49 insertions(+), 8 deletions(-)Krish Sadhukhan (1):
KVM: nSVM: Test non-MBZ reserved bits in CR3 in long mode
The patches does not apply anymore, please resend on top of kvm/queue.
Paolo