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 v2 08/15] powerpc/mm: don't use pte_alloc_kernel() until slab is available on PPC32
Date: Fri, 26 Apr 2019 15:58:06 +0000 (UTC) [thread overview]
Message-ID: <818f251f96fce0024509529a39a1847204cf118d.1556293738.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1556293738.git.christophe.leroy@c-s.fr>
In the same way as PPC64, implement early allocation functions and
avoid calling pte_alloc_kernel() before slab is available.
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/powerpc/mm/pgtable_32.c | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index 6e56a6240bfa..a1c3062f0665 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -43,11 +43,8 @@ EXPORT_SYMBOL(ioremap_bot); /* aka VMALLOC_END */
extern char etext[], _stext[], _sinittext[], _einittext[];
-__ref pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
+pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
{
- if (!slab_is_available())
- return memblock_alloc(PTE_FRAG_SIZE, PTE_FRAG_SIZE);
-
return (pte_t *)pte_fragment_alloc(mm, 1);
}
@@ -205,7 +202,29 @@ void iounmap(volatile void __iomem *addr)
}
EXPORT_SYMBOL(iounmap);
-int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot)
+static void __init *early_alloc_pgtable(unsigned long size)
+{
+ void *ptr = memblock_alloc(size, size);
+
+ if (!ptr)
+ panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
+ __func__, size, size);
+
+ return ptr;
+}
+
+static pte_t __init *early_pte_alloc_kernel(pmd_t *pmdp, unsigned long va)
+{
+ if (pmd_none(*pmdp)) {
+ pte_t *ptep = early_alloc_pgtable(PTE_FRAG_SIZE);
+
+ pmd_populate_kernel(&init_mm, pmdp, ptep);
+ }
+ return pte_offset_kernel(pmdp, va);
+}
+
+
+int __ref map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot)
{
pmd_t *pd;
pte_t *pg;
@@ -214,7 +233,10 @@ int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot)
/* Use upper 10 bits of VA to index the first level map */
pd = pmd_offset(pud_offset(pgd_offset_k(va), va), va);
/* Use middle 10 bits of VA to index the second-level map */
- pg = pte_alloc_kernel(pd, va);
+ if (likely(slab_is_available()))
+ pg = pte_alloc_kernel(pd, va);
+ else
+ pg = early_pte_alloc_kernel(pd, va);
if (pg != 0) {
err = 0;
/* The PTE should never be already set nor present in the
--
2.13.3
next prev parent reply other threads:[~2019-04-26 15:58 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 ` Christophe Leroy [this message]
2019-04-26 15:58 ` [PATCH v2 09/15] powerpc/mm: inline pte_alloc_one_kernel() and pte_alloc_one() on PPC32 Christophe Leroy
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=818f251f96fce0024509529a39a1847204cf118d.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).