xen/arm: Fix unreachable panic for vpl011 vIRQ
PATCH 1/1 xen/arm: Fix unreachable panic for vpl011 vIRQ
When creating direct mapped domU, the vIRQ for vpl011 is taken from the SERHND_DTUART serial port using serial_irq. This function can return -1 (i.e. no interrupt found) in which case we should call a panic. However, vpl011_virq is defined as unsigned int which causes the panic to be unreachable, because less than zero comparison of an unsigned value can never be true. Fix it by defining vpl011_virq as int.
---
To be considered to be taken for 4.17, although direct-map depends on CONFIG_STATIC_MEMORY which is marked as unsupported.
--- xen/arch/arm/domain_build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
xen/arch/arm/domain_build.c +1 -1
@@ -3897,7 +3897,7 @@ void __init create_domUs(void)if ( !dt_property_read_u32 (node,"nr_spis" , &d_cfg.arch.nr_spis) ) { -unsigned int vpl011_virq =GUEST_VPL011_SPI ; +int vpl011_virq =GUEST_VPL011_SPI ; d_cfg.arch.nr_spis =gic_number_lines () -32 ;
Signature · 1 line
2.25.1
Hi Michal,
Quoted 11 lines · Michal Orzel
When creating direct mapped domU, the vIRQ for vpl011 is taken from the
SERHND_DTUARTserial port usingserial_irq. This function can return -1 (i.e. no interrupt found) in which case we should call a panic. However,vpl011_virqis defined as unsigned int which causes the panic to be unreachable, because less than zero comparison of an unsigned value can never be true. Fix it by definingvpl011_virqas int.Fixes 3580c8b2dfc3 ("xen/arm: if direct-map domain use native UART address and IRQ number for vPL011")Signed-off-by Michal Orzel <[email protected]>
Quoted 3 lines
---
To be considered to be taken for 4.17, although direct-map depends onCONFIG_STATIC_MEMORYwhich is marked as unsupported.
At this stage I do not think we should back port it for the release. We should consider this as candidate for 4.17.1
Cheers
Bertrand
Quoted 20 lines
---
xen/arch/arm/domain_build.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)xen/arch/arm/domain_build.c +1
-1@@ -3897,7 +3897,7 @@ void __init create_domUs(void)if ( !dt_property_read_u32 (node,"nr_spis" , &d_cfg.arch.nr_spis) ) { -unsigned int vpl011_virq =GUEST_VPL011_SPI ; +int vpl011_virq =GUEST_VPL011_SPI ; d_cfg.arch.nr_spis =gic_number_lines () -32 ;Signature · 1 line
2.25.1
Quoted 16 lines · Bertrand Marquis
Hi Michal,
Quoted 11 lines · Michal Orzel
When creating direct mapped domU, the vIRQ for vpl011 is taken from the
SERHND_DTUARTserial port usingserial_irq. This function can return -1 (i.e. no interrupt found) in which case we should call a panic. However,vpl011_virqis defined as unsigned int which causes the panic to be unreachable, because less than zero comparison of an unsigned value can never be true. Fix it by definingvpl011_virqas int.Fixes 3580c8b2dfc3 ("xen/arm: if direct-map domain use native UART address and IRQ number for vPL011")Signed-off-by Michal Orzel <[email protected]>Reviewed-by Bertrand Marquis <[email protected]>
Quoted 6 lines
Quoted 3 lines
---
To be considered to be taken for 4.17, although direct-map depends onCONFIG_STATIC_MEMORYwhich is marked as unsupported.At this stage I do not think we should back port it for the release. We should consider this as candidate for 4.17.1
We don't usually backport fixes for tech preview feature.
Cheers,
Signature · 1 line
Julien Grall
Hi,
Quoted 9 lines · Bertrand Marquis
Quoted 9 lines · Michal Orzel
When creating direct mapped domU, the vIRQ for vpl011 is taken from the
SERHND_DTUARTserial port usingserial_irq. This function can return -1 (i.e. no interrupt found) in which case we should call a panic. However,vpl011_virqis defined as unsigned int which causes the panic to be unreachable, because less than zero comparison of an unsigned value can never be true. Fix it by definingvpl011_virqas int.
Quoted 3 lines
Quoted 2 lines
Fixes 3580c8b2dfc3 ("xen/arm: if direct-map domain use native UART address and IRQ number for vPL011")Signed-off-by Michal Orzel <[email protected]>Reviewed-by Bertrand Marquis <[email protected]>
I have committed it in a branch for-next/4.18 which will be merged once the tree reopened.
Cheers,
Signature · 1 line
Julien Grall