Commit 2a47607e authored by David Hildenbrand's avatar David Hildenbrand Committed by Kefeng Wang
Browse files

mm/mmu_gather: add tlb_remove_tlb_entries() 

mainline inclusion
from mainline-v6.9-rc1
commit 4d5bf0b6183f79ea361dd506365d2a471270735c
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9CHB4
CVE: NA

-------------------------------------------------

Let's add a helper that lets us batch-process multiple consecutive PTEs.

Note that the loop will get optimized out on all architectures except on
powerpc.  We have to add an early define of __tlb_remove_tlb_entry() on
ppc to make the compiler happy (and avoid making tlb_remove_tlb_entries()
a macro).

[arnd@kernel.org: change __tlb_remove_tlb_entry() to an inline function]
  Link: https://lkml.kernel.org/r/20240221154549.2026073-1-arnd@kernel.org
Link: https://lkml.kernel.org/r/20240214204435.167852-8-david@redhat.com


Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarRyan Roberts <ryan.roberts@arm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@suse.com>
Cc: "Naveen N. Rao" <naveen.n.rao@linux.ibm.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yin Fengwei <fengwei.yin@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
(cherry picked from commit 4d5bf0b6183f79ea361dd506365d2a471270735c)
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
parent fd57a1c4

arch/powerpc/include/asm/tlb.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 


#include <linux/pagemap.h>



static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep,

					  unsigned long address);

#define __tlb_remove_tlb_entry	__tlb_remove_tlb_entry



#define tlb_flush tlb_flush

include/asm-generic/tlb.h

+23 −1
Original line number Diff line number Diff line
@@ -595,7 +595,9 @@ static inline void tlb_flush_p4d_range(struct mmu_gather *tlb, 
}



#ifndef __tlb_remove_tlb_entry

#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)

static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, unsigned long address)

{

}

#endif



/**
@@ -611,6 +613,26 @@ static inline void tlb_flush_p4d_range(struct mmu_gather *tlb, 
		__tlb_remove_tlb_entry(tlb, ptep, address);	\

	} while (0)



/**

 * tlb_remove_tlb_entries - remember unmapping of multiple consecutive ptes for

 *			    later tlb invalidation.

 *

 * Similar to tlb_remove_tlb_entry(), but remember unmapping of multiple

 * consecutive ptes instead of only a single one.

 */

static inline void tlb_remove_tlb_entries(struct mmu_gather *tlb,

		pte_t *ptep, unsigned int nr, unsigned long address)

{

	tlb_flush_pte_range(tlb, address, PAGE_SIZE * nr);

	for (;;) {

		__tlb_remove_tlb_entry(tlb, ptep, address);

		if (--nr == 0)

			break;

		ptep++;

		address += PAGE_SIZE;

	}

}



#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\

	do {							\

		unsigned long _sz = huge_page_size(h);		\