KVM: MIPS: Make ERET handle ERL before EXL
authorJames Hogan <james.hogan@imgtec.com>
Tue, 25 Oct 2016 15:11:11 +0000 (16:11 +0100)
committerSasha Levin <alexander.levin@verizon.com>
Sat, 26 Nov 2016 03:57:02 +0000 (22:57 -0500)
commitb05ff0cb0dea33b12e803e5bf2bb66a382c8696b
tree018c4bb70c57d02027eb0a62314778bfb1e83d94
parent90a107c0b85b4b5b2ecfb9fa6b7a714d8bb349e8
KVM: MIPS: Make ERET handle ERL before EXL

[ Upstream commit ede5f3e7b54a4347be4d8525269eae50902bd7cd ]

The ERET instruction to return from exception is used for returning from
exception level (Status.EXL) and error level (Status.ERL). If both bits
are set however we should be returning from ERL first, as ERL can
interrupt EXL, for example when an NMI is taken. KVM however checks EXL
first.

Fix the order of the checks to match the pseudocode in the instruction
set manual.

Fixes: e685c689f3a8 ("KVM/MIPS32: Privileged instruction/target branch emulation.")
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář <rkrcmar@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Cc: <stable@vger.kernel.org> # 3.10.x-
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
arch/mips/kvm/emulate.c