Commit ab950e1a authored by Paul Mackerras's avatar Paul Mackerras

KVM: PPC: Book3S HV: Ensure radix guest has no SLB entries

Commit 68ad28a4 ("KVM: PPC: Book3S HV: Fix radix guest SLB side
channel") changed the older guest entry path, with the side effect
that vcpu->arch.slb_max no longer gets cleared for a radix guest.
This means that a HPT guest which loads some SLB entries, switches to
radix mode, runs the guest using the old guest entry path (e.g.,
because the indep_threads_mode module parameter has been set to
false), and then switches back to HPT mode would now see the old SLB
entries being present, whereas previously it would have seen no SLB
entries.

To avoid changing guest-visible behaviour, this adds a store
instruction to clear vcpu->arch.slb_max for a radix guest using the
old guest entry path.
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent a722076e
...@@ -1539,8 +1539,12 @@ guest_exit_cont: /* r9 = vcpu, r12 = trap, r13 = paca */ ...@@ -1539,8 +1539,12 @@ guest_exit_cont: /* r9 = vcpu, r12 = trap, r13 = paca */
.endr .endr
b guest_bypass b guest_bypass
0: /* Sanitise radix guest SLB, see guest_exit_short_path comment. */ 0: /*
* Sanitise radix guest SLB, see guest_exit_short_path comment.
* We clear vcpu->arch.slb_max to match earlier behaviour.
*/
li r0,0 li r0,0
stw r0,VCPU_SLB_MAX(r9)
slbmte r0,r0 slbmte r0,r0
li r4,1 li r4,1
slbmte r0,r4 slbmte r0,r4
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment