Commit 72476aaa authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests 



Commit 68ad28a4 ("KVM: PPC: Book3S HV: Fix radix guest SLB side
channel") incorrectly removed the radix host instruction patch to skip
re-loading the host SLB entries when exiting from a hash
guest. Restore it.

Fixes: 68ad28a4 ("KVM: PPC: Book3S HV: Fix radix guest SLB side channel")
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent ab950e1a

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+3 −0
Original line number Diff line number Diff line
@@ -1525,6 +1525,9 @@ guest_exit_cont: /* r9 = vcpu, r12 = trap, r13 = paca */ 
	stw	r5,VCPU_SLB_MAX(r9)



	/* load host SLB entries */

BEGIN_MMU_FTR_SECTION

	b	guest_bypass

END_MMU_FTR_SECTION_IFSET(MMU_FTR_TYPE_RADIX)

	ld	r8,PACA_SLBSHADOWPTR(r13)



	.rept	SLB_NUM_BOLTED