Skip to content

Commit

Permalink
KVM: PPC: Book3S HV: Use POWER9 SLBIA IH=6 variant to clear SLB
Browse files Browse the repository at this point in the history
IH=6 may preserve hypervisor real-mode ERAT entries and is the
recommended SLBIA hint for switching partitions.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
  • Loading branch information
Nicholas Piggin authored and Paul Mackerras committed Feb 10, 2021
1 parent 078ebe3 commit 7a7f94a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/powerpc/kvm/book3s_hv_rmhandlers.S
Original file line number Diff line number Diff line change
Expand Up @@ -912,7 +912,7 @@ BEGIN_MMU_FTR_SECTION
/* Radix host won't have populated the SLB, so no need to clear */
li r6, 0
slbmte r6, r6
slbia
PPC_SLBIA(6)
ptesync
END_MMU_FTR_SECTION_IFCLR(MMU_FTR_TYPE_RADIX)

Expand Down Expand Up @@ -1520,7 +1520,7 @@ guest_exit_cont: /* r9 = vcpu, r12 = trap, r13 = paca */
/* Finally clear out the SLB */
li r0,0
slbmte r0,r0
slbia
PPC_SLBIA(6)
ptesync
stw r5,VCPU_SLB_MAX(r9)

Expand Down Expand Up @@ -3352,7 +3352,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_DAWR1)

/* Clear hash and radix guest SLB, see guest_exit_short_path comment. */
slbmte r0, r0
slbia
PPC_SLBIA(6)

BEGIN_MMU_FTR_SECTION
b 4f
Expand Down

0 comments on commit 7a7f94a

Please sign in to comment.