kevin/linux
1
Fork 0
Code

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

Browse Source 
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: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Oscar 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: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Christophe Leroy 2024-07-02 15:51:19 +02:00 committed by Andrew Morton
parent 0db46aaabe
commit 18d095b255
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/pgtable.h
View File

@ -1907,9 +1907,12 @@ typedef unsigned int pgtbl_mod_mask;
#ifndef pmd_leaf_size #ifndef pmd_leaf_size
#define pmd_leaf_size(x) PMD_SIZE #define pmd_leaf_size(x) PMD_SIZE
#endif #endif
#ifndef __pte_leaf_size
#ifndef pte_leaf_size #ifndef pte_leaf_size
#define pte_leaf_size(x) PAGE_SIZE #define pte_leaf_size(x) PAGE_SIZE
#endif #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 * We always define pmd_pfn for all archs as it's used in lots of generic

2
kernel/events/core.c
View File

@ -7609,7 +7609,7 @@ again:
pte = ptep_get_lockless(ptep); pte = ptep_get_lockless(ptep);
if (pte_present(pte)) if (pte_present(pte))
size = pte_leaf_size(pte); size = __pte_leaf_size(pmd, pte);
pte_unmap(ptep); pte_unmap(ptep);
#endif /* CONFIG_HAVE_GUP_FAST */ #endif /* CONFIG_HAVE_GUP_FAST */