Commit f3601156 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

KVM: PPC: Book3S 64: move KVM interrupt entry to a common entry point 



Rather than bifurcate the call depending on whether or not HV is
possible, and have the HV entry test for PR, just make a single
common point which does the demultiplexing. This makes it simpler
to add another type of exit handler.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Reviewed-by: default avatarDaniel Axtens <dja@axtens.net>
Reviewed-by: default avatarFabiano Rosas <farosas@linux.ibm.com>
Acked-by: default avatarPaul Mackerras <paulus@ozlabs.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210528090752.3542186-2-npiggin@gmail.com
parent 6ba53317

arch/powerpc/kernel/exceptions-64s.S

+1 −7
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ do_define_int n 
.endm



#ifdef CONFIG_KVM_BOOK3S_64_HANDLER

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

/*

 * All interrupts which set HSRR registers, as well as SRESET and MCE and

 * syscall when invoked with "sc 1" switch to MSR[HV]=1 (HVMODE) to be taken,
@@ -238,13 +237,8 @@ do_define_int n 


/*

 * If an interrupt is taken while a guest is running, it is immediately routed

 * to KVM to handle. If both HV and PR KVM arepossible, KVM interrupts go first

 * to kvmppc_interrupt_hv, which handles the PR guest case.

 * to KVM to handle.

 */

#define kvmppc_interrupt kvmppc_interrupt_hv

#else

#define kvmppc_interrupt kvmppc_interrupt_pr

#endif



.macro KVMTEST name

	lbz	r10,HSTATE_IN_GUEST(r13)

arch/powerpc/kvm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ kvm-pr-y := \ 
	book3s_32_mmu.o



kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \

	book3s_64_entry.o \

	tm.o



ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE

arch/powerpc/kvm/book3s_64_entry.S

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

#include <asm/asm-offsets.h>

#include <asm/cache.h>

#include <asm/kvm_asm.h>

#include <asm/kvm_book3s_asm.h>

#include <asm/ppc_asm.h>

#include <asm/reg.h>



/*

 * This is branched to from interrupt handlers in exception-64s.S which set

 * IKVM_REAL or IKVM_VIRT, if HSTATE_IN_GUEST was found to be non-zero.

 */

.global	kvmppc_interrupt

.balign IFETCH_ALIGN_BYTES

kvmppc_interrupt:

	/*

	 * Register contents:

	 * R12		= (guest CR << 32) | interrupt vector

	 * R13		= PACA

	 * guest R12 saved in shadow VCPU SCRATCH0

	 * guest R13 saved in SPRN_SCRATCH0

	 */

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	std	r9,HSTATE_SCRATCH2(r13)

	lbz	r9,HSTATE_IN_GUEST(r13)

	cmpwi	r9,KVM_GUEST_MODE_HOST_HV

	beq	kvmppc_bad_host_intr

#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE

	cmpwi	r9,KVM_GUEST_MODE_GUEST

	ld	r9,HSTATE_SCRATCH2(r13)

	beq	kvmppc_interrupt_pr

#endif

	b	kvmppc_interrupt_hv

#else

	b	kvmppc_interrupt_pr

#endif

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+2 −9
Original line number Diff line number Diff line
@@ -1272,16 +1272,8 @@ kvmppc_interrupt_hv: 
	 * R13		= PACA

	 * guest R12 saved in shadow VCPU SCRATCH0

	 * guest R13 saved in SPRN_SCRATCH0

	 * guest R9 saved in HSTATE_SCRATCH2

	 */

	std	r9, HSTATE_SCRATCH2(r13)

	lbz	r9, HSTATE_IN_GUEST(r13)

	cmpwi	r9, KVM_GUEST_MODE_HOST_HV

	beq	kvmppc_bad_host_intr

#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE

	cmpwi	r9, KVM_GUEST_MODE_GUEST

	ld	r9, HSTATE_SCRATCH2(r13)

	beq	kvmppc_interrupt_pr

#endif

	/* We're now back in the host but in guest MMU context */

	li	r9, KVM_GUEST_MODE_HOST_HV

	stb	r9, HSTATE_IN_GUEST(r13)
@@ -3287,6 +3279,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_P9_TM_HV_ASSIST) 
 * cfar is saved in HSTATE_CFAR(r13)

 * ppr is saved in HSTATE_PPR(r13)

 */

.global kvmppc_bad_host_intr

kvmppc_bad_host_intr:

	/*

	 * Switch to the emergency stack, but start half-way down in