From: Christophe Leroy <christophe.leroy@csgroup.eu> To: Andrew Morton <akpm@linux-foundation.org>, Jason Gunthorpe <jgg@nvidia.com>, Peter Xu <peterx@redhat.com> Cc: Christophe Leroy <christophe.leroy@csgroup.eu>, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 6/8] powerpc/8xx: Fix size given to set_huge_pte_at() Date: Mon, 25 Mar 2024 15:55:59 +0100 [thread overview] Message-ID: <b10988a38406b5a6ceae79c30d3dd65d3e5b40ab.1711377230.git.christophe.leroy@csgroup.eu> (raw) In-Reply-To: <cover.1711377230.git.christophe.leroy@csgroup.eu> set_huge_pte_at() expects the real page size, 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> --- 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 6be6421086ed..70b4d807fda5 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.43.0
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@csgroup.eu> To: Andrew Morton <akpm@linux-foundation.org>, Jason Gunthorpe <jgg@nvidia.com>, Peter Xu <peterx@redhat.com> Cc: linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 6/8] powerpc/8xx: Fix size given to set_huge_pte_at() Date: Mon, 25 Mar 2024 15:55:59 +0100 [thread overview] Message-ID: <b10988a38406b5a6ceae79c30d3dd65d3e5b40ab.1711377230.git.christophe.leroy@csgroup.eu> (raw) In-Reply-To: <cover.1711377230.git.christophe.leroy@csgroup.eu> set_huge_pte_at() expects the real page size, 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> --- 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 6be6421086ed..70b4d807fda5 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.43.0
next prev parent reply other threads:[~2024-03-25 14:56 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-03-25 14:55 [RFC PATCH 0/8] Reimplement huge pages without hugepd on powerpc 8xx Christophe Leroy 2024-03-25 14:55 ` Christophe Leroy 2024-03-25 14:55 ` [RFC PATCH 1/8] mm: Provide pagesize to pmd_populate() Christophe Leroy 2024-03-25 14:55 ` Christophe Leroy 2024-03-25 16:19 ` Jason Gunthorpe 2024-03-25 16:19 ` Jason Gunthorpe 2024-03-25 19:05 ` Christophe Leroy 2024-03-25 19:05 ` Christophe Leroy 2024-03-26 15:01 ` Jason Gunthorpe 2024-03-26 15:01 ` Jason Gunthorpe 2024-03-27 9:58 ` Christophe Leroy 2024-03-27 9:58 ` Christophe Leroy 2024-03-27 16:57 ` Jason Gunthorpe 2024-03-27 16:57 ` Jason Gunthorpe 2024-04-03 18:24 ` Christophe Leroy 2024-04-03 18:24 ` Christophe Leroy 2024-04-04 11:46 ` Jason Gunthorpe 2024-04-04 11:46 ` Jason Gunthorpe 2024-03-25 14:55 ` [RFC PATCH 2/8] mm: Provide page size to pte_alloc_huge() Christophe Leroy 2024-03-25 14:55 ` Christophe Leroy 2024-03-25 14:55 ` [RFC PATCH 3/8] mm: Provide pmd to pte_leaf_size() Christophe Leroy 2024-03-25 14:55 ` Christophe Leroy 2024-03-25 14:55 ` [RFC PATCH 4/8] mm: Provide mm_struct and address to huge_ptep_get() Christophe Leroy 2024-03-25 14:55 ` Christophe Leroy 2024-03-25 16:35 ` Jason Gunthorpe 2024-03-25 16:35 ` Jason Gunthorpe 2024-03-25 14:55 ` [RFC PATCH 5/8] powerpc/mm: Allow hugepages without hugepd Christophe Leroy 2024-03-25 14:55 ` Christophe Leroy 2024-03-25 14:55 ` Christophe Leroy [this message] 2024-03-25 14:55 ` [RFC PATCH 6/8] powerpc/8xx: Fix size given to set_huge_pte_at() Christophe Leroy 2024-03-25 14:56 ` [RFC PATCH 7/8] powerpc/8xx: Remove support for 8M pages Christophe Leroy 2024-03-25 14:56 ` Christophe Leroy 2024-03-25 14:56 ` [RFC PATCH 8/8] powerpc/8xx: Add back support for 8M pages using contiguous PTE entries Christophe Leroy 2024-03-25 14:56 ` Christophe Leroy 2024-03-25 16:38 ` [RFC PATCH 0/8] Reimplement huge pages without hugepd on powerpc 8xx Jason Gunthorpe 2024-03-25 16:38 ` Jason Gunthorpe 2024-04-11 16:15 ` Peter Xu 2024-04-11 16:15 ` Peter Xu 2024-04-12 14:08 ` Christophe Leroy 2024-04-12 14:08 ` Christophe Leroy 2024-04-12 14:30 ` Peter Xu 2024-04-12 14:30 ` Peter Xu 2024-04-15 19:12 ` Christophe Leroy 2024-04-15 19:12 ` Christophe Leroy 2024-04-16 10:58 ` Christophe Leroy 2024-04-16 10:58 ` Christophe Leroy 2024-04-16 19:40 ` Peter Xu 2024-04-16 19:40 ` Peter Xu
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=b10988a38406b5a6ceae79c30d3dd65d3e5b40ab.1711377230.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=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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.