Skip to content

Commit 9a604ed

Browse files
JasonChenCJlijinxia
authored andcommitted
correct idt_vectoring_info handling
filter out HW exception and NMI from idt_vectoring_info first: - queue HW exception through vcpu_queue_exception - make NMI request through vcpu_make_request this is a complement patch for previous commit "exception: refine exception injection path", here take care un-injected vectors for types HW exception & NMI, the previous commit take care SW exception & external interrupt. Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com> Acked-by: Tian, Kevin <kevin.tian@intel.com>
1 parent 7718338 commit 9a604ed

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

hypervisor/arch/x86/vmexit.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,23 @@ int vmexit_handler(struct vcpu *vcpu)
166166
/* Obtain interrupt info */
167167
vcpu->arch_vcpu.idt_vectoring_info =
168168
exec_vmread(VMX_IDT_VEC_INFO_FIELD);
169+
/* Filter out HW exception & NMI */
170+
if (vcpu->arch_vcpu.idt_vectoring_info & VMX_INT_INFO_VALID) {
171+
uint32_t vector_info = vcpu->arch_vcpu.idt_vectoring_info;
172+
uint32_t vector = vector_info & 0xff;
173+
uint32_t type = (vector_info & VMX_INT_TYPE_MASK) >> 8;
174+
uint32_t err_code = 0;
175+
176+
if (type == VMX_INT_TYPE_HW_EXP) {
177+
if (vector_info & VMX_INT_INFO_ERR_CODE_VALID)
178+
err_code = exec_vmread(VMX_IDT_VEC_ERROR_CODE);
179+
vcpu_queue_exception(vcpu, vector, err_code);
180+
vcpu->arch_vcpu.idt_vectoring_info = 0;
181+
} else if (type == VMX_INT_TYPE_NMI) {
182+
vcpu_make_request(vcpu, ACRN_REQUEST_NMI);
183+
vcpu->arch_vcpu.idt_vectoring_info = 0;
184+
}
185+
}
169186

170187
/* Calculate basic exit reason (low 16-bits) */
171188
basic_exit_reason = vcpu->arch_vcpu.exit_reason & 0xFFFF;

0 commit comments

Comments
 (0)