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: Christophe Leroy <christophe.leroy@csgroup.eu>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v7 12/23] powerpc/8xx: Fix size given to set_huge_pte_at()
Date: Tue, 2 Jul 2024 15:51:24 +0200 [thread overview]
Message-ID: <97f2090011e25d99b6b0aae73e22e1b921c5d1fb.1719928057.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1719928057.git.christophe.leroy@csgroup.eu>
set_huge_pte_at() expects the size of the hugepage as an int, not the
psize which is the index of the page definition in table mmu_psize_defs[]
Fixes: 935d4f0c6dc8 ("mm: hugetlb: add huge page size param to set_huge_pte_at()")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
---
arch/powerpc/mm/nohash/8xx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/mm/nohash/8xx.c b/arch/powerpc/mm/nohash/8xx.c
index 43d4842bb1c7..d93433e26ded 100644
--- a/arch/powerpc/mm/nohash/8xx.c
+++ b/arch/powerpc/mm/nohash/8xx.c
@@ -94,7 +94,8 @@ static int __ref __early_map_kernel_hugepage(unsigned long va, phys_addr_t pa,
return -EINVAL;
set_huge_pte_at(&init_mm, va, ptep,
- pte_mkhuge(pfn_pte(pa >> PAGE_SHIFT, prot)), psize);
+ pte_mkhuge(pfn_pte(pa >> PAGE_SHIFT, prot)),
+ 1UL << mmu_psize_to_shift(psize));
return 0;
}
--
2.44.0
next prev parent reply other threads:[~2024-07-02 13:52 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-02 13:51 [PATCH v7 00/23] Reimplement huge pages without hugepd on powerpc (8xx, e500, book3s/64) Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 01/23] powerpc/64e: Remove unused IBM HTW code Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 02/23] powerpc/64e: Split out nohash Book3E 64-bit code Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 03/23] powerpc/64e: Drop E500 ifdefs in " Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 04/23] powerpc/64e: Drop MMU_FTR_TYPE_FSL_E checks " Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 05/23] powerpc/64e: Consolidate TLB miss handler patching Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 06/23] powerpc/64e: Drop unused TLB miss handlers Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 07/23] mm: Define __pte_leaf_size() to also take a PMD entry Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 08/23] mm: Provide mm_struct and address to huge_ptep_get() Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 09/23] powerpc/mm: Remove _PAGE_PSIZE Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 10/23] powerpc/mm: Fix __find_linux_pte() on 32 bits with PMD leaf entries Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 11/23] powerpc/mm: Allow hugepages without hugepd Christophe Leroy
2024-07-02 13:51 ` Christophe Leroy [this message]
2024-07-02 13:51 ` [PATCH v7 13/23] powerpc/8xx: Rework support for 8M pages using contiguous PTE entries Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 14/23] powerpc/8xx: Simplify struct mmu_psize_def Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 15/23] powerpc/e500: Remove enc and ind fields from " Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 16/23] powerpc/e500: Switch to 64 bits PGD on 85xx (32 bits) Christophe Leroy
2024-07-29 22:10 ` Guenter Roeck
2024-07-31 15:36 ` LEROY Christophe
2024-07-31 16:35 ` Guenter Roeck
[not found] ` <b73e991e-5f66-455e-a271-e10511ebeaef@csgroup.eu>
[not found] ` <5cc43ed9-b4f8-49f5-99ee-b411bb144085@roeck-us.net>
[not found] ` <17eed040-969e-4d2c-b20b-ecfd93450901@csgroup.eu>
2024-08-08 15:21 ` Guenter Roeck
2024-07-02 13:51 ` [PATCH v7 17/23] powerpc/e500: Encode hugepage size in PTE bits Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 18/23] powerpc/e500: Don't pre-check write access on data TLB error Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 19/23] powerpc/e500: Free r10 for FIND_PTE Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 20/23] powerpc/e500: Use contiguous PMD instead of hugepd Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 21/23] powerpc/64s: Use contiguous PMD/PUD instead of HUGEPD Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 22/23] powerpc/mm: Remove hugepd leftovers Christophe Leroy
2024-07-02 13:51 ` [PATCH v7 23/23] mm: Remove CONFIG_ARCH_HAS_HUGEPD Christophe Leroy
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=97f2090011e25d99b6b0aae73e22e1b921c5d1fb.1719928057.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