powerpc/mm: Update tlbiel loop on POWER10
Subsystems (2)
PATCH v2 1/1 powerpc/mm: Update tlbiel loop on POWER10
With POWER10, single tlbiel instruction invalidates all the congruence class of the TLB and hence we need to issue only one tlbiel with SET=0.
Signed-off-by Aneesh Kumar K.V <[email protected]>
--- arch/powerpc/kvm/book3s_hv.c | 7 ++++++- arch/powerpc/kvm/book3s_hv_builtin.c | 11 ++++++++++- arch/powerpc/mm/book3s64/radix_tlb.c | 23 ++++++++++++++++------- 3 files changed, 32 insertions(+), 9 deletions(-)
arch/powerpc/kvm/book3s_hv.c +6 -1
@@ -4939,7 +4939,12 @@ 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 (radix_enabled ()) +if (cpu_has_feature (CPU_FTR_ARCH_31 )) { +/* +* P10 will flush all the congruence class with a single tlbiel +*/ + kvm->arch.tlb_sets =1 ; + }else if (radix_enabled ()) 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 */
arch/powerpc/kvm/book3s_hv_builtin.c +10 -1
@@ -702,6 +702,7 @@ static void wait_for_sync(struct kvm_split_mode *sip, int phase)void kvmhv_p9_set_lpcr (struct kvm_split_mode *sip) { +int num_sets;unsigned long rb, set;/* wait for every other thread to get to real mode */
@@ -712,11 +713,19 @@ void kvmhv_p9_set_lpcr(struct kvm_split_mode *sip)mtspr (SPRN_LPID , sip->lpidr_req);isync (); +/* +* P10 will flush all the congruence class with a single tlbiel +*/ +if (cpu_has_feature (CPU_FTR_ARCH_31 )) + num_sets =1 ; +else + num_sets =POWER9_TLB_SETS_RADIX ; +/* Invalidate the TLB on thread 0 */ if (local_paca->kvm_hstate.tid ==0 ) { sip->do_set =0 ; asmvolatile ("ptesync" : : :"memory" ); -for (set =0 ; set <POWER9_TLB_SETS_RADIX ; ++set) { +for (set =0 ; set < num_sets; ++set) { rb =TLBIEL_INVAL_SET_LPID + (set <<TLBIEL_INVAL_SET_SHIFT ); asm volatile(PPC_TLBIEL(%0, %1, 0, 0, 0) : :
arch/powerpc/mm/book3s64/radix_tlb.c +16 -7
@@ -56,14 +56,21 @@ static void tlbiel_all_isa300(unsigned int num_sets, unsigned int is)if (early_cpu_has_feature (CPU_FTR_HVMODE )) {/* MSR[HV] should flush partition scope translations first. */ tlbiel_radix_set_isa300 (0 , is,0 ,RIC_FLUSH_ALL ,0 ); -for (set =1 ; set < num_sets; set++) -tlbiel_radix_set_isa300 (set, is,0 ,RIC_FLUSH_TLB ,0 ); + +if (!early_cpu_has_feature (CPU_FTR_ARCH_31 )) { +for (set =1 ; set < num_sets; set++) +tlbiel_radix_set_isa300 (set, is,0 , +RIC_FLUSH_TLB ,0 ); + } }/* Flush process scoped entries. */ tlbiel_radix_set_isa300 (0 , is,0 ,RIC_FLUSH_ALL ,1 ); -for (set =1 ; set < num_sets; set++) -tlbiel_radix_set_isa300 (set, is,0 ,RIC_FLUSH_TLB ,1 ); + +if (!early_cpu_has_feature (CPU_FTR_ARCH_31 )) { +for (set =1 ; set < num_sets; set++) +tlbiel_radix_set_isa300 (set, is,0 ,RIC_FLUSH_TLB ,1 ); + } asmvolatile ("ptesync" : : :"memory" ); }
@@ -300,9 +307,11 @@ static __always_inline void _tlbiel_pid(unsigned long pid, unsigned long ric)return ; } -/* For the remaining sets, just flush the TLB */ -for (set =1 ; set <POWER9_TLB_SETS_RADIX ; set++) -__tlbiel_pid (pid, set,RIC_FLUSH_TLB ); +if (!cpu_has_feature (CPU_FTR_ARCH_31 )) { +/* For the remaining sets, just flush the TLB */ +for (set =1 ; set <POWER9_TLB_SETS_RADIX ; set++) +__tlbiel_pid (pid, set,RIC_FLUSH_TLB ); + } asmvolatile ("ptesync" : : :"memory" ); asmvolatile (PPC_RADIX_INVALIDATE_ERAT_USER "; isync" : : :"memory" );
Signature · 1 line
2.26.2
Michael Ellerman
AppliedQuoted 2 lines · Aneesh Kumar K.V
With POWER10, single tlbiel instruction invalidates all the congruence class of the TLB and hence we need to issue only one tlbiel with SET=0.
Applied to powerpc/next.
[1/1] powerpc/mm: Update tlbiel loop on POWER10
https://git.kernel.org/powerpc/c/e80639405c40127727812a0e1f8a65ba9979f146
cheers