From: Mike Rapoport <rppt@kernel•org>
To: Christophe Leroy <christophe.leroy@csgroup•eu>
Cc: linux-kernel@vger•kernel.org, stable@vger•kernel.org,
Paul Mackerras <paulus@samba•org>,
linuxppc-dev@lists•ozlabs.org
Subject: Re: [PATCH] powerpc/book3e: Fix PUD allocation size in map_kernel_page()
Date: Thu, 23 Jun 2022 12:13:07 -0500 [thread overview]
Message-ID: <YrSfIyDy3rM16NqC@kernel.org> (raw)
In-Reply-To: <95ddfd6176d53e6c85e13bd1c358359daa56775f.1655974558.git.christophe.leroy@csgroup.eu>
On Thu, Jun 23, 2022 at 10:56:17AM +0200, Christophe Leroy wrote:
> Commit 2fb4706057bc ("powerpc: add support for folded p4d page tables")
> erroneously changed PUD setup to a mix of PMD and PUD. Fix it.
>
> While at it, use PTE_TABLE_SIZE instead of PAGE_SIZE for PTE tables
> in order to avoid any confusion.
>
> Fixes: 2fb4706057bc ("powerpc: add support for folded p4d page tables")
> Cc: stable@vger•kernel.org
> Cc: Mike Rapoport <rppt@kernel•org>
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup•eu>
Acked-by: Mike Rapoport <rppt@linux•ibm.com>
> ---
> arch/powerpc/mm/nohash/book3e_pgtable.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/powerpc/mm/nohash/book3e_pgtable.c b/arch/powerpc/mm/nohash/book3e_pgtable.c
> index 7d4368d055a6..b80fc4a91a53 100644
> --- a/arch/powerpc/mm/nohash/book3e_pgtable.c
> +++ b/arch/powerpc/mm/nohash/book3e_pgtable.c
> @@ -96,8 +96,8 @@ int __ref map_kernel_page(unsigned long ea, unsigned long pa, pgprot_t prot)
> pgdp = pgd_offset_k(ea);
> p4dp = p4d_offset(pgdp, ea);
> if (p4d_none(*p4dp)) {
> - pmdp = early_alloc_pgtable(PMD_TABLE_SIZE);
> - p4d_populate(&init_mm, p4dp, pmdp);
> + pudp = early_alloc_pgtable(PUD_TABLE_SIZE);
> + p4d_populate(&init_mm, p4dp, pudp);
> }
> pudp = pud_offset(p4dp, ea);
> if (pud_none(*pudp)) {
> @@ -106,7 +106,7 @@ int __ref map_kernel_page(unsigned long ea, unsigned long pa, pgprot_t prot)
> }
> pmdp = pmd_offset(pudp, ea);
> if (!pmd_present(*pmdp)) {
> - ptep = early_alloc_pgtable(PAGE_SIZE);
> + ptep = early_alloc_pgtable(PTE_TABLE_SIZE);
> pmd_populate_kernel(&init_mm, pmdp, ptep);
> }
> ptep = pte_offset_kernel(pmdp, ea);
> --
> 2.36.1
>
--
Sincerely yours,
Mike.
next prev parent reply other threads:[~2022-06-23 17:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-23 8:56 [PATCH] powerpc/book3e: Fix PUD allocation size in map_kernel_page() Christophe Leroy
2022-06-23 17:13 ` Mike Rapoport [this message]
2022-06-29 7:01 ` Michael Ellerman
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=YrSfIyDy3rM16NqC@kernel.org \
--to=rppt@kernel$(echo .)org \
--cc=christophe.leroy@csgroup$(echo .)eu \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=paulus@samba$(echo .)org \
--cc=stable@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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