From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
alex@ghiti.fr
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>,
linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-mm@kvack.org, akpm@linux-foundation.org,
catalin.marinas@arm.com, will@kernel.org,
linux-arm-kernel@lists.infradead.org,
Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH v8 06/14] powerpc/mm: Move vma_mmu_pagesize()
Date: Wed, 9 Mar 2022 18:44:40 +0100 [thread overview]
Message-ID: <a32e823e40b4ee0bba27cea71c1bdc8ac3149c06.1646847562.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1646847561.git.christophe.leroy@csgroup.eu>
vma_mmu_pagesize() is only required for slices,
otherwise there is a generic weak version doing the
exact same thing.
Move it to slice.c
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/mm/hugetlbpage.c | 11 -----------
arch/powerpc/mm/slice.c | 9 +++++++++
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index b642a5a8668f..7b89f0799d82 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -565,17 +565,6 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
}
#endif
-unsigned long vma_mmu_pagesize(struct vm_area_struct *vma)
-{
- /* With radix we don't use slice, so derive it from vma*/
- if (IS_ENABLED(CONFIG_PPC_MM_SLICES) && !radix_enabled()) {
- unsigned int psize = get_slice_psize(vma->vm_mm, vma->vm_start);
-
- return 1UL << mmu_psize_to_shift(psize);
- }
- return vma_kernel_pagesize(vma);
-}
-
bool __init arch_hugetlb_valid_size(unsigned long size)
{
int shift = __ffs(size);
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index f42711f865f3..8a3ac062b71e 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -759,4 +759,13 @@ int slice_is_hugepage_only_range(struct mm_struct *mm, unsigned long addr,
return !slice_check_range_fits(mm, maskp, addr, len);
}
+
+unsigned long vma_mmu_pagesize(struct vm_area_struct *vma)
+{
+ /* With radix we don't use slice, so derive it from vma*/
+ if (radix_enabled())
+ return vma_kernel_pagesize(vma);
+
+ return 1UL << mmu_psize_to_shift(get_slice_psize(vma->vm_mm, vma->vm_start));
+}
#endif
--
2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
alex@ghiti.fr
Cc: will@kernel.org, catalin.marinas@arm.com,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Nicholas Piggin <npiggin@gmail.com>,
akpm@linux-foundation.org, linuxppc-dev@lists.ozlabs.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v8 06/14] powerpc/mm: Move vma_mmu_pagesize()
Date: Wed, 9 Mar 2022 18:44:40 +0100 [thread overview]
Message-ID: <a32e823e40b4ee0bba27cea71c1bdc8ac3149c06.1646847562.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1646847561.git.christophe.leroy@csgroup.eu>
vma_mmu_pagesize() is only required for slices,
otherwise there is a generic weak version doing the
exact same thing.
Move it to slice.c
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/mm/hugetlbpage.c | 11 -----------
arch/powerpc/mm/slice.c | 9 +++++++++
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index b642a5a8668f..7b89f0799d82 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -565,17 +565,6 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
}
#endif
-unsigned long vma_mmu_pagesize(struct vm_area_struct *vma)
-{
- /* With radix we don't use slice, so derive it from vma*/
- if (IS_ENABLED(CONFIG_PPC_MM_SLICES) && !radix_enabled()) {
- unsigned int psize = get_slice_psize(vma->vm_mm, vma->vm_start);
-
- return 1UL << mmu_psize_to_shift(psize);
- }
- return vma_kernel_pagesize(vma);
-}
-
bool __init arch_hugetlb_valid_size(unsigned long size)
{
int shift = __ffs(size);
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index f42711f865f3..8a3ac062b71e 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -759,4 +759,13 @@ int slice_is_hugepage_only_range(struct mm_struct *mm, unsigned long addr,
return !slice_check_range_fits(mm, maskp, addr, len);
}
+
+unsigned long vma_mmu_pagesize(struct vm_area_struct *vma)
+{
+ /* With radix we don't use slice, so derive it from vma*/
+ if (radix_enabled())
+ return vma_kernel_pagesize(vma);
+
+ return 1UL << mmu_psize_to_shift(get_slice_psize(vma->vm_mm, vma->vm_start));
+}
#endif
--
2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
alex@ghiti.fr
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>,
linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-mm@kvack.org, akpm@linux-foundation.org,
catalin.marinas@arm.com, will@kernel.org,
linux-arm-kernel@lists.infradead.org,
Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH v8 06/14] powerpc/mm: Move vma_mmu_pagesize()
Date: Wed, 9 Mar 2022 18:44:40 +0100 [thread overview]
Message-ID: <a32e823e40b4ee0bba27cea71c1bdc8ac3149c06.1646847562.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1646847561.git.christophe.leroy@csgroup.eu>
vma_mmu_pagesize() is only required for slices,
otherwise there is a generic weak version doing the
exact same thing.
Move it to slice.c
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/mm/hugetlbpage.c | 11 -----------
arch/powerpc/mm/slice.c | 9 +++++++++
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index b642a5a8668f..7b89f0799d82 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -565,17 +565,6 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
}
#endif
-unsigned long vma_mmu_pagesize(struct vm_area_struct *vma)
-{
- /* With radix we don't use slice, so derive it from vma*/
- if (IS_ENABLED(CONFIG_PPC_MM_SLICES) && !radix_enabled()) {
- unsigned int psize = get_slice_psize(vma->vm_mm, vma->vm_start);
-
- return 1UL << mmu_psize_to_shift(psize);
- }
- return vma_kernel_pagesize(vma);
-}
-
bool __init arch_hugetlb_valid_size(unsigned long size)
{
int shift = __ffs(size);
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index f42711f865f3..8a3ac062b71e 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -759,4 +759,13 @@ int slice_is_hugepage_only_range(struct mm_struct *mm, unsigned long addr,
return !slice_check_range_fits(mm, maskp, addr, len);
}
+
+unsigned long vma_mmu_pagesize(struct vm_area_struct *vma)
+{
+ /* With radix we don't use slice, so derive it from vma*/
+ if (radix_enabled())
+ return vma_kernel_pagesize(vma);
+
+ return 1UL << mmu_psize_to_shift(get_slice_psize(vma->vm_mm, vma->vm_start));
+}
#endif
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-03-09 17:45 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-09 17:44 [PATCH v8 00/14] Convert powerpc to default topdown mmap layout (v8) Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` [PATCH v8 01/14] sizes.h: Add SZ_1T macro Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-10 16:52 ` Bjorn Helgaas
2022-03-10 16:52 ` Bjorn Helgaas
2022-03-10 16:52 ` Bjorn Helgaas
2022-03-10 18:09 ` Christophe Leroy
2022-03-10 18:09 ` Christophe Leroy
2022-03-10 18:09 ` Christophe Leroy
2022-03-10 18:21 ` Bjorn Helgaas
2022-03-10 18:21 ` Bjorn Helgaas
2022-03-10 18:21 ` Bjorn Helgaas
2022-03-09 17:44 ` [PATCH v8 02/14] mm: Allow arch specific arch_randomize_brk() with CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` [PATCH v8 03/14] mm, hugetlbfs: Allow an arch to always use generic versions of get_unmapped_area functions Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` [PATCH v8 04/14] mm: Add len and flags parameters to arch_get_mmap_end() Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` [PATCH v8 05/14] mm, hugetlbfs: Allow for "high" userspace addresses Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy [this message]
2022-03-09 17:44 ` [PATCH v8 06/14] powerpc/mm: Move vma_mmu_pagesize() Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` [PATCH v8 07/14] powerpc/mm: Make slice specific to book3s/64 Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` [PATCH v8 08/14] powerpc/mm: Remove CONFIG_PPC_MM_SLICES Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` [PATCH v8 09/14] powerpc/mm: Use generic_get_unmapped_area() and call it from arch_get_unmapped_area() Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` [PATCH v8 10/14] powerpc/mm: Use generic_hugetlb_get_unmapped_area() Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` [PATCH v8 11/14] powerpc/mm: Move get_unmapped_area functions to slice.c Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` [PATCH v8 12/14] powerpc/mm: Enable full randomisation of memory mappings Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` [PATCH v8 13/14] powerpc/mm: Convert to default topdown mmap layout Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` [PATCH v8 14/14] powerpc: Simplify and move arch_randomize_brk() Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-09 17:44 ` Christophe Leroy
2022-03-10 6:51 ` [PATCH v8 00/14] Convert powerpc to default topdown mmap layout (v8) Christophe Leroy
2022-03-10 6:51 ` Christophe Leroy
2022-03-10 6:51 ` Christophe Leroy
2022-03-11 4:26 ` Michael Ellerman
2022-03-11 4:26 ` Michael Ellerman
2022-03-11 4:26 ` Michael Ellerman
2022-03-11 4:49 ` Andrew Morton
2022-03-11 4:49 ` Andrew Morton
2022-03-11 4:49 ` Andrew Morton
2022-04-04 5:22 ` Christophe Leroy
2022-04-04 5:22 ` Christophe Leroy
2022-04-04 5:22 ` Christophe Leroy
2022-04-07 18:30 ` Christophe Leroy
2022-04-07 18:30 ` Christophe Leroy
2022-04-07 18:30 ` Christophe Leroy
2022-04-08 4:18 ` Michael Ellerman
2022-04-08 4:18 ` Michael Ellerman
2022-04-08 4:18 ` Michael Ellerman
2022-04-08 4:17 ` Michael Ellerman
2022-04-08 4:17 ` Michael Ellerman
2022-04-08 4:17 ` 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=a32e823e40b4ee0bba27cea71c1bdc8ac3149c06.1646847562.git.christophe.leroy@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=akpm@linux-foundation.org \
--cc=alex@ghiti.fr \
--cc=benh@kernel.crashing.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--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=paulus@samba.org \
--cc=will@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 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.