hw/intc/arm_gicv3_cpuif: Fix virtual irq number check in icv_[dir|eoir]_write
PATCH 1/1 hw/intc/arm_gicv3_cpuif: Fix virtual irq number check in icv_[dir|eoir]_write
icv_eoir_write() and icv_dir_write() ignore invalid virtual IRQ numbers (like LPIs). The issue is that these functions check against the number of implemented IRQs (QEMU's default is num_irq=288) which can be lower than the maximum virtual IRQ number (1020 - 1). The consequence is that if a hypervisor creates an LR for an IRQ between 288 and 1020, then the guest is unable to deactivate the resulting IRQ. Note that other functions that deal with large IRQ numbers, like icv_iar_read, check against 1020 and not against num_irq.
Fix the checks by using GICV3_MAXIRQ (1020) instead of the number of implemented IRQs.
--- hw/intc/arm_gicv3_cpuif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/intc/arm_gicv3_cpuif.c +2 -2
@@ -1227,7 +1227,7 @@ static void icv_dir_write(CPUARMState *env, const ARMCPRegInfo *ri,trace_gicv3_icv_dir_write (gicv3_redist_affid (cs), value); -if (irq >= cs->gic->num_irq) { +if (irq >=GICV3_MAXIRQ ) {/* Also catches special interrupt numbers and LPIs */ return ; }
@@ -1262,7 +1262,7 @@ static void icv_eoir_write(CPUARMState *env, const ARMCPRegInfo *ri,trace_gicv3_icv_eoir_write (ri->crm ==8 ?0 :1 ,gicv3_redist_affid (cs), value); -if (irq >= cs->gic->num_irq) { +if (irq >=GICV3_MAXIRQ ) {/* Also catches special interrupt numbers and LPIs */ return ; }
Signature · 1 line
2.32.0.93.g670b81a890-goog
Peter Maydell
AppliedQuoted 10 lines · Ricardo Koller
icv_eoir_write()andicv_dir_write()ignore invalid virtual IRQ numbers (like LPIs). The issue is that these functions check against the number of implemented IRQs (QEMU's default is num_irq=288) which can be lower than the maximum virtual IRQ number (1020 - 1). The consequence is that if a hypervisor creates an LR for an IRQ between 288 and 1020, then the guest is unable to deactivate the resulting IRQ. Note that other functions that deal with large IRQ numbers, likeicv_iar_read, check against 1020 and not againstnum_irq.
Quoted 7 lines
Fix the checks by using
GICV3_MAXIRQ(1020) instead of the number of implemented IRQs.Signed-off-by Ricardo Koller <[email protected]>--- hw/intc/arm_gicv3_cpuif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Applied to target-arm.next, thanks.
-- PMM