KVM: nSVM: Check reserved values for 'Type' and invalid vectors in EVENTINJ
v5 cover KVM: nSVM: Check reserved values for 'Type' and invalid vectors in EVENTINJ
v4 -> v5:
1. In patch# 1, the storage for the 'type' variable has been changed back to u32.
2. In patch# 1, the two 'if' conditions in the second check have been merged into one.
[PATCH 1/2 v5] KVM: nSVM: Check reserved values for 'Type' and invalid [PATCH 2/2 v5] nSVM: Test reserved values for 'Type' and invalid vectors in
arch/x86/include/asm/svm.h | 4 ++++ arch/x86/kvm/svm/nested.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+)
Krish Sadhukhan (1):
KVM: nSVM: Check reserved values for 'Type' and invalid vectors in EVENTINJ
x86/svm_tests.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
Krish Sadhukhan (1):
nSVM: Test reserved values for 'Type' and invalid vectors in EVENTINJ
PATCH v5 1/2 KVM: nSVM: Check reserved values for 'Type' and invalid vectors in EVENTINJ
According to sections "Canonicalization and Consistency Checks" and "Event Injection" in APM vol 2
VMRUN exits with VMEXIT_INVALID error code if either:
- Reserved values of TYPE have been specified, or
- TYPE = 3 (exception) has been specified with a vector that does not correspond to an exception (this includes vector 2, which is an NMI, not an exception).
--- arch/x86/include/asm/svm.h | 4 ++++ arch/x86/kvm/svm/nested.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+)
arch/x86/include/asm/svm.h +4 -0
@@ -341,9 +341,13 @@ struct vmcb {#define SVM_EVTINJ_TYPE_MASK (7 << SVM_EVTINJ_TYPE_SHIFT)#define SVM_EVTINJ_TYPE_INTR (0 << SVM_EVTINJ_TYPE_SHIFT) +#define SVM_EVTINJ_TYPE_RESV1 (1 << SVM_EVTINJ_TYPE_SHIFT)#define SVM_EVTINJ_TYPE_NMI (2 << SVM_EVTINJ_TYPE_SHIFT)#define SVM_EVTINJ_TYPE_EXEPT (3 << SVM_EVTINJ_TYPE_SHIFT)#define SVM_EVTINJ_TYPE_SOFT (4 << SVM_EVTINJ_TYPE_SHIFT) +#define SVM_EVTINJ_TYPE_RESV5 (5 << SVM_EVTINJ_TYPE_SHIFT) +#define SVM_EVTINJ_TYPE_RESV6 (6 << SVM_EVTINJ_TYPE_SHIFT) +#define SVM_EVTINJ_TYPE_RESV7 (7 << SVM_EVTINJ_TYPE_SHIFT)#define SVM_EVTINJ_VALID (1 << 31)#define SVM_EVTINJ_VALID_ERR (1 << 11)
arch/x86/kvm/svm/nested.c +15 -0
@@ -212,6 +212,10 @@ static bool svm_get_nested_state_pages(struct kvm_vcpu *vcpu)static bool nested_vmcb_check_controls (struct vmcb_control_area *control) { +u8 vector; +u32 type; +bool valid; +if ((vmcb_is_intercept (control,INTERCEPT_VMRUN )) ==0 )return false;
@@ -222,6 +226,17 @@ static bool nested_vmcb_check_controls(struct vmcb_control_area *control) !npt_enabled)return false; + valid = control->event_inj &SVM_EVTINJ_VALID ; + type = control->event_inj &SVM_EVTINJ_TYPE_MASK ; +if (valid && (type ==SVM_EVTINJ_TYPE_RESV1 || + type >=SVM_EVTINJ_TYPE_RESV5 )) +return false; + + vector = control->event_inj &SVM_EVTINJ_VEC_MASK ; +if (valid && type ==SVM_EVTINJ_TYPE_EXEPT && + (vector ==NMI_VECTOR || vector >31 )) +return false; +return true; }
Signature · 1 line
2.27.0
PATCH v5 2/2 nSVM: Test reserved values for 'Type' and invalid vectors in EVENTINJ
In reply to Krish SadhukhanAccording to sections "Canonicalization and Consistency Checks" and "Event Injection" in APM vol 2
VMRUN exits with VMEXIT_INVALID error code if either:
- Reserved values of TYPE have been specified, or
- TYPE = 3 (exception) has been specified with a vector that does not correspond to an exception (this includes vector 2, which is an NMI, not an exception).
Existing tests already cover part of the second rule. This patch covers the the first rule and the missing pieces of the second rule.
--- x86/svm_tests.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
x86/svm_tests.c +38 -0
@@ -2132,6 +2132,43 @@ static void test_dr(void) vmcb->save.dr7 = dr_saved; } +static void test_event_inject (void ) +{ +u32 i; +u32 event_inj_saved = vmcb->control.event_inj; + +handle_exception (DE_VECTOR , my_isr); + +report (svm_vmrun () ==SVM_EXIT_VMMCALL && count_exc ==0 ,"Test " +"No EVENTINJ" ); + +/* +* Reserved values for 'Type' in EVENTINJ causes VMEXIT_INVALID. +*/ +for (i =1 ; i <8 ; i++) { +if (i !=1 && i <5 ) +continue ; + vmcb->control.event_inj =DE_VECTOR | + i <<SVM_EVTINJ_TYPE_SHIFT |SVM_EVTINJ_VALID ; +report (svm_vmrun () ==SVM_EXIT_ERR && count_exc ==0 , +"Test invalid TYPE (%x) in EVENTINJ" , i); + } + +/* +* Invalid vector number for event type 'exception' in EVENTINJ +* causes VMEXIT_INVALID. +*/ +for (i =32 ; i <256 ; i +=4 ) { + vmcb->control.event_inj = i |SVM_EVTINJ_TYPE_EXEPT | +SVM_EVTINJ_VALID ; +report (svm_vmrun () ==SVM_EXIT_ERR && count_exc ==0 , +"Test invalid vector (%u) in EVENTINJ for event type " +"\'exception\'" , i); + } + + vmcb->control.event_inj = event_inj_saved; +} +static void svm_guest_state_test (void ) {test_set_guest (basic_guest_main);
@@ -2141,6 +2178,7 @@ static void svm_guest_state_test(void)test_cr3 ();test_cr4 ();test_dr (); +test_event_inject (); }struct svm_test svm_tests[] = {
Signature · 1 line
2.18.4