KVM: arm: Fix DFSR setting for non-LPAE aarch32 guests
authorJames Morse <james.morse@arm.com>
Tue, 21 Jan 2020 12:33:55 +0000 (12:33 +0000)
committerMarc Zyngier <maz@kernel.org>
Thu, 23 Jan 2020 10:38:15 +0000 (10:38 +0000)
commit018f22f95e8a6c3e27188b7317ef2c70a34cb2cd
tree7fc9466d8d9f75a168b56562429892f6e0ec2eb1
parentcf2d23e0bac9f6b5cd1cba8898f5f05ead40e530
KVM: arm: Fix DFSR setting for non-LPAE aarch32 guests

Beata reports that KVM_SET_VCPU_EVENTS doesn't inject the expected
exception to a non-LPAE aarch32 guest.

The host intends to inject DFSR.FS=0x14 "IMPLEMENTATION DEFINED fault
(Lockdown fault)", but the guest receives DFSR.FS=0x04 "Fault on
instruction cache maintenance". This fault is hooked by
do_translation_fault() since ARMv6, which goes on to silently 'handle'
the exception, and restart the faulting instruction.

It turns out, when TTBCR.EAE is clear DFSR is split, and FS[4] has
to shuffle up to DFSR[10].

As KVM only does this in one place, fix up the static values. We
now get the expected:
| Unhandled fault: lock abort (0x404) at 0x9c800f00

Fixes: 74a64a981662a ("KVM: arm/arm64: Unify 32bit fault injection")
Reported-by: Beata Michalska <beata.michalska@linaro.org>
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200121123356.203000-2-james.morse@arm.com
virt/kvm/arm/aarch32.c