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>
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v2 25/45] powerpc/8xx: Prepare handlers for _PAGE_HUGE for 512k pages.
Date: Wed, 6 May 2020 16:48:30 +0000 (UTC) [thread overview]
Message-ID: <371a89670713061c06b47ca9f5170fed89c5d141.1588783498.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1588783498.git.christophe.leroy@csgroup.eu>
Prepare ITLB handler to handle _PAGE_HUGE when CONFIG_HUGETLBFS
is enabled. This means that the L1 entry has to be kept in r11
until L2 entry is read, in order to insert _PAGE_HUGE into it.
Also move pgd_offset helpers before pte_update() as they
will be needed there in next patch.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/include/asm/nohash/32/pgtable.h | 13 ++++++-------
arch/powerpc/kernel/head_8xx.S | 15 +++++++++------
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h
index dd5835354e33..1a86d20b58f3 100644
--- a/arch/powerpc/include/asm/nohash/32/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/32/pgtable.h
@@ -206,6 +206,12 @@ static inline void pmd_clear(pmd_t *pmdp)
}
+/* to find an entry in a kernel page-table-directory */
+#define pgd_offset_k(address) pgd_offset(&init_mm, address)
+
+/* to find an entry in a page-table-directory */
+#define pgd_index(address) ((address) >> PGDIR_SHIFT)
+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
/*
* PTE updates. This function is called whenever an existing
@@ -348,13 +354,6 @@ static inline int pte_young(pte_t pte)
pfn_to_page((__pa(pmd_val(pmd)) >> PAGE_SHIFT))
#endif
-/* to find an entry in a kernel page-table-directory */
-#define pgd_offset_k(address) pgd_offset(&init_mm, address)
-
-/* to find an entry in a page-table-directory */
-#define pgd_index(address) ((address) >> PGDIR_SHIFT)
-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
-
/* Find an entry in the third-level page table.. */
#define pte_index(address) \
(((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index 905205c79a25..adad8baadcf5 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -196,7 +196,7 @@ SystemCall:
InstructionTLBMiss:
mtspr SPRN_SPRG_SCRATCH0, r10
-#if defined(ITLB_MISS_KERNEL) || defined(CONFIG_SWAP)
+#if defined(ITLB_MISS_KERNEL) || defined(CONFIG_SWAP) || defined(CONFIG_HUGETLBFS)
mtspr SPRN_SPRG_SCRATCH1, r11
#endif
@@ -235,16 +235,19 @@ InstructionTLBMiss:
rlwinm r10, r10, 0, 20, 31
oris r10, r10, (swapper_pg_dir - PAGE_OFFSET)@ha
3:
+ mtcr r11
#endif
+#ifdef CONFIG_HUGETLBFS
+ lwz r11, (swapper_pg_dir-PAGE_OFFSET)@l(r10) /* Get level 1 entry */
+ mtspr SPRN_MI_TWC, r11 /* Set segment attributes */
+ mtspr SPRN_MD_TWC, r11
+#else
lwz r10, (swapper_pg_dir-PAGE_OFFSET)@l(r10) /* Get level 1 entry */
mtspr SPRN_MI_TWC, r10 /* Set segment attributes */
-
mtspr SPRN_MD_TWC, r10
+#endif
mfspr r10, SPRN_MD_TWC
lwz r10, 0(r10) /* Get the pte */
-#ifdef ITLB_MISS_KERNEL
- mtcr r11
-#endif
#ifdef CONFIG_SWAP
rlwinm r11, r10, 32-5, _PAGE_PRESENT
and r11, r11, r10
@@ -263,7 +266,7 @@ InstructionTLBMiss:
/* Restore registers */
0: mfspr r10, SPRN_SPRG_SCRATCH0
-#if defined(ITLB_MISS_KERNEL) || defined(CONFIG_SWAP)
+#if defined(ITLB_MISS_KERNEL) || defined(CONFIG_SWAP) || defined(CONFIG_HUGETLBFS)
mfspr r11, SPRN_SPRG_SCRATCH1
#endif
rfi
--
2.25.0
next prev parent reply other threads:[~2020-05-06 16:50 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 16:48 [PATCH v2 00/45] Use hugepages to map kernel mem on 8xx Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 01/45] powerpc/kasan: Fix error detection on memory allocation Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 02/45] powerpc/kasan: Fix issues by lowering KASAN_SHADOW_END Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 03/45] powerpc/kasan: Fix shadow pages allocation failure Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 04/45] powerpc/kasan: Remove unnecessary page table locking Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 05/45] powerpc/kasan: Refactor update of early shadow mappings Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 06/45] powerpc/kasan: Declare kasan_init_region() weak Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 07/45] powerpc/ptdump: Limit size of flags text to 1/2 chars on PPC32 Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 08/45] powerpc/ptdump: Reorder flags Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 09/45] powerpc/ptdump: Add _PAGE_COHERENT flag Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 10/45] powerpc/ptdump: Display size of BATs Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 11/45] powerpc/ptdump: Standardise display of BAT flags Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 12/45] powerpc/ptdump: Properly handle non standard page size Christophe Leroy
2020-05-07 16:12 ` kbuild test robot
2020-05-06 16:48 ` [PATCH v2 13/45] powerpc/ptdump: Handle hugepd at PGD level Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 14/45] powerpc/32s: Don't warn when mapping RO data ROX Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 15/45] powerpc/mm: Allocate static page tables for fixmap Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 16/45] powerpc/mm: Fix conditions to perform MMU specific management by blocks on PPC32 Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 17/45] powerpc/mm: PTE_ATOMIC_UPDATES is only for 40x Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 18/45] powerpc/mm: Refactor pte_update() on nohash/32 Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 19/45] powerpc/mm: Refactor pte_update() on book3s/32 Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 20/45] powerpc/mm: Standardise __ptep_test_and_clear_young() params between PPC32 and PPC64 Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 21/45] powerpc/mm: Standardise pte_update() prototype " Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 22/45] powerpc/mm: Create a dedicated pte_update() for 8xx Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 23/45] powerpc/mm: Reduce hugepd size for 8M hugepages on 8xx Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 24/45] powerpc/8xx: Drop CONFIG_8xx_COPYBACK option Christophe Leroy
2020-05-06 16:48 ` Christophe Leroy [this message]
2020-05-06 16:48 ` [PATCH v2 26/45] powerpc/8xx: Manage 512k huge pages as standard pages Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 27/45] powerpc/8xx: Only 8M pages are hugepte pages now Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 28/45] powerpc/8xx: MM_SLICE is not needed anymore Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 29/45] powerpc/8xx: Move PPC_PIN_TLB options into 8xx Kconfig Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 30/45] powerpc/8xx: Add function to set pinned TLBs Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 31/45] powerpc/8xx: Don't set IMMR map anymore at boot Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 32/45] powerpc/8xx: Always pin TLBs at startup Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 33/45] powerpc/8xx: Drop special handling of Linear and IMMR mappings in I/D TLB handlers Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 34/45] powerpc/8xx: Remove now unused TLB miss functions Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 35/45] powerpc/8xx: Move DTLB perf handling closer Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 36/45] powerpc/mm: Don't be too strict with _etext alignment on PPC32 Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 37/45] powerpc/8xx: Refactor kernel address boundary comparison Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 38/45] powerpc/8xx: Add a function to early map kernel via huge pages Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 39/45] powerpc/8xx: Map IMMR with a huge page Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 40/45] powerpc/8xx: Map linear memory with huge pages Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 41/45] powerpc/8xx: Allow STRICT_KERNEL_RwX with pinned TLB Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 42/45] powerpc/8xx: Allow large TLBs with DEBUG_PAGEALLOC Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 43/45] powerpc/8xx: Implement dedicated kasan_init_region() Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 44/45] powerpc/32s: Allow mapping with BATs with DEBUG_PAGEALLOC Christophe Leroy
2020-05-06 16:48 ` [PATCH v2 45/45] powerpc/32s: Implement dedicated kasan_init_region() 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=371a89670713061c06b47ca9f5170fed89c5d141.1588783498.git.christophe.leroy@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--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).