riscv: mm: Implement pmdp_collapse_flush for THP
PATCH v2 1/1 riscv: mm: Implement pmdp_collapse_flush for THP
When THP is enabled, 4K pages are collapsed into a single huge page using the generic pmdp_collapse_flush() which will further use flush_tlb_range() to shoot-down stale TLB entries. Unfortunately, the generic pmdp_collapse_flush() only invalidates cached leaf PTEs using address specific SFENCEs which results in repetitive (or unpredictable) page faults on RISC-V implementations which cache non-leaf PTEs.
Provide a RISC-V specific pmdp_collapse_flush() which ensures both cached leaf and non-leaf PTEs are invalidated by using non-address specific SFENCEs as recommended by the RISC-V privileged specification.
--- arch/riscv/include/asm/pgtable.h | 4 ++++ arch/riscv/mm/pgtable.c | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+)
arch/riscv/include/asm/pgtable.h +4 -0
@@ -721,6 +721,10 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma,page_table_check_pmd_set (vma->vm_mm, address, pmdp, pmd); return __pmd(atomic_long_xchg((atomic_long_t *)pmdp, pmd_val(pmd))); } + +#define pmdp_collapse_flush pmdp_collapse_flush +extern pmd_t pmdp_collapse_flush (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp);#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ /*
arch/riscv/mm/pgtable.c +26 -0
@@ -81,3 +81,29 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) }#endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +pmd_t pmdp_collapse_flush (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) +{ +pmd_t pmd =pmdp_huge_get_and_clear (vma->vm_mm, address, pmdp); + +VM_BUG_ON (address & ~HPAGE_PMD_MASK ); +VM_BUG_ON (pmd_trans_huge (*pmdp)); +/* +* When leaf PTE enteries (regular pages) are collapsed into a leaf +* PMD entry (huge page), a valid non-leaf PTE is converted into a +* valid leaf PTE at the level 1 page table. The RISC-V privileged v1.12 +* specification allows implementations to cache valid non-leaf PTEs, +* but the section "4.2.1 Supervisor Memory-Management Fence +* Instruction" recommends the following: +* "If software modifies a non-leaf PTE, it should execute SFENCE.VMA +* with rs1=x0. If any PTE along the traversal path had its G bit set, +* rs2 must be x0; otherwise, rs2 should be set to the ASID for which +* the translation is being modified." +* Based on the above recommendation, we should do full flush whenever +* leaf PTE entries are collapsed into a leaf PMD entry. +*/ +flush_tlb_mm (vma->vm_mm); +return pmd; +} +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Quoted 8 lines · Mayuresh Chitale
When THP is enabled, 4K pages are collapsed into a single huge page using the generic
pmdp_collapse_flush()which will further useflush_tlb_range()to shoot-down stale TLB entries. Unfortunately, the genericpmdp_collapse_flush()only invalidates cached leaf PTEs using address specific SFENCEs which results in repetitive (or unpredictable) page faults on RISC-V implementations which cache non-leaf PTEs.
Quoted 7 lines
Provide a RISC-V specific
pmdp_collapse_flush()which ensures both cached leaf and non-leaf PTEs are invalidated by using non-address specific SFENCEs as recommended by the RISC-V privileged specification.Fixes e88b333142e4 ("riscv: mm: add THP support on 64-bit")Signed-off-by Mayuresh Chitale <[email protected]>---
Please add a changelog here under the --- to explain the differences between this version and the last version. b4-diff shows me what changed, but the changelog should be present to explain why it changed.
Quoted 25 lines
arch/riscv/include/asm/pgtable.h | 4 ++++ arch/riscv/mm/pgtable.c | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+)arch/riscv/include/asm/pgtable.h +4
-0@@ -721,6 +721,10 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma,page_table_check_pmd_set (vma->vm_mm, address, pmdp, pmd); return __pmd(atomic_long_xchg((atomic_long_t *)pmdp, pmd_val(pmd))); } + +#define pmdp_collapse_flush pmdp_collapse_flush +extern pmd_t pmdp_collapse_flush (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp);#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ /* arch/riscv/mm/pgtable.c +0
-0@@ -81,3 +81,29 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) }
arch/riscv/mm/pgtable.c int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) · line 91
Quoted 10 lines
arch/riscv/mm/pgtable.c +8
-0#endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +pmd_t pmdp_collapse_flush (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) +{ +pmd_t pmd =pmdp_huge_get_and_clear (vma->vm_mm, address, pmdp); + +VM_BUG_ON (address & ~HPAGE_PMD_MASK ); +VM_BUG_ON (pmd_trans_huge (*pmdp));
These checks should come before the use of variables being checked, as is done in the common version of the function.
Quoted 21 lines
arch/riscv/mm/pgtable.c +18
-0+/* +* When leaf PTE enteries (regular pages) are collapsed into a leaf +* PMD entry (huge page), a valid non-leaf PTE is converted into a +* valid leaf PTE at the level 1 page table. The RISC-V privileged v1.12 +* specification allows implementations to cache valid non-leaf PTEs, +* but the section "4.2.1 Supervisor Memory-Management Fence +* Instruction" recommends the following: +* "If software modifies a non-leaf PTE, it should execute SFENCE.VMA +* with rs1=x0. If any PTE along the traversal path had its G bit set, +* rs2 must be x0; otherwise, rs2 should be set to the ASID for which +* the translation is being modified." +* Based on the above recommendation, we should do full flush whenever +* leaf PTE entries are collapsed into a leaf PMD entry. +*/ +flush_tlb_mm (vma->vm_mm); + return pmd; +} +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ Signature · 1 line
2.34.1
Thanks,
drew
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Palmer Dabbelt
maintainerQuoted 53 lines · On Sun, 29 Jan 2023 23:48:15 PST (-0800), [email protected] wrote:
When THP is enabled, 4K pages are collapsed into a single huge page using the generic
pmdp_collapse_flush()which will further useflush_tlb_range()to shoot-down stale TLB entries. Unfortunately, the genericpmdp_collapse_flush()only invalidates cached leaf PTEs using address specific SFENCEs which results in repetitive (or unpredictable) page faults on RISC-V implementations which cache non-leaf PTEs.Provide a RISC-V specific
pmdp_collapse_flush()which ensures both cached leaf and non-leaf PTEs are invalidated by using non-address specific SFENCEs as recommended by the RISC-V privileged specification.Fixes e88b333142e4 ("riscv: mm: add THP support on 64-bit")Signed-off-by Mayuresh Chitale <[email protected]>--- arch/riscv/include/asm/pgtable.h | 4 ++++ arch/riscv/mm/pgtable.c | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+)arch/riscv/include/asm/pgtable.h +4
-0@@ -721,6 +721,10 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma,page_table_check_pmd_set (vma->vm_mm, address, pmdp, pmd); return __pmd(atomic_long_xchg((atomic_long_t *)pmdp, pmd_val(pmd))); } + +#define pmdp_collapse_flush pmdp_collapse_flush +extern pmd_t pmdp_collapse_flush (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp);#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ /* arch/riscv/mm/pgtable.c +11
-0@@ -81,3 +81,29 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) }#endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +pmd_t pmdp_collapse_flush (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) +{ +pmd_t pmd =pmdp_huge_get_and_clear (vma->vm_mm, address, pmdp); + +VM_BUG_ON (address & ~HPAGE_PMD_MASK ); +VM_BUG_ON (pmd_trans_huge (*pmdp)); +/* +* When leaf PTE enteries (regular pages) are collapsed into a leaf +* PMD entry (huge page), a valid non-leaf PTE is converted into a
arch/riscv/mm/pgtable.c int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) · line 104
Quoted 10 lines
arch/riscv/mm/pgtable.c +10
-0+* valid leaf PTE at the level 1 page table. The RISC-V privileged v1.12 +* specification allows implementations to cache valid non-leaf PTEs, +* but the section "4.2.1 Supervisor Memory-Management Fence +* Instruction" recommends the following: +* "If software modifies a non-leaf PTE, it should execute SFENCE.VMA +* with rs1=x0. If any PTE along the traversal path had its G bit set, +* rs2 must be x0; otherwise, rs2 should be set to the ASID for which +* the translation is being modified." +* Based on the above recommendation, we should do full flush whenever +* leaf PTE entries are collapsed into a leaf PMD entry.
It's generally best to ignore the recommendations in the commentary about flushes, they assume a specific software model that doesn't always apply to Linux. In this case we do need the fence, though, but I changed the comment to explain it differently (an fix at least one spelling mistake).
I've squashed this in and have it in staging, if that looks good I'll put it on fixes. Thanks!
arch/riscv/mm/pgtable.c +0 -0
@@ -90,18 +90,12 @@ pmd_t pmdp_collapse_flush(struct vm_area_struct *vma,
VM_BUG_ON(address & ~HPAGE_PMD_MASK); VM_BUG_ON(pmd_trans_huge(*pmdp)); /*
- * When leaf PTE enteries (regular pages) are collapsed into a leaf
+ * When leaf PTE entries (regular pages) are collapsed into a leaf
* PMD entry (huge page), a valid non-leaf PTE is converted into a
- * valid leaf PTE at the level 1 page table. The RISC-V privileged v1.12
- * specification allows implementations to cache valid non-leaf PTEs,
- * but the section "4.2.1 Supervisor Memory-Management Fence
- * Instruction" recommends the following:
- * "If software modifies a non-leaf PTE, it should execute SFENCE.VMA
- * with rs1=x0. If any PTE along the traversal path had its G bit set,
- * rs2 must be x0; otherwise, rs2 should be set to the ASID for which
- * the translation is being modified."
- * Based on the above recommendation, we should do full flush whenever
- * leaf PTE entries are collapsed into a leaf PMD entry.
+ * valid leaf PTE at the level 1 page table. Since the sfence.vma
+ * forms that specify an address only apply to leaf PTEs, we need a
+ * global flush here. collapse_huge_page() assumes these flushes are
+ * eager, so just do the fence here.
*/ flush_tlb_mm(vma->vm_mm); return pmd;
arch/riscv/mm/pgtable.c int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) · line 109
Quoted 5 lines
arch/riscv/mm/pgtable.c +5
-0+*/ +flush_tlb_mm (vma->vm_mm); + return pmd; +} +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Quoted 93 lines · Palmer Dabbelt
Quoted 53 lines · On Sun, 29 Jan 2023 23:48:15 PST (-0800), [email protected] wrote:
When THP is enabled, 4K pages are collapsed into a single huge page using the generic
pmdp_collapse_flush()which will further useflush_tlb_range()to shoot-down stale TLB entries. Unfortunately, the genericpmdp_collapse_flush()only invalidates cached leaf PTEs using address specific SFENCEs which results in repetitive (or unpredictable) page faults on RISC-V implementations which cache non-leaf PTEs.Provide a RISC-V specific
pmdp_collapse_flush()which ensures both cached leaf and non-leaf PTEs are invalidated by using non-address specific SFENCEs as recommended by the RISC-V privileged specification.Fixes e88b333142e4 ("riscv: mm: add THP support on 64-bit")Signed-off-by Mayuresh Chitale <[email protected]>--- arch/riscv/include/asm/pgtable.h | 4 ++++ arch/riscv/mm/pgtable.c | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+)arch/riscv/include/asm/pgtable.h +4
-0@@ -721,6 +721,10 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma,page_table_check_pmd_set (vma->vm_mm, address, pmdp, pmd); return __pmd(atomic_long_xchg((atomic_long_t *)pmdp, pmd_val(pmd))); } + +#define pmdp_collapse_flush pmdp_collapse_flush +extern pmd_t pmdp_collapse_flush (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp);#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ /* arch/riscv/mm/pgtable.c +11
-0@@ -81,3 +81,29 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) }#endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +pmd_t pmdp_collapse_flush (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp) +{ +pmd_t pmd =pmdp_huge_get_and_clear (vma->vm_mm, address, pmdp); + +VM_BUG_ON (address & ~HPAGE_PMD_MASK ); +VM_BUG_ON (pmd_trans_huge (*pmdp)); +/* +* When leaf PTE enteries (regular pages) are collapsed into a leaf +* PMD entry (huge page), a valid non-leaf PTE is converted into a arch/riscv/mm/pgtable.c int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) · line 104
Quoted 10 lines
arch/riscv/mm/pgtable.c +10
-0+* valid leaf PTE at the level 1 page table. The RISC-V privileged v1.12 +* specification allows implementations to cache valid non-leaf PTEs, +* but the section "4.2.1 Supervisor Memory-Management Fence +* Instruction" recommends the following: +* "If software modifies a non-leaf PTE, it should execute SFENCE.VMA +* with rs1=x0. If any PTE along the traversal path had its G bit set, +* rs2 must be x0; otherwise, rs2 should be set to the ASID for which +* the translation is being modified." +* Based on the above recommendation, we should do full flush whenever +* leaf PTE entries are collapsed into a leaf PMD entry. It's generally best to ignore the recommendations in the commentary about flushes, they assume a specific software model that doesn't always apply to Linux. In this case we do need the fence, though, but I changed the comment to explain it differently (an fix at least one spelling mistake).
I've squashed this in and have it in staging, if that looks good I'll put it on fixes. Thanks!
arch/riscv/mm/pgtable.c +1
-8@@ -90,18 +90,12 @@ pmd_t pmdp_collapse_flush(struct vm_area_struct *vma,VM_BUG_ON (address & ~HPAGE_PMD_MASK );VM_BUG_ON (pmd_trans_huge (*pmdp));/* -* When leaf PTE enteries (regular pages) are collapsed into a leaf +* When leaf PTE entries (regular pages) are collapsed into a leaf * PMD entry (huge page), a valid non-leaf PTE is converted into a -* valid leaf PTE at the level 1 page table. The RISC-V privileged v1.12 -* specification allows implementations to cache valid non-leaf PTEs, -* but the section "4.2.1 Supervisor Memory-Management Fence -* Instruction" recommends the following: -* "If software modifies a non-leaf PTE, it should execute SFENCE.VMA -* with rs1=x0. If any PTE along the traversal path had its G bit set, -* rs2 must be x0; otherwise, rs2 should be set to the ASID for which
arch/riscv/mm/pgtable.c pmd_t pmdp_collapse_flush(struct vm_area_struct *vma, · line 101
Quoted 10 lines
arch/riscv/mm/pgtable.c +4
-3-* the translation is being modified." -* Based on the above recommendation, we should do full flush whenever -* leaf PTE entries are collapsed into a leaf PMD entry. +* valid leaf PTE at the level 1 page table. Since the sfence.vma +* forms that specify an address only apply to leaf PTEs, we need a +* global flush here. collapse_huge_page() assumes these flushes are +* eager, so just do the fence here. */ flush_tlb_mm (vma->vm_mm);return pmd;
This looks good to me. Please add it to the list of fixes.
Regards,
Anup
Quoted 7 lines
arch/riscv/mm/pgtable.c int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) · line 109
Quoted 7 lines
arch/riscv/mm/pgtable.c +5
-0+*/ +flush_tlb_mm (vma->vm_mm); + return pmd; +} +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
This patch was applied to riscv/linux.git (fixes) by Palmer Dabbelt <[email protected]>:
Hello:
This patch was applied to riscv/linux.git (fixes)
by Palmer Dabbelt <[email protected]>:
Quoted 9 lines · On Mon, 30 Jan 2023 13:18:15 +0530 you wrote:
When THP is enabled, 4K pages are collapsed into a single huge page using the generic
pmdp_collapse_flush()which will further useflush_tlb_range()to shoot-down stale TLB entries. Unfortunately, the genericpmdp_collapse_flush()only invalidates cached leaf PTEs using address specific SFENCEs which results in repetitive (or unpredictable) page faults on RISC-V implementations which cache non-leaf PTEs.[...]
Here is the summary with links:
- [v2] riscv: mm: Implement pmdp_collapse_flush for THP
https://git.kernel.org/riscv/c/f0293cd1f4fc
You are awesome, thank you!
Signature · 9 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv