target/arm: Fix ISR_EL1 tracking when executing at EL2
Marc Zyngier
maintainerPATCH 1/1 target/arm: Fix ISR_EL1 tracking when executing at EL2
The ARMv8 ARM states when executing at EL2, EL3 or Secure EL1, ISR_EL1 shows the pending status of the physical IRQ, FIQ, or SError interrupts.
Unfortunately, QEMU's implementation only considers the HCR_EL2 bits, and ignores the current exception level. This means a hypervisor trying to look at its own interrupt state actually sees the guest state, which is unexpected and breaks KVM as of Linux 5.3.
Instead, check for the running EL and return the physical bits if not running in a virtualized context.
--- target/arm/helper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
target/arm/helper.c +5 -2
@@ -1934,8 +1934,11 @@ static uint64_t isr_read(CPUARMState *env, const ARMCPRegInfo *ri)CPUState *cs =env_cpu (env);uint64_t hcr_el2 =arm_hcr_el2_eff (env);uint64_t ret =0 ; +bool allow_virt = (arm_current_el (env) ==1 && + (!arm_is_secure_below_el3 (env) || + (env->cp15.scr_el3 &SCR_EEL2 ))); -if (hcr_el2 &HCR_IMO ) { +if (allow_virt && (hcr_el2 &HCR_IMO )) {if (cs->interrupt_request &CPU_INTERRUPT_VIRQ ) { ret |=CPSR_I ; }
@@ -1945,7 +1948,7 @@ static uint64_t isr_read(CPUARMState *env, const ARMCPRegInfo *ri) } } -if (hcr_el2 &HCR_FMO ) { +if (allow_virt && (hcr_el2 &HCR_FMO )) {if (cs->interrupt_request &CPU_INTERRUPT_VFIQ ) { ret |=CPSR_F ; }
Signature · 6 lines
2.17.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Quoted 10 lines · Marc Zyngier
The ARMv8 ARM states when executing at EL2, EL3 or Secure EL1,
ISR_EL1shows the pending status of the physical IRQ, FIQ, or SError interrupts.Unfortunately, QEMU's implementation only considers the
HCR_EL2bits, and ignores the current exception level. This means a hypervisor trying to look at its own interrupt state actually sees the guest state, which is unexpected and breaks KVM as of Linux 5.3.
Quoted 6 lines
Instead, check for the running EL and return the physical bits if not running in a virtualized context.
Fixes 636540e9c40bReported-by Quentin Perret <[email protected]>Signed-off-by Marc Zyngier <[email protected]>
Congratulations on your first QEMU patch :-)
I've applied this to target-arm.next and will get it into rc3 ("fixes running newer kernels" seems like an rc-ish kind of bug).
RTH: vaguely wondering if this might be related to the bug you ran into trying to test your VHE emulation patchset...
thanks
-- PMM
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Quoted 11 lines · Peter Maydell
Quoted 10 lines · Marc Zyngier
The ARMv8 ARM states when executing at EL2, EL3 or Secure EL1,
ISR_EL1shows the pending status of the physical IRQ, FIQ, or SError interrupts.Unfortunately, QEMU's implementation only considers the
HCR_EL2bits, and ignores the current exception level. This means a hypervisor trying to look at its own interrupt state actually sees the guest state, which is unexpected and breaks KVM as of Linux 5.3.
Quoted 8 lines
Quoted 6 lines
Instead, check for the running EL and return the physical bits if not running in a virtualized context.
Fixes 636540e9c40bReported-by Quentin Perret <[email protected]>Signed-off-by Marc Zyngier <[email protected]>Congratulations on your first QEMU patch :-)
:))
Quoted 3 lines · Peter Maydell
RTH: vaguely wondering if this might be related to the bug you ran into trying to test your VHE emulation patchset...
Thanks for the thought. It might be related, but it isn't the final cause:
the inner guest does not yet succeed including this patch.
r~
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Quoted 9 lines · Marc Zyngier
The ARMv8 ARM states when executing at EL2, EL3 or Secure EL1,
ISR_EL1shows the pending status of the physical IRQ, FIQ, or SError interrupts.Unfortunately, QEMU's implementation only considers the
HCR_EL2bits, and ignores the current exception level. This means a hypervisor trying to look at its own interrupt state actually sees the guest state, which is unexpected and breaks KVM as of Linux 5.3.
Quoted 6 lines
Instead, check for the running EL and return the physical bits if not running in a virtualized context.
Fixes 636540e9c40bReported-by Quentin Perret <[email protected]>Signed-off-by Marc Zyngier <[email protected]>
Looks good to me:
Quoted 34 lines
--- target/arm/helper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)target/arm/helper.c +5
-2@@ -1934,8 +1934,11 @@ static uint64_t isr_read(CPUARMState *env, const ARMCPRegInfo *ri)CPUState *cs =env_cpu (env);uint64_t hcr_el2 =arm_hcr_el2_eff (env);uint64_t ret =0 ; +bool allow_virt = (arm_current_el (env) ==1 && + (!arm_is_secure_below_el3 (env) || + (env->cp15.scr_el3 &SCR_EEL2 ))); -if (hcr_el2 &HCR_IMO ) { +if (allow_virt && (hcr_el2 &HCR_IMO )) {if (cs->interrupt_request &CPU_INTERRUPT_VIRQ ) { ret |=CPSR_I ; }@@ -1945,7 +1948,7 @@ static uint64_t isr_read(CPUARMState *env, const ARMCPRegInfo *ri) } } -if (hcr_el2 &HCR_FMO ) { +if (allow_virt && (hcr_el2 &HCR_FMO )) {if (cs->interrupt_request &CPU_INTERRUPT_VFIQ ) { ret |=CPSR_F ; }Signature · 1 line
2.17.1
Quoted 9 lines · Marc Zyngier
The ARMv8 ARM states when executing at EL2, EL3 or Secure EL1,
ISR_EL1shows the pending status of the physical IRQ, FIQ, or SError interrupts.Unfortunately, QEMU's implementation only considers the
HCR_EL2bits, and ignores the current exception level. This means a hypervisor trying to look at its own interrupt state actually sees the guest state, which is unexpected and breaks KVM as of Linux 5.3.
Quoted 5 lines
Instead, check for the running EL and return the physical bits if not running in a virtualized context.
Fixes 636540e9c40bReported-by Quentin Perret <[email protected]>
And FWIW, Tested-by: Quentin Perret <[email protected]>
Thanks Marc :)
Quentin
Quoted 34 lines
Signed-off-by Marc Zyngier <[email protected]>--- target/arm/helper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)target/arm/helper.c +5
-2@@ -1934,8 +1934,11 @@ static uint64_t isr_read(CPUARMState *env, const ARMCPRegInfo *ri)CPUState *cs =env_cpu (env);uint64_t hcr_el2 =arm_hcr_el2_eff (env);uint64_t ret =0 ; +bool allow_virt = (arm_current_el (env) ==1 && + (!arm_is_secure_below_el3 (env) || + (env->cp15.scr_el3 &SCR_EEL2 ))); -if (hcr_el2 &HCR_IMO ) { +if (allow_virt && (hcr_el2 &HCR_IMO )) {if (cs->interrupt_request &CPU_INTERRUPT_VIRQ ) { ret |=CPSR_I ; }@@ -1945,7 +1948,7 @@ static uint64_t isr_read(CPUARMState *env, const ARMCPRegInfo *ri) } } -if (hcr_el2 &HCR_FMO ) { +if (allow_virt && (hcr_el2 &HCR_FMO )) {if (cs->interrupt_request &CPU_INTERRUPT_VFIQ ) { ret |=CPSR_F ; }Signature · 1 line
2.17.1
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm