arm_gicv3_its: Implement MOVI and MOVALL commands
cover arm_gicv3_its: Implement MOVI and MOVALL commands
I noticed while working on the new-in-GICv4 ITS commands that we'd forgotten to implement the GICv3 MOVI and MOVALL commands. These move interrupts from one redistributor to another; Linux doesn't use MOVALL but does use MOVI if it wants to power down a CPU (when it needs to migrate interrupts formerly targeting that CPU to a different one).
This patchseries starts with a couple of patches that I found useful to improve the debug logging when I was writing this. It then has a collection of fixes for various minor bugs that I noticed while I was in the code (including yet another fix to the table lookup bounds checking...). Finally the last two patches implement the two new commands.
thanks
-- PMM
Peter Maydell (14):
target/arm: Log CPU index in 'Taking exception' log hw/intc/arm_gicv3_its: Add tracepoints
hw/intc/arm_gicv3: Initialise dma_as in GIC, not ITS hw/intc/arm_gicv3_its: Don't clear GITS_CREADR when GITS_CTLR.ENABLED
is set
hw/intc/arm_gicv3_its: Don't clear GITS_CWRITER on writes to
GITS_CBASER
hw/intc/arm_gicv3: Honour GICD_CTLR.EnableGrp1NS for LPIs hw/intc/arm_gicv3_its: Sort ITS command list into numeric order hw/intc/arm_gicv3_redist: Remove unnecessary zero checks hw/intc/arm_gicv3: Set GICR_CTLR.CES if LPIs are supported hw/intc/arm_gicv3_its: Provide read accessor for translation_ops hw/intc/arm_gicv3_its: Make GITS_BASER<n> RAZ/WI for unimplemented
registers
hw/intc/arm_gicv3_its: Check table bounds against correct limit hw/intc/arm_gicv3_its: Implement MOVALL hw/intc/arm_gicv3_its: Implement MOVI
hw/intc/gicv3_internal.h | 43 ++++- include/hw/intc/arm_gicv3_its_common.h | 1 - target/arm/internals.h | 2 +- hw/intc/arm_gicv3.c | 1 + hw/intc/arm_gicv3_common.c | 9 + hw/intc/arm_gicv3_its.c | 258 +++++++++++++++++++++++-- hw/intc/arm_gicv3_redist.c | 115 ++++++++++- target/arm/helper.c | 9 +- target/arm/m_helper.c | 2 +- hw/intc/trace-events | 8 + 10 files changed, 416 insertions(+), 32 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/14 target/arm: Log CPU index in 'Taking exception' log
In an SMP system it can be unclear which CPU is taking an exception; add the CPU index (which is the same value used in the TCG 'Trace %d:' logging) to the "Taking exception" log line to clarify it.
--- target/arm/internals.h | 2 +- target/arm/helper.c | 9 ++++++--- target/arm/m_helper.c | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-)
target/arm/internals.h +1 -1
@@ -1130,7 +1130,7 @@ bool get_phys_addr(CPUARMState *env, target_ulong address, ARMMMUFaultInfo *fi, ARMCacheAttrs *cacheattrs) __attribute__((nonnull)); -void arm_log_exception (int idx); +void arm_log_exception (CPUState *cs);#endif /* !CONFIG_USER_ONLY */
target/arm/helper.c +6 -3
@@ -9317,8 +9317,10 @@ uint32_t arm_phys_excp_target_el(CPUState *cs, uint32_t excp_idx,return target_el; } -void arm_log_exception (int idx) +void arm_log_exception (CPUState *cs) { +int idx = cs->exception_index; +if (qemu_loglevel_mask (CPU_LOG_INT )) {const char *exc =NULL ; static const char * const excnames[] = {
@@ -9352,7 +9354,8 @@ void arm_log_exception(int idx)if (!exc) { exc ="unknown" ; } -qemu_log_mask (CPU_LOG_INT ,"Taking exception %d [%s]\n" , idx, exc); +qemu_log_mask (CPU_LOG_INT ,"Taking exception %d [%s] on CPU %d\n" , + idx, exc, cs->cpu_index); } }
@@ -10185,7 +10188,7 @@ void arm_cpu_do_interrupt(CPUState *cs)assert (!arm_feature (env,ARM_FEATURE_M )); -arm_log_exception (cs->exception_index); +arm_log_exception (cs);qemu_log_mask (CPU_LOG_INT ,"...from EL%d to EL%d\n" ,arm_current_el (env), new_el); if (qemu_loglevel_mask(CPU_LOG_INT)
target/arm/m_helper.c +1 -1
@@ -2206,7 +2206,7 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs)uint32_t lr;bool ignore_stackfaults; -arm_log_exception (cs->exception_index); +arm_log_exception (cs);/* * For exceptions we just mark as pending on the NVIC, and let that
Signature · 1 line
2.25.1
Re: [PATCH 01/14] target/arm: Log CPU index in 'Taking exception' log
Quoted 10 lines · Peter Maydell
In an SMP system it can be unclear which CPU is taking an exception; add the CPU index (which is the same value used in the TCG 'Trace %d:' logging) to the "Taking exception" log line to clarify it.
Signed-off-by Peter Maydell <[email protected]>--- target/arm/internals.h | 2 +- target/arm/helper.c | 9 ++++++--- target/arm/m_helper.c | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-)
Re: [PATCH 01/14] target/arm: Log CPU index in 'Taking exception' log
In reply to Peter MaydellQuoted 10 lines · Peter Maydell
In an SMP system it can be unclear which CPU is taking an exception; add the CPU index (which is the same value used in the TCG 'Trace %d:' logging) to the "Taking exception" log line to clarify it.
Signed-off-by Peter Maydell<[email protected]>--- target/arm/internals.h | 2 +- target/arm/helper.c | 9 ++++++--- target/arm/m_helper.c | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-)
r~
PATCH 2/14 hw/intc/arm_gicv3_its: Add tracepoints
In reply to Peter MaydellThe ITS currently has no tracepoints; add a minimal set that allows basic monitoring of guest register accesses and reading of commands from the command queue.
--- hw/intc/arm_gicv3_its.c | 11 +++++++++++ hw/intc/trace-events | 8 ++++++++ 2 files changed, 19 insertions(+)
hw/intc/arm_gicv3_its.c +11 -0
@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "qemu/log.h" +#include "trace.h" #include "hw/qdev-properties.h" #include "hw/intc/arm_gicv3_its_common.h" #include "gicv3_internal.h"
@@ -634,6 +635,8 @@ static void process_cmdq(GICv3ITSState *s) cmd = (data &CMD_MASK ); +trace_gicv3_its_process_command (rd_offset, cmd); +switch (cmd) {case GITS_CMD_INT : result =process_its_cmd (s, data, cq_offset,INTERRUPT );
@@ -818,6 +821,8 @@ static MemTxResult gicv3_its_translation_write(void *opaque, hwaddr offset,bool result = true;uint32_t devid =0 ; +trace_gicv3_its_translation_write (offset, data, size, attrs.requester_id); +switch (offset) {case GITS_TRANSLATER :if (s->ctlr &R_GITS_CTLR_ENABLED_MASK ) {
@@ -1107,6 +1112,7 @@ static MemTxResult gicv3_its_read(void *opaque, hwaddr offset, uint64_t *data,qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid guest read at offset " TARGET_FMT_plx"size %u\n" , __func__, offset, size); +trace_gicv3_its_badread (offset, size);/* * The spec requires that reserved registers are RAZ/WI; * so use false returns from leaf functions as a way to
@@ -1114,6 +1120,8 @@ static MemTxResult gicv3_its_read(void *opaque, hwaddr offset, uint64_t *data,* the caller, or we'll cause a spurious guest data abort. */ *data =0 ; + }else { +trace_gicv3_its_read (offset, *data, size); }return MEMTX_OK ; }
@@ -1140,12 +1148,15 @@ static MemTxResult gicv3_its_write(void *opaque, hwaddr offset, uint64_t data,qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid guest write at offset " TARGET_FMT_plx"size %u\n" , __func__, offset, size); +trace_gicv3_its_badwrite (offset, data, size);/* * The spec requires that reserved registers are RAZ/WI; * so use false returns from leaf functions as a way to * trigger the guest-error logging but don't return it to * the caller, or we'll cause a spurious guest data abort. */ + }else { +trace_gicv3_its_write (offset, data, size); }return MEMTX_OK ; }
hw/intc/trace-events +8 -0
@@ -169,6 +169,14 @@ gicv3_redist_badwrite(uint32_t cpu, uint64_t offset, uint64_t data, unsigned siz gicv3_redist_set_irq(uint32_t cpu, int irq, int level) "GICv3 redistributor 0x%x interrupt %d level changed to %d" gicv3_redist_send_sgi(uint32_t cpu, int irq) "GICv3 redistributor 0x%x pending SGI %d" +# arm_gicv3_its.c +gicv3_its_read(uint64_t offset, uint64_t data, unsigned size) "GICv3 ITS read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" +gicv3_its_badread(uint64_t offset, unsigned size) "GICv3 ITS read: offset 0x%" PRIx64 " size %u: error" +gicv3_its_write(uint64_t offset, uint64_t data, unsigned size) "GICv3 ITS write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" +gicv3_its_badwrite(uint64_t offset, uint64_t data, unsigned size) "GICv3 ITS write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u: error" +gicv3_its_translation_write(uint64_t offset, uint64_t data, unsigned size, uint32_t requester_id) "GICv3 ITS TRANSLATER write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u requester_id 0x%x" +gicv3_its_process_command(uint32_t rd_offset, uint8_t cmd) "GICv3 ITS: processing command at offset 0x%x: 0x%x" + # armv7m_nvic.c nvic_recompute_state(int vectpending, int vectpending_prio, int exception_prio) "NVIC state recomputed: vectpending %d vectpending_prio %d exception_prio %d" nvic_recompute_state_secure(int vectpending, bool vectpending_is_s_banked, int vectpending_prio, int exception_prio) "NVIC state recomputed: vectpending %d is_s_banked %d vectpending_prio %d exception_prio %d"
Signature · 1 line
2.25.1
Re: [PATCH 02/14] hw/intc/arm_gicv3_its: Add tracepoints
Quoted 9 lines · Peter Maydell
The ITS currently has no tracepoints; add a minimal set that allows basic monitoring of guest register accesses and reading of commands from the command queue.
Signed-off-by Peter Maydell <[email protected]>--- hw/intc/arm_gicv3_its.c | 11 +++++++++++ hw/intc/trace-events | 8 ++++++++ 2 files changed, 19 insertions(+)
Re: [PATCH 02/14] hw/intc/arm_gicv3_its: Add tracepoints
In reply to Peter MaydellQuoted 9 lines · Peter Maydell
The ITS currently has no tracepoints; add a minimal set that allows basic monitoring of guest register accesses and reading of commands from the command queue.
Signed-off-by Peter Maydell<[email protected]>--- hw/intc/arm_gicv3_its.c | 11 +++++++++++ hw/intc/trace-events | 8 ++++++++ 2 files changed, 19 insertions(+)
r~
PATCH 3/14 hw/intc/arm_gicv3: Initialise dma_as in GIC, not ITS
In reply to Peter MaydellIn our implementation, all ITSes connected to a GIC share a single AddressSpace, which we keep in the GICv3State::dma_as field and initialized based on the GIC's 'sysmem' property. The right place to set it up by calling address_space_init() is therefore in the GIC's realize method, not the ITS's realize.
This fixes a theoretical bug where QEMU hangs on startup if the board model creates two ITSes connected to the same GIC -- we would call address_space_init() twice on the same AddressSpace*, which creates an infinite loop in the QTAILQ that softmmu/memory.c uses to store its list of AddressSpaces and causes any subsequent attempt to iterate through that list to loop forever. There aren't any board models like that in the tree at the moment, though.
--- hw/intc/arm_gicv3_common.c | 5 +++++ hw/intc/arm_gicv3_its.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-)
hw/intc/arm_gicv3_common.c +5 -0
@@ -357,6 +357,11 @@ static void arm_gicv3_common_realize(DeviceState *dev, Error **errp)return ; } +if (s->lpi_enable) { +address_space_init (&s->dma_as, s->dma, +"gicv3-its-sysmem" ); + } + s->cpu =g_new0 (GICv3CPUState, s->num_cpu);for (i =0 ; i < s->num_cpu; i++) {
hw/intc/arm_gicv3_its.c +0 -3
@@ -1194,9 +1194,6 @@ static void gicv3_arm_its_realize(DeviceState *dev, Error **errp)gicv3_its_init_mmio (s, &gicv3_its_control_ops, &gicv3_its_translation_ops); -address_space_init (&s->gicv3->dma_as, s->gicv3->dma, -"gicv3-its-sysmem" ); -/* set the ITS default features supported */ s->typer =FIELD_DP64 (s->typer,GITS_TYPER ,PHYSICAL ,1 ); s->typer = FIELD_DP64(s->typer, GITS_TYPER, ITT_ENTRY_SIZE,
Signature · 1 line
2.25.1
Re: [PATCH 03/14] hw/intc/arm_gicv3: Initialise dma_as in GIC, not ITS
Quoted 14 lines · Peter Maydell
In our implementation, all ITSes connected to a GIC share a single AddressSpace, which we keep in the
GICv3State::dma_asfield and initialized based on the GIC's 'sysmem' property. The right place to set it up by callingaddress_space_init()is therefore in the GIC's realize method, not the ITS's realize.This fixes a theoretical bug where QEMU hangs on startup if the board model creates two ITSes connected to the same GIC -- we would call
address_space_init()twice on the same AddressSpace*, which creates an infinite loop in the QTAILQ thatsoftmmu/memory.cuses to store its list of AddressSpaces and causes any subsequent attempt to iterate through that list to loop forever. There aren't any board models like that in the tree at the moment, though.
Quoted 5 lines
Signed-off-by Peter Maydell<[email protected]>--- hw/intc/arm_gicv3_common.c | 5 +++++ hw/intc/arm_gicv3_its.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-)
r~
PATCH 4/14 hw/intc/arm_gicv3_its: Don't clear GITS_CREADR when GITS_CTLR.ENABLED is set
In reply to Peter MaydellThe current ITS code clears GITS_CREADR when GITS_CTLR.ENABLED is set. This is not correct -- guest code can validly clear ENABLED and then set it again and expect the ITS to continue processing where it left off. Remove the erroneous assignment.
--- hw/intc/arm_gicv3_its.c | 1 - 1 file changed, 1 deletion(-)
hw/intc/arm_gicv3_its.c +0 -1
@@ -853,7 +853,6 @@ static bool its_writel(GICv3ITSState *s, hwaddr offset, s->ctlr |=R_GITS_CTLR_ENABLED_MASK ;extract_table_params (s);extract_cmdq_params (s); - s->creadr =0 ;process_cmdq (s); }else { s->ctlr &= ~R_GITS_CTLR_ENABLED_MASK ;
Signature · 1 line
2.25.1
Re: [PATCH 04/14] hw/intc/arm_gicv3_its: Don't clear GITS_CREADR when GITS_CTLR.ENABLED is set
Quoted 9 lines · Peter Maydell
The current ITS code clears
GITS_CREADRwhen GITS_CTLR.ENABLED is set. This is not correct -- guest code can validly clear ENABLED and then set it again and expect the ITS to continue processing where it left off. Remove the erroneous assignment.Signed-off-by Peter Maydell<[email protected]>--- hw/intc/arm_gicv3_its.c | 1 - 1 file changed, 1 deletion(-)
r~
PATCH 5/14 hw/intc/arm_gicv3_its: Don't clear GITS_CWRITER on writes to GITS_CBASER
In reply to Peter MaydellThe ITS specification says that when the guest writes to GITS_CBASER this causes GITS_CREADR to be cleared. However it does not have an equivalent clause for GITS_CWRITER. (This is because GITS_CREADR is read-only, but GITS_CWRITER is writable and the guest can initialize it.) Remove the code that clears GITS_CWRITER on GITS_CBASER writes.
--- hw/intc/arm_gicv3_its.c | 3 --- 1 file changed, 3 deletions(-)
hw/intc/arm_gicv3_its.c +0 -3
@@ -866,7 +866,6 @@ static bool its_writel(GICv3ITSState *s, hwaddr offset,if (!(s->ctlr &R_GITS_CTLR_ENABLED_MASK )) { s->cbaser =deposit64 (s->cbaser,0 ,32 , value); s->creadr =0 ; - s->cwriter = s->creadr; }break ;case GITS_CBASER +4 :
@@ -877,7 +876,6 @@ static bool its_writel(GICv3ITSState *s, hwaddr offset,if (!(s->ctlr &R_GITS_CTLR_ENABLED_MASK )) { s->cbaser =deposit64 (s->cbaser,32 ,32 , value); s->creadr =0 ; - s->cwriter = s->creadr; }break ;case GITS_CWRITER :
@@ -1027,7 +1025,6 @@ static bool its_writell(GICv3ITSState *s, hwaddr offset,if (!(s->ctlr &R_GITS_CTLR_ENABLED_MASK )) { s->cbaser = value; s->creadr =0 ; - s->cwriter = s->creadr; }break ;case GITS_CWRITER :
Signature · 1 line
2.25.1
Re: [PATCH 05/14] hw/intc/arm_gicv3_its: Don't clear GITS_CWRITER on writes to GITS_CBASER
Quoted 10 lines · Peter Maydell
The ITS specification says that when the guest writes to
GITS_CBASERthis causesGITS_CREADRto be cleared. However it does not have an equivalent clause forGITS_CWRITER. (This is becauseGITS_CREADRis read-only, butGITS_CWRITERis writable and the guest can initialize it.) Remove the code that clearsGITS_CWRITERonGITS_CBASERwrites.Signed-off-by Peter Maydell<[email protected]>--- hw/intc/arm_gicv3_its.c | 3 --- 1 file changed, 3 deletions(-)
r~
PATCH 6/14 hw/intc/arm_gicv3: Honour GICD_CTLR.EnableGrp1NS for LPIs
In reply to Peter MaydellThe GICD_CTLR distributor register has enable bits which control whether the different interrupt groups (Group 0, Non-secure Group 1 and Secure Group 1) are forwarded to the CPU. We get this right for traditional interrupts, but forgot to account for it when adding LPIs. LPIs are always Group 1 NS and if the EnableGrp1NS bit is not set we must not forward them to the CPU.
--- hw/intc/arm_gicv3.c | 1 + 1 file changed, 1 insertion(+)
hw/intc/arm_gicv3.c +1 -0
@@ -166,6 +166,7 @@ static void gicv3_redist_update_noirqset(GICv3CPUState *cs) }if ((cs->gicr_ctlr &GICR_CTLR_ENABLE_LPIS ) && cs->gic->lpi_enable && + (cs->gic->gicd_ctlr &GICD_CTLR_EN_GRP1NS ) && (cs->hpplpi.prio !=0xff )) {if (irqbetter (cs, cs->hpplpi.irq, cs->hpplpi.prio)) { cs->hppi.irq = cs->hpplpi.irq;
Signature · 1 line
2.25.1
Re: [PATCH 06/14] hw/intc/arm_gicv3: Honour GICD_CTLR.EnableGrp1NS for LPIs
Quoted 11 lines · Peter Maydell
The
GICD_CTLRdistributor register has enable bits which control whether the different interrupt groups (Group 0, Non-secure Group 1 and Secure Group 1) are forwarded to the CPU. We get this right for traditional interrupts, but forgot to account for it when adding LPIs. LPIs are always Group 1 NS and if the EnableGrp1NS bit is not set we must not forward them to the CPU.Signed-off-by Peter Maydell<[email protected]>--- hw/intc/arm_gicv3.c | 1 + 1 file changed, 1 insertion(+)
r~
PATCH 7/14 hw/intc/arm_gicv3_its: Sort ITS command list into numeric order
In reply to Peter MaydellThe list of #defines for the ITS command packet numbers is neither in alphabetical nor numeric order. Sort it into numeric order.
--- hw/intc/gicv3_internal.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
hw/intc/gicv3_internal.h +5 -5
@@ -314,16 +314,16 @@ FIELD(GITS_TYPER, CIL, 36, 1)#define CMD_MASK 0xff/* ITS Commands */ -#define GITS_CMD_CLEAR 0x04 -#define GITS_CMD_DISCARD 0x0F#define GITS_CMD_INT 0x03 -#define GITS_CMD_MAPC 0x09 +#define GITS_CMD_CLEAR 0x04 +#define GITS_CMD_SYNC 0x05#define GITS_CMD_MAPD 0x08 -#define GITS_CMD_MAPI 0x0B +#define GITS_CMD_MAPC 0x09#define GITS_CMD_MAPTI 0x0A +#define GITS_CMD_MAPI 0x0B#define GITS_CMD_INV 0x0C#define GITS_CMD_INVALL 0x0D -#define GITS_CMD_SYNC 0x05 +#define GITS_CMD_DISCARD 0x0F/* MAPC command fields */ #define ICID_LENGTH 16
Signature · 1 line
2.25.1
Re: [PATCH 07/14] hw/intc/arm_gicv3_its: Sort ITS command list into numeric order
Quoted 7 lines · Peter Maydell
The list of #defines for the ITS command packet numbers is neither in alphabetical nor numeric order. Sort it into numeric order.
Signed-off-by Peter Maydell <[email protected]>--- hw/intc/gicv3_internal.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Re: [PATCH 07/14] hw/intc/arm_gicv3_its: Sort ITS command list into numeric order
In reply to Peter MaydellQuoted 7 lines · Peter Maydell
The list of #defines for the ITS command packet numbers is neither in alphabetical nor numeric order. Sort it into numeric order.
Signed-off-by Peter Maydell<[email protected]>--- hw/intc/gicv3_internal.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
r~
PATCH 8/14 hw/intc/arm_gicv3_redist: Remove unnecessary zero checks
In reply to Peter MaydellThe ITS-related parts of the redistributor code make some checks for whether registers like GICR_PROPBASER and GICR_PENDBASER are zero. There is no requirement in the specification for treating zeroes in these address registers specially -- they contain guest physical addresses and it is entirely valid (if unusual) for the guest to choose to put the tables they address at guest physical address zero. We use these values only to calculate guest addresses, and attempts by the guest to use a bad address will be handled by the address_space_* functions which we use to do the loads and stores.
Remove the unnecessary checks.
--- hw/intc/arm_gicv3_redist.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
hw/intc/arm_gicv3_redist.c +3 -5
@@ -591,8 +591,7 @@ void gicv3_redist_update_lpi_only(GICv3CPUState *cs) idbits =MIN (FIELD_EX64 (cs->gicr_propbaser,GICR_PROPBASER ,IDBITS ),GICD_TYPER_IDBITS ); -if (!(cs->gicr_ctlr &GICR_CTLR_ENABLE_LPIS ) || !cs->gicr_propbaser || - !cs->gicr_pendbaser) { +if (!(cs->gicr_ctlr &GICR_CTLR_ENABLE_LPIS )) {return ; }
@@ -673,9 +672,8 @@ void gicv3_redist_process_lpi(GICv3CPUState *cs, int irq, int level) idbits =MIN (FIELD_EX64 (cs->gicr_propbaser,GICR_PROPBASER ,IDBITS ),GICD_TYPER_IDBITS ); -if (!(cs->gicr_ctlr &GICR_CTLR_ENABLE_LPIS ) || !cs->gicr_propbaser || - !cs->gicr_pendbaser || (irq > (1ULL << (idbits +1 )) -1 ) || - irq <GICV3_LPI_INTID_START ) { +if (!(cs->gicr_ctlr &GICR_CTLR_ENABLE_LPIS ) || + (irq > (1ULL << (idbits +1 )) -1 ) || irq <GICV3_LPI_INTID_START ) {return ; }
Signature · 1 line
2.25.1
Re: [PATCH 08/14] hw/intc/arm_gicv3_redist: Remove unnecessary zero checks
Quoted 10 lines · Peter Maydell
The ITS-related parts of the redistributor code make some checks for whether registers like
GICR_PROPBASERandGICR_PENDBASERare zero. There is no requirement in the specification for treating zeroes in these address registers specially -- they contain guest physical addresses and it is entirely valid (if unusual) for the guest to choose to put the tables they address at guest physical address zero. We use these values only to calculate guest addresses, and attempts by the guest to use a bad address will be handled by the address_space_* functions which we use to do the loads and stores.
Quoted 6 lines
Remove the unnecessary checks.
Signed-off-by Peter Maydell<[email protected]>--- hw/intc/arm_gicv3_redist.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
r~
PATCH 9/14 hw/intc/arm_gicv3: Set GICR_CTLR.CES if LPIs are supported
In reply to Peter MaydellThe GICR_CTLR.CES bit is a read-only bit which is set to 1 to indicate that the GICR_CTLR.EnableLPIs bit can be written to 0 to disable LPIs (as opposed to allowing LPIs to be enabled but not subsequently disabled). Our implementation permits this, so advertise it by setting CES to 1.
--- hw/intc/gicv3_internal.h | 1 + hw/intc/arm_gicv3_common.c | 4 ++++ 2 files changed, 5 insertions(+)
hw/intc/gicv3_internal.h +1 -0
@@ -110,6 +110,7 @@#define GICR_NSACR (GICR_SGI_OFFSET + 0x0E00)#define GICR_CTLR_ENABLE_LPIS (1U << 0) +#define GICR_CTLR_CES (1U << 1)#define GICR_CTLR_RWP (1U << 3)#define GICR_CTLR_DPG0 (1U << 24)#define GICR_CTLR_DPG1NS (1U << 25)
hw/intc/arm_gicv3_common.c +4 -0
@@ -429,6 +429,10 @@ static void arm_gicv3_common_reset(DeviceState *dev) cs->level =0 ; cs->gicr_ctlr =0 ; +if (s->lpi_enable) { +/* Our implementation supports clearing GICR_CTLR.EnableLPIs */ + cs->gicr_ctlr |=GICR_CTLR_CES ; + } cs->gicr_statusr[GICV3_S ] =0 ; cs->gicr_statusr[GICV3_NS ] =0 ; cs->gicr_waker = GICR_WAKER_ProcessorSleep | GICR_WAKER_ChildrenAsleep;
Signature · 1 line
2.25.1
Re: [PATCH 09/14] hw/intc/arm_gicv3: Set GICR_CTLR.CES if LPIs are supported
Quoted 11 lines · Peter Maydell
The GICR_CTLR.CES bit is a read-only bit which is set to 1 to indicate that the GICR_CTLR.EnableLPIs bit can be written to 0 to disable LPIs (as opposed to allowing LPIs to be enabled but not subsequently disabled). Our implementation permits this, so advertise it by setting CES to 1.
Signed-off-by Peter Maydell<[email protected]>--- hw/intc/gicv3_internal.h | 1 + hw/intc/arm_gicv3_common.c | 4 ++++ 2 files changed, 5 insertions(+)
r~
PATCH 10/14 hw/intc/arm_gicv3_its: Provide read accessor for translation_ops
In reply to Peter MaydellThe MemoryRegionOps gicv3_its_translation_ops currently provides only a .write_with_attrs function, because the only register in this region is the write-only GITS_TRANSLATER. However, if you don't provide a read function and the guest tries reading from this memory region, QEMU will crash because memory_region_read_with_attrs_accessor() calls a NULL pointer.
Add a read function which always returns 0, to cover both bogus attempts to read GITS_TRANSLATER and also reads from the rest of the region, which is documented to be reserved, RES0.
--- hw/intc/arm_gicv3_its.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
hw/intc/arm_gicv3_its.c +13 -0
@@ -813,6 +813,18 @@ static void extract_cmdq_params(GICv3ITSState *s) } } +static MemTxResult gicv3_its_translation_read (void *opaque,hwaddr offset, +uint64_t *data,unsigned size, +MemTxAttrs attrs) +{ +/* +* GITS_TRANSLATER is write-only, and all other addresses +* in the interrupt translation space frame are RES0. +*/ + *data =0 ; +return MEMTX_OK ; +} +static MemTxResult gicv3_its_translation_write (void *opaque,hwaddr offset,uint64_t data,unsigned size,MemTxAttrs attrs)
@@ -1168,6 +1180,7 @@ static const MemoryRegionOps gicv3_its_control_ops = { };static const MemoryRegionOps gicv3_its_translation_ops = { + .read_with_attrs = gicv3_its_translation_read, .write_with_attrs = gicv3_its_translation_write, .valid.min_access_size =2 , .valid.max_access_size =4 ,
Signature · 1 line
2.25.1
Re: [PATCH 10/14] hw/intc/arm_gicv3_its: Provide read accessor for translation_ops
Quoted 16 lines · Peter Maydell
The MemoryRegionOps
gicv3_its_translation_opscurrently provides only a .write_with_attrs function, because the only register in this region is the write-onlyGITS_TRANSLATER. However, if you don't provide a read function and the guest tries reading from this memory region, QEMU will crash becausememory_region_read_with_attrs_accessor()calls a NULL pointer.Add a read function which always returns 0, to cover both bogus attempts to read
GITS_TRANSLATERand also reads from the rest of the region, which is documented to be reserved, RES0.Signed-off-by Peter Maydell <[email protected]>--- hw/intc/arm_gicv3_its.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
hw/intc/arm_gicv3_its.c static void extract_cmdq_params(GICv3ITSState *s) · line 824
Quoted 9 lines
hw/intc/arm_gicv3_its.c +9
-0+static MemTxResult gicv3_its_translation_read (void *opaque,hwaddr offset, +uint64_t *data,unsigned size, +MemTxAttrs attrs) +{ +/* +* GITS_TRANSLATER is write-only, and all other addresses +* in the interrupt translation space frame are RES0. +*/ + *data =0 ;
Maybe log GUEST_ERROR?
Otherwise,
Quoted 2 lines
hw/intc/arm_gicv3_its.c +2
-0+return MEMTX_OK ; +}
Re: [PATCH 10/14] hw/intc/arm_gicv3_its: Provide read accessor for translation_ops
In reply to Peter MaydellQuoted 7 lines · Peter Maydell
The MemoryRegionOps
gicv3_its_translation_opscurrently provides only a .write_with_attrs function, because the only register in this region is the write-onlyGITS_TRANSLATER. However, if you don't provide a read function and the guest tries reading from this memory region, QEMU will crash becausememory_region_read_with_attrs_accessor()calls a NULL pointer.
Quoted 8 lines
Add a read function which always returns 0, to cover both bogus attempts to read
GITS_TRANSLATERand also reads from the rest of the region, which is documented to be reserved, RES0.Signed-off-by Peter Maydell<[email protected]>--- hw/intc/arm_gicv3_its.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
r~
PATCH 11/14 hw/intc/arm_gicv3_its: Make GITS_BASER<n> RAZ/WI for unimplemented registers
In reply to Peter MaydellThe ITS has a bank of 8 GITS_BASER<n> registers, which allow the guest to specify the base address of various data tables. Each register has a read-only type field indicating which table it is for and a read-write field where the guest can write in the base address (among other things). We currently allow the guest to write the writeable fields for all eight registers, even if the type field is 0 indicating "Unimplemented". This means the guest can provoke QEMU into asserting by writing an address into one of these unimplemented base registers, which bypasses the "if (!value) continue" check in extract_table_params() and lets us hit the assertion that the type field is one of the permitted table types.
Prevent the assertion by not allowing the guest to write to the unimplemented base registers. This means their value will remain 0 and extract_table_params() will ignore them.
--- hw/intc/arm_gicv3_its.c | 8 ++++++++ 1 file changed, 8 insertions(+)
hw/intc/arm_gicv3_its.c +8 -0
@@ -929,6 +929,10 @@ static bool its_writel(GICv3ITSState *s, hwaddr offset,if (!(s->ctlr &R_GITS_CTLR_ENABLED_MASK )) { index = (offset -GITS_BASER ) /8 ; +if (s->baser[index] ==0 ) { +/* Unimplemented GITS_BASERn: RAZ/WI */ +break ; + }if (offset &7 ) { value <<=32 ; value &= ~GITS_BASER_RO_MASK ;
@@ -1025,6 +1029,10 @@ static bool its_writell(GICv3ITSState *s, hwaddr offset,*/ if (!(s->ctlr &R_GITS_CTLR_ENABLED_MASK )) { index = (offset -GITS_BASER ) /8 ; +if (s->baser[index] ==0 ) { +/* Unimplemented GITS_BASERn: RAZ/WI */ +break ; + } s->baser[index] &=GITS_BASER_RO_MASK ; s->baser[index] |= (value & ~GITS_BASER_RO_MASK ); }
Signature · 1 line
2.25.1
Re: [PATCH 11/14] hw/intc/arm_gicv3_its: Make GITS_BASER<n> RAZ/WI for unimplemented registers
Quoted 17 lines · Peter Maydell
The ITS has a bank of 8 GITS_BASER<n> registers, which allow the guest to specify the base address of various data tables. Each register has a read-only type field indicating which table it is for and a read-write field where the guest can write in the base address (among other things). We currently allow the guest to write the writeable fields for all eight registers, even if the type field is 0 indicating "Unimplemented". This means the guest can provoke QEMU into asserting by writing an address into one of these unimplemented base registers, which bypasses the "if (!value) continue" check in
extract_table_params()and lets us hit the assertion that the type field is one of the permitted table types.Prevent the assertion by not allowing the guest to write to the unimplemented base registers. This means their value will remain 0 and
extract_table_params()will ignore them.
Quoted 4 lines
Signed-off-by Peter Maydell<[email protected]>--- hw/intc/arm_gicv3_its.c | 8 ++++++++ 1 file changed, 8 insertions(+)
r~
PATCH 12/14 hw/intc/arm_gicv3_its: Check table bounds against correct limit
In reply to Peter MaydellCurrently when we fill in a TableDesc based on the value the guest has written to the GITS_BASER<n> register, we calculate both:
* num_entries : the number of entries in the table, constrained by the amount of memory the guest has given it
* num_ids : the number of IDs we support for this table, constrained by the implementation choices and the architecture (eg DeviceIDs are 16 bits, so num_ids is 1 << 16)
When validating ITS commands, however, we check only num_ids, thus allowing a broken guest to specify table entries that index off the end of it. This will only corrupt guest memory, but the ITS is supposed to reject such commands as invalid.
Instead of calculating both num_entries and num_ids, set num_entries to the minimum of the two limits, and check that.
--- include/hw/intc/arm_gicv3_its_common.h | 1 - hw/intc/arm_gicv3_its.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-)
include/hw/intc/arm_gicv3_its_common.h +0 -1
@@ -47,7 +47,6 @@ typedef struct {uint16_t entry_sz;uint32_t page_sz;uint32_t num_entries; -uint32_t num_ids;uint64_t base_addr; } TableDesc;
hw/intc/arm_gicv3_its.c +9 -9
@@ -256,10 +256,10 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value, eventid = (value &EVENTID_MASK ); -if (devid >= s->dt.num_ids) { +if (devid >= s->dt.num_entries) {qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid command attributes: devid %d>=%d" , - __func__, devid, s->dt.num_ids); + __func__, devid, s->dt.num_entries);return CMD_CONTINUE ; }
@@ -300,7 +300,7 @@ static ItsCmdResult process_its_cmd(GICv3ITSState *s, uint64_t value,return CMD_CONTINUE ; } -if (icid >= s->ct.num_ids) { +if (icid >= s->ct.num_entries) {qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid ICID 0x%x in ITE (table corrupted?)\n" , __func__, icid);
@@ -384,10 +384,10 @@ static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value, icid = value &ICID_MASK ; -if (devid >= s->dt.num_ids) { +if (devid >= s->dt.num_entries) {qemu_log_mask (LOG_GUEST_ERROR ,"%s: invalid command attributes: devid %d>=%d" , - __func__, devid, s->dt.num_ids); + __func__, devid, s->dt.num_entries);return CMD_CONTINUE ; }
@@ -400,7 +400,7 @@ static ItsCmdResult process_mapti(GICv3ITSState *s, uint64_t value, num_eventids =1ULL << (FIELD_EX64 (dte,DTE ,SIZE ) +1 ); num_intids =1ULL << (GICD_TYPER_IDBITS +1 ); -if ((icid >= s->ct.num_ids) +if ((icid >= s->ct.num_entries) || !dte_valid || (eventid >= num_eventids) || (((pIntid <GICV3_LPI_INTID_START ) || (pIntid >= num_intids)) && (pIntid !=INTID_SPURIOUS ))) {
@@ -485,7 +485,7 @@ static ItsCmdResult process_mapc(GICv3ITSState *s, uint32_t offset) valid = (value &CMD_FIELD_VALID_MASK ); -if ((icid >= s->ct.num_ids) || (rdbase >= s->gicv3->num_cpu)) { +if ((icid >= s->ct.num_entries) || (rdbase >= s->gicv3->num_cpu)) {qemu_log_mask (LOG_GUEST_ERROR ,"ITS MAPC: invalid collection table attributes " "icid %d rdbase %" PRIu64"\n" , icid, rdbase);
@@ -566,7 +566,7 @@ static ItsCmdResult process_mapd(GICv3ITSState *s, uint64_t value, valid = (value &CMD_FIELD_VALID_MASK ); -if ((devid >= s->dt.num_ids) || +if ((devid >= s->dt.num_entries) || (size >FIELD_EX64 (s->typer,GITS_TYPER ,IDBITS ))) {qemu_log_mask (LOG_GUEST_ERROR , "ITS MAPD: invalid device table attributes "
@@ -791,7 +791,7 @@ static void extract_table_params(GICv3ITSState *s) L1TABLE_ENTRY_SIZE) * (page_sz / td->entry_sz)); } - td->num_ids =1ULL << idbits; + td->num_entries =MIN (td->num_entries,1ULL << idbits); } }
Signature · 1 line
2.25.1
Re: [PATCH 12/14] hw/intc/arm_gicv3_its: Check table bounds against correct limit
Quoted 13 lines · Peter Maydell
Currently when we fill in a TableDesc based on the value the guest has written to the GITS_BASER<n> register, we calculate both:
*num_entries: the number of entries in the table, constrained by the amount of memory the guest has given it
*num_ids: the number of IDs we support for this table, constrained by the implementation choices and the architecture (eg DeviceIDs are 16 bits, sonum_idsis 1 << 16)When validating ITS commands, however, we check only
num_ids, thus allowing a broken guest to specify table entries that index off the end of it. This will only corrupt guest memory, but the ITS is supposed to reject such commands as invalid.
Quoted 8 lines
Instead of calculating both
num_entriesandnum_ids, setnum_entriesto the minimum of the two limits, and check that.Signed-off-by Peter Maydell<[email protected]>--- include/hw/intc/arm_gicv3_its_common.h | 1 - hw/intc/arm_gicv3_its.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-)
r~
PATCH 13/14 hw/intc/arm_gicv3_its: Implement MOVALL
In reply to Peter MaydellImplement the ITS MOVALL command, which takes all the pending interrupts on a source redistributor and makes the not-pending on that source redistributor and pending on a destination redistributor.
This is a GICv3 ITS command which we forgot to implement. (It is not used by Linux guests.)
--- hw/intc/gicv3_internal.h | 16 +++++++++++ hw/intc/arm_gicv3_its.c | 55 ++++++++++++++++++++++++++++++++++++++ hw/intc/arm_gicv3_redist.c | 54 +++++++++++++++++++++++++++++++++++++ 3 files changed, 125 insertions(+)
hw/intc/gicv3_internal.h +16 -0
@@ -324,6 +324,7 @@ FIELD(GITS_TYPER, CIL, 36, 1)#define GITS_CMD_MAPI 0x0B#define GITS_CMD_INV 0x0C#define GITS_CMD_INVALL 0x0D +#define GITS_CMD_MOVALL 0x0E#define GITS_CMD_DISCARD 0x0F/* MAPC command fields */
@@ -355,6 +356,10 @@ FIELD(MAPC, RDBASE, 16, 32)#define L2_TABLE_VALID_MASK CMD_FIELD_VALID_MASK#define TABLE_ENTRY_VALID_MASK (1ULL << 0) +/* MOVALL command fields */ +FIELD(MOVALL_2, RDBASE1, 16, 36) +FIELD (MOVALL_3 ,RDBASE2 ,16 ,36 ) +/* * 12 bytes Interrupt translation Table Entry size * as per Table 5.3 in GICv3 spec
@@ -497,6 +502,17 @@ void gicv3_redist_update_lpi(GICv3CPUState *cs);* an incoming migration has loaded new state. */ void gicv3_redist_update_lpi_only (GICv3CPUState *cs); +/** +* gicv3_redist_movall_lpis: +* @src: source redistributor +* @dest: destination redistributor +* +* Scan the LPI pending table for @src, and for each pending LPI there +* mark it as not-pending for @src and pending for @dest, as required +* by the ITS MOVALL command. +*/ +void gicv3_redist_movall_lpis (GICv3CPUState *src,GICv3CPUState *dest); +void gicv3_redist_send_sgi (GICv3CPUState *cs,int grp,int irq,bool ns);void gicv3_init_cpuif (GICv3State *s);
hw/intc/arm_gicv3_its.c +55 -0
67 lines not on this page · raw message
hw/intc/arm_gicv3_redist.c +54 -0
60 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH 13/14] hw/intc/arm_gicv3_its: Implement MOVALL
Quoted 7 lines · Peter Maydell
Implement the ITS MOVALL command, which takes all the pending interrupts on a source redistributor and makes the not-pending on that source redistributor and pending on a destination redistributor.
This is a GICv3 ITS command which we forgot to implement. (It is not used by Linux guests.)
Quoted 6 lines
Signed-off-by Peter Maydell<[email protected]>--- hw/intc/gicv3_internal.h | 16 +++++++++++ hw/intc/arm_gicv3_its.c | 55 ++++++++++++++++++++++++++++++++++++++ hw/intc/arm_gicv3_redist.c | 54 +++++++++++++++++++++++++++++++++++++ 3 files changed, 125 insertions(+)
r~
PATCH 14/14 hw/intc/arm_gicv3_its: Implement MOVI
In reply to Peter MaydellImplement the ITS MOVI command. This command specifies a (physical) LPI by DeviceID and EventID and provides a new ICID for it. The ITS must find the interrupt translation table entry for the LPI, which will tell it the old ICID. It then moves the pending state of the LPI from the old redistributor to the new one and updates the ICID field in the translation table entry.
This is another GICv3 ITS command that we forgot to implement. Linux does use this one, but only if the guest powers off one of its CPUs.
---
All the "validate guest command argument, log and return if bad" logic feels very clunky here...
--- hw/intc/gicv3_internal.h | 16 ++++ hw/intc/arm_gicv3_its.c | 146 +++++++++++++++++++++++++++++++++++++ hw/intc/arm_gicv3_redist.c | 53 ++++++++++++++ 3 files changed, 215 insertions(+)
hw/intc/gicv3_internal.h +16 -0
@@ -315,6 +315,7 @@ FIELD(GITS_TYPER, CIL, 36, 1)#define CMD_MASK 0xff/* ITS Commands */ +#define GITS_CMD_MOVI 0x01#define GITS_CMD_INT 0x03#define GITS_CMD_CLEAR 0x04#define GITS_CMD_SYNC 0x05
@@ -360,6 +361,11 @@ FIELD(MAPC, RDBASE, 16, 32) FIELD(MOVALL_2, RDBASE1, 16, 36)FIELD (MOVALL_3 ,RDBASE2 ,16 ,36 ) +/* MOVI command fields */ +FIELD(MOVI_0, DEVICEID, 32, 32) +FIELD(MOVI_1, EVENTID, 0, 32) +FIELD (MOVI_2 ,ICID ,0 ,16 ) +/* * 12 bytes Interrupt translation Table Entry size * as per Table 5.3 in GICv3 spec
@@ -502,6 +508,16 @@ void gicv3_redist_update_lpi(GICv3CPUState *cs);* an incoming migration has loaded new state. */ void gicv3_redist_update_lpi_only (GICv3CPUState *cs); +/** +* gicv3_redist_mov_lpi: +* @src: source redistributor +* @dest: destination redistributor +* @irq: LPI to update +* +* Move the pending state of the specified LPI from @src to @dest, +* as required by the ITS MOVI command. +*/ +void gicv3_redist_mov_lpi (GICv3CPUState *src,GICv3CPUState *dest,int irq);/** * gicv3_redist_movall_lpis: * @src: source redistributor
hw/intc/arm_gicv3_its.c +146 -0
158 lines not on this page · raw message
hw/intc/arm_gicv3_redist.c +53 -0
59 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH 14/14] hw/intc/arm_gicv3_its: Implement MOVI
Quoted 11 lines · Peter Maydell
Implement the ITS MOVI command. This command specifies a (physical) LPI by DeviceID and EventID and provides a new ICID for it. The ITS must find the interrupt translation table entry for the LPI, which will tell it the old ICID. It then moves the pending state of the LPI from the old redistributor to the new one and updates the ICID field in the translation table entry.
This is another GICv3 ITS command that we forgot to implement. Linux does use this one, but only if the guest powers off one of its CPUs.
Signed-off-by Peter Maydell<[email protected]>
Quoted 8 lines
---
All the "validate guest command argument, log and return if bad" logic feels very clunky here...--- hw/intc/gicv3_internal.h | 16 ++++ hw/intc/arm_gicv3_its.c | 146 +++++++++++++++++++++++++++++++++++++ hw/intc/arm_gicv3_redist.c | 53 ++++++++++++++ 3 files changed, 215 insertions(+)
r~