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: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 09/15] powerpc/mm: inline pte_alloc_one_kernel() and pte_alloc_one() on PPC32
Date: Fri, 26 Apr 2019 15:58:07 +0000 (UTC) [thread overview]
Message-ID: <90f5242d483aced3a0ebc9abdebf0dc6ab431e1e.1556293738.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1556293738.git.christophe.leroy@c-s.fr>
pte_alloc_one_kernel() and pte_alloc_one() are simple calls to
pte_fragment_alloc(), so they are good candidates for inlining as
already done on PPC64.
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/powerpc/include/asm/book3s/32/pgalloc.h | 15 ++++++++++++---
arch/powerpc/include/asm/nohash/32/pgalloc.h | 15 ++++++++++++---
arch/powerpc/mm/pgtable_32.c | 10 ----------
3 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/32/pgalloc.h b/arch/powerpc/include/asm/book3s/32/pgalloc.h
index 645af86cd072..0ed856068bb8 100644
--- a/arch/powerpc/include/asm/book3s/32/pgalloc.h
+++ b/arch/powerpc/include/asm/book3s/32/pgalloc.h
@@ -59,10 +59,19 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmdp,
#define pmd_pgtable(pmd) ((pgtable_t)pmd_page_vaddr(pmd))
-extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm);
-extern pgtable_t pte_alloc_one(struct mm_struct *mm);
-void pte_frag_destroy(void *pte_frag);
pte_t *pte_fragment_alloc(struct mm_struct *mm, int kernel);
+
+static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
+{
+ return (pte_t *)pte_fragment_alloc(mm, 1);
+}
+
+static inline pgtable_t pte_alloc_one(struct mm_struct *mm)
+{
+ return (pgtable_t)pte_fragment_alloc(mm, 0);
+}
+
+void pte_frag_destroy(void *pte_frag);
void pte_fragment_free(unsigned long *table, int kernel);
static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
diff --git a/arch/powerpc/include/asm/nohash/32/pgalloc.h b/arch/powerpc/include/asm/nohash/32/pgalloc.h
index ea265a578eb0..1d41508f0676 100644
--- a/arch/powerpc/include/asm/nohash/32/pgalloc.h
+++ b/arch/powerpc/include/asm/nohash/32/pgalloc.h
@@ -77,10 +77,19 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmdp,
#define pmd_pgtable(pmd) ((pgtable_t)pmd_page_vaddr(pmd))
#endif
-extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm);
-extern pgtable_t pte_alloc_one(struct mm_struct *mm);
-void pte_frag_destroy(void *pte_frag);
pte_t *pte_fragment_alloc(struct mm_struct *mm, int kernel);
+
+static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
+{
+ return (pte_t *)pte_fragment_alloc(mm, 1);
+}
+
+static inline pgtable_t pte_alloc_one(struct mm_struct *mm)
+{
+ return (pgtable_t)pte_fragment_alloc(mm, 0);
+}
+
+void pte_frag_destroy(void *pte_frag);
void pte_fragment_free(unsigned long *table, int kernel);
static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index a1c3062f0665..d02fe3ce64db 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -43,16 +43,6 @@ EXPORT_SYMBOL(ioremap_bot); /* aka VMALLOC_END */
extern char etext[], _stext[], _sinittext[], _einittext[];
-pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
-{
- return (pte_t *)pte_fragment_alloc(mm, 1);
-}
-
-pgtable_t pte_alloc_one(struct mm_struct *mm)
-{
- return (pgtable_t)pte_fragment_alloc(mm, 0);
-}
-
void __iomem *
ioremap(phys_addr_t addr, unsigned long size)
{
--
2.13.3
next prev parent reply other threads:[~2019-04-26 16:14 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-26 15:57 [PATCH v2 00/15] Refactor pgalloc stuff Christophe Leroy
2019-04-26 15:57 ` [PATCH v2 01/15] powerpc/mm: drop __bad_pte() Christophe Leroy
2019-05-03 6:59 ` Michael Ellerman
2019-04-26 15:58 ` [PATCH v2 02/15] powerpc/mm: define __pud_free_tlb() at all time on nohash/64 Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 03/15] powerpc/mm: convert Book3E 64 to pte_fragment Christophe Leroy
2019-05-06 6:37 ` Christophe Leroy
2019-05-06 11:29 ` Michael Ellerman
2019-04-26 15:58 ` [PATCH v2 04/15] powerpc/mm: move pgtable_t in asm/mmu.h Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 05/15] powerpc/mm: get rid of nohash/32/mmu.h and nohash/64/mmu.h Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 06/15] powerpc/Kconfig: select PPC_MM_SLICES from subarch type Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 07/15] powerpc/book3e: move early_alloc_pgtable() to init section Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 08/15] powerpc/mm: don't use pte_alloc_kernel() until slab is available on PPC32 Christophe Leroy
2019-04-26 15:58 ` Christophe Leroy [this message]
2019-04-26 15:58 ` [PATCH v2 10/15] powerpc/mm: refactor pte_alloc_one() and pte_free() families definition Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 11/15] powerpc/mm: refactor definition of pgtable_cache[] Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 12/15] powerpc/mm: Only keep one version of pmd_populate() functions on nohash/32 Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 13/15] powerpc/mm: refactor pgtable freeing functions on nohash Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 14/15] powerpc/mm: refactor pmd_pgtable() Christophe Leroy
2019-04-26 15:58 ` [PATCH v2 15/15] powerpc/mm: refactor pgd_alloc() and pgd_free() on nohash 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=90f5242d483aced3a0ebc9abdebf0dc6ab431e1e.1556293738.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).