diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2021-02-11 08:38:30 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2021-02-11 09:28:15 +0300 |
| commit | 72476aaa469179222b92c380de60c76b4cb9a318 (patch) | |
| tree | 5cde22455580fd641743ee362809e2786a33e971 | |
| parent | ab950e1acd2175eae825cfcbac621c0625ad2a86 (diff) | |
| download | linux-72476aaa469179222b92c380de60c76b4cb9a318.tar.xz | |
KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests
Commit 68ad28a4cdd4 ("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: 68ad28a4cdd4 ("KVM: PPC: Book3S HV: Fix radix guest SLB side channel")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_rmhandlers.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S index 0bc1c8248050..5e634db4809b 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S @@ -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 |