From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 947A313790B for ; Tue, 10 Jun 2025 06:22:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749536553; cv=none; b=nzu2Mm7pUqr6VPS4FQJ0A7bv/jVlrhM+ajpNC/tWsMiuDMXvPJJ8fX1enM5Dm0hcAMv85peMjwj4oUv5a+nfbsEtbjv/o+bT1SCdmtfVMx9S4eMkTulaA5WTDNVUgRg+mqK49asXgvC3ZFbhhXy4Z+7zdTGico11wNFssPavUDY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749536553; c=relaxed/simple; bh=1LGanVL9rsZpTtQ4n946nndMw7cIENFLH/DMULUxgv0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=cvmth5jO8Gse5uTvHZhsjUT7DGnfOBdQ/Ji+SGX6cTX2rG46mAKkrkE3MUu6acpImLaYvhh0VEN7xuDfspABDbbYnSoRnhC/4igqr1suzhvY+2FMRfQ0i2L/f4oRc/zRBLGz+Z+ueOTAxhBOvoAqIyXTQRH7dVjfybEirnFD4mo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AE37414BF; Mon, 9 Jun 2025 23:22:11 -0700 (PDT) Received: from [10.163.32.103] (unknown [10.163.32.103]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8F0793F673; Mon, 9 Jun 2025 23:22:23 -0700 (PDT) Message-ID: Date: Tue, 10 Jun 2025 11:52:20 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1] mm: Remove arch_flush_tlb_batched_pending() arch helper To: Ryan Roberts , Andrew Morton , Catalin Marinas , Will Deacon , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , David Hildenbrand , Lorenzo Stoakes , Rik van Riel , "Liam R. Howlett" , Vlastimil Babka , Harry Yoo Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-mm@kvack.org References: <20250609103132.447370-1-ryan.roberts@arm.com> Content-Language: en-US From: Anshuman Khandual In-Reply-To: <20250609103132.447370-1-ryan.roberts@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 09/06/25 4:01 PM, Ryan Roberts wrote: > Since commit 4b634918384c ("arm64/mm: Close theoretical race where stale > TLB entry remains valid"), all arches that use tlbbatch for reclaim > (arm64, riscv, x86) implement arch_flush_tlb_batched_pending() with a > flush_tlb_mm(). > > So let's simplify by removing the unnecessary abstraction and doing the > flush_tlb_mm() directly in flush_tlb_batched_pending(). This effectively > reverts commit db6c1f6f236d ("mm/tlbbatch: introduce > arch_flush_tlb_batched_pending()"). > > Suggested-by: Will Deacon > Signed-off-by: Ryan Roberts Makes sense to replace arch callbacks with common generic functions applicable for all platforms. Reviewed-by: Anshuman Khandual > --- > arch/arm64/include/asm/tlbflush.h | 11 ----------- > arch/riscv/include/asm/tlbflush.h | 1 - > arch/riscv/mm/tlbflush.c | 5 ----- > arch/x86/include/asm/tlbflush.h | 5 ----- > mm/rmap.c | 2 +- > 5 files changed, 1 insertion(+), 23 deletions(-) > > diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h > index aa9efee17277..18a5dc0c9a54 100644 > --- a/arch/arm64/include/asm/tlbflush.h > +++ b/arch/arm64/include/asm/tlbflush.h > @@ -322,17 +322,6 @@ static inline bool arch_tlbbatch_should_defer(struct mm_struct *mm) > return true; > } > > -/* > - * If mprotect/munmap/etc occurs during TLB batched flushing, we need to ensure > - * all the previously issued TLBIs targeting mm have completed. But since we > - * can be executing on a remote CPU, a DSB cannot guarantee this like it can > - * for arch_tlbbatch_flush(). Our only option is to flush the entire mm. > - */ > -static inline void arch_flush_tlb_batched_pending(struct mm_struct *mm) > -{ > - flush_tlb_mm(mm); > -} > - > /* > * To support TLB batched flush for multiple pages unmapping, we only send > * the TLBI for each page in arch_tlbbatch_add_pending() and wait for the > diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h > index 1a20dd746a49..eed0abc40514 100644 > --- a/arch/riscv/include/asm/tlbflush.h > +++ b/arch/riscv/include/asm/tlbflush.h > @@ -63,7 +63,6 @@ void flush_pud_tlb_range(struct vm_area_struct *vma, unsigned long start, > bool arch_tlbbatch_should_defer(struct mm_struct *mm); > void arch_tlbbatch_add_pending(struct arch_tlbflush_unmap_batch *batch, > struct mm_struct *mm, unsigned long start, unsigned long end); > -void arch_flush_tlb_batched_pending(struct mm_struct *mm); > void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch); > > extern unsigned long tlb_flush_all_threshold; > diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c > index e737ba7949b1..8404530ec00f 100644 > --- a/arch/riscv/mm/tlbflush.c > +++ b/arch/riscv/mm/tlbflush.c > @@ -234,11 +234,6 @@ void arch_tlbbatch_add_pending(struct arch_tlbflush_unmap_batch *batch, > mmu_notifier_arch_invalidate_secondary_tlbs(mm, start, end); > } > > -void arch_flush_tlb_batched_pending(struct mm_struct *mm) > -{ > - flush_tlb_mm(mm); > -} > - > void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch) > { > __flush_tlb_range(NULL, &batch->cpumask, > diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h > index e9b81876ebe4..00daedfefc1b 100644 > --- a/arch/x86/include/asm/tlbflush.h > +++ b/arch/x86/include/asm/tlbflush.h > @@ -356,11 +356,6 @@ static inline void arch_tlbbatch_add_pending(struct arch_tlbflush_unmap_batch *b > mmu_notifier_arch_invalidate_secondary_tlbs(mm, 0, -1UL); > } > > -static inline void arch_flush_tlb_batched_pending(struct mm_struct *mm) > -{ > - flush_tlb_mm(mm); > -} > - > extern void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch); > > static inline bool pte_flags_need_flush(unsigned long oldflags, > diff --git a/mm/rmap.c b/mm/rmap.c > index fb63d9256f09..fd160ddaa980 100644 > --- a/mm/rmap.c > +++ b/mm/rmap.c > @@ -746,7 +746,7 @@ void flush_tlb_batched_pending(struct mm_struct *mm) > int flushed = batch >> TLB_FLUSH_BATCH_FLUSHED_SHIFT; > > if (pending != flushed) { > - arch_flush_tlb_batched_pending(mm); > + flush_tlb_mm(mm); > /* > * If the new TLB flushing is pending during flushing, leave > * mm->tlb_flush_batched as is, to avoid losing flushing. > -- > 2.43.0 > >