Add SLB switching code for entry/exit
Subsystems (3)
PATCH 8/28 Add SLB switching code for entry/exit
This is the really low level of guest entry/exit code.
Book3s_64 has an SLB, which stores all ESID -> VSID mappings we're currently aware of.
The segments in the guest differ from the ones on the host, so we need to switch the SLB to tell the MMU that we're in a new context.
So we store a shadow of the guest's SLB in the PACA, switch to that on entry and only restore bolted entries on exit, leaving the rest to the Linux SLB fault handler.
That way we get a really clean way of switching the SLB.
---
v6 -> v7:
- use macros for slb bolt / unbolt
--- arch/powerpc/kvm/book3s_64_slb.S | 262 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 262 insertions(+), 0 deletions(-) create mode 100644 arch/powerpc/kvm/book3s_64_slb.S
arch/powerpc/kvm/book3s_64_slb.S new file +262 -0
@@ -0,0 +1,262 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Copyright SUSE Linux Products GmbH 2009 + * + * Authors: Alexander Graf <[email protected]> + */ + +#define SHADOW_SLB_ESID(num) (SLBSHADOW_SAVEAREA + (num * 0x10)) +#define SHADOW_SLB_VSID(num) (SLBSHADOW_SAVEAREA + (num * 0x10) + 0x8) +#define UNBOLT_SLB_ENTRY(num) \ + ld r9, SHADOW_SLB_ESID(num)(r12); \ + /* Invalid? Skip. */; \ + rldicl. r0, r9, 37, 63; \ + beq slb_entry_skip_ ## num; \ + xoris r9, r9, SLB_ESID_V@h; \ + std r9, SHADOW_SLB_ESID(num)(r12); \ + slb_entry_skip_ ## num: + +#define REBOLT_SLB_ENTRY(num) \ + ld r10, SHADOW_SLB_ESID(num)(r11); \ + cmpdi r10, 0; \ + beq slb_exit_skip_1; \ + oris r10, r10, SLB_ESID_V@h; \ + ld r9, SHADOW_SLB_VSID(num)(r11); \ + slbmte r9, r10; \ + std r10, SHADOW_SLB_ESID(num)(r11); \ +slb_exit_skip_ ## num: + +/****************************************************************************** + * * + * Entry code * + * * + *****************************************************************************/ + +.global kvmppc_handler_trampoline_enter +kvmppc_handler_trampoline_enter: + + /* Required state: + * + * MSR = ~IR|DR + * R13 = PACA + * R9 = guest IP + * R10 = guest MSR + * R11 = free + * R12 = free + * PACA[PACA_EXMC + EX_R9] = guest R9 + * PACA[PACA_EXMC + EX_R10] = guest R10 + * PACA[PACA_EXMC + EX_R11] = guest R11 + * PACA[PACA_EXMC + EX_R12] = guest R12 + * PACA[PACA_EXMC + EX_R13] = guest R13 + * PACA[PACA_EXMC + EX_CCR] = guest CR + * PACA[PACA_EXMC + EX_R3] = guest XER + */ + + mtsrr0 r9 + mtsrr1 r10 + + mtspr SPRN_SPRG_SCRATCH0, r0 + + /* Remove LPAR shadow entries */ + +#if SLB_NUM_BOLTED == 3 + + ld r12, PACA_SLBSHADOWPTR(r13) + + /* Save off the first entry so we can slbie it later */ + ld r10, SHADOW_SLB_ESID(0)(r12) + ld r11, SHADOW_SLB_VSID(0)(r12) + + /* Remove bolted entries */ + UNBOLT_SLB_ENTRY(0) + UNBOLT_SLB_ENTRY(1) + UNBOLT_SLB_ENTRY(2) + +#else +#error unknown number of bolted entries +#endif + + /* Flush SLB */ + + slbia + + /* r0 = esid & ESID_MASK */ + rldicr r10, r10, 0, 35 + /* r0 |= CLASS_BIT(VSID) */ + rldic r12, r11, 56 - 36, 36 + or r10, r10, r12 + slbie r10 + + isync + + /* Fill SLB with our shadow */ + + lbz r12, PACA_KVM_SLB_MAX(r13) + mulli r12, r12, 16 + addi r12, r12, PACA_KVM_SLB + add r12, r12, r13 + + /* for (r11 = kvm_slb; r11 < kvm_slb + kvm_slb_size; r11+=slb_entry) */ + li r11, PACA_KVM_SLB + add r11, r11, r13 + +slb_loop_enter: + + ld r10, 0(r11) + + rldicl. r0, r10, 37, 63 + beq slb_loop_enter_skip + + ld r9, 8(r11) + slbmte r9, r10 + +slb_loop_enter_skip: + addi r11, r11, 16 + cmpd cr0, r11, r12 + blt slb_loop_enter + +slb_do_enter: + + /* Enter guest */ + + mfspr r0, SPRN_SPRG_SCRATCH0 + + ld r9, (PACA_EXMC+EX_R9)(r13) + ld r10, (PACA_EXMC+EX_R10)(r13) + ld r12, (PACA_EXMC+EX_R12)(r13) + + lwz r11, (PACA_EXMC+EX_CCR)(r13) + mtcr r11 + + ld r11, (PACA_EXMC+EX_R3)(r13) + mtxer r11 + + ld r11, (PACA_EXMC+EX_R11)(r13) + ld r13, (PACA_EXMC+EX_R13)(r13) + + RFI +kvmppc_handler_trampoline_enter_end: + + + +/****************************************************************************** + * * + * Exit code * + * * + *****************************************************************************/ + +.global kvmppc_handler_trampoline_exit +kvmppc_handler_trampoline_exit: + + /* Register usage at this point: + * + * SPRG_SCRATCH0 = guest R13 + * R01 = host R1 + * R02 = host R2 + * R10 = guest PC + * R11 = guest MSR + * R12 = exit handler id + * R13 = PACA + * PACA.exmc.CCR = guest CR + * PACA.exmc.R9 = guest R1 + * PACA.exmc.R10 = guest R10 + * PACA.exmc.R11 = guest R11 + * PACA.exmc.R12 = guest R12 + * PACA.exmc.R13 = guest R2 + * + */ + + /* Save registers */ + + std r0, (PACA_EXMC+EX_SRR0)(r13) + std r9, (PACA_EXMC+EX_R3)(r13) + std r10, (PACA_EXMC+EX_LR)(r13) + std r11, (PACA_EXMC+EX_DAR)(r13) + + /* + * In order for us to easily get the last instruction, + * we got the #vmexit at, we exploit the fact that the + * virtual layout is still the same here, so we can just + * ld from the guest's PC address + */ + + /* We only load the last instruction when it's safe */ + cmpwi r12, BOOK3S_INTERRUPT_DATA_STORAGE + beq ld_last_inst + cmpwi r12, BOOK3S_INTERRUPT_PROGRAM + beq ld_last_inst + + b no_ld_last_inst + +ld_last_inst: + /* Save off the guest instruction we're at */ + /* 1) enable paging for data */ + mfmsr r9 + ori r11, r9, MSR_DR /* Enable paging for data */ + mtmsr r11 + /* 2) fetch the instruction */ + lwz r0, 0(r10) + /* 3) disable paging again */ + mtmsr r9 + +no_ld_last_inst: + + /* Restore bolted entries from the shadow and fix it along the way */ + + /* We don't store anything in entry 0, so we don't need to take care of it */ + slbia + isync + +#if SLB_NUM_BOLTED == 3 + + ld r11, PACA_SLBSHADOWPTR(r13) + + REBOLT_SLB_ENTRY(0) + REBOLT_SLB_ENTRY(1) + REBOLT_SLB_ENTRY(2) + +#else +#error unknown number of bolted entries +#endif + +slb_do_exit: + + /* Restore registers */ + + ld r11, (PACA_EXMC+EX_DAR)(r13) + ld r10, (PACA_EXMC+EX_LR)(r13) + ld r9, (PACA_EXMC+EX_R3)(r13) + + /* Save last inst */ + stw r0, (PACA_EXMC+EX_LR)(r13) + + /* Save DAR and DSISR before going to paged mode */ + mfdar r0 + std r0, (PACA_EXMC+EX_DAR)(r13) + mfdsisr r0 + stw r0, (PACA_EXMC+EX_DSISR)(r13) + + /* RFI into the highmem handler */ + mfmsr r0 + ori r0, r0, MSR_IR|MSR_DR|MSR_RI /* Enable paging */ + mtsrr1 r0 + ld r0, PACASAVEDMSR(r13) /* Highmem handler address */ + mtsrr0 r0 + + mfspr r0, SPRN_SPRG_SCRATCH0 + + RFI +kvmppc_handler_trampoline_exit_end: +
Signature · 1 line
1.6.0.2
PATCH 20/28 Split init_new_context and destroy_context
For KVM we need to allocate a new context id, but don't really care about all the mm context around it.
So let's split the alloc and destroy functions for the context id, so we can grab one without allocating an mm context.
---
v6 -> v7:
- don't #ifdef twice
--- arch/powerpc/include/asm/mmu_context.h | 2 ++ arch/powerpc/mm/mmu_context_hash64.c | 24 +++++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/mmu_context.h +2 -0
@@ -23,6 +23,8 @@ extern void switch_slb(struct task_struct *tsk, struct mm_struct *mm);extern void set_context (unsigned long id,pgd_t *pgd);#ifdef CONFIG_PPC_BOOK3S_64 +extern int __init_new_context (void ); +extern void __destroy_context (int context_id);static inline void mmu_context_init (void ) { }#else extern void mmu_context_init (void );
arch/powerpc/mm/mmu_context_hash64.c +21 -3
@@ -18,6 +18,7 @@#include <linux/mm.h> #include <linux/spinlock.h> #include <linux/idr.h> +#include <linux/module.h> #include <asm/mmu_context.h>
@@ -32,7 +33,7 @@ static DEFINE_IDR(mmu_context_idr);#define NO_CONTEXT 0#define MAX_CONTEXT ((1UL << 19) - 1) -int init_new_context (struct task_struct *tsk,struct mm_struct *mm) +int __init_new_context (void ) {int index;int err;
@@ -57,6 +58,18 @@ again:return -ENOMEM ; } +return index; +} +EXPORT_SYMBOL_GPL (__init_new_context); + +int init_new_context (struct task_struct *tsk,struct mm_struct *mm) +{ +int index; + + index =__init_new_context (); +if (index <0 ) +return index; +/* The old code would re-promote on fork, we don't do that * when using slices as it could cause problem promoting slices * that have been forced down to 4K
@@ -68,11 +81,16 @@ again:return 0 ; } -void destroy_context (struct mm_struct *mm) +void __destroy_context (int context_id) {spin_lock (&mmu_context_lock); -idr_remove (&mmu_context_idr, mm->context.id); +idr_remove (&mmu_context_idr, context_id);spin_unlock (&mmu_context_lock); +} +EXPORT_SYMBOL_GPL (__destroy_context); +void destroy_context (struct mm_struct *mm) +{ +__destroy_context (mm->context.id); mm->context.id =NO_CONTEXT ; }
Signature · 1 line
1.6.0.2
PATCH 27/28 Use hrtimers for the decrementer
In reply to Alexander GrafFollowing S390's good example we should use hrtimers for the decrementer too! This patch converts the timer from the old mechanism to hrtimers.
---
v6 -> v7:
- remove non-hrtimer export
--- arch/powerpc/include/asm/kvm_host.h | 6 ++++-- arch/powerpc/kernel/ppc_ksyms.c | 3 +-- arch/powerpc/kvm/emulate.c | 18 +++++++++++------- arch/powerpc/kvm/powerpc.c | 20 ++++++++++++++++++-- 4 files changed, 34 insertions(+), 13 deletions(-)
arch/powerpc/include/asm/kvm_host.h +4 -2
@@ -21,7 +21,8 @@#define __POWERPC_KVM_HOST_H__#include <linux/mutex.h> -#include <linux/timer.h> +#include <linux/hrtimer.h> +#include <linux/interrupt.h> #include <linux/types.h> #include <linux/kvm_types.h> #include <asm/kvm_asm.h>
@@ -250,7 +251,8 @@ struct kvm_vcpu_arch {u32 cpr0_cfgaddr;/* holds the last set cpr0_cfgaddr */ -struct timer_list dec_timer; +struct hrtimer dec_timer; +struct tasklet_struct tasklet;u64 dec_jiffies;unsigned long pending_exceptions;
arch/powerpc/kernel/ppc_ksyms.c +1 -2
@@ -163,12 +163,11 @@ EXPORT_SYMBOL(screen_info);#ifdef CONFIG_PPC32 EXPORT_SYMBOL (timer_interrupt);EXPORT_SYMBOL (irq_desc); +EXPORT_SYMBOL (tb_ticks_per_jiffy);EXPORT_SYMBOL (cacheable_memcpy);EXPORT_SYMBOL (cacheable_memzero);#endif -EXPORT_SYMBOL (tb_ticks_per_jiffy); -#ifdef CONFIG_PPC32 EXPORT_SYMBOL (switch_mmu_context);#endif
arch/powerpc/kvm/emulate.c +11 -7
@@ -18,7 +18,7 @@*/ #include <linux/jiffies.h> -#include <linux/timer.h> +#include <linux/hrtimer.h> #include <linux/types.h> #include <linux/string.h> #include <linux/kvm_host.h>
@@ -79,12 +79,13 @@ static int kvmppc_dec_enabled(struct kvm_vcpu *vcpu)void kvmppc_emulate_dec (struct kvm_vcpu *vcpu) { -unsigned long nr_jiffies; +unsigned long dec_nsec; +pr_debug ("mtDEC: %x\n" , vcpu->arch.dec);#ifdef CONFIG_PPC64 /* POWER4+ triggers a dec interrupt if the value is < 0 */ if (vcpu->arch.dec &0x80000000 ) { -del_timer (&vcpu->arch.dec_timer); +hrtimer_try_to_cancel (&vcpu->arch.dec_timer);kvmppc_core_queue_dec (vcpu);return ; }
@@ -94,12 +95,15 @@ void kvmppc_emulate_dec(struct kvm_vcpu *vcpu)* that's how we convert the guest DEC value to the number of * host ticks. */ +hrtimer_try_to_cancel (&vcpu->arch.dec_timer); + dec_nsec = vcpu->arch.dec; + dec_nsec *=1000 ; + dec_nsec /= tb_ticks_per_usec; +hrtimer_start (&vcpu->arch.dec_timer,ktime_set (0 , dec_nsec), +HRTIMER_MODE_REL ); vcpu->arch.dec_jiffies =get_tb (); - nr_jiffies = vcpu->arch.dec / tb_ticks_per_jiffy; -mod_timer (&vcpu->arch.dec_timer, -get_jiffies_64 () + nr_jiffies); }else { -del_timer (&vcpu->arch.dec_timer); +hrtimer_try_to_cancel (&vcpu->arch.dec_timer); } }
arch/powerpc/kvm/powerpc.c +18 -2
@@ -23,6 +23,7 @@#include <linux/kvm_host.h> #include <linux/module.h> #include <linux/vmalloc.h> +#include <linux/hrtimer.h> #include <linux/fs.h> #include <asm/cputable.h> #include <asm/uaccess.h>
@@ -209,10 +210,25 @@ static void kvmppc_decrementer_func(unsigned long data) } } +/* +* low level hrtimer wake routine. Because this runs in hardirq context +* we schedule a tasklet to do the real work. +*/ +enum hrtimer_restart kvmppc_decrementer_wakeup (struct hrtimer *timer) +{ +struct kvm_vcpu *vcpu; + + vcpu = container_of(timer, struct kvm_vcpu, arch.dec_timer); +tasklet_schedule (&vcpu->arch.tasklet); + +return HRTIMER_NORESTART ; +} +int kvm_arch_vcpu_init (struct kvm_vcpu *vcpu) { -setup_timer (&vcpu->arch.dec_timer, kvmppc_decrementer_func, - (unsigned long )vcpu); +hrtimer_init (&vcpu->arch.dec_timer,CLOCK_REALTIME ,HRTIMER_MODE_ABS ); +tasklet_init (&vcpu->arch.tasklet, kvmppc_decrementer_func, (ulong )vcpu); + vcpu->arch.dec_timer.function = kvmppc_decrementer_wakeup;return 0 ; }
Signature · 1 line
1.6.0.2