OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/intc/arm_gicv3_its: Split error checks 

In most of the ITS command processing, we check different error
possibilities one at a time and log them appropriately. In
process_mapti() and process_mapd() we have code which checks
multiple error cases at once, which means the logging is less
specific than it could be. Split those cases up.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220201193207.2771604-14-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2022-02-01 19:32:07 +00:00
parent 3330241407
commit d7d359c4ac
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
hw/intc/arm_gicv3_its.c
View File

@ -404,19 +404,29 @@ static ItsCmdResult process_mapti(GICv3ITSState *s, const uint64_t *cmdpkt,
num_eventids = 1ULL << (dte.size + 1); num_eventids = 1ULL << (dte.size + 1);
num_intids = 1ULL << (GICD_TYPER_IDBITS + 1); num_intids = 1ULL << (GICD_TYPER_IDBITS + 1);
if ((icid >= s->ct.num_entries) if (icid >= s->ct.num_entries) {
|| !dte.valid || (eventid >= num_eventids) ||
(((pIntid < GICV3_LPI_INTID_START) || (pIntid >= num_intids)))) {
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"%s: invalid command attributes " "%s: invalid ICID 0x%x >= 0x%x\n",
"icid %d or eventid %d or pIntid %d or" __func__, icid, s->ct.num_entries);
"unmapped dte %d\n", __func__, icid, eventid, return CMD_CONTINUE;
pIntid, dte.valid); }
/*
* in this implementation, in case of error if (!dte.valid) {
* we ignore this command and move onto the next qemu_log_mask(LOG_GUEST_ERROR,
* command in the queue "%s: no valid DTE for devid 0x%x\n", __func__, devid);
*/ return CMD_CONTINUE;
}
if (eventid >= num_eventids) {
qemu_log_mask(LOG_GUEST_ERROR,
"%s: invalid event ID 0x%x >= 0x%" PRIx64 "\n",
__func__, eventid, num_eventids);
return CMD_CONTINUE;
}
if (pIntid < GICV3_LPI_INTID_START || pIntid >= num_intids) {
qemu_log_mask(LOG_GUEST_ERROR,
"%s: invalid interrupt ID 0x%x\n", __func__, pIntid);
return CMD_CONTINUE; return CMD_CONTINUE;
} }
@ -529,16 +539,16 @@ static ItsCmdResult process_mapd(GICv3ITSState *s, const uint64_t *cmdpkt)
dte.ittaddr = (cmdpkt[2] & ITTADDR_MASK) >> ITTADDR_SHIFT; dte.ittaddr = (cmdpkt[2] & ITTADDR_MASK) >> ITTADDR_SHIFT;
dte.valid = cmdpkt[2] & CMD_FIELD_VALID_MASK; dte.valid = cmdpkt[2] & CMD_FIELD_VALID_MASK;
if ((devid >= s->dt.num_entries) || if (devid >= s->dt.num_entries) {
(dte.size > FIELD_EX64(s->typer, GITS_TYPER, IDBITS))) {
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"ITS MAPD: invalid device table attributes " "ITS MAPD: invalid device ID field 0x%x >= 0x%x\n",
"devid %d or size %d\n", devid, dte.size); devid, s->dt.num_entries);
/* return CMD_CONTINUE;
* in this implementation, in case of error }
* we ignore this command and move onto the next
* command in the queue if (dte.size > FIELD_EX64(s->typer, GITS_TYPER, IDBITS)) {
*/ qemu_log_mask(LOG_GUEST_ERROR,
"ITS MAPD: invalid size %d\n", dte.size);
return CMD_CONTINUE; return CMD_CONTINUE;
} }