SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

spapr, xics, xive: Better use of assert()s on irq claim/free paths

Browse Source 
The irq claim and free paths for both XICS and XIVE check for some
validity conditions.  Some of these represent genuine runtime failures,
however others - particularly checking that the basic irq number is in a
sane range - could only fail in the case of bugs in the callin code.
Therefore use assert()s instead of runtime failures for those.

In addition the non backend-specific part of the claim/free paths should
only be used for PAPR external irqs, that is in the range SPAPR_XIRQ_BASE
to the maximum irq number.  Put assert()s for that into the top level
dispatchers as well.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Greg Kurz <groug@kaod.org>
This commit is contained in:
David Gibson 2019-09-25 13:49:59 +10:00
parent f233cee97b
commit 580dde5e4a
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/intc/spapr_xive.c
View File

@ -532,9 +532,7 @@ bool spapr_xive_irq_claim(SpaprXive *xive, uint32_t lisn, bool lsi)
{ {
XiveSource *xsrc = &xive->source; XiveSource *xsrc = &xive->source;
if (lisn >= xive->nr_irqs) { assert(lisn < xive->nr_irqs);
return false;
}
/* /*
* Set default values when allocating an IRQ number * Set default values when allocating an IRQ number
@ -559,9 +557,7 @@ bool spapr_xive_irq_claim(SpaprXive *xive, uint32_t lisn, bool lsi)
bool spapr_xive_irq_free(SpaprXive *xive, uint32_t lisn) bool spapr_xive_irq_free(SpaprXive *xive, uint32_t lisn)
{ {
if (lisn >= xive->nr_irqs) { assert(lisn < xive->nr_irqs);
return false;
}
xive->eat[lisn].w &= cpu_to_be64(~EAS_VALID); xive->eat[lisn].w &= cpu_to_be64(~EAS_VALID);
return true; return true;

16
hw/ppc/spapr_irq.c
View File

@ -118,11 +118,7 @@ static int spapr_irq_claim_xics(SpaprMachineState *spapr, int irq, bool lsi,
ICSState *ics = spapr->ics; ICSState *ics = spapr->ics;
assert(ics); assert(ics);
assert(ics_valid_irq(ics, irq));
if (!ics_valid_irq(ics, irq)) {
error_setg(errp, "IRQ %d is invalid", irq);
return -1;
}
if (!ics_irq_free(ics, irq - ics->offset)) { if (!ics_irq_free(ics, irq - ics->offset)) {
error_setg(errp, "IRQ %d is not free", irq); error_setg(errp, "IRQ %d is not free", irq);
@ -138,10 +134,10 @@ static void spapr_irq_free_xics(SpaprMachineState *spapr, int irq)
ICSState *ics = spapr->ics; ICSState *ics = spapr->ics;
uint32_t srcno = irq - ics->offset; uint32_t srcno = irq - ics->offset;
if (ics_valid_irq(ics, irq)) { assert(ics_valid_irq(ics, irq));
memset(&ics->irqs[srcno], 0, sizeof(ICSIRQState)); memset(&ics->irqs[srcno], 0, sizeof(ICSIRQState));
} }
}
static void spapr_irq_print_info_xics(SpaprMachineState *spapr, Monitor *mon) static void spapr_irq_print_info_xics(SpaprMachineState *spapr, Monitor *mon)
{ {
@ -623,6 +619,9 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
int spapr_irq_claim(SpaprMachineState *spapr, int irq, bool lsi, Error **errp) int spapr_irq_claim(SpaprMachineState *spapr, int irq, bool lsi, Error **errp)
{ {
assert(irq >= SPAPR_XIRQ_BASE);
assert(irq < (spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE));
return spapr->irq->claim(spapr, irq, lsi, errp); return spapr->irq->claim(spapr, irq, lsi, errp);
} }
@ -630,6 +629,9 @@ void spapr_irq_free(SpaprMachineState *spapr, int irq, int num)
{ {
int i; int i;
assert(irq >= SPAPR_XIRQ_BASE);
assert((irq + num) <= (spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE));
for (i = irq; i < (irq + num); i++) { for (i = irq; i < (irq + num); i++) {
spapr->irq->free(spapr, i); spapr->irq->free(spapr, i);
} }