Commit 18d095b2 authored by Christophe Leroy's avatar Christophe Leroy Committed by Andrew Morton
Browse files

mm: define __pte_leaf_size() to also take a PMD entry 

On powerpc 8xx, when a page is 8M size, the information is in the PMD
entry.  So allow architectures to provide __pte_leaf_size() instead of
pte_leaf_size() and provide the PMD entry to that function.

When __pte_leaf_size() is not defined, define it as a pte_leaf_size() so
that architectures not interested in the PMD arguments are not impacted.

Only define a default pte_leaf_size() when __pte_leaf_size() is not
defined to make sure nobody adds new calls to pte_leaf_size() in the core.

Link: https://lkml.kernel.org/r/c7c008f0a314bf8029ad7288fdc908db1ec7e449.1719928057.git.christophe.leroy@csgroup.eu


Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarOscar Salvador <osalvador@suse.de>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 0db46aaa

include/linux/pgtable.h

+3 −0
Original line number Diff line number Diff line
@@ -1907,9 +1907,12 @@ typedef unsigned int pgtbl_mod_mask; 
#ifndef pmd_leaf_size

#define pmd_leaf_size(x) PMD_SIZE

#endif

#ifndef __pte_leaf_size

#ifndef pte_leaf_size

#define pte_leaf_size(x) PAGE_SIZE

#endif

#define __pte_leaf_size(x,y) pte_leaf_size(y)

#endif



/*

 * We always define pmd_pfn for all archs as it's used in lots of generic

kernel/events/core.c

+1 −1
Original line number Diff line number Diff line
@@ -7609,7 +7609,7 @@ static u64 perf_get_pgtable_size(struct mm_struct *mm, unsigned long addr) 


	pte = ptep_get_lockless(ptep);

	if (pte_present(pte))

		size = pte_leaf_size(pte);

		size = __pte_leaf_size(pmd, pte);

	pte_unmap(ptep);

#endif /* CONFIG_HAVE_GUP_FAST */