]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
powerpc/64s/exception: KVM Fix for host DSI being taken in HPT guest MMU context
authorNicholas Piggin <npiggin@gmail.com>
Tue, 17 Nov 2020 13:56:17 +0000 (23:56 +1000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Dec 2020 07:51:45 +0000 (08:51 +0100)
commit48974162077955ce8d6c55d8ea90100c49a8083c
treeda96d639a6f2c8ae5dcac09c862b4b77a09c93c7
parent7ef4afa137ba64bc6d1cac044753aa382fb0ebbb
powerpc/64s/exception: KVM Fix for host DSI being taken in HPT guest MMU context

commit cd81acc600a9684ea4b4d25a47900d38a3890eab upstream.

Commit 2284ffea8f0c ("powerpc/64s/exception: Only test KVM in SRR
interrupts when PR KVM is supported") removed KVM guest tests from
interrupts that do not set HV=1, when PR-KVM is not configured.

This is wrong for HV-KVM HPT guest MMIO emulation case which attempts
to load the faulting instruction word with MSR[DR]=1 and MSR[HV]=1 with
the guest MMU context loaded. This can cause host DSI, DSLB interrupts
which must test for KVM guest. Restore this and add a comment.

Fixes: 2284ffea8f0c ("powerpc/64s/exception: Only test KVM in SRR interrupts when PR KVM is supported")
Cc: stable@vger.kernel.org # v5.7+
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201117135617.3521127-1-npiggin@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/kernel/exceptions-64s.S