From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: perf/core] powerpc/8xx: Implement pXX_leaf_size() support
Date: Thu, 03 Dec 2020 09:24:32 -0000 [thread overview]
Message-ID: <160698747226.3364.11701061900605887245.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201126121121.364451610@infradead.org>
The following commit has been merged into the perf/core branch of tip:
Commit-ID: c88a82f668cff457561272632a06a4a63dbf2fe0
Gitweb: https://git.kernel.org/tip/c88a82f668cff457561272632a06a4a63dbf2fe0
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Thu, 26 Nov 2020 11:53:33 +01:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Thu, 03 Dec 2020 10:14:52 +01:00
powerpc/8xx: Implement pXX_leaf_size() support
Christophe Leroy wrote:
> I can help with powerpc 8xx. It is a 32 bits powerpc. The PGD has 1024
> entries, that means each entry maps 4M.
>
> Page sizes are 4k, 16k, 512k and 8M.
>
> For the 8M pages we use hugepd with a single entry. The two related PGD
> entries point to the same hugepd.
>
> For the other sizes, they are in standard page tables. 16k pages appear
> 4 times in the page table. 512k entries appear 128 times in the page
> table.
>
> When the PGD entry has _PMD_PAGE_8M bits, the PMD entry points to a
> hugepd with holds the single 8M entry.
>
> In the PTE, we have two bits: _PAGE_SPS and _PAGE_HUGE
>
> _PAGE_HUGE means it is a 512k page
> _PAGE_SPS means it is not a 4k page
>
> The kernel can by build either with 4k pages as standard page size, or
> 16k pages. It doesn't change the page table layout though.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20201126121121.364451610@infradead.org
---
arch/powerpc/include/asm/nohash/32/pte-8xx.h | 23 +++++++++++++++++++-
1 file changed, 23 insertions(+)
diff --git a/arch/powerpc/include/asm/nohash/32/pte-8xx.h b/arch/powerpc/include/asm/nohash/32/pte-8xx.h
index 1581204..fcc48d5 100644
--- a/arch/powerpc/include/asm/nohash/32/pte-8xx.h
+++ b/arch/powerpc/include/asm/nohash/32/pte-8xx.h
@@ -135,6 +135,29 @@ static inline pte_t pte_mkhuge(pte_t pte)
}
#define pte_mkhuge pte_mkhuge
+
+static inline unsigned long pgd_leaf_size(pgd_t pgd)
+{
+ if (pgd_val(pgd) & _PMD_PAGE_8M)
+ return SZ_8M;
+ return SZ_4M;
+}
+
+#define pgd_leaf_size pgd_leaf_size
+
+static inline unsigned long pte_leaf_size(pte_t pte)
+{
+ pte_basic_t val = pte_val(pte);
+
+ if (val & _PAGE_HUGE)
+ return SZ_512K;
+ if (val & _PAGE_SPS)
+ return SZ_16K;
+ return SZ_4K;
+}
+
+#define pte_leaf_size pte_leaf_size
+
#endif
#endif /* __KERNEL__ */
next prev parent reply other threads:[~2020-12-03 9:25 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-26 12:01 [PATCH v2 0/6] perf/mm: Fix PERF_SAMPLE_*_PAGE_SIZE Peter Zijlstra
2020-11-26 12:01 ` [PATCH v2 1/6] mm/gup: Provide gup_get_pte() more generic Peter Zijlstra
2020-11-26 12:43 ` Matthew Wilcox
2020-11-26 13:02 ` Peter Zijlstra
2020-12-03 9:07 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2020-12-03 9:24 ` tip-bot2 for Peter Zijlstra
2020-11-26 12:01 ` [PATCH v2 2/6] mm: Introduce pXX_leaf_size() Peter Zijlstra
2020-11-26 12:43 ` Matthew Wilcox
2020-12-03 9:07 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2020-12-03 9:24 ` tip-bot2 for Peter Zijlstra
2020-11-26 12:01 ` [PATCH v2 3/6] perf/core: Fix arch_perf_get_page_size() Peter Zijlstra
2020-11-26 12:34 ` Matthew Wilcox
2020-11-26 12:42 ` Peter Zijlstra
2020-11-26 12:56 ` Matthew Wilcox
2020-11-26 13:06 ` Peter Zijlstra
2020-11-26 13:27 ` Matthew Wilcox
2020-12-03 9:07 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2020-12-03 9:24 ` tip-bot2 for Peter Zijlstra
2020-11-26 12:01 ` [PATCH v2 4/6] arm64/mm: Implement pXX_leaf_size() support Peter Zijlstra
2020-11-26 12:57 ` Peter Zijlstra
2020-11-26 14:32 ` Will Deacon
2020-12-03 9:07 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2020-12-03 9:24 ` tip-bot2 for Peter Zijlstra
2020-11-26 12:01 ` [PATCH v2 5/6] sparc64/mm: " Peter Zijlstra
2020-12-03 9:07 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2020-12-03 9:24 ` tip-bot2 for Peter Zijlstra
2020-12-09 18:44 ` tip-bot2 for Peter Zijlstra
2020-11-26 12:01 ` [PATCH v2 6/6] powerpc/8xx: " Peter Zijlstra
2020-12-03 9:07 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2020-12-03 9:24 ` tip-bot2 for Peter Zijlstra [this message]
2020-12-09 18:44 ` tip-bot2 for Peter Zijlstra
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=160698747226.3364.11701061900605887245.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
/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 NNTP newsgroup(s).