]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
KVM: arm64: Unconditionally set IL for injected abort exceptions
authorFuad Tabba <tabba@google.com>
Thu, 18 Jun 2026 12:16:39 +0000 (13:16 +0100)
committerMarc Zyngier <maz@kernel.org>
Mon, 22 Jun 2026 09:44:08 +0000 (10:44 +0100)
commitadd40af98b34764ff5603dce297160fde12d784c
treefd81e6171c199b98821bc00738e228c289b3f5ba
parent1d695dc827957e9570d1b56abac1250d2d13bf0c
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>
arch/arm64/kvm/inject_fault.c