]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
arm64: KVM: Skip MMIO insn after emulation
authorMark Rutland <mark.rutland@arm.com>
Fri, 9 Nov 2018 15:07:10 +0000 (15:07 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Feb 2019 09:09:00 +0000 (10:09 +0100)
commit39e6fd28a1bf177eb2f7031388ad82c6d6077bfb
tree9178ae651c75ffa465db1ad46fe86bc9183a636f
parenta6e15ccc870a628c0a494f5aeed3e3048748905d
arm64: KVM: Skip MMIO insn after emulation

[ Upstream commit 0d640732dbebed0f10f18526de21652931f0b2f2 ]

When we emulate an MMIO instruction, we advance the CPU state within
decode_hsr(), before emulating the instruction effects.

Having this logic in decode_hsr() is opaque, and advancing the state
before emulation is problematic. It gets in the way of applying
consistent single-step logic, and it prevents us from being able to fail
an MMIO instruction with a synchronous exception.

Clean this up by only advancing the CPU state *after* the effects of the
instruction are emulated.

Cc: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Christoffer Dall <christoffer.dall@arm.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/kvm/mmio.c