Commit 649ec9e3 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_pmd_clear() 

This reverts commit 1831414c ("mm/page_table_check: remove unused
parameter in [__]page_table_check_pmd_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 on arm64 changes]
Link: https://lkml.kernel.org/r/20251219-pgtable_check_v18rebase-v18-7-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 2e6ac078

arch/arm64/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -1345,7 +1345,7 @@ static inline pte_t __ptep_get_and_clear_anysz(struct mm_struct *mm, 
		page_table_check_pte_clear(mm, pte);

		break;

	case PMD_SIZE:

		page_table_check_pmd_clear(mm, pte_pmd(pte));

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

		break;

#ifndef __PAGETABLE_PMD_FOLDED

	case PUD_SIZE:

arch/riscv/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, 
	pmd_clear(pmdp);

#endif



	page_table_check_pmd_clear(mm, pmd);

	page_table_check_pmd_clear(mm, address, pmd);



	return pmd;

}

arch/x86/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -1319,7 +1319,7 @@ static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, unsigned long 
{

	pmd_t pmd = native_pmdp_get_and_clear(pmdp);



	page_table_check_pmd_clear(mm, pmd);

	page_table_check_pmd_clear(mm, addr, pmd);



	return pmd;

}

include/linux/page_table_check.h

+7 −4
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 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_pmd_clear(struct mm_struct *mm, pmd_t pmd);

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,

				  pud_t pud);

void __page_table_check_ptes_set(struct mm_struct *mm, unsigned long addr,
@@ -52,12 +53,13 @@ static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte) 
	__page_table_check_pte_clear(mm, pte);

}



static inline void page_table_check_pmd_clear(struct mm_struct *mm, pmd_t pmd)

static inline void page_table_check_pmd_clear(struct mm_struct *mm,

					      unsigned long addr, pmd_t pmd)

{

	if (static_branch_likely(&page_table_check_disabled))

		return;



	__page_table_check_pmd_clear(mm, pmd);

	__page_table_check_pmd_clear(mm, addr, pmd);

}



static inline void page_table_check_pud_clear(struct mm_struct *mm,
@@ -121,7 +123,8 @@ static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte) 
{

}



static inline void page_table_check_pmd_clear(struct mm_struct *mm, pmd_t pmd)

static inline void page_table_check_pmd_clear(struct mm_struct *mm,

					      unsigned long addr, pmd_t pmd)

{

}

include/linux/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, 
	pmd_t pmd = *pmdp;



	pmd_clear(pmdp);

	page_table_check_pmd_clear(mm, pmd);

	page_table_check_pmd_clear(mm, address, pmd);



	return pmd;

}