Commit d7b4b67e authored by Rohan McLure's avatar Rohan McLure Committed by Andrew Morton
Browse files

mm/page_table_check: reinstate address parameter in [__]page_table_check_pte_clear() 

This reverts commit aa232204 ("mm/page_table_check: remove unused
parameter in [__]page_table_check_pte_clear").

Reinstate previously unused parameters for the purpose of supporting
powerpc platforms, as many do not encode user/kernel ownership of the page
in the pte, but instead in the address of the access.

[ajd@linux.ibm.com: rebase, fix additional occurrence and loop handling]
Link: https://lkml.kernel.org/r/20251219-pgtable_check_v18rebase-v18-8-755bc151a50b@linux.ibm.com


Signed-off-by: default avatarRohan McLure <rmclure@linux.ibm.com>
Signed-off-by: default avatarAndrew Donnellan <ajd@linux.ibm.com>
Reviewed-by: default avatarPasha Tatashin <pasha.tatashin@soleen.com>
Acked-by: Ingo Molnar <mingo@kernel.org>  # x86
Acked-by: Alexandre Ghiti <alexghiti@rivosinc.com> # riscv
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: "Christophe Leroy (CS GROUP)" <chleroy@kernel.org>
Cc: David Hildenbrand <david@kernel.org>
Cc: Donet Tom <donettom@linux.ibm.com>
Cc: Guo Weikang <guoweikang.kernel@gmail.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Kevin Brodsky <kevin.brodsky@arm.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Magnus Lindholm <linmag7@gmail.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Miehlbradt <nicholas@linux.ibm.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Paul Mackerras <paulus@ozlabs.org>
Cc: Qi Zheng <zhengqi.arch@bytedance.com>
Cc: "Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
Cc: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
Cc: Thomas Huth <thuth@redhat.com>
Cc: "Vishal Moola (Oracle)" <vishal.moola@gmail.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 649ec9e3

arch/arm64/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -1342,7 +1342,7 @@ static inline pte_t __ptep_get_and_clear_anysz(struct mm_struct *mm, 


	switch (pgsize) {

	case PAGE_SIZE:

		page_table_check_pte_clear(mm, pte);

		page_table_check_pte_clear(mm, address, pte);

		break;

	case PMD_SIZE:

		page_table_check_pmd_clear(mm, address, pte_pmd(pte));

arch/riscv/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, 
	set_pte(ptep, __pte(0));

#endif



	page_table_check_pte_clear(mm, pte);

	page_table_check_pte_clear(mm, address, pte);



	return pte;

}

arch/x86/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, 
				       pte_t *ptep)

{

	pte_t pte = native_ptep_get_and_clear(ptep);

	page_table_check_pte_clear(mm, pte);

	page_table_check_pte_clear(mm, addr, pte);

	return pte;

}
@@ -1268,7 +1268,7 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, 
		 * care about updates and native needs no locking

		 */

		pte = native_local_ptep_get_and_clear(ptep);

		page_table_check_pte_clear(mm, pte);

		page_table_check_pte_clear(mm, addr, pte);

	} else {

		pte = ptep_get_and_clear(mm, addr, ptep);

	}

include/linux/page_table_check.h

+7 −4
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ extern struct static_key_true page_table_check_disabled; 
extern struct page_ext_operations page_table_check_ops;



void __page_table_check_zero(struct page *page, unsigned int order);

void __page_table_check_pte_clear(struct mm_struct *mm, pte_t pte);

void __page_table_check_pte_clear(struct mm_struct *mm, unsigned long addr,

				  pte_t pte);

void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr,

				  pmd_t pmd);

void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr,
@@ -45,12 +46,13 @@ static inline void page_table_check_free(struct page *page, unsigned int order) 
	__page_table_check_zero(page, order);

}



static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte)

static inline void page_table_check_pte_clear(struct mm_struct *mm,

					      unsigned long addr, pte_t pte)

{

	if (static_branch_likely(&page_table_check_disabled))

		return;



	__page_table_check_pte_clear(mm, pte);

	__page_table_check_pte_clear(mm, addr, pte);

}



static inline void page_table_check_pmd_clear(struct mm_struct *mm,
@@ -119,7 +121,8 @@ static inline void page_table_check_free(struct page *page, unsigned int order) 
{

}



static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte)

static inline void page_table_check_pte_clear(struct mm_struct *mm,

					      unsigned long addr, pte_t pte)

{

}

include/linux/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, 
{

	pte_t pte = ptep_get(ptep);

	pte_clear(mm, address, ptep);

	page_table_check_pte_clear(mm, pte);

	page_table_check_pte_clear(mm, address, pte);

	return pte;

}

#endif
@@ -693,7 +693,7 @@ static inline void ptep_clear(struct mm_struct *mm, unsigned long addr, 
	 * No need for ptep_get_and_clear(): page table check doesn't care about

	 * any bits that could have been set by HW concurrently.

	 */

	page_table_check_pte_clear(mm, pte);

	page_table_check_pte_clear(mm, addr, pte);

}



#ifdef CONFIG_GUP_GET_PXX_LOW_HIGH