KVM: PPC: e6500: Handle LRAT error exception
Subsystems (2)
PATCH 1/2 KVM: PPC: e6500: Handle LRAT error exception
Handle LRAT error exception with support for
lrat mapping and invalidation.
[[email protected]: addressed review feedback,
refactoring, cleanup & other fixes]
--- arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/include/asm/kvm_ppc.h | 2 + arch/powerpc/include/asm/mmu-book3e.h | 12 ++++ arch/powerpc/include/asm/reg_booke.h | 14 +++++ arch/powerpc/kernel/asm-offsets.c | 1 + arch/powerpc/kvm/booke.c | 41 +++++++++++++ arch/powerpc/kvm/bookehv_interrupts.S | 9 ++- arch/powerpc/kvm/e500_mmu_host.c | 106 ++++++++++++++++++++++++++++++++++ arch/powerpc/kvm/e500mc.c | 4 ++ arch/powerpc/mm/fsl_booke_mmu.c | 10 ++++ 10 files changed, 199 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/kvm_host.h +1 -0
@@ -444,6 +444,7 @@ struct kvm_vcpu_arch {u32 eplc;u32 epsc;u32 oldpir; +u64 fault_lper;#endif #if defined(CONFIG_BOOKE )
arch/powerpc/include/asm/kvm_ppc.h +2 -0
@@ -117,6 +117,8 @@ extern void kvmppc_mmu_itlb_miss(struct kvm_vcpu *vcpu);extern int kvmppc_xlate (struct kvm_vcpu *vcpu,ulong eaddr,enum xlate_instdata xlid,enum xlate_readwrite xlrw,struct kvmppc_pte *pte); +extern void kvmppc_lrat_map (struct kvm_vcpu *vcpu,gfn_t gfn); +extern void kvmppc_lrat_invalidate (struct kvm_vcpu *vcpu);extern struct kvm_vcpu *kvmppc_core_vcpu_create (struct kvm *kvm,unsigned int id);
arch/powerpc/include/asm/mmu-book3e.h +12 -0
@@ -40,6 +40,8 @@/* MAS registers bit definitions */ +#define MAS0_ATSEL 0x80000000 +#define MAS0_ATSEL_SHIFT 31#define MAS0_TLBSEL_MASK 0x30000000#define MAS0_TLBSEL_SHIFT 28#define MAS0_TLBSEL (x) (((x) << MAS0_TLBSEL_SHIFT) & MAS0_TLBSEL_MASK)
@@ -55,6 +57,7 @@#define MAS0_WQ_CLR_RSRV 0x00002000#define MAS1_VALID 0x80000000 +#define MAS1_VALID_SHIFT 31#define MAS1_IPROT 0x40000000#define MAS1_TID (x) (((x) << 16) & 0x3FFF0000)#define MAS1_IND 0x00002000
@@ -220,6 +223,12 @@#define TLBILX_T_CLASS2 6#define TLBILX_T_CLASS3 7 +/* LRATCFG bits */ +#define LRATCFG_ASSOC 0xFF000000 +#define LRATCFG_LASIZE 0x00FE0000 +#define LRATCFG_LPID 0x00002000 +#define LRATCFG_NENTRY 0x00000FFF +#ifndef __ASSEMBLY__#include <asm/bug.h>
@@ -297,6 +306,9 @@ struct tlb_core_data {/* For software way selection, as on Freescale TLB1 */ u8 esel_next, esel_max, esel_first; +#ifdef CONFIG_KVM_BOOKE_HV +u8 lrat_next, lrat_max; +#endif };#ifdef CONFIG_PPC64
arch/powerpc/include/asm/reg_booke.h +14 -0
@@ -55,6 +55,8 @@/* Special Purpose Registers (SPRNs)*/ #define SPRN_DECAR 0x036/* Decrementer Auto Reload Register */ +#define SPRN_LPER 0x038/* Logical Page Exception Register */ +#define SPRN_LPERU 0x039/* Logical Page Exception Register Upper */ #define SPRN_IVPR 0x03F/* Interrupt Vector Prefix Register */ #define SPRN_USPRG0 0x100/* User Special Purpose Register General 0 */ #define SPRN_SPRG3R 0x103/* Special Purpose Register General 3 Read */
@@ -76,6 +78,7 @@#define SPRN_DVC2 0x13F/* Data Value Compare Register 2 */ #define SPRN_LPID 0x152/* Logical Partition ID */ #define SPRN_MAS8 0x155/* MMU Assist Register 8 */ +#define SPRN_LRATCFG 0x156/* LRAT Configuration Register */ #define SPRN_TLB0PS 0x158/* TLB 0 Page Size Register */ #define SPRN_TLB1PS 0x159/* TLB 1 Page Size Register */ #define SPRN_MAS5_MAS6 0x15c/* MMU Assist Register 5 || 6 */
@@ -371,6 +374,9 @@#define ESR_ILK 0x00100000/* Instr. Cache Locking */ #define ESR_PUO 0x00040000/* Unimplemented Operation exception */ #define ESR_BO 0x00020000/* Byte Ordering */ +#define ESR_DATA 0x00000400/* Page Table Data Access */ +#define ESR_TLBI 0x00000200/* Page Table TLB Ineligible */ +#define ESR_PT 0x00000100/* Page Table Translation */ #define ESR_SPV 0x00000080/* Signal Processing operation */ /* Bit definitions related to the DBCR0. */
@@ -669,6 +675,14 @@#define EPC_EPID 0x00003fff#define EPC_EPID_SHIFT 0 +/* Bit definitions for LPER */ +#define LPER_ALPN 0x000FFFFFFFFFF000ULL +#define LPER_ALPN_SHIFT 12 +#define LPER_WIMGE 0x00000F80 +#define LPER_WIMGE_SHIFT 7 +#define LPER_LPS 0x0000000F +#define LPER_LPS_SHIFT 0 +/* * The IBM-403 is an even more odd special case, as it is much * older than the IBM-405 series. We put these down here incase someone
arch/powerpc/kernel/asm-offsets.c +1 -0
@@ -745,6 +745,7 @@ int main(void) DEFINE(VCPU_HOST_MAS4, offsetof(struct kvm_vcpu, arch.host_mas4)); DEFINE(VCPU_HOST_MAS6, offsetof(struct kvm_vcpu, arch.host_mas6)); DEFINE(VCPU_EPLC, offsetof(struct kvm_vcpu, arch.eplc)); + DEFINE(VCPU_FAULT_LPER, offsetof(struct kvm_vcpu, arch.fault_lper));#endif #ifdef CONFIG_KVM_EXIT_TIMING
arch/powerpc/kvm/booke.c +40 -0
@@ -1322,6 +1322,47 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,break ; } +#if defined(PPC64 ) && defined(CONFIG_KVM_BOOKE_HV ) +case BOOKE_INTERRUPT_LRAT_ERROR : + { +gfn_t gfn; + +/* +* Guest TLB management instructions (EPCR.DGTMI = 0) is not +* supported for now +*/ +if (!(vcpu->arch.fault_esr &ESR_PT )) { +WARN_ONCE (1 ,"%s: Guest TLB management instructions not supported!\n" , + __func__); +break ; + } + + gfn = (vcpu->arch.fault_lper &LPER_ALPN ) >>LPER_ALPN_SHIFT ; + + idx =srcu_read_lock (&vcpu->kvm->srcu); + +if (kvm_is_visible_gfn (vcpu->kvm, gfn)) { +kvmppc_lrat_map (vcpu, gfn); + r =RESUME_GUEST ; + }else if (vcpu->arch.fault_esr &ESR_DATA ) { + vcpu->arch.paddr_accessed = (gfn <<PAGE_SHIFT ) + | (vcpu->arch.fault_dear & (PAGE_SIZE -1 )); + vcpu->arch.vaddr_accessed + vcpu->arch.fault_dear; + + r =kvmppc_emulate_mmio (run, vcpu); +kvmppc_account_exit (vcpu,MMIO_EXITS ); + }else { +kvmppc_booke_queue_irqprio (vcpu, +BOOKE_IRQPRIO_MACHINE_CHECK ); + r =RESUME_GUEST ; + } + +srcu_read_unlock (&vcpu->kvm->srcu, idx); +break ; + } +#endif +case BOOKE_INTERRUPT_DEBUG : { r =kvmppc_handle_debug (run, vcpu);if (r =RESUME_HOST )
arch/powerpc/kvm/bookehv_interrupts.S +8 -1
@@ -62,6 +62,7 @@ #define NEED_EMU 0x00000001 /* emulation -- save nv regs */ #define NEED_DEAR 0x00000002 /* save faulting DEAR */ #define NEED_ESR 0x00000004 /* save faulting ESR */ +#define NEED_LPER 0x00000008 /* save faulting LPER */ /* * On entry:
@@ -159,6 +160,12 @@ PPC_STL r9, VCPU_FAULT_DEAR(r4) .endif + /* Only supported on 64-bit cores for now */ + .if \flags & NEED_LPER + mfspr r7, SPRN_LPER + std r7, VCPU_FAULT_LPER(r4) + .endif + b kvmppc_resume_host .endm
@@ -279,7 +286,7 @@ kvm_handler BOOKE_INTERRUPT_DEBUG, EX_PARAMS(DBG), \ kvm_handler BOOKE_INTERRUPT_DEBUG, EX_PARAMS(CRIT), \ SPRN_CSRR0, SPRN_CSRR1, 0 kvm_handler BOOKE_INTERRUPT_LRAT_ERROR, EX_PARAMS(GEN), \ - SPRN_SRR0, SPRN_SRR1, (NEED_EMU | NEED_DEAR | NEED_ESR) + SPRN_SRR0, SPRN_SRR1, (NEED_EMU | NEED_DEAR | NEED_ESR | NEED_LPER) #else /* * For input register values, see arch/powerpc/include/asm/kvm_booke_hv_asm.h
arch/powerpc/kvm/e500_mmu_host.c +106 -0
112 lines not on this page · raw message
arch/powerpc/kvm/e500mc.c +4 -0
@@ -99,6 +99,10 @@ void kvmppc_e500_tlbil_all(struct kvmppc_vcpu_e500 *vcpu_e500) asmvolatile ("tlbilxlpid" );mtspr (SPRN_MAS5 ,0 );local_irq_restore (flags); + +#ifdef PPC64 +kvmppc_lrat_invalidate (&vcpu_e500->vcpu); +#endif }void kvmppc_set_pid (struct kvm_vcpu *vcpu,u32 pid)
arch/powerpc/mm/fsl_booke_mmu.c +10 -0
@@ -194,6 +194,16 @@ static unsigned long map_mem_in_cams_addr(phys_addr_t phys, unsigned long virt,get_paca ()->tcd.esel_next = i;get_paca ()->tcd.esel_max =mfspr (SPRN_TLB1CFG ) & TLBnCFG_N_ENTRY;get_paca ()->tcd.esel_first = i; + +#ifdef CONFIG_KVM_BOOKE_HV +get_paca ()->tcd.lrat_next =0 ; +if (((mfspr (SPRN_MMUCFG ) &MMUCFG_MAVN ) =MMUCFG_MAVN_V2 ) && + (mfspr (SPRN_MMUCFG ) &MMUCFG_LRAT )) { +get_paca ()->tcd.lrat_max =mfspr (SPRN_LRATCFG ) &LRATCFG_NENTRY ; + }else { +get_paca ()->tcd.lrat_max =0 ; + } +#endif #endif return amount_mapped;
Signature · 1 line
1.8.3.1
Quoted 14 lines · Laurentiu Tudor
arch/powerpc/kvm/bookehv_interrupts.S +1
-0@@ -62,6 +62,7 @@ #define NEED_EMU 0x00000001 /* emulation -- save nv regs */ #define NEED_DEAR 0x00000002 /* save faulting DEAR */ #define NEED_ESR 0x00000004 /* save faulting ESR */ +#define NEED_LPER 0x00000008 /* save faulting LPER */ /* * On entry:
arch/powerpc/kvm/bookehv_interrupts.S line 167
Quoted 8 lines
arch/powerpc/kvm/bookehv_interrupts.S +5
-0@@ -159,6 +160,12 @@ PPC_STL r9, VCPU_FAULT_DEAR(r4) .endif + /* Only supported on 64-bit cores for now */ + .if \flags & NEED_LPER + mfspr r7, SPRN_LPER + std r7, VCPU_FAULT_LPER(r4) + .endif
What's the harm in using PPC_STL anyway?
Quoted 9 lines
arch/powerpc/kvm/bookehv_interrupts.S +0
-0/* * For input register values, see
arch/powerpc/include/asm/kvm_booke_hv_asm.harch/powerpc/kvm/e500_mmu_host.c +0
-0
arch/powerpc/kvm/e500_mmu_host.c static inline void __write_host_tlbe(struct · line 102
Quoted 7 lines
arch/powerpc/kvm/e500_mmu_host.c +3
-0@@ -96,6 +96,112 @@ static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, stlbe->mas2, stlbe->mas7_3); } +#if defined(CONFIG_64BIT ) && defined(CONFIG_KVM_BOOKE_HV ) +static int lrat_next (void ) +{
Will anything break by removing the CONFIG_64BIT condition, even if we don't have a 32-bit target that uses this?
Quoted 8 lines
arch/powerpc/kvm/e500_mmu_host.c +8
-0+void kvmppc_lrat_map (struct kvm_vcpu *vcpu,gfn_t gfn) +{ +struct kvm_memory_slot *slot; +unsigned long pfn; +unsigned long hva; +struct vm_area_struct *vma; +unsigned long psize; +int tsize;
arch/powerpc/kvm/e500_mmu_host.c static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, · line 149
Quoted 10 lines
arch/powerpc/kvm/e500_mmu_host.c +10
-0+unsigned long tsize_pages; + + slot =gfn_to_memslot (vcpu->kvm, gfn); +if (!slot) { +pr_err_ratelimited ("%s: couldn't find memslot for gfn %lx!\n" , + __func__, (long )gfn); +return ; + } + + hva = slot->userspace_addr;
What if the faulting address is somewhere in the middle of the slot? Shouldn't you use gfn_to_hva_memslot() like kvmppc_e500_shadow_map()? In fact there's probably a lot of logic that should be shared between these two functions.
arch/powerpc/kvm/e500_mmu_host.c static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, · line 154
Quoted 4 lines
arch/powerpc/kvm/e500_mmu_host.c +4
-0+down_read (¤t->mm->mmap_sem); + vma =find_vma (current->mm, hva); +if (vma && (hva >= vma->vm_start)) { + psize =vma_kernel_pagesize (vma);
What if it's VM_PFNMAP?
Quoted 8 lines
arch/powerpc/kvm/e500_mmu_host.c +7
-0+ }else { + pr_err_ratelimited("%s: couldn't find virtual memory address for gfn %lx!\n", + __func__, (long)gfn); +up_read (¤t->mm->mmap_sem); +return ; + } +up_read (¤t->mm->mmap_sem);
arch/powerpc/kvm/e500_mmu_host.c static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, · line 171
Quoted 10 lines
arch/powerpc/kvm/e500_mmu_host.c +10
-0+ + pfn =gfn_to_pfn_memslot (slot, gfn); +if (is_error_noslot_pfn (pfn)) { +pr_err_ratelimited ("%s: couldn't get real page for gfn %lx!\n" , + __func__, (long )gfn); +return ; + } + + tsize =__ilog2 (psize) -10 ; + tsize_pages =1 << (tsize +10 -PAGE_SHIFT );
1UL << ...
kvmppc_e500_shadow_map needs the same fix.
Quoted 41 lines
arch/powerpc/kvm/e500_mmu_host.c +33
-0+ gfn &= ~(tsize_pages -1 ); + pfn &= ~(tsize_pages -1 ); + +write_host_lrate (tsize, gfn, pfn, vcpu->kvm->arch.lpid, true); + +kvm_release_pfn_clean (pfn); +} + +void kvmppc_lrat_invalidate (struct kvm_vcpu *vcpu) +{ +uint32_t mas0, mas1 =0 ; +int esel; +unsigned long flags; + +local_irq_save (flags); + +/* LRAT does not have a dedicated instruction for invalidation */ +for (esel =0 ; esel <get_paca ()->tcd_ptr->lrat_max; esel++) { + mas0 =MAS0_ATSEL |MAS0_ESEL (esel); +mtspr (SPRN_MAS0 , mas0); + asmvolatile ("isync; tlbre" : : :"memory" ); + mas1 =mfspr (SPRN_MAS1 ) & ~MAS1_VALID ; +mtspr (SPRN_MAS1 , mas1); + asmvolatile ("isync; tlbwe" : : :"memory" ); + } +/* Must clear mas8 for other host tlbwe's */ +mtspr (SPRN_MAS8 ,0 ); +isync (); + +local_irq_restore (flags); +} +#endif /* CONFIG_64BIT && CONFIG_KVM_BOOKE_HV */ +/* * Acquire a mas0 with victim hint, as if we just took a TLB miss. * arch/powerpc/kvm/e500mc.c +0
-0
arch/powerpc/kvm/e500mc.c void kvmppc_e500_tlbil_all(struct kvmppc_vcpu_e500 · line 106
Quoted 8 lines
arch/powerpc/kvm/e500mc.c +4
-0@@ -99,6 +99,10 @@ void kvmppc_e500_tlbil_all(struct kvmppc_vcpu_e500 *vcpu_e500) asmvolatile ("tlbilxlpid" );mtspr (SPRN_MAS5 ,0 );local_irq_restore (flags); + +#ifdef PPC64 +kvmppc_lrat_invalidate (&vcpu_e500->vcpu); +#endif
Don't you mean CONFIG_PPC64 (or CONFIG_64BIT to be consistent)?
Quoted 12 lines
arch/powerpc/kvm/e500mc.c +0
-0}void
kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 pid)arch/powerpc/mm/fsl_booke_mmu.c +0
-0@@ -194,6 +194,16 @@ static unsigned long map_mem_in_cams_addr(phys_addr_t phys, unsigned long virt,get_paca ()->tcd.esel_next = i;get_paca ()->tcd.esel_max =mfspr (SPRN_TLB1CFG ) & TLBnCFG_N_ENTRY;
arch/powerpc/mm/fsl_booke_mmu.c static unsigned long map_mem_in_cams_addr(phys_addr_t · line 206
Quoted 10 lines
arch/powerpc/mm/fsl_booke_mmu.c +9
-0get_paca ()->tcd.esel_first = i; + +#ifdef CONFIG_KVM_BOOKE_HV +get_paca ()->tcd.lrat_next =0 ; +if (((mfspr (SPRN_MMUCFG ) &MMUCFG_MAVN ) =MMUCFG_MAVN_V2 ) && + (mfspr (SPRN_MMUCFG ) &MMUCFG_LRAT )) { +get_paca ()->tcd.lrat_max =mfspr (SPRN_LRATCFG ) &LRATCFG_NENTRY ; + }else { +get_paca ()->tcd.lrat_max =0 ; + }
Unnecessary braces
-Scott
Quoted 18 lines · Scott Wood
Quoted 17 lines · Laurentiu Tudor
arch/powerpc/kvm/bookehv_interrupts.S +1
-0@@ -62,6 +62,7 @@ #define NEED_EMU 0x00000001 /* emulation -- save nv regs */ #define NEED_DEAR 0x00000002 /* save faulting DEAR */ #define NEED_ESR 0x00000004 /* save faulting ESR */ +#define NEED_LPER 0x00000008 /* save faulting LPER */ /* * On entry:@@ -159,6 +160,12 @@ PPC_STL r9, VCPU_FAULT_DEAR(r4) .endif
Quoted 7 lines
arch/powerpc/kvm/bookehv_interrupts.S line 167
Quoted 5 lines
arch/powerpc/kvm/bookehv_interrupts.S +5
-0+ /* Only supported on 64-bit cores for now */ + .if \flags & NEED_LPER + mfspr r7, SPRN_LPER + std r7, VCPU_FAULT_LPER(r4) + .endifWhat's the harm in using
PPC_STLanyway?
Will do so.
Quoted 14 lines
Quoted 14 lines
arch/powerpc/kvm/bookehv_interrupts.S +0
-0/* * For input register values, see
arch/powerpc/include/asm/kvm_booke_hv_asm.harch/powerpc/kvm/e500_mmu_host.c +0
-0@@ -96,6 +96,112 @@ static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, stlbe->mas2, stlbe->mas7_3); }
Quoted 6 lines
arch/powerpc/kvm/e500_mmu_host.c static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, · line 101
Quoted 3 lines
arch/powerpc/kvm/e500_mmu_host.c +3
-0+#if defined(CONFIG_64BIT ) && defined(CONFIG_KVM_BOOKE_HV ) +static int lrat_next (void ) +{Will anything break by removing the
CONFIG_64BITcondition, even if we don't have a 32-bit target that uses this?
Not completly certain but i remember getting compile or link errors on 32-bit e500mc or e500v2. I can recheck if you want.
Quoted 15 lines
Quoted 15 lines
arch/powerpc/kvm/e500_mmu_host.c +15
-0+void kvmppc_lrat_map (struct kvm_vcpu *vcpu,gfn_t gfn) +{ +struct kvm_memory_slot *slot; +unsigned long pfn; +unsigned long hva; +struct vm_area_struct *vma; +unsigned long psize; +int tsize; +unsigned long tsize_pages; + + slot =gfn_to_memslot (vcpu->kvm, gfn); +if (!slot) { +pr_err_ratelimited ("%s: couldn't find memslot for gfn %lx!\n" , + __func__, (long )gfn); +return ;
Quoted 8 lines
arch/powerpc/kvm/e500_mmu_host.c static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, · line 149
Quoted 3 lines
arch/powerpc/kvm/e500_mmu_host.c +3
-0+ } + + hva = slot->userspace_addr;What if the faulting address is somewhere in the middle of the slot? Shouldn't you use
gfn_to_hva_memslot()likekvmppc_e500_shadow_map()? In fact there's probably a lot of logic that should be shared between these two functions.
So if my understanding is correct most of the gfn -> pfn translation stuff done in kvmppc_e500_shadow_map() should also be present in here. If that's the case maybe i should first extract this code (which includes VM_PFNMAP handling) in a separate function and call it from both kvmppc_lrat_map() and kvmppc_e500_shadow_map().
Quoted 28 lines
arch/powerpc/kvm/e500_mmu_host.c static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, · line 154
Quoted 4 lines
arch/powerpc/kvm/e500_mmu_host.c +4
-0+down_read (¤t->mm->mmap_sem); + vma =find_vma (current->mm, hva); +if (vma && (hva >= vma->vm_start)) { + psize =vma_kernel_pagesize (vma);What if it's
VM_PFNMAP?Quoted 8 lines
arch/powerpc/kvm/e500_mmu_host.c +7
-0+ }else { + pr_err_ratelimited("%s: couldn't find virtual memory address for gfn %lx!\n", + __func__, (long)gfn); +up_read (¤t->mm->mmap_sem); +return ; + } +up_read (¤t->mm->mmap_sem);arch/powerpc/kvm/e500_mmu_host.c static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, · line 171
Quoted 10 lines
arch/powerpc/kvm/e500_mmu_host.c +10
-0+ + pfn =gfn_to_pfn_memslot (slot, gfn); +if (is_error_noslot_pfn (pfn)) { +pr_err_ratelimited ("%s: couldn't get real page for gfn %lx!\n" , + __func__, (long )gfn); +return ; + } + + tsize =__ilog2 (psize) -10 ; + tsize_pages =1 << (tsize +10 -PAGE_SHIFT );1UL << ...
Quoted 1 line
kvmppc_e500_shadow_mapneeds the same fix.
I'll make a distinct patch with the kvmppc_e500_shadow_map() fix.
Quoted 43 lines
Quoted 43 lines
arch/powerpc/kvm/e500_mmu_host.c +33
-0+ gfn &= ~(tsize_pages -1 ); + pfn &= ~(tsize_pages -1 ); + +write_host_lrate (tsize, gfn, pfn, vcpu->kvm->arch.lpid, true); + +kvm_release_pfn_clean (pfn); +} + +void kvmppc_lrat_invalidate (struct kvm_vcpu *vcpu) +{ +uint32_t mas0, mas1 =0 ; +int esel; +unsigned long flags; + +local_irq_save (flags); + +/* LRAT does not have a dedicated instruction for invalidation */ +for (esel =0 ; esel <get_paca ()->tcd_ptr->lrat_max; esel++) { + mas0 =MAS0_ATSEL |MAS0_ESEL (esel); +mtspr (SPRN_MAS0 , mas0); + asmvolatile ("isync; tlbre" : : :"memory" ); + mas1 =mfspr (SPRN_MAS1 ) & ~MAS1_VALID ; +mtspr (SPRN_MAS1 , mas1); + asmvolatile ("isync; tlbwe" : : :"memory" ); + } +/* Must clear mas8 for other host tlbwe's */ +mtspr (SPRN_MAS8 ,0 ); +isync (); + +local_irq_restore (flags); +} +#endif /* CONFIG_64BIT && CONFIG_KVM_BOOKE_HV */ +/* * Acquire a mas0 with victim hint, as if we just took a TLB miss. * arch/powerpc/kvm/e500mc.c +0
-0@@ -99,6 +99,10 @@ void kvmppc_e500_tlbil_all(struct kvmppc_vcpu_e500 *vcpu_e500) asmvolatile ("tlbilxlpid" );
Quoted 8 lines
arch/powerpc/kvm/e500mc.c void kvmppc_e500_tlbil_all(struct kvmppc_vcpu_e500 *vcpu_e500) · line 105
Quoted 6 lines
arch/powerpc/kvm/e500mc.c +4
-0mtspr (SPRN_MAS5 ,0 );local_irq_restore (flags); + +#ifdef PPC64 +kvmppc_lrat_invalidate (&vcpu_e500->vcpu); +#endif Don't you mean
CONFIG_PPC64(orCONFIG_64BITto be consistent)?
Absolutely. Thanks for spotting this.
---
Best Regards, Laurentiu
Quoted 2 lines · Laurentiu Tudor
Quoted 1 line · Scott Wood
On Thu, 2015-09-24 at 16:11 +0300, Laurentiu Tudor wrote:
[snip]
Quoted 43 lines
Quoted 9 lines
Quoted 9 lines
b/arch/powerpc/kvm/e500_mmu_host.c
index 12d5c67..99ad88a 100644arch/powerpc/kvm/e500_mmu_host.c +0
-0@@ -96,6 +96,112 @@ static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, stlbe->mas2, stlbe->mas7_3); }Quoted 6 lines
arch/powerpc/kvm/e500_mmu_host.c static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, · line 101
Quoted 3 lines
arch/powerpc/kvm/e500_mmu_host.c +3
-0+#if defined(CONFIG_64BIT ) && defined(CONFIG_KVM_BOOKE_HV ) +static int lrat_next (void ) +{Will anything break by removing the
CONFIG_64BITcondition, even if we don't have a 32-bit target that uses this?Not completly certain but i remember getting compile or link errors on 32-bit e500mc or e500v2. I can recheck if you want.
Quoted 15 lines
Quoted 15 lines
arch/powerpc/kvm/e500_mmu_host.c +15
-0+void kvmppc_lrat_map (struct kvm_vcpu *vcpu,gfn_t gfn) +{ +struct kvm_memory_slot *slot; +unsigned long pfn; +unsigned long hva; +struct vm_area_struct *vma; +unsigned long psize; +int tsize; +unsigned long tsize_pages; + + slot =gfn_to_memslot (vcpu->kvm, gfn); +if (!slot) { +pr_err_ratelimited ("%s: couldn't find memslot for gfn %lx!\n" , + __func__, (long )gfn); +return ;Quoted 8 lines
arch/powerpc/kvm/e500_mmu_host.c static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, · line 149
Quoted 3 lines
arch/powerpc/kvm/e500_mmu_host.c +3
-0+ } + + hva = slot->userspace_addr;What if the faulting address is somewhere in the middle of the slot? Shouldn't you use
gfn_to_hva_memslot()likekvmppc_e500_shadow_map()? In fact there's probably a lot of logic that should be shared between these two functions.
Quoted 6 lines
So if my understanding is correct most of the gfn -> pfn translation stuff done in
kvmppc_e500_shadow_map()should also be present in here. If that's the case maybe i should first extract this code (which includesVM_PFNMAPhandling) in a separate function and call it from bothkvmppc_lrat_map()andkvmppc_e500_shadow_map().
Off-topic, but just noticed that kvmppc_e500_shadow_map() is marked as inline. Was that on purpose? Is inlining such a large function worth anything?
---
Best Regards, Laurentiu
Quoted 61 lines · Laurentiu Tudor
Quoted 2 lines · Laurentiu Tudor
Quoted 1 line · Scott Wood
On Thu, 2015-09-24 at 16:11 +0300, Laurentiu Tudor wrote:
[snip]
Quoted 47 lines
Quoted 9 lines
Quoted 9 lines
b/arch/powerpc/kvm/e500_mmu_host.c
index 12d5c67..99ad88a 100644arch/powerpc/kvm/e500_mmu_host.c +0
-0@@ -96,6 +96,112 @@ static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, stlbe->mas2, stlbe->mas7_3); }Quoted 7 lines
arch/powerpc/kvm/e500_mmu_host.c static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, · line 101
Quoted 3 lines
arch/powerpc/kvm/e500_mmu_host.c +3
-0+#if defined(CONFIG_64BIT ) && defined(CONFIG_KVM_BOOKE_HV ) +static int lrat_next (void ) +{Will anything break by removing the
CONFIG_64BITcondition, even if we don't
have a 32-bit target that uses this?Not completly certain but i remember getting compile or link errors on 32-bit e500mc or e500v2. I can recheck if you want.
Quoted 18 lines
Quoted 18 lines
arch/powerpc/kvm/e500_mmu_host.c +17
-0+void kvmppc_lrat_map (struct kvm_vcpu *vcpu,gfn_t gfn) +{ +struct kvm_memory_slot *slot; +unsigned long pfn; +unsigned long hva; +struct vm_area_struct *vma; +unsigned long psize; +int tsize; +unsigned long tsize_pages; + + slot =gfn_to_memslot (vcpu->kvm, gfn); +if (!slot) { + pr_err_ratelimited("%s: couldn't find memslot for gfn %lx!\n", + __func__, (long)gfn); +return ; + } +Quoted 8 lines
arch/powerpc/kvm/e500_mmu_host.c static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, · line 149
Quoted 1 line
arch/powerpc/kvm/e500_mmu_host.c +1
-0+ hva = slot->userspace_addr;What if the faulting address is somewhere in the middle of the slot? Shouldn't you use
gfn_to_hva_memslot()likekvmppc_e500_shadow_map()? In
fact there's probably a lot of logic that should be shared between these two
functions.Quoted 7 lines
So if my understanding is correct most of the gfn -> pfn translation stuff done in
kvmppc_e500_shadow_map()should also be present in here. If that's the case maybe i should first extract this code (which includesVM_PFNMAPhandling) in a separate function and call it from bothkvmppc_lrat_map()
andkvmppc_e500_shadow_map().
Quoted 3 lines
Off-topic, but just noticed that
kvmppc_e500_shadow_map()is marked as inline.
Was that on purpose? Is inlining such a large function worth anything?
I don't remember the intent. It was probably a lot smaller back then. That said, it's only used two places, with probably pretty good temporal separation between performance-intensive uses of one versus the other (so not a huge icache concern), and a pretty good portion of the function will be optimized out in the caller with tlbsel = 0.
-Scott
Quoted 2 lines · Laurentiu Tudor
Quoted 1 line · Scott Wood
On Thu, 2015-09-24 at 16:11 +0300, Laurentiu Tudor wrote:
[snip]
Quoted 17 lines
Quoted 10 lines
Quoted 10 lines
arch/powerpc/kvm/e500_mmu_host.c +0
-0@@ -96,6 +96,112 @@ static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, stlbe->mas2, stlbe->mas7_3); }Quoted 6 lines
arch/powerpc/kvm/e500_mmu_host.c static inline void __write_host_tlbe(struct kvm_book3e_206_tlb_entry *stlbe, · line 101
Quoted 3 lines
arch/powerpc/kvm/e500_mmu_host.c +3
-0+#if defined(CONFIG_64BIT ) && defined(CONFIG_KVM_BOOKE_HV ) +static int lrat_next (void ) +{Will anything break by removing the
CONFIG_64BITcondition, even if we don't have a 32-bit target that uses this?
Quoted 3 lines
Not completly certain but i remember getting compile or link errors on 32-bit e500mc or e500v2. I can recheck if you want.
I double-checked this and indeed it doesn't compile on 32-bit because lrat_next() calls get_paca().
---
Best Regards, Laurentiu