* [PATCH] powerpc/64s: use ibm, tlbiel-congruence-classes-(hash|radix) dt property [not found] <20170422005854.17128-1-npiggin@gmail.com> @ 2017-04-22 0:58 ` Nicholas Piggin 2017-04-22 8:02 ` [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) " Benjamin Herrenschmidt ` (2 more replies) 0 siblings, 3 replies; 13+ messages in thread From: Nicholas Piggin @ 2017-04-22 0:58 UTC (permalink / raw) To: linuxppc-dev; +Cc: Nicholas Piggin, Benjamin Herrenschmidt, Aneesh Kumar K . V tlbiel instruction with IS!=0 on POWER7 and later Book3s CPUs invalidate TLBs belonging to a specified congruence class. In order to operate on the entire TLB, all congruence classes must be specified, requiring a software loop. This dt property specifies the number of classes that must be operated on. Use this to set tlbiel loop counts. If the property does not exist, fall back to hard coded values based on the cpu table. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/include/asm/cputable.h | 14 +++++------ arch/powerpc/include/asm/mce.h | 5 ++++ arch/powerpc/kernel/cputable.c | 26 ++++++++++----------- arch/powerpc/kernel/mce_power.c | 46 ++++++++----------------------------- arch/powerpc/kernel/prom.c | 21 +++++++++++++++++ arch/powerpc/kvm/book3s_hv.c | 9 +------- arch/powerpc/kvm/book3s_hv_ras.c | 6 ++--- arch/powerpc/mm/init_64.c | 10 ++++++-- arch/powerpc/mm/tlb-radix.c | 9 ++++---- 9 files changed, 71 insertions(+), 75 deletions(-) diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h index 1f6847b107e4..f4cdd04ec37b 100644 --- a/arch/powerpc/include/asm/cputable.h +++ b/arch/powerpc/include/asm/cputable.h @@ -62,6 +62,12 @@ struct cpu_spec { unsigned int cpu_user_features2; /* Userland features v2 */ unsigned int mmu_features; /* MMU features */ + /* Number of sets/congruence classes for tlbiel IS!=0 invalidation */ + /* For POWER7 and later Book3s CPUs */ + unsigned int tlb_sets; /* set to current MMU mode */ + unsigned int tlb_sets_hash; + unsigned int tlb_sets_radix; + /* cache line sizes */ unsigned int icache_bsize; unsigned int dcache_bsize; @@ -106,12 +112,6 @@ struct cpu_spec { * called in real mode to handle SLB and TLB errors. */ long (*machine_check_early)(struct pt_regs *regs); - - /* - * Processor specific routine to flush tlbs. - */ - void (*flush_tlb)(unsigned int action); - }; extern struct cpu_spec *cur_cpu_spec; @@ -130,7 +130,7 @@ extern void cpu_feature_keys_init(void); static inline void cpu_feature_keys_init(void) { } #endif -/* TLB flush actions. Used as argument to cpu_spec.flush_tlb() hook */ +/* TLB flush actions. Used as argument to machine_check_flush_tlb() */ enum { TLB_INVAL_SCOPE_GLOBAL = 0, /* invalidate all TLBs */ TLB_INVAL_SCOPE_LPID = 1, /* invalidate TLBs for current LPID */ diff --git a/arch/powerpc/include/asm/mce.h b/arch/powerpc/include/asm/mce.h index 81eff8631434..907fba5817e2 100644 --- a/arch/powerpc/include/asm/mce.h +++ b/arch/powerpc/include/asm/mce.h @@ -211,4 +211,9 @@ extern void machine_check_print_event_info(struct machine_check_event *evt, bool user_mode); extern uint64_t get_mce_fault_addr(struct machine_check_event *evt); +/* + * TLB flush for POWER7 and later + */ +extern void machine_check_flush_tlb(unsigned int action); + #endif /* __ASM_PPC64_MCE_H__ */ diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index e79b9daa873c..4823937c14ee 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c @@ -72,9 +72,6 @@ extern void __setup_cpu_power8(unsigned long offset, struct cpu_spec* spec); extern void __restore_cpu_power8(void); extern void __setup_cpu_power9(unsigned long offset, struct cpu_spec* spec); extern void __restore_cpu_power9(void); -extern void __flush_tlb_power7(unsigned int action); -extern void __flush_tlb_power8(unsigned int action); -extern void __flush_tlb_power9(unsigned int action); extern long __machine_check_early_realmode_p7(struct pt_regs *regs); extern long __machine_check_early_realmode_p8(struct pt_regs *regs); extern long __machine_check_early_realmode_p9(struct pt_regs *regs); @@ -359,13 +356,13 @@ static struct cpu_spec __initdata cpu_specs[] = { .cpu_user_features = COMMON_USER_POWER7, .cpu_user_features2 = COMMON_USER2_POWER7, .mmu_features = MMU_FTRS_POWER7, + .tlb_sets_hash = POWER7_TLB_SETS, .icache_bsize = 128, .dcache_bsize = 128, .oprofile_type = PPC_OPROFILE_POWER4, .oprofile_cpu_type = "ppc64/ibm-compat-v1", .cpu_setup = __setup_cpu_power7, .cpu_restore = __restore_cpu_power7, - .flush_tlb = __flush_tlb_power7, .machine_check_early = __machine_check_early_realmode_p7, .platform = "power7", }, @@ -377,13 +374,13 @@ static struct cpu_spec __initdata cpu_specs[] = { .cpu_user_features = COMMON_USER_POWER8, .cpu_user_features2 = COMMON_USER2_POWER8, .mmu_features = MMU_FTRS_POWER8, + .tlb_sets_hash = POWER8_TLB_SETS, .icache_bsize = 128, .dcache_bsize = 128, .oprofile_type = PPC_OPROFILE_INVALID, .oprofile_cpu_type = "ppc64/ibm-compat-v1", .cpu_setup = __setup_cpu_power8, .cpu_restore = __restore_cpu_power8, - .flush_tlb = __flush_tlb_power8, .machine_check_early = __machine_check_early_realmode_p8, .platform = "power8", }, @@ -401,7 +398,6 @@ static struct cpu_spec __initdata cpu_specs[] = { .oprofile_cpu_type = "ppc64/ibm-compat-v1", .cpu_setup = __setup_cpu_power9, .cpu_restore = __restore_cpu_power9, - .flush_tlb = __flush_tlb_power9, .platform = "power9", }, { /* Power7 */ @@ -412,6 +408,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .cpu_user_features = COMMON_USER_POWER7, .cpu_user_features2 = COMMON_USER2_POWER7, .mmu_features = MMU_FTRS_POWER7, + .tlb_sets_hash = POWER7_TLB_SETS, .icache_bsize = 128, .dcache_bsize = 128, .num_pmcs = 6, @@ -420,7 +417,6 @@ static struct cpu_spec __initdata cpu_specs[] = { .oprofile_type = PPC_OPROFILE_POWER4, .cpu_setup = __setup_cpu_power7, .cpu_restore = __restore_cpu_power7, - .flush_tlb = __flush_tlb_power7, .machine_check_early = __machine_check_early_realmode_p7, .platform = "power7", }, @@ -432,6 +428,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .cpu_user_features = COMMON_USER_POWER7, .cpu_user_features2 = COMMON_USER2_POWER7, .mmu_features = MMU_FTRS_POWER7, + .tlb_sets_hash = POWER7_TLB_SETS, .icache_bsize = 128, .dcache_bsize = 128, .num_pmcs = 6, @@ -440,7 +437,6 @@ static struct cpu_spec __initdata cpu_specs[] = { .oprofile_type = PPC_OPROFILE_POWER4, .cpu_setup = __setup_cpu_power7, .cpu_restore = __restore_cpu_power7, - .flush_tlb = __flush_tlb_power7, .machine_check_early = __machine_check_early_realmode_p7, .platform = "power7+", }, @@ -452,6 +448,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .cpu_user_features = COMMON_USER_POWER8, .cpu_user_features2 = COMMON_USER2_POWER8, .mmu_features = MMU_FTRS_POWER8, + .tlb_sets_hash = POWER8_TLB_SETS, .icache_bsize = 128, .dcache_bsize = 128, .num_pmcs = 6, @@ -460,7 +457,6 @@ static struct cpu_spec __initdata cpu_specs[] = { .oprofile_type = PPC_OPROFILE_INVALID, .cpu_setup = __setup_cpu_power8, .cpu_restore = __restore_cpu_power8, - .flush_tlb = __flush_tlb_power8, .machine_check_early = __machine_check_early_realmode_p8, .platform = "power8", }, @@ -472,6 +468,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .cpu_user_features = COMMON_USER_POWER8, .cpu_user_features2 = COMMON_USER2_POWER8, .mmu_features = MMU_FTRS_POWER8, + .tlb_sets_hash = POWER8_TLB_SETS, .icache_bsize = 128, .dcache_bsize = 128, .num_pmcs = 6, @@ -480,7 +477,6 @@ static struct cpu_spec __initdata cpu_specs[] = { .oprofile_type = PPC_OPROFILE_INVALID, .cpu_setup = __setup_cpu_power8, .cpu_restore = __restore_cpu_power8, - .flush_tlb = __flush_tlb_power8, .machine_check_early = __machine_check_early_realmode_p8, .platform = "power8", }, @@ -492,6 +488,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .cpu_user_features = COMMON_USER_POWER8, .cpu_user_features2 = COMMON_USER2_POWER8, .mmu_features = MMU_FTRS_POWER8, + .tlb_sets_hash = POWER8_TLB_SETS, .icache_bsize = 128, .dcache_bsize = 128, .num_pmcs = 6, @@ -500,7 +497,6 @@ static struct cpu_spec __initdata cpu_specs[] = { .oprofile_type = PPC_OPROFILE_INVALID, .cpu_setup = __setup_cpu_power8, .cpu_restore = __restore_cpu_power8, - .flush_tlb = __flush_tlb_power8, .machine_check_early = __machine_check_early_realmode_p8, .platform = "power8", }, @@ -512,6 +508,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .cpu_user_features = COMMON_USER_POWER8, .cpu_user_features2 = COMMON_USER2_POWER8, .mmu_features = MMU_FTRS_POWER8, + .tlb_sets_hash = POWER8_TLB_SETS, .icache_bsize = 128, .dcache_bsize = 128, .num_pmcs = 6, @@ -520,7 +517,6 @@ static struct cpu_spec __initdata cpu_specs[] = { .oprofile_type = PPC_OPROFILE_INVALID, .cpu_setup = __setup_cpu_power8, .cpu_restore = __restore_cpu_power8, - .flush_tlb = __flush_tlb_power8, .machine_check_early = __machine_check_early_realmode_p8, .platform = "power8", }, @@ -532,6 +528,8 @@ static struct cpu_spec __initdata cpu_specs[] = { .cpu_user_features = COMMON_USER_POWER9, .cpu_user_features2 = COMMON_USER2_POWER9, .mmu_features = MMU_FTRS_POWER9, + .tlb_sets_hash = POWER9_TLB_SETS_HASH, + .tlb_sets_radix = POWER9_TLB_SETS_RADIX, .icache_bsize = 128, .dcache_bsize = 128, .num_pmcs = 6, @@ -540,7 +538,6 @@ static struct cpu_spec __initdata cpu_specs[] = { .oprofile_type = PPC_OPROFILE_INVALID, .cpu_setup = __setup_cpu_power9, .cpu_restore = __restore_cpu_power9, - .flush_tlb = __flush_tlb_power9, .machine_check_early = __machine_check_early_realmode_p9, .platform = "power9", }, @@ -552,6 +549,8 @@ static struct cpu_spec __initdata cpu_specs[] = { .cpu_user_features = COMMON_USER_POWER9, .cpu_user_features2 = COMMON_USER2_POWER9, .mmu_features = MMU_FTRS_POWER9, + .tlb_sets_hash = POWER9_TLB_SETS_HASH, + .tlb_sets_radix = POWER9_TLB_SETS_RADIX, .icache_bsize = 128, .dcache_bsize = 128, .num_pmcs = 6, @@ -560,7 +559,6 @@ static struct cpu_spec __initdata cpu_specs[] = { .oprofile_type = PPC_OPROFILE_INVALID, .cpu_setup = __setup_cpu_power9, .cpu_restore = __restore_cpu_power9, - .flush_tlb = __flush_tlb_power9, .machine_check_early = __machine_check_early_realmode_p9, .platform = "power9", }, diff --git a/arch/powerpc/kernel/mce_power.c b/arch/powerpc/kernel/mce_power.c index f913139bb0c2..4092ddaaacf0 100644 --- a/arch/powerpc/kernel/mce_power.c +++ b/arch/powerpc/kernel/mce_power.c @@ -28,7 +28,13 @@ #include <asm/mce.h> #include <asm/machdep.h> -static void flush_tlb_206(unsigned int num_sets, unsigned int action) +/* + * Generic routine to flush TLB on POWER7 and later processors. + * + * action => TLB_INVAL_SCOPE_GLOBAL: Invalidate all TLBs. + * TLB_INVAL_SCOPE_LPID: Invalidate TLB for current LPID. + */ +void machine_check_flush_tlb(unsigned int action) { unsigned long rb; unsigned int i; @@ -46,43 +52,13 @@ static void flush_tlb_206(unsigned int num_sets, unsigned int action) } asm volatile("ptesync" : : : "memory"); - for (i = 0; i < num_sets; i++) { + for (i = 0; i < cur_cpu_spec->tlb_sets; i++) { asm volatile("tlbiel %0" : : "r" (rb)); rb += 1 << TLBIEL_INVAL_SET_SHIFT; } asm volatile("ptesync" : : : "memory"); } -/* - * Generic routines to flush TLB on POWER processors. These routines - * are used as flush_tlb hook in the cpu_spec. - * - * action => TLB_INVAL_SCOPE_GLOBAL: Invalidate all TLBs. - * TLB_INVAL_SCOPE_LPID: Invalidate TLB for current LPID. - */ -void __flush_tlb_power7(unsigned int action) -{ - flush_tlb_206(POWER7_TLB_SETS, action); -} - -void __flush_tlb_power8(unsigned int action) -{ - flush_tlb_206(POWER8_TLB_SETS, action); -} - -void __flush_tlb_power9(unsigned int action) -{ - unsigned int num_sets; - - if (radix_enabled()) - num_sets = POWER9_TLB_SETS_RADIX; - else - num_sets = POWER9_TLB_SETS_HASH; - - flush_tlb_206(num_sets, action); -} - - /* flush SLBs and reload */ #ifdef CONFIG_PPC_STD_MMU_64 static void flush_and_reload_slb(void) @@ -142,10 +118,8 @@ static int mce_flush(int what) return 1; } if (what == MCE_FLUSH_TLB) { - if (cur_cpu_spec && cur_cpu_spec->flush_tlb) { - cur_cpu_spec->flush_tlb(TLB_INVAL_SCOPE_GLOBAL); - return 1; - } + machine_check_flush_tlb(TLB_INVAL_SCOPE_GLOBAL); + return 1; } return 0; diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index d2f0afeae5a0..08ec2f431eff 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -236,8 +236,27 @@ static void __init init_mmu_slb_size(unsigned long node) if (slb_size_ptr) mmu_slb_size = be32_to_cpup(slb_size_ptr); } +static void __init init_mmu_tlb_sets_hash(unsigned long node) +{ + const __be32 *ptr; + + ptr = of_get_flat_dt_prop(node, "ibm,tlbiel-congruence-classes-hash", NULL); + if (ptr) + cur_cpu_spec->tlb_sets_hash = be32_to_cpup(ptr); +} + +static void __init init_mmu_tlb_sets_radix(unsigned long node) +{ + const __be32 *ptr; + + ptr = of_get_flat_dt_prop(node, "ibm,tlbiel-congruence-classes-radix", NULL); + if (ptr) + cur_cpu_spec->tlb_sets_radix = be32_to_cpup(ptr); +} #else #define init_mmu_slb_size(node) do { } while(0) +#define init_mmu_hash_sets(node) do { } while(0) +#define init_mmu_radix_sets(node) do { } while(0) #endif static struct feature_property { @@ -385,6 +404,8 @@ static int __init early_init_dt_scan_cpus(unsigned long node, check_cpu_feature_properties(node); check_cpu_pa_features(node); init_mmu_slb_size(node); + init_mmu_tlb_sets_hash(node); + init_mmu_tlb_sets_radix(node); #ifdef CONFIG_PPC64 if (nthreads > 1) diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index fadb75abfe37..2211cda5de90 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -3430,14 +3430,7 @@ static int kvmppc_core_init_vm_hv(struct kvm *kvm) * Work out how many sets the TLB has, for the use of * the TLB invalidation loop in book3s_hv_rmhandlers.S. */ - if (kvm_is_radix(kvm)) - kvm->arch.tlb_sets = POWER9_TLB_SETS_RADIX; /* 128 */ - else if (cpu_has_feature(CPU_FTR_ARCH_300)) - kvm->arch.tlb_sets = POWER9_TLB_SETS_HASH; /* 256 */ - else if (cpu_has_feature(CPU_FTR_ARCH_207S)) - kvm->arch.tlb_sets = POWER8_TLB_SETS; /* 512 */ - else - kvm->arch.tlb_sets = POWER7_TLB_SETS; /* 128 */ + kvm->arch.tlb_sets = cur_cpu_spec->tlb_sets; /* * Track that we now have a HV mode VM active. This blocks secondary diff --git a/arch/powerpc/kvm/book3s_hv_ras.c b/arch/powerpc/kvm/book3s_hv_ras.c index 7ef0993214f3..f62798ce304b 100644 --- a/arch/powerpc/kvm/book3s_hv_ras.c +++ b/arch/powerpc/kvm/book3s_hv_ras.c @@ -87,8 +87,7 @@ static long kvmppc_realmode_mc_power7(struct kvm_vcpu *vcpu) DSISR_MC_SLB_PARITY | DSISR_MC_DERAT_MULTI); } if (dsisr & DSISR_MC_TLB_MULTI) { - if (cur_cpu_spec && cur_cpu_spec->flush_tlb) - cur_cpu_spec->flush_tlb(TLB_INVAL_SCOPE_LPID); + machine_check_flush_tlb(TLB_INVAL_SCOPE_LPID); dsisr &= ~DSISR_MC_TLB_MULTI; } /* Any other errors we don't understand? */ @@ -105,8 +104,7 @@ static long kvmppc_realmode_mc_power7(struct kvm_vcpu *vcpu) reload_slb(vcpu); break; case SRR1_MC_IFETCH_TLBMULTI: - if (cur_cpu_spec && cur_cpu_spec->flush_tlb) - cur_cpu_spec->flush_tlb(TLB_INVAL_SCOPE_LPID); + machine_check_flush_tlb(TLB_INVAL_SCOPE_LPID); break; default: handled = 0; diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index ec84b31c6c86..a7c771170993 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -405,9 +405,15 @@ void __init mmu_early_init_devtree(void) if (!(mfmsr() & MSR_HV)) early_check_vec5(); - if (early_radix_enabled()) + if (early_radix_enabled()) { + cur_cpu_spec->tlb_sets = cur_cpu_spec->tlb_sets_radix; radix__early_init_devtree(); - else + } else { + cur_cpu_spec->tlb_sets = cur_cpu_spec->tlb_sets_hash; hash__early_init_devtree(); + } + /* This should not happen, but fall back to 1 set */ + if (!cur_cpu_spec->tlb_sets) + cur_cpu_spec->tlb_sets = 1; } #endif /* CONFIG_PPC_STD_MMU_64 */ diff --git a/arch/powerpc/mm/tlb-radix.c b/arch/powerpc/mm/tlb-radix.c index b68b5219cf45..76c8ed7549a7 100644 --- a/arch/powerpc/mm/tlb-radix.c +++ b/arch/powerpc/mm/tlb-radix.c @@ -38,15 +38,16 @@ static inline void __tlbiel_pid(unsigned long pid, int set, : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory"); } -/* - * We use 128 set in radix mode and 256 set in hpt mode. - */ static inline void _tlbiel_pid(unsigned long pid, unsigned long ric) { int set; asm volatile("ptesync": : :"memory"); - for (set = 0; set < POWER9_TLB_SETS_RADIX ; set++) { + /* + * tlbiel with IS != 0 operates on a specified congruence class, + * requiring a loop to invalidate the entire TLB (see ISA). + */ + for (set = 0; set < cur_cpu_spec->tlb_sets; set++) { __tlbiel_pid(pid, set, ric); } asm volatile("ptesync": : :"memory"); -- 2.11.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) dt property 2017-04-22 0:58 ` [PATCH] powerpc/64s: use ibm, tlbiel-congruence-classes-(hash|radix) dt property Nicholas Piggin @ 2017-04-22 8:02 ` Benjamin Herrenschmidt 2017-04-22 23:14 ` Nicholas Piggin 2017-04-22 10:34 ` [PATCH] powerpc/64s: use ibm, tlbiel-congruence-classes-(hash|radix) " kbuild test robot 2017-04-24 8:23 ` Aneesh Kumar K.V 2 siblings, 1 reply; 13+ messages in thread From: Benjamin Herrenschmidt @ 2017-04-22 8:02 UTC (permalink / raw) To: Nicholas Piggin, linuxppc-dev; +Cc: Aneesh Kumar K . V On Sat, 2017-04-22 at 10:58 +1000, Nicholas Piggin wrote: > +static void __init init_mmu_tlb_sets_hash(unsigned long node) > +{ > + const __be32 *ptr; > + > + ptr = of_get_flat_dt_prop(node, "ibm,tlbiel-congruence-classes-hash", NULL); > + if (ptr) > + cur_cpu_spec->tlb_sets_hash = be32_to_cpup(ptr); > +} > + > +static void __init init_mmu_tlb_sets_radix(unsigned long node) > +{ > + const __be32 *ptr; > + > + ptr = of_get_flat_dt_prop(node, "ibm,tlbiel-congruence-classes-radix", NULL); > + if (ptr) > + cur_cpu_spec->tlb_sets_radix = be32_to_cpup(ptr); > +} > #else > #define init_mmu_slb_size(node) do { } while(0) > +#define init_mmu_hash_sets(node) do { } while(0) > +#define init_mmu_radix_sets(node) do { } while(0) > #endif Why 2 functions ? I would have done one checking both props :-) Anothe thing to do is remove the assembly TLB flush from cpu_setup_power.S. That happens too early anyway and do it later, at MMU init. In fact, I wonder ... a lot of the stuff in there still requires us to more or less know the PVR of the CPU. We could move the call to after we've done the early DT parsing I reckon. That way we can use arch level to set things like LPCR appropriately. Cheers, Ben. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) dt property 2017-04-22 8:02 ` [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) " Benjamin Herrenschmidt @ 2017-04-22 23:14 ` Nicholas Piggin 2017-04-23 0:39 ` Benjamin Herrenschmidt 0 siblings, 1 reply; 13+ messages in thread From: Nicholas Piggin @ 2017-04-22 23:14 UTC (permalink / raw) To: Benjamin Herrenschmidt; +Cc: linuxppc-dev, Aneesh Kumar K . V On Sat, 22 Apr 2017 18:02:10 +1000 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > On Sat, 2017-04-22 at 10:58 +1000, Nicholas Piggin wrote: > > +static void __init init_mmu_tlb_sets_hash(unsigned long node) > > +{ > > + const __be32 *ptr; > > + > > + ptr = of_get_flat_dt_prop(node, "ibm,tlbiel-congruence-classes-hash", NULL); > > + if (ptr) > > + cur_cpu_spec->tlb_sets_hash = be32_to_cpup(ptr); > > +} > > + > > +static void __init init_mmu_tlb_sets_radix(unsigned long node) > > +{ > > + const __be32 *ptr; > > + > > + ptr = of_get_flat_dt_prop(node, "ibm,tlbiel-congruence-classes-radix", NULL); > > + if (ptr) > > + cur_cpu_spec->tlb_sets_radix = be32_to_cpup(ptr); > > +} > > #else > > #define init_mmu_slb_size(node) do { } while(0) > > +#define init_mmu_hash_sets(node) do { } while(0) > > +#define init_mmu_radix_sets(node) do { } while(0) > > #endif > > Why 2 functions ? I would have done one checking both props :-) Probably mindless copy paste. I'll consolidate. > Anothe thing to do is remove the assembly TLB flush from cpu_setup_power.S. > > That happens too early anyway and do it later, at MMU init. > > In fact, I wonder ... a lot of the stuff in there still requires us to more > or less know the PVR of the CPU. We could move the call to after we've done > the early DT parsing I reckon. > > That way we can use arch level to set things like LPCR appropriately. I think we were going to take another look at moving the setup code later, but I think that might wait until 4.13. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) dt property 2017-04-22 23:14 ` Nicholas Piggin @ 2017-04-23 0:39 ` Benjamin Herrenschmidt 2017-04-23 9:57 ` Nicholas Piggin 0 siblings, 1 reply; 13+ messages in thread From: Benjamin Herrenschmidt @ 2017-04-23 0:39 UTC (permalink / raw) To: Nicholas Piggin; +Cc: linuxppc-dev, Aneesh Kumar K . V On Sun, 2017-04-23 at 09:14 +1000, Nicholas Piggin wrote: > I think we were going to take another look at moving the setup code > later, but I think that might wait until 4.13. Except without that we won't boot a post-P9 CPU right ? So we'll end up having to chase distros to backport it :-( Oh well... Ben. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) dt property 2017-04-23 0:39 ` Benjamin Herrenschmidt @ 2017-04-23 9:57 ` Nicholas Piggin 2017-04-24 0:13 ` Benjamin Herrenschmidt 0 siblings, 1 reply; 13+ messages in thread From: Nicholas Piggin @ 2017-04-23 9:57 UTC (permalink / raw) To: Benjamin Herrenschmidt Cc: linuxppc-dev, "Aneesh Kumar K . V\" <aneesh.kumar@linux.vnet.ibm.com> On Sun, 23 Apr 2017 10:39:11 +1000 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > On Sun, 2017-04-23 at 09:14 +1000, Nicholas Piggin wrote: > > I think we were going to take another look at moving the setup code > > later, but I think that might wait until 4.13. > > Except without that we won't boot a post-P9 CPU right ? So we'll end up > having to chase distros to backport it :-( Oh well... Okay, well what if we just move the TLB flushing to somewhere like early_init_mmu(_secondary) for power CPUs first? Non-local tlbie does not seem to have this requirement, so would it make it more robust just to execute that once during boot with the primary thread? ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) dt property 2017-04-23 9:57 ` Nicholas Piggin @ 2017-04-24 0:13 ` Benjamin Herrenschmidt 2017-04-24 4:22 ` Nicholas Piggin 2017-04-30 10:59 ` Nicholas Piggin 0 siblings, 2 replies; 13+ messages in thread From: Benjamin Herrenschmidt @ 2017-04-24 0:13 UTC (permalink / raw) To: Nicholas Piggin; +Cc: linuxppc-dev On Sun, 2017-04-23 at 19:57 +1000, Nicholas Piggin wrote: > On Sun, 23 Apr 2017 10:39:11 +1000 > Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > > > On Sun, 2017-04-23 at 09:14 +1000, Nicholas Piggin wrote: > > > I think we were going to take another look at moving the setup > > > code > > > later, but I think that might wait until 4.13. > > > > Except without that we won't boot a post-P9 CPU right ? So we'll > > end up > > having to chase distros to backport it :-( Oh well... > > Okay, well what if we just move the TLB flushing to somewhere like > early_init_mmu(_secondary) for power CPUs first? > > Non-local tlbie does not seem to have this requirement, so would it > make it more robust just to execute that once during boot with the > primary thread? I wouldn't do a broadcast before we have LPCR setup... but for no obvious reason. Also I'm not sure our boot time cleanup does things properly vs hash & radix. I think we really need 2 passes. Oh well.. My main worry is the fact that on future chip we won't be setting up LPCR properly. We should at least assume an unknown chip is P9, is that what you do with your cpu-features patches ? Cheers, Ben. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) dt property 2017-04-24 0:13 ` Benjamin Herrenschmidt @ 2017-04-24 4:22 ` Nicholas Piggin 2017-04-30 10:59 ` Nicholas Piggin 1 sibling, 0 replies; 13+ messages in thread From: Nicholas Piggin @ 2017-04-24 4:22 UTC (permalink / raw) To: Benjamin Herrenschmidt; +Cc: linuxppc-dev On Mon, 24 Apr 2017 10:13:23 +1000 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > On Sun, 2017-04-23 at 19:57 +1000, Nicholas Piggin wrote: > > On Sun, 23 Apr 2017 10:39:11 +1000 > > Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > > > > > On Sun, 2017-04-23 at 09:14 +1000, Nicholas Piggin wrote: > > > > I think we were going to take another look at moving the setup > > > > code > > > > later, but I think that might wait until 4.13. > > > > > > Except without that we won't boot a post-P9 CPU right ? So we'll > > > end up > > > having to chase distros to backport it :-( Oh well... > > > > Okay, well what if we just move the TLB flushing to somewhere like > > early_init_mmu(_secondary) for power CPUs first? > > > > Non-local tlbie does not seem to have this requirement, so would it > > make it more robust just to execute that once during boot with the > > primary thread? > > I wouldn't do a broadcast before we have LPCR setup... but for no > obvious reason. Also I'm not sure our boot time cleanup does things > properly vs hash & radix. I think we really need 2 passes. > > Oh well.. > > My main worry is the fact that on future chip we won't be setting up > LPCR properly. We should at least assume an unknown chip is P9, is that > what you do with your cpu-features patches ? cpu-features patches set up LPCR based on ISAv3 compatible MMU property (among other things). In case that does not match, we currently don't do anything graceful. Actually those patches I think are missing the TLB flush though, which I will add as a per-cpu local flush in the MMU setup path. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) dt property 2017-04-24 0:13 ` Benjamin Herrenschmidt 2017-04-24 4:22 ` Nicholas Piggin @ 2017-04-30 10:59 ` Nicholas Piggin 1 sibling, 0 replies; 13+ messages in thread From: Nicholas Piggin @ 2017-04-30 10:59 UTC (permalink / raw) To: Benjamin Herrenschmidt; +Cc: linuxppc-dev On Mon, 24 Apr 2017 10:13:23 +1000 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > On Sun, 2017-04-23 at 19:57 +1000, Nicholas Piggin wrote: > > On Sun, 23 Apr 2017 10:39:11 +1000 > > Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > > > > > On Sun, 2017-04-23 at 09:14 +1000, Nicholas Piggin wrote: > > > > I think we were going to take another look at moving the setup > > > > code > > > > later, but I think that might wait until 4.13. > > > > > > Except without that we won't boot a post-P9 CPU right ? So we'll > > > end up > > > having to chase distros to backport it :-( Oh well... > > > > Okay, well what if we just move the TLB flushing to somewhere like > > early_init_mmu(_secondary) for power CPUs first? > > > > Non-local tlbie does not seem to have this requirement, so would it > > make it more robust just to execute that once during boot with the > > primary thread? > > I wouldn't do a broadcast before we have LPCR setup... but for no > obvious reason. Also I'm not sure our boot time cleanup does things > properly vs hash & radix. I think we really need 2 passes. I'm just trying to look at the best thing to do for this. In fact we already do broadcast tlbie before all CPUs have their LPCR and other MMU related registers all set up properly (e.g., in update_hid_for_radix / hash and radix_init_pgtable). I was looking at doing a local TLB flush for appropriate machine and MMU mode right at the end of early_init_mmu/early_init_mmu_secondary, so after all registers are set, but before relocation is switched on. Would that be preferable for you? For the next release at least we would just leave in existing earlier flushes too, I guess. Thanks, Nick ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] powerpc/64s: use ibm, tlbiel-congruence-classes-(hash|radix) dt property 2017-04-22 0:58 ` [PATCH] powerpc/64s: use ibm, tlbiel-congruence-classes-(hash|radix) dt property Nicholas Piggin 2017-04-22 8:02 ` [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) " Benjamin Herrenschmidt @ 2017-04-22 10:34 ` kbuild test robot 2017-04-24 8:23 ` Aneesh Kumar K.V 2 siblings, 0 replies; 13+ messages in thread From: kbuild test robot @ 2017-04-22 10:34 UTC (permalink / raw) To: Nicholas Piggin Cc: kbuild-all, linuxppc-dev, Aneesh Kumar K . V, Nicholas Piggin [-- Attachment #1: Type: text/plain, Size: 1901 bytes --] Hi Nicholas, [auto build test ERROR on powerpc/next] [also build test ERROR on next-20170421] [cannot apply to v4.11-rc7] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nicholas-Piggin/powerpc-64s-use-ibm-tlbiel-congruence-classes-hash-radix-dt-property/20170422-164227 base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next config: powerpc-allnoconfig (attached as .config) compiler: powerpc-linux-gnu-gcc (Debian 6.1.1-9) 6.1.1 20160705 reproduce: wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=powerpc All errors (new ones prefixed by >>): arch/powerpc/kernel/prom.c: In function 'early_init_dt_scan_cpus': >> arch/powerpc/kernel/prom.c:407:2: error: implicit declaration of function 'init_mmu_tlb_sets_hash' [-Werror=implicit-function-declaration] init_mmu_tlb_sets_hash(node); ^~~~~~~~~~~~~~~~~~~~~~ >> arch/powerpc/kernel/prom.c:408:2: error: implicit declaration of function 'init_mmu_tlb_sets_radix' [-Werror=implicit-function-declaration] init_mmu_tlb_sets_radix(node); ^~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors vim +/init_mmu_tlb_sets_hash +407 arch/powerpc/kernel/prom.c 401 402 identical_pvr_fixup(node); 403 404 check_cpu_feature_properties(node); 405 check_cpu_pa_features(node); 406 init_mmu_slb_size(node); > 407 init_mmu_tlb_sets_hash(node); > 408 init_mmu_tlb_sets_radix(node); 409 410 #ifdef CONFIG_PPC64 411 if (nthreads > 1) --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 6135 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] powerpc/64s: use ibm, tlbiel-congruence-classes-(hash|radix) dt property 2017-04-22 0:58 ` [PATCH] powerpc/64s: use ibm, tlbiel-congruence-classes-(hash|radix) dt property Nicholas Piggin 2017-04-22 8:02 ` [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) " Benjamin Herrenschmidt 2017-04-22 10:34 ` [PATCH] powerpc/64s: use ibm, tlbiel-congruence-classes-(hash|radix) " kbuild test robot @ 2017-04-24 8:23 ` Aneesh Kumar K.V 2017-04-24 9:17 ` Michael Ellerman 2017-04-26 8:29 ` [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) " Nicholas Piggin 2 siblings, 2 replies; 13+ messages in thread From: Aneesh Kumar K.V @ 2017-04-24 8:23 UTC (permalink / raw) To: Nicholas Piggin, linuxppc-dev; +Cc: Nicholas Piggin, Benjamin Herrenschmidt Nicholas Piggin <npiggin@gmail.com> writes: > tlbiel instruction with IS!=0 on POWER7 and later Book3s CPUs invalidate > TLBs belonging to a specified congruence class. In order to operate on > the entire TLB, all congruence classes must be specified, requiring a > software loop. > > This dt property specifies the number of classes that must be operated > on. Use this to set tlbiel loop counts. If the property does not exist, > fall back to hard coded values based on the cpu table. > > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > return 0; ..... ..... > diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c > index d2f0afeae5a0..08ec2f431eff 100644 > --- a/arch/powerpc/kernel/prom.c > +++ b/arch/powerpc/kernel/prom.c > @@ -236,8 +236,27 @@ static void __init init_mmu_slb_size(unsigned long node) > if (slb_size_ptr) > mmu_slb_size = be32_to_cpup(slb_size_ptr); > } > +static void __init init_mmu_tlb_sets_hash(unsigned long node) > +{ > + const __be32 *ptr; > + > + ptr = of_get_flat_dt_prop(node, "ibm,tlbiel-congruence-classes-hash", NULL); > + if (ptr) > + cur_cpu_spec->tlb_sets_hash = be32_to_cpup(ptr); > +} > + > +static void __init init_mmu_tlb_sets_radix(unsigned long node) > +{ > + const __be32 *ptr; > + > + ptr = of_get_flat_dt_prop(node, "ibm,tlbiel-congruence-classes-radix", NULL); > + if (ptr) > + cur_cpu_spec->tlb_sets_radix = be32_to_cpup(ptr); > +} > #else > #define init_mmu_slb_size(node) do { } while(0) > +#define init_mmu_hash_sets(node) do { } while(0) > +#define init_mmu_radix_sets(node) do { } while(0) > #endif > > static struct feature_property { > @@ -385,6 +404,8 @@ static int __init early_init_dt_scan_cpus(unsigned long node, > check_cpu_feature_properties(node); > check_cpu_pa_features(node); > init_mmu_slb_size(node); > + init_mmu_tlb_sets_hash(node); > + init_mmu_tlb_sets_radix(node); > I thought cpu features patch series had a generic mechanism to parse all these based on dt_cpu_feature_match_table[] ? > #ifdef CONFIG_PPC64 > if (nthreads > 1) > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index fadb75abfe37..2211cda5de90 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -3430,14 +3430,7 @@ static int kvmppc_core_init_vm_hv(struct kvm *kvm) > * Work out how many sets the TLB has, for the use of > * the TLB invalidation loop in book3s_hv_rmhandlers.S. > */ > - if (kvm_is_radix(kvm)) > - kvm->arch.tlb_sets = POWER9_TLB_SETS_RADIX; /* 128 */ > - else if (cpu_has_feature(CPU_FTR_ARCH_300)) > - kvm->arch.tlb_sets = POWER9_TLB_SETS_HASH; /* 256 */ > - else if (cpu_has_feature(CPU_FTR_ARCH_207S)) > - kvm->arch.tlb_sets = POWER8_TLB_SETS; /* 512 */ > - else > - kvm->arch.tlb_sets = POWER7_TLB_SETS; /* 128 */ > + kvm->arch.tlb_sets = cur_cpu_spec->tlb_sets; This should be based on guest mode right ? ie, we need to set kvm->arch.tlb_sets based on the mode kvm guest is running ? > > /* > * Track that we now have a HV mode VM active. This blocks secondary > diff --git a/arch/powerpc/kvm/book3s_hv_ras.c b/arch/powerpc/kvm/book3s_hv_ras.c > index 7ef0993214f3..f62798ce304b 100644 > --- a/arch/powerpc/kvm/book3s_hv_ras.c > +++ b/arch/powerpc/kvm/book3s_hv_ras.c > @@ -87,8 +87,7 @@ static long kvmppc_realmode_mc_power7(struct kvm_vcpu *vcpu) > DSISR_MC_SLB_PARITY | DSISR_MC_DERAT_MULTI); > } > if (dsisr & DSISR_MC_TLB_MULTI) { > - if (cur_cpu_spec && cur_cpu_spec->flush_tlb) > - cur_cpu_spec->flush_tlb(TLB_INVAL_SCOPE_LPID); > + machine_check_flush_tlb(TLB_INVAL_SCOPE_LPID); > dsisr &= ~DSISR_MC_TLB_MULTI; > } > /* Any other errors we don't understand? */ > @@ -105,8 +104,7 @@ static long kvmppc_realmode_mc_power7(struct kvm_vcpu *vcpu) > reload_slb(vcpu); > break; > case SRR1_MC_IFETCH_TLBMULTI: > - if (cur_cpu_spec && cur_cpu_spec->flush_tlb) > - cur_cpu_spec->flush_tlb(TLB_INVAL_SCOPE_LPID); > + machine_check_flush_tlb(TLB_INVAL_SCOPE_LPID); > break; > default: > handled = 0; > diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c > index ec84b31c6c86..a7c771170993 100644 > --- a/arch/powerpc/mm/init_64.c > +++ b/arch/powerpc/mm/init_64.c > @@ -405,9 +405,15 @@ void __init mmu_early_init_devtree(void) > if (!(mfmsr() & MSR_HV)) > early_check_vec5(); > > - if (early_radix_enabled()) > + if (early_radix_enabled()) { > + cur_cpu_spec->tlb_sets = cur_cpu_spec->tlb_sets_radix; > radix__early_init_devtree(); > - else > + } else { > + cur_cpu_spec->tlb_sets = cur_cpu_spec->tlb_sets_hash; > hash__early_init_devtree(); > + } > + /* This should not happen, but fall back to 1 set */ > + if (!cur_cpu_spec->tlb_sets) > + cur_cpu_spec->tlb_sets = 1; > } > #endif /* CONFIG_PPC_STD_MMU_64 */ > diff --git a/arch/powerpc/mm/tlb-radix.c b/arch/powerpc/mm/tlb-radix.c > index b68b5219cf45..76c8ed7549a7 100644 > --- a/arch/powerpc/mm/tlb-radix.c > +++ b/arch/powerpc/mm/tlb-radix.c > @@ -38,15 +38,16 @@ static inline void __tlbiel_pid(unsigned long pid, int set, > : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory"); > } > > -/* > - * We use 128 set in radix mode and 256 set in hpt mode. > - */ > static inline void _tlbiel_pid(unsigned long pid, unsigned long ric) > { > int set; > > asm volatile("ptesync": : :"memory"); > - for (set = 0; set < POWER9_TLB_SETS_RADIX ; set++) { > + /* > + * tlbiel with IS != 0 operates on a specified congruence class, > + * requiring a loop to invalidate the entire TLB (see ISA). > + */ > + for (set = 0; set < cur_cpu_spec->tlb_sets; set++) { > __tlbiel_pid(pid, set, ric); > } > asm volatile("ptesync": : :"memory"); > -- > 2.11.0 This may need a rebase if mpe is going to take https://lists.ozlabs.org/pipermail/linuxppc-dev/2017-April/157130.html -aneesh ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] powerpc/64s: use ibm, tlbiel-congruence-classes-(hash|radix) dt property 2017-04-24 8:23 ` Aneesh Kumar K.V @ 2017-04-24 9:17 ` Michael Ellerman 2017-04-24 9:22 ` Aneesh Kumar K.V 2017-04-26 8:29 ` [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) " Nicholas Piggin 1 sibling, 1 reply; 13+ messages in thread From: Michael Ellerman @ 2017-04-24 9:17 UTC (permalink / raw) To: Aneesh Kumar K.V, Nicholas Piggin, linuxppc-dev; +Cc: Nicholas Piggin "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> writes: > Nicholas Piggin <npiggin@gmail.com> writes: >> tlbiel instruction with IS!=0 on POWER7 and later Book3s CPUs invalidate >> TLBs belonging to a specified congruence class. In order to operate on >> the entire TLB, all congruence classes must be specified, requiring a >> software loop. ... > > This may need a rebase if mpe is going to take https://lists.ozlabs.org/pipermail/linuxppc-dev/2017-April/157130.html I would but it says "Not yet tested" :) cheers ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] powerpc/64s: use ibm, tlbiel-congruence-classes-(hash|radix) dt property 2017-04-24 9:17 ` Michael Ellerman @ 2017-04-24 9:22 ` Aneesh Kumar K.V 0 siblings, 0 replies; 13+ messages in thread From: Aneesh Kumar K.V @ 2017-04-24 9:22 UTC (permalink / raw) To: Michael Ellerman, Nicholas Piggin, linuxppc-dev On Monday 24 April 2017 02:47 PM, Michael Ellerman wrote: > "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> writes: >> Nicholas Piggin <npiggin@gmail.com> writes: >>> tlbiel instruction with IS!=0 on POWER7 and later Book3s CPUs invalidate >>> TLBs belonging to a specified congruence class. In order to operate on >>> the entire TLB, all congruence classes must be specified, requiring a >>> software loop. > ... >> >> This may need a rebase if mpe is going to take https://lists.ozlabs.org/pipermail/linuxppc-dev/2017-April/157130.html > > I would but it says "Not yet tested" :) > Anton replied with test results. -aneesh ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) dt property 2017-04-24 8:23 ` Aneesh Kumar K.V 2017-04-24 9:17 ` Michael Ellerman @ 2017-04-26 8:29 ` Nicholas Piggin 1 sibling, 0 replies; 13+ messages in thread From: Nicholas Piggin @ 2017-04-26 8:29 UTC (permalink / raw) To: Aneesh Kumar K.V; +Cc: linuxppc-dev, Benjamin Herrenschmidt On Mon, 24 Apr 2017 13:53:12 +0530 "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> wrote: > Nicholas Piggin <npiggin@gmail.com> writes: > > > tlbiel instruction with IS!=0 on POWER7 and later Book3s CPUs invalidate > > TLBs belonging to a specified congruence class. In order to operate on > > the entire TLB, all congruence classes must be specified, requiring a > > software loop. > > > > This dt property specifies the number of classes that must be operated > > on. Use this to set tlbiel loop counts. If the property does not exist, > > fall back to hard coded values based on the cpu table. > > > > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > > return 0; > ..... > ..... > > > diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c > > index d2f0afeae5a0..08ec2f431eff 100644 > > --- a/arch/powerpc/kernel/prom.c > > +++ b/arch/powerpc/kernel/prom.c > > @@ -236,8 +236,27 @@ static void __init init_mmu_slb_size(unsigned long node) > > if (slb_size_ptr) > > mmu_slb_size = be32_to_cpup(slb_size_ptr); > > } > > +static void __init init_mmu_tlb_sets_hash(unsigned long node) > > +{ > > + const __be32 *ptr; > > + > > + ptr = of_get_flat_dt_prop(node, "ibm,tlbiel-congruence-classes-hash", NULL); > > + if (ptr) > > + cur_cpu_spec->tlb_sets_hash = be32_to_cpup(ptr); > > +} > > + > > +static void __init init_mmu_tlb_sets_radix(unsigned long node) > > +{ > > + const __be32 *ptr; > > + > > + ptr = of_get_flat_dt_prop(node, "ibm,tlbiel-congruence-classes-radix", NULL); > > + if (ptr) > > + cur_cpu_spec->tlb_sets_radix = be32_to_cpup(ptr); > > +} > > #else > > #define init_mmu_slb_size(node) do { } while(0) > > +#define init_mmu_hash_sets(node) do { } while(0) > > +#define init_mmu_radix_sets(node) do { } while(0) > > #endif > > > > static struct feature_property { > > @@ -385,6 +404,8 @@ static int __init early_init_dt_scan_cpus(unsigned long node, > > check_cpu_feature_properties(node); > > check_cpu_pa_features(node); > > init_mmu_slb_size(node); > > + init_mmu_tlb_sets_hash(node); > > + init_mmu_tlb_sets_radix(node); > > > > > I thought cpu features patch series had a generic mechanism to parse all > these based on dt_cpu_feature_match_table[] ? It could in theory. We could have a feature node for this set-wise invalidation behaviour, and make a custom property of that feature to give the number of sets to loop over. At the moment Ben preferred each feature to be just a "binary" (present or absent), with the accompanying metadata just being for the compatibility bits. But this is a policy decision, and we may reconsider it as we start adding extra cpu-features for future hardware. For these numbers I think it's okay to add this way for now. > > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > > index fadb75abfe37..2211cda5de90 100644 > > --- a/arch/powerpc/kvm/book3s_hv.c > > +++ b/arch/powerpc/kvm/book3s_hv.c > > @@ -3430,14 +3430,7 @@ static int kvmppc_core_init_vm_hv(struct kvm *kvm) > > * Work out how many sets the TLB has, for the use of > > * the TLB invalidation loop in book3s_hv_rmhandlers.S. > > */ > > - if (kvm_is_radix(kvm)) > > - kvm->arch.tlb_sets = POWER9_TLB_SETS_RADIX; /* 128 */ > > - else if (cpu_has_feature(CPU_FTR_ARCH_300)) > > - kvm->arch.tlb_sets = POWER9_TLB_SETS_HASH; /* 256 */ > > - else if (cpu_has_feature(CPU_FTR_ARCH_207S)) > > - kvm->arch.tlb_sets = POWER8_TLB_SETS; /* 512 */ > > - else > > - kvm->arch.tlb_sets = POWER7_TLB_SETS; /* 128 */ > > + kvm->arch.tlb_sets = cur_cpu_spec->tlb_sets; > > > This should be based on guest mode right ? ie, we need to set > kvm->arch.tlb_sets based on the mode kvm guest is running ? You mean radix vs hash? Yes... Well, that's a reasonable assumption for the behaviour of a CPU that supports guest mode != host mode, right? I'll make the change. > > /* > > * Track that we now have a HV mode VM active. This blocks secondary > > diff --git a/arch/powerpc/kvm/book3s_hv_ras.c b/arch/powerpc/kvm/book3s_hv_ras.c > > index 7ef0993214f3..f62798ce304b 100644 > > --- a/arch/powerpc/kvm/book3s_hv_ras.c > > +++ b/arch/powerpc/kvm/book3s_hv_ras.c > > @@ -87,8 +87,7 @@ static long kvmppc_realmode_mc_power7(struct kvm_vcpu *vcpu) > > DSISR_MC_SLB_PARITY | DSISR_MC_DERAT_MULTI); > > } > > if (dsisr & DSISR_MC_TLB_MULTI) { > > - if (cur_cpu_spec && cur_cpu_spec->flush_tlb) > > - cur_cpu_spec->flush_tlb(TLB_INVAL_SCOPE_LPID); > > + machine_check_flush_tlb(TLB_INVAL_SCOPE_LPID); > > dsisr &= ~DSISR_MC_TLB_MULTI; > > } > > /* Any other errors we don't understand? */ > > @@ -105,8 +104,7 @@ static long kvmppc_realmode_mc_power7(struct kvm_vcpu *vcpu) > > reload_slb(vcpu); > > break; > > case SRR1_MC_IFETCH_TLBMULTI: > > - if (cur_cpu_spec && cur_cpu_spec->flush_tlb) > > - cur_cpu_spec->flush_tlb(TLB_INVAL_SCOPE_LPID); > > + machine_check_flush_tlb(TLB_INVAL_SCOPE_LPID); > > break; > > default: > > handled = 0; > > diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c > > index ec84b31c6c86..a7c771170993 100644 > > --- a/arch/powerpc/mm/init_64.c > > +++ b/arch/powerpc/mm/init_64.c > > @@ -405,9 +405,15 @@ void __init mmu_early_init_devtree(void) > > if (!(mfmsr() & MSR_HV)) > > early_check_vec5(); > > > > - if (early_radix_enabled()) > > + if (early_radix_enabled()) { > > + cur_cpu_spec->tlb_sets = cur_cpu_spec->tlb_sets_radix; > > radix__early_init_devtree(); > > - else > > + } else { > > + cur_cpu_spec->tlb_sets = cur_cpu_spec->tlb_sets_hash; > > hash__early_init_devtree(); > > + } > > + /* This should not happen, but fall back to 1 set */ > > + if (!cur_cpu_spec->tlb_sets) > > + cur_cpu_spec->tlb_sets = 1; > > } > > #endif /* CONFIG_PPC_STD_MMU_64 */ > > diff --git a/arch/powerpc/mm/tlb-radix.c b/arch/powerpc/mm/tlb-radix.c > > index b68b5219cf45..76c8ed7549a7 100644 > > --- a/arch/powerpc/mm/tlb-radix.c > > +++ b/arch/powerpc/mm/tlb-radix.c > > @@ -38,15 +38,16 @@ static inline void __tlbiel_pid(unsigned long pid, int set, > > : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory"); > > } > > > > -/* > > - * We use 128 set in radix mode and 256 set in hpt mode. > > - */ > > static inline void _tlbiel_pid(unsigned long pid, unsigned long ric) > > { > > int set; > > > > asm volatile("ptesync": : :"memory"); > > - for (set = 0; set < POWER9_TLB_SETS_RADIX ; set++) { > > + /* > > + * tlbiel with IS != 0 operates on a specified congruence class, > > + * requiring a loop to invalidate the entire TLB (see ISA). > > + */ > > + for (set = 0; set < cur_cpu_spec->tlb_sets; set++) { > > __tlbiel_pid(pid, set, ric); > > } > > asm volatile("ptesync": : :"memory"); > > -- > > 2.11.0 > > This may need a rebase if mpe is going to take https://lists.ozlabs.org/pipermail/linuxppc-dev/2017-April/157130.html Yeah shouldn't be much problem. Thanks, Nick ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-04-30 10:59 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20170422005854.17128-1-npiggin@gmail.com>
2017-04-22 0:58 ` [PATCH] powerpc/64s: use ibm, tlbiel-congruence-classes-(hash|radix) dt property Nicholas Piggin
2017-04-22 8:02 ` [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) " Benjamin Herrenschmidt
2017-04-22 23:14 ` Nicholas Piggin
2017-04-23 0:39 ` Benjamin Herrenschmidt
2017-04-23 9:57 ` Nicholas Piggin
2017-04-24 0:13 ` Benjamin Herrenschmidt
2017-04-24 4:22 ` Nicholas Piggin
2017-04-30 10:59 ` Nicholas Piggin
2017-04-22 10:34 ` [PATCH] powerpc/64s: use ibm, tlbiel-congruence-classes-(hash|radix) " kbuild test robot
2017-04-24 8:23 ` Aneesh Kumar K.V
2017-04-24 9:17 ` Michael Ellerman
2017-04-24 9:22 ` Aneesh Kumar K.V
2017-04-26 8:29 ` [PATCH] powerpc/64s: use ibm,tlbiel-congruence-classes-(hash|radix) " Nicholas Piggin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).