From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
aneesh.kumar@linux.ibm.com
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v1 22/27] powerpc/mm: move slice_mask_for_size() into mmu.h
Date: Wed, 20 Mar 2019 10:06:58 +0000 (UTC) [thread overview]
Message-ID: <631fc88138cf384c94879d70c133b1260b0e0b96.1553076180.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1553076180.git.christophe.leroy@c-s.fr>
Move slice_mask_for_size() into subarch mmu.h
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/powerpc/include/asm/book3s/64/mmu.h | 22 +++++++++++++----
arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 18 ++++++++++++++
arch/powerpc/mm/slice.c | 36 ----------------------------
3 files changed, 36 insertions(+), 40 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/64/mmu.h b/arch/powerpc/include/asm/book3s/64/mmu.h
index 1ceee000c18d..927e3714b0d8 100644
--- a/arch/powerpc/include/asm/book3s/64/mmu.h
+++ b/arch/powerpc/include/asm/book3s/64/mmu.h
@@ -123,7 +123,6 @@ typedef struct {
/* NPU NMMU context */
struct npu_context *npu_context;
-#ifdef CONFIG_PPC_MM_SLICES
/* SLB page size encodings*/
unsigned char low_slices_psize[BITS_PER_LONG / BITS_PER_BYTE];
unsigned char high_slices_psize[SLICE_ARRAY_SIZE];
@@ -136,9 +135,6 @@ typedef struct {
struct slice_mask mask_16m;
struct slice_mask mask_16g;
# endif
-#else
- u16 sllp; /* SLB page size encoding */
-#endif
unsigned long vdso_base;
#ifdef CONFIG_PPC_SUBPAGE_PROT
struct subpage_prot_table spt;
@@ -172,6 +168,24 @@ extern int mmu_vmalloc_psize;
extern int mmu_vmemmap_psize;
extern int mmu_io_psize;
+static inline struct slice_mask *slice_mask_for_size(mm_context_t *ctx, int psize)
+{
+#ifdef CONFIG_PPC_64K_PAGES
+ if (psize == MMU_PAGE_64K)
+ return &ctx->mask_64k;
+#endif
+ if (psize == MMU_PAGE_4K)
+ return &ctx->mask_4k;
+#ifdef CONFIG_HUGETLB_PAGE
+ if (psize == MMU_PAGE_16M)
+ return &ctx->mask_16m;
+ if (psize == MMU_PAGE_16G)
+ return &ctx->mask_16g;
+#endif
+ WARN_ON(true);
+ return NULL;
+}
+
/* MMU initialization */
void mmu_early_init_devtree(void);
void hash__early_init_devtree(void);
diff --git a/arch/powerpc/include/asm/nohash/32/mmu-8xx.h b/arch/powerpc/include/asm/nohash/32/mmu-8xx.h
index 0a1a3fc54e54..4ba92c48b3a5 100644
--- a/arch/powerpc/include/asm/nohash/32/mmu-8xx.h
+++ b/arch/powerpc/include/asm/nohash/32/mmu-8xx.h
@@ -255,4 +255,22 @@ extern s32 patch__itlbmiss_perf, patch__dtlbmiss_perf;
#define mmu_linear_psize MMU_PAGE_8M
+#ifndef __ASSEMBLY__
+#ifdef CONFIG_PPC_MM_SLICES
+static inline struct slice_mask *slice_mask_for_size(mm_context_t *ctx, int psize)
+{
+ if (psize == mmu_virtual_psize)
+ return &ctx->mask_base_psize;
+#ifdef CONFIG_HUGETLB_PAGE
+ if (psize == MMU_PAGE_512K)
+ return &ctx->mask_512k;
+ if (psize == MMU_PAGE_8M)
+ return &ctx->mask_8m;
+#endif
+ WARN_ON(true);
+ return NULL;
+}
+#endif
+#endif /* !__ASSEMBLY__ */
+
#endif /* _ASM_POWERPC_MMU_8XX_H_ */
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index 231fd88d97e2..357d64e14757 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -126,42 +126,6 @@ static void slice_mask_for_free(struct mm_struct *mm, struct slice_mask *ret,
__set_bit(i, ret->high_slices);
}
-#ifdef CONFIG_PPC_BOOK3S_64
-static struct slice_mask *slice_mask_for_size(mm_context_t *ctx, int psize)
-{
-#ifdef CONFIG_PPC_64K_PAGES
- if (psize == MMU_PAGE_64K)
- return &ctx->mask_64k;
-#endif
- if (psize == MMU_PAGE_4K)
- return &ctx->mask_4k;
-#ifdef CONFIG_HUGETLB_PAGE
- if (psize == MMU_PAGE_16M)
- return &ctx->mask_16m;
- if (psize == MMU_PAGE_16G)
- return &ctx->mask_16g;
-#endif
- WARN_ON(true);
- return NULL;
-}
-#elif defined(CONFIG_PPC_8xx)
-static struct slice_mask *slice_mask_for_size(mm_context_t *ctx, int psize)
-{
- if (psize == mmu_virtual_psize)
- return &ctx->mask_base_psize;
-#ifdef CONFIG_HUGETLB_PAGE
- if (psize == MMU_PAGE_512K)
- return &ctx->mask_512k;
- if (psize == MMU_PAGE_8M)
- return &ctx->mask_8m;
-#endif
- WARN_ON(true);
- return NULL;
-}
-#else
-#error "Must define the slice masks for page sizes supported by the platform"
-#endif
-
static bool slice_check_range_fits(struct mm_struct *mm,
const struct slice_mask *available,
unsigned long start, unsigned long len)
--
2.13.3
next prev parent reply other threads:[~2019-03-20 10:07 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-20 10:06 [PATCH v1 00/27] Reduce ifdef mess in hugetlbpage.c and slice.c Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 01/27] powerpc/mm: Don't BUG() in hugepd_page() Christophe Leroy
2019-04-11 5:39 ` Aneesh Kumar K.V
2019-04-24 14:09 ` Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 02/27] powerpc/mm: don't BUG in add_huge_page_size() Christophe Leroy
2019-04-11 5:41 ` Aneesh Kumar K.V
2019-04-24 14:09 ` Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 03/27] powerpc/mm: don't BUG() in slice_mask_for_size() Christophe Leroy
2019-04-11 5:41 ` Aneesh Kumar K.V
2019-04-24 14:09 ` Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 04/27] powerpc/book3e: drop mmu_get_tsize() Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 05/27] powerpc/mm: drop slice_set_user_psize() Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 06/27] powerpc/64: only book3s/64 supports CONFIG_PPC_64K_PAGES Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 07/27] powerpc/book3e: hugetlbpage is only for CONFIG_PPC_FSL_BOOK3E Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 08/27] powerpc/mm: move __find_linux_pte() out of hugetlbpage.c Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 09/27] powerpc/mm: make hugetlbpage.c depend on CONFIG_HUGETLB_PAGE Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 10/27] powerpc/mm: make gup_hugepte() static Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 11/27] powerpc/mm: split asm/hugetlb.h into dedicated subarch files Christophe Leroy
2019-03-21 10:42 ` Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 12/27] powerpc/mm: add a helper to populate hugepd Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 13/27] powerpc/mm: define get_slice_psize() all the time Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 14/27] powerpc/mm: no slice for nohash/64 Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 15/27] powerpc/mm: cleanup ifdef mess in add_huge_page_size() Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 16/27] powerpc/mm: move hugetlb_disabled into asm/hugetlb.h Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 17/27] powerpc/mm: cleanup HPAGE_SHIFT setup Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 18/27] powerpc/mm: cleanup remaining ifdef mess in hugetlbpage.c Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 19/27] powerpc/mm: drop slice DEBUG Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 20/27] powerpc/mm: remove unnecessary #ifdef CONFIG_PPC64 Christophe Leroy
2019-03-20 10:06 ` [PATCH v1 21/27] powerpc/mm: hand a context_t over to slice_mask_for_size() instead of mm_struct Christophe Leroy
2019-03-20 10:06 ` Christophe Leroy [this message]
2019-03-20 10:06 ` [PATCH v1 23/27] powerpc/mm: remove a couple of #ifdef CONFIG_PPC_64K_PAGES in mm/slice.c Christophe Leroy
2019-03-20 10:07 ` [PATCH v1 24/27] powerpc: define subarch SLB_ADDR_LIMIT_DEFAULT Christophe Leroy
2019-03-20 10:07 ` [PATCH v1 25/27] powerpc/mm: flatten function __find_linux_pte() Christophe Leroy
2019-03-20 10:07 ` [PATCH v1 26/27] powerpc/mm: flatten function __find_linux_pte() step 2 Christophe Leroy
2019-03-20 10:07 ` [PATCH v1 27/27] powerpc/mm: flatten function __find_linux_pte() step 3 Christophe Leroy
2019-03-21 10:44 ` [PATCH v1 00/27] Reduce ifdef mess in hugetlbpage.c and slice.c 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=631fc88138cf384c94879d70c133b1260b0e0b96.1553076180.git.christophe.leroy@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=aneesh.kumar@linux.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.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).