github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 14:07:42 +00:00
Code Issues Projects Releases Wiki Activity

fix "Recursion in procedure calls found"

Browse Source 
Functions shall not call themselves, either directly or indirectly.
V1->V2:
    add pre-assumption.
V2->V3:
    when vector < 16,call vlapic_set_error

Tracked-On: #861
Signed-off-by: Huihuang Shi <huihuang.shi@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Huihuang Shi 2018-10-29 10:22:26 +08:00 committed by lijinxia
parent e8a59f30f1
commit e24899d9c9
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hypervisor/arch/x86/guest/vlapic.c
View File

@ -442,6 +442,7 @@ vlapic_esr_write_handler(struct acrn_vlapic *vlapic)
/* /*
* Returns 1 if the vcpu needs to be notified of the interrupt and 0 otherwise. * Returns 1 if the vcpu needs to be notified of the interrupt and 0 otherwise.
* @pre vector >= 16
*/ */
static int static int
vlapic_set_intr_ready(struct acrn_vlapic *vlapic, uint32_t vector, bool level) vlapic_set_intr_ready(struct acrn_vlapic *vlapic, uint32_t vector, bool level)
@ -463,13 +464,6 @@ vlapic_set_intr_ready(struct acrn_vlapic *vlapic, uint32_t vector, bool level)
return 0; return 0;
} }
if (vector < 16U) {
vlapic_set_error(vlapic, APIC_ESR_RECEIVE_ILLEGAL_VECTOR);
dev_dbg(ACRN_DBG_LAPIC,
"vlapic ignoring interrupt to vector %u", vector);
return 1;
}
if (is_apicv_intr_delivery_supported()) { if (is_apicv_intr_delivery_supported()) {
pending_intr = apicv_set_intr_ready(vlapic, vector); pending_intr = apicv_set_intr_ready(vlapic, vector);
if ((pending_intr != 0) if ((pending_intr != 0)
@ -714,6 +708,9 @@ vlapic_mask_lvts(struct acrn_vlapic *vlapic)
vlapic_lvt_write_handler(vlapic, APIC_OFFSET_ERROR_LVT); vlapic_lvt_write_handler(vlapic, APIC_OFFSET_ERROR_LVT);
} }
/*
* @pre vec = (lvt & APIC_LVT_VECTOR) >=16
*/
static void static void
vlapic_fire_lvt(struct acrn_vlapic *vlapic, uint32_t lvt) vlapic_fire_lvt(struct acrn_vlapic *vlapic, uint32_t lvt)
{ {
@ -729,10 +726,6 @@ vlapic_fire_lvt(struct acrn_vlapic *vlapic, uint32_t lvt)
switch (mode) { switch (mode) {
case APIC_LVT_DM_FIXED: case APIC_LVT_DM_FIXED:
if (vec < 16U) {
vlapic_set_error(vlapic, APIC_ESR_SEND_ILLEGAL_VECTOR);
return;
}
if (vlapic_set_intr_ready(vlapic, vec, false) != 0) { if (vlapic_set_intr_ready(vlapic, vec, false) != 0) {
vcpu_make_request(vcpu, ACRN_REQUEST_EVENT); vcpu_make_request(vcpu, ACRN_REQUEST_EVENT);
} }
@ -896,7 +889,9 @@ vlapic_set_error(struct acrn_vlapic *vlapic, uint32_t mask)
vlapic_fire_lvt(vlapic, lvt | APIC_LVT_DM_FIXED); vlapic_fire_lvt(vlapic, lvt | APIC_LVT_DM_FIXED);
vlapic->esr_firing = 0; vlapic->esr_firing = 0;
} }
/*
* @pre vector <= 255
*/
static int static int
vlapic_trigger_lvt(struct acrn_vlapic *vlapic, uint32_t vector) vlapic_trigger_lvt(struct acrn_vlapic *vlapic, uint32_t vector)
{ {
@ -954,7 +949,11 @@ vlapic_trigger_lvt(struct acrn_vlapic *vlapic, uint32_t vector)
default: default:
return -EINVAL; return -EINVAL;
} }
vlapic_fire_lvt(vlapic, lvt); if (vector < 16U) {
vlapic_set_error(vlapic, APIC_ESR_RECEIVE_ILLEGAL_VECTOR);
} else {
vlapic_fire_lvt(vlapic, lvt);
}
return 0; return 0;
} }
@ -1825,11 +1824,18 @@ vlapic_set_intr(struct vcpu *vcpu, uint32_t vector, bool level)
* According to section "Maskable Hardware Interrupts" in Intel SDM * According to section "Maskable Hardware Interrupts" in Intel SDM
* vectors 16 through 255 can be delivered through the local APIC. * vectors 16 through 255 can be delivered through the local APIC.
*/ */
if ((vector < 16U) || (vector > 255U)) { if (vector > 255U) {
return -EINVAL; return -EINVAL;
} }
vlapic = vcpu_vlapic(vcpu); vlapic = vcpu_vlapic(vcpu);
if (vector < 16U) {
vlapic_set_error(vlapic, APIC_ESR_RECEIVE_ILLEGAL_VECTOR);
dev_dbg(ACRN_DBG_LAPIC,
"vlapic ignoring interrupt to vector %u", vector);
return 0;
}
if (vlapic_set_intr_ready(vlapic, vector, level) != 0) { if (vlapic_set_intr_ready(vlapic, vector, level) != 0) {
vcpu_make_request(vcpu, ACRN_REQUEST_EVENT); vcpu_make_request(vcpu, ACRN_REQUEST_EVENT);
} }