KVM: PPC: Book3S PR: Enable MSR_DR for switch_mmu_context()
Subsystems (4)
PATCH v3 1/1 KVM: PPC: Book3S PR: Enable MSR_DR for switch_mmu_context()
Commit 863771a28e27 ("powerpc/32s: Convert switch_mmu_context() to C") moved the switch_mmu_context() to C. While in principle a good idea, it meant that the function now uses the stack. The stack is not accessible from real mode though.
So to keep calling the function, let's turn on MSR_DR while we call it. That way, all pointer references to the stack are handled virtually.
In addition, make sure to save/restore r12 on the stack, as it may get clobbered by the C function.
---
v1 -> v2:
- Save and restore R12, so that we don't touch volatile registers while calling into C.
v2 -> v3:
- Save and restore R12 on the stack. SPRGs may be clobbered by page faults.
--- arch/powerpc/kvm/book3s_32_sr.S | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-)
arch/powerpc/kvm/book3s_32_sr.S +21 -5
@@ -122,11 +122,27 @@ /* 0x0 - 0xb */ - /* 'current->mm' needs to be in r4 */ - tophys(r4, r2) - lwz r4, MM(r4) - tophys(r4, r4) - /* This only clobbers r0, r3, r4 and r5 */ + /* switch_mmu_context() needs paging, let's enable it */ + mfmsr r9 + ori r11, r9, MSR_DR + mtmsr r11 + sync + + /* switch_mmu_context() clobbers r12, rescue it */ + SAVE_GPR(12, r1) + + /* Calling switch_mmu_context(<inv>, current->mm, <inv>); */ + lwz r4, MM(r2) bl switch_mmu_context + /* restore r12 */ + REST_GPR(12, r1) + + /* Disable paging again */ + mfmsr r9 + li r6, MSR_DR + andc r9, r9, r6 + mtmsr r9 + sync + .endm
Signature · 12 lines
2.28.0.394.ge197136389 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879
Le 10/05/2022 à 14:37, Alexander Graf a écrit :
Quoted 54 lines
Commit
863771a28e27("powerpc/32s: Convertswitch_mmu_context()to C") moved theswitch_mmu_context()to C. While in principle a good idea, it meant that the function now uses the stack. The stack is not accessible from real mode though.So to keep calling the function, let's turn on
MSR_DRwhile we call it. That way, all pointer references to the stack are handled virtually.In addition, make sure to save/restore r12 on the stack, as it may get clobbered by the C function.
Reported-by Matt Evans <[email protected]>Fixes 863771a28e27 ("powerpc/32s: Convert switch_mmu_context() to C")Signed-off-by Alexander Graf <[email protected]>Cc [email protected] # v5.14+---
v1 -> v2:
- Save and restore R12, so that we don't touch volatile registers while calling into C.
v2 -> v3:
- Save and restore R12 on the stack. SPRGs may be clobbered by page faults.
--- arch/powerpc/kvm/book3s_32_sr.S | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-)arch/powerpc/kvm/book3s_32_sr.S +10
-5@@ -122,11 +122,27 @@ /* 0x0 - 0xb */ - /* 'current->mm' needs to be in r4 */ - tophys(r4, r2) - lwz r4, MM(r4) - tophys(r4, r4) - /* This only clobbers r0, r3, r4 and r5 */ + /* switch_mmu_context() needs paging, let's enable it */ + mfmsr r9 + ori r11, r9, MSR_DR + mtmsr r11 + sync + + /* switch_mmu_context() clobbers r12, rescue it */ + SAVE_GPR(12, r1) + + /* Calling switch_mmu_context(<inv>, current->mm, <inv>); */
arch/powerpc/kvm/book3s_32_sr.S line 144
Quoted 10 lines
arch/powerpc/kvm/book3s_32_sr.S +8
-0+ lwz r4, MM(r2) bl switch_mmu_context + /* restore r12 */ + REST_GPR(12, r1) + + /* Disable paging again */ + mfmsr r9 + li r6, MSR_DR + andc r9, r9, r6
Instead of li/andc you can do:
rlwinm r9, r9, 0, ~MSR_DR
Quoted 4 lines
arch/powerpc/kvm/book3s_32_sr.S +3
-0+ mtmsr r9 + sync + .endm
Michael Ellerman
AppliedQuoted 9 lines · Alexander Graf
Commit
863771a28e27("powerpc/32s: Convertswitch_mmu_context()to C") moved theswitch_mmu_context()to C. While in principle a good idea, it meant that the function now uses the stack. The stack is not accessible from real mode though.So to keep calling the function, let's turn on
MSR_DRwhile we call it. That way, all pointer references to the stack are handled virtually.[...]
Applied to powerpc/fixes.
[1/1] KVM: PPC: Book3S PR: Enable MSR_DR for switch_mmu_context()
https://git.kernel.org/powerpc/c/ee8348496c77e3737d0a6cda307a521f2cff954f
cheers