From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Andrew Morton <akpm@linux-foundation.org>,
Jason Gunthorpe <jgg@nvidia.com>, Peter Xu <peterx@redhat.com>,
Oscar Salvador <osalvador@suse.de>,
Michael Ellerman <mpe@ellerman.id.au>,
Nicholas Piggin <npiggin@gmail.com>
Cc: linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org
Subject: [RFC PATCH v3 02/16] mm: Define __pte_leaf_size() to also take a PMD entry
Date: Sun, 26 May 2024 11:22:22 +0200 [thread overview]
Message-ID: <cab4f087fa6f5933be4f5673d015da6887546ebd.1716714720.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1716714720.git.christophe.leroy@csgroup.eu>
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.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
v3: Don't change pte_leaf_size() to not impact other architectures
---
include/linux/pgtable.h | 3 +++
kernel/events/core.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
index 85fc7554cd52..514e05730df1 100644
--- a/include/linux/pgtable.h
+++ b/include/linux/pgtable.h
@@ -1801,9 +1801,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
/*
* Some architectures have MMUs that are configurable or selectable at boot
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 724e6d7e128f..d37512f2ebf2 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -7585,7 +7585,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_FAST_GUP */
--
2.44.0
next prev parent reply other threads:[~2024-05-26 9:32 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-26 9:22 [RFC PATCH v3 00/16] Reimplement huge pages without hugepd on powerpc (8xx, e500, book3s/64) Christophe Leroy
2024-05-26 9:22 ` [RFC PATCH v3 01/16] powerpc/64e: Remove unused IBM HTW code [SQUASHED] Christophe Leroy
2024-05-26 9:22 ` Christophe Leroy [this message]
2024-05-27 4:52 ` [RFC PATCH v3 02/16] mm: Define __pte_leaf_size() to also take a PMD entry Oscar Salvador
2024-05-26 9:22 ` [RFC PATCH v3 03/16] mm: Provide mm_struct and address to huge_ptep_get() Christophe Leroy
2024-05-27 11:19 ` Oscar Salvador
2024-05-27 15:51 ` Christophe Leroy
2024-05-27 17:38 ` Oscar Salvador
2024-05-26 9:22 ` [RFC PATCH v3 04/16] powerpc/mm: Remove _PAGE_PSIZE Christophe Leroy
2024-05-26 9:22 ` [RFC PATCH v3 05/16] powerpc/mm: Fix __find_linux_pte() on 32 bits with PMD leaf entries Christophe Leroy
2024-05-27 4:55 ` Oscar Salvador
2024-05-27 5:16 ` Christophe Leroy
2024-05-27 11:25 ` Oscar Salvador
2024-05-26 9:22 ` [RFC PATCH v3 06/16] powerpc/mm: Allow hugepages without hugepd Christophe Leroy
2024-05-27 11:49 ` Oscar Salvador
2024-05-26 9:22 ` [RFC PATCH v3 07/16] powerpc/8xx: Fix size given to set_huge_pte_at() Christophe Leroy
2024-05-27 4:56 ` Oscar Salvador
2024-05-26 9:22 ` [RFC PATCH v3 08/16] powerpc/8xx: Rework support for 8M pages using contiguous PTE entries Christophe Leroy
2024-05-27 12:10 ` Oscar Salvador
2024-05-28 10:53 ` Christophe Leroy
2024-05-26 9:22 ` [RFC PATCH v3 09/16] powerpc/8xx: Simplify struct mmu_psize_def Christophe Leroy
2024-05-26 9:22 ` [RFC PATCH v3 10/16] powerpc/e500: Remove enc and ind fields from " Christophe Leroy
2024-05-26 9:22 ` [RFC PATCH v3 11/16] powerpc/e500: Switch to 64 bits PGD on 85xx (32 bits) Christophe Leroy
2024-05-26 9:22 ` [RFC PATCH v3 12/16] powerpc/e500: Encode hugepage size in PTE bits Christophe Leroy
2024-05-26 9:22 ` [RFC PATCH v3 13/16] powerpc/e500: Use contiguous PMD instead of hugepd Christophe Leroy
2024-05-26 9:22 ` [RFC PATCH v3 14/16] powerpc/64s: Use contiguous PMD/PUD instead of HUGEPD Christophe Leroy
2024-05-26 9:22 ` [RFC PATCH v3 15/16] powerpc/mm: Remove hugepd leftovers Christophe Leroy
2024-05-26 9:22 ` [RFC PATCH v3 16/16] mm: Remove CONFIG_ARCH_HAS_HUGEPD Christophe Leroy
2024-05-26 11:04 ` [RFC PATCH v3 00/16] Reimplement huge pages without hugepd on powerpc (8xx, e500, book3s/64) Oscar Salvador
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cab4f087fa6f5933be4f5673d015da6887546ebd.1716714720.git.christophe.leroy@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=akpm@linux-foundation.org \
--cc=jgg@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=osalvador@suse.de \
--cc=peterx@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).