KVM: arm64: Unconditionally set IL for injected abort exceptions

inject_abt64() derives IL from the triggering trap's instruction length
(kvm_vcpu_trap_il_is32bit()), but the IL of the injected abort is fixed
by its EC, not by the triggering instruction. The architecture mandates
IL=1 for Instruction Aborts unconditionally and for Data Aborts with
ISV=0, and this function never sets ISV (the FSC is always EXTABT or
SEA_TTW). For a 16-bit T32 trap (a 32-bit EL0 task under an AArch64 EL1
guest) the trap has IL=0, so the abort is injected with the wrong IL.

Set ESR_ELx_IL unconditionally.

Fixes: aa8eff9bfbd5 ("arm64: KVM: fault injection into a guest")
Signed-off-by: Fuad Tabba <tabba@google.com>
Link: https://patch.msgid.link/20260618121643.4105064-4-tabba@google.com
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c
index 9dfae1bcdf9924954494c5f1f4ab2b633a1d9ef5..444d219b02174e10690269b9626380e3625a3f92 100644 (file)
--- a/arch/arm64/kvm/inject_fault.c
+++ b/arch/arm64/kvm/inject_fault.c
@@ -138,11 +138,10 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr
                pend_sync_exception(vcpu);
 
        /*
-        * Build an {i,d}abort, depending on the level and the
-        * instruction set. Report an external synchronous abort.
+        * Build an {i,d}abort, depending on the level.
+        * Report an external synchronous abort.
         */
-       if (kvm_vcpu_trap_il_is32bit(vcpu))
-               esr |= ESR_ELx_IL;
+       esr |= ESR_ELx_IL;
 
        /*
         * Here, the guest runs in AArch64 mode when in EL1. If we get