mm: preparatory patches for PMD level swap entries
Subsystems (16)
Usama Arif
reviewerv2 cover mm: preparatory patches for PMD level swap entries
This is the preparatory part of the PMD page table swapin work. The full PMD swap entry series has been split into two parts:
1. this preparatory series, which contains the first 6 patches. Zi [1] and Lance [2] suggested to separate this out from the core series.
2. the PMD swap entry core series, which depends on this one. I will send this once the preparatory series is merged in mm-new as v3 as the combined is currently at v2 [1].
I have not marked this prep series as v3, as its not really adding support for PMD swap entries.
This series does not introduce PMD swap entries and does not install any new page-table entry type. It only cleans up existing PMD softleaf helpers and call sites so the follow-up PMD swap entry series can be smaller and easier to review.
It should be safe to merge independently. The patches are either helper additions, refactors of existing open-coded logic, defensive checks that preserve current migration/device-private behavior, or a mechanical rename of the PMD softleaf Kconfig gate. The follow-up series depends on these helpers, but this series does not depend on the follow-up series.
Patch breakdown:
1. mm: add softleaf_to_pmd() and convert existing callers Add the PMD counterpart to softleaf_to_pte() and convert existing swp_entry_to_pmd() users that are constructing PMD softleaf entries.
2. mm: extract mm_prepare_for_swap_entries() helper Hoist the "register mm with swapoff" double-checked-locking pattern out of try_to_unmap_one() and copy_nonpresent_pte() so future PMD-level users do not need another open-coded copy.
3. fs/proc: use softleaf_has_pfn() in pagemap PMD walker Avoid assuming every non-present PMD softleaf entry encodes a PFN. Existing migration/device-private behavior is preserved.
4. mm/huge_memory: move softleaf_to_folio() inside migration branch Keep the folio lookup in change_non_present_huge_pmd() scoped to the migration-entry branch that actually needs it.
5. mm/migrate_device: move softleaf_to_folio() inside device-private branch
Apply the same ordering cleanup to migrate_vma_collect_pmd(): only derive a folio after confirming the PMD entry is device-private.
6. mm: rename ARCH_ENABLE_THP_MIGRATION to ARCH_HAS_PMD_SOFTLEAVES Rename the architecture gate to describe what it actually enables:
PMD softleaf entries. Migration remains the only current user in this series; the follow-up series adds PMD swap entries.
The patches are based on akpm/mm-new from before this series (git hash: a8754c9b38cf2fa1d764fedd29ae8b9f3ace8058)
[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/#t
[3] https://lore.kernel.org/all/[email protected]/
---
v1 -> v2: https://lore.kernel.org/all/[email protected]/
- Remove unnecessary comment in patch 2 (David)
- s/ARCH_SUPPORTS_PMD_SOFTLEAF/ARCH_HAS_PMD_SOFTLEAVES/ and rewrite the commit message (David)
Usama Arif (6):
mm: add softleaf_to_pmd() and convert existing callers
mm: extract mm_prepare_for_swap_entries() helper fs/proc: use softleaf_has_pfn() in pagemap PMD walker mm/huge_memory: move softleaf_to_folio() inside migration branch mm/migrate_device: move softleaf_to_folio() inside device-private
branch
mm: rename ARCH_ENABLE_THP_MIGRATION to ARCH_HAS_PMD_SOFTLEAVES
arch/arm64/Kconfig | 2 +- arch/arm64/include/asm/pgtable.h | 4 +-- arch/loongarch/Kconfig | 2 +- arch/powerpc/include/asm/book3s/64/pgtable.h | 2 +- arch/powerpc/platforms/Kconfig.cputype | 2 +- arch/riscv/Kconfig | 2 +- arch/riscv/include/asm/pgtable.h | 8 +++--- arch/s390/Kconfig | 2 +- arch/s390/include/asm/pgtable.h | 2 +- arch/x86/Kconfig | 2 +- arch/x86/include/asm/pgtable.h | 2 +- fs/proc/task_mmu.c | 3 ++- include/linux/huge_mm.h | 2 +- include/linux/leafops.h | 28 +++++++++++++++++--- include/linux/pgtable.h | 2 +- include/linux/swapops.h | 6 ++--- mm/Kconfig | 2 +- mm/debug_vm_pgtable.c | 12 ++++----- mm/hmm.c | 4 +-- mm/huge_memory.c | 17 ++++++------ mm/internal.h | 10 +++++++ mm/memory.c | 9 +------ mm/migrate.c | 4 +-- mm/migrate_device.c | 19 +++++++------ mm/rmap.c | 9 ++----- 25 files changed, 90 insertions(+), 67 deletions(-)
Signature · 1 line
2.53.0-Meta
Usama Arif
reviewerPATCH v2 1/6 mm: add softleaf_to_pmd() and convert existing callers
Add softleaf_to_pmd() as the PMD counterpart to softleaf_to_pte(), completing the symmetry of the softleaf abstraction for page table leaf entries.
The upcoming PMD swap entry support needs to construct PMD entries from swap entries. Converting existing swp_entry_to_pmd() callers to softleaf_to_pmd() in a prep patch keeps the feature patches focused on new functionality rather than mixing refactoring with new code.
--- include/linux/leafops.h | 20 ++++++++++++++++++++ mm/debug_vm_pgtable.c | 4 ++-- mm/huge_memory.c | 12 ++++++------ mm/migrate_device.c | 2 +- 4 files changed, 29 insertions(+), 9 deletions(-)
include/linux/leafops.h +20 -0
@@ -108,6 +108,21 @@ static inline softleaf_t softleaf_from_pmd(pmd_t pmd) return swp_entry(__swp_type(arch_entry), __swp_offset(arch_entry)); } +/** +* softleaf_to_pmd() - Obtain a PMD entry from a leaf entry. +* @entry: Leaf entry. +* +* This generates an architecture-specific PMD entry that can be utilised to +* encode the metadata the leaf entry encodes. +* +* Returns: Architecture-specific PMD entry encoding leaf entry. +*/ +static inline pmd_t softleaf_to_pmd (softleaf_t entry) +{ +/* Temporary until swp_entry_t eliminated. */ +return swp_entry_to_pmd (entry); +} +#else static inline softleaf_t softleaf_from_pmd (pmd_t pmd)
@@ -115,6 +130,11 @@ static inline softleaf_t softleaf_from_pmd(pmd_t pmd) return softleaf_mk_none(); } +static inline pmd_t softleaf_to_pmd (softleaf_t entry) +{ +return __pmd (0 ); +} +#endif /**
mm/debug_vm_pgtable.c +2 -2
@@ -758,7 +758,7 @@ static void __init pmd_leaf_soft_dirty_tests(struct pgtable_debug_args *args)return ;pr_debug ("Validating PMD swap soft dirty\n" ); - pmd =swp_entry_to_pmd (args->leaf_entry); + pmd =softleaf_to_pmd (args->leaf_entry);WARN_ON (!pmd_is_huge (pmd));WARN_ON (!pmd_is_valid_softleaf (pmd));
@@ -829,7 +829,7 @@ static void __init pmd_softleaf_tests(struct pgtable_debug_args *args)return ;pr_debug ("Validating PMD swap\n" ); - pmd1 =swp_entry_to_pmd (args->leaf_entry); + pmd1 =softleaf_to_pmd (args->leaf_entry);WARN_ON (!pmd_is_huge (pmd1));WARN_ON (!pmd_is_valid_softleaf (pmd1));
mm/huge_memory.c +6 -6
@@ -1819,7 +1819,7 @@ static void copy_huge_non_present_pmd(if (softleaf_is_migration_write (entry) ||softleaf_is_migration_read_exclusive (entry)) { entry =make_readable_migration_entry (swp_offset (entry)); - pmd =swp_entry_to_pmd (entry); + pmd =softleaf_to_pmd (entry);if (pmd_swp_soft_dirty (*src_pmd)) pmd =pmd_swp_mksoft_dirty (pmd);if (pmd_swp_uffd_wp (*src_pmd))
@@ -1832,7 +1832,7 @@ static void copy_huge_non_present_pmd(*/ if (softleaf_is_device_private_write (entry)) { entry =make_readable_device_private_entry (swp_offset (entry)); - pmd =swp_entry_to_pmd (entry); + pmd =softleaf_to_pmd (entry);if (pmd_swp_soft_dirty (*src_pmd)) pmd =pmd_swp_mksoft_dirty (pmd);
@@ -2570,12 +2570,12 @@ static void change_non_present_huge_pmd(struct mm_struct *mm, entry =make_readable_exclusive_migration_entry (swp_offset (entry)); else entry =make_readable_migration_entry (swp_offset (entry)); - newpmd =swp_entry_to_pmd (entry); + newpmd =softleaf_to_pmd (entry);if (pmd_swp_soft_dirty (*pmd)) newpmd =pmd_swp_mksoft_dirty (newpmd); }else if (softleaf_is_device_private_write (entry)) { entry =make_readable_device_private_entry (swp_offset (entry)); - newpmd =swp_entry_to_pmd (entry); + newpmd =softleaf_to_pmd (entry);if (pmd_swp_uffd_wp (*pmd)) newpmd =pmd_swp_mkuffd_wp (newpmd); }else {
@@ -4927,7 +4927,7 @@ int set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw, }/* Set PMD. */ - pmdswp =swp_entry_to_pmd (entry); + pmdswp =softleaf_to_pmd (entry);if (softdirty) pmdswp =pmd_swp_mksoft_dirty (pmdswp);if (uffd_wp)
@@ -4980,7 +4980,7 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new)else entry =make_readable_device_private_entry (page_to_pfn (new)); - pmde =swp_entry_to_pmd (entry); + pmde =softleaf_to_pmd (entry);if (pmd_swp_soft_dirty (*pvmw->pmd)) pmde =pmd_swp_mksoft_dirty (pmde);
mm/migrate_device.c +1 -1
@@ -835,7 +835,7 @@ static int migrate_vma_insert_huge_pmd_page(struct migrate_vma *migrate,else swp_entry =make_readable_device_private_entry (page_to_pfn (page)); - entry =swp_entry_to_pmd (swp_entry); + entry =softleaf_to_pmd (swp_entry); }else {if (folio_is_zone_device (folio) && !folio_is_device_coherent (folio)) {
Signature · 1 line
2.53.0-Meta
Usama Arif
reviewerPATCH v2 2/6 mm: extract mm_prepare_for_swap_entries() helper
In reply to Usama ArifWhen a swap entry is installed in a page table, the mm must be added to init_mm.mmlist so that swapoff can find and unuse its swap entries. This double-checked locking pattern is currently open-coded in try_to_unmap_one() and copy_nonpresent_pte().
Move it into mm_prepare_for_swap_entries() in mm/internal.h and convert both callers so it can be reused by upcoming PMD-level swap entry code paths that also need to register the mm with swapoff.
copy_nonpresent_pte() previously inserted into &src_mm->mmlist rather than &init_mm.mmlist, but the insertion point is irrelevant, mmlist is a circular list and swapoff walks it entirely from init_mm.mmlist, so only membership matters, not position.
--- mm/internal.h | 10 ++++++++++ mm/memory.c | 9 +-------- mm/rmap.c | 7 +------ 3 files changed, 12 insertions(+), 14 deletions(-)
mm/internal.h +10 -0
@@ -1955,4 +1955,14 @@ static inline int get_sysctl_max_map_count(void)bool may_expand_vm (struct mm_struct *mm,const vma_flags_t *vma_flags,unsigned long npages); +static inline void mm_prepare_for_swap_entries (struct mm_struct *mm) +{ +if (list_empty (&mm->mmlist)) { +spin_lock (&mmlist_lock); +if (list_empty (&mm->mmlist)) +list_add (&mm->mmlist, &init_mm.mmlist); +spin_unlock (&mmlist_lock); + } +} +#endif /* __MM_INTERNAL_H */
mm/memory.c +1 -8
@@ -953,14 +953,7 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,if (swap_dup_entry_direct (entry) <0 )return -EIO ; -/* make sure dst_mm is on swapoff's mmlist. */ -if (unlikely (list_empty (&dst_mm->mmlist))) { -spin_lock (&mmlist_lock); -if (list_empty (&dst_mm->mmlist)) -list_add (&dst_mm->mmlist, - &src_mm->mmlist); -spin_unlock (&mmlist_lock); - } +mm_prepare_for_swap_entries (dst_mm);/* Mark the swap entry as shared. */ if (pte_swp_exclusive (orig_pte)) { pte =pte_swp_clear_exclusive (orig_pte);
mm/rmap.c +1 -6
@@ -2304,12 +2304,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma,set_pte_at (mm, address, pvmw.pte, pteval); goto walk_abort; } -if (list_empty (&mm->mmlist)) { -spin_lock (&mmlist_lock); -if (list_empty (&mm->mmlist)) -list_add (&mm->mmlist, &init_mm.mmlist); -spin_unlock (&mmlist_lock); - } +mm_prepare_for_swap_entries (mm);dec_mm_counter (mm,MM_ANONPAGES );inc_mm_counter (mm,MM_SWAPENTS ); swp_pte =swp_entry_to_pte (entry);
Signature · 1 line
2.53.0-Meta
Kiryl Shutsemau
reviewerRe: [PATCH v2 2/6] mm: extract mm_prepare_for_swap_entries() helper
Quoted 29 lines · Usama Arif
When a swap entry is installed in a page table, the mm must be added to init_mm.mmlist so that swapoff can find and unuse its swap entries. This double-checked locking pattern is currently open-coded in
try_to_unmap_one()andcopy_nonpresent_pte().Move it into
mm_prepare_for_swap_entries()inmm/internal.hand convert both callers so it can be reused by upcoming PMD-level swap entry code paths that also need to register the mm with swapoff.
copy_nonpresent_pte()previously inserted into&src_mm->mmlistrather than &init_mm.mmlist, but the insertion point is irrelevant, mmlist is a circular list and swapoff walks it entirely from init_mm.mmlist, so only membership matters, not position.Reviewed-by Dev Jain <[email protected]>Reviewed-by Zi Yan <[email protected]>Signed-off-by Usama Arif <[email protected]>--- mm/internal.h | 10 ++++++++++ mm/memory.c | 9 +-------- mm/rmap.c | 7 +------ 3 files changed, 12 insertions(+), 14 deletions(-)mm/internal.h +0
-0
mm/internal.h static inline int get_sysctl_max_map_count(void) · line 1963
Quoted 9 lines
mm/internal.h +6
-0@@ -1955,4 +1955,14 @@ static inline int get_sysctl_max_map_count(void)bool may_expand_vm (struct mm_struct *mm,const vma_flags_t *vma_flags,unsigned long npages); +static inline void mm_prepare_for_swap_entries (struct mm_struct *mm) +{ +if (list_empty (&mm->mmlist)) { +spin_lock (&mmlist_lock); +if (list_empty (&mm->mmlist)) +list_add (&mm->mmlist, &init_mm.mmlist);
The patch is fine, but the name of the field is awful. Seeing mmlist I assumed it listed all mm_structs. It has to have "swap" somewhere in the field name.
Signature · 1 line
Kiryl Shutsemau / Kirill A. Shutemov
Usama Arif
reviewerRe: [PATCH v2 2/6] mm: extract mm_prepare_for_swap_entries() helper
Quoted 33 lines · Kiryl Shutsemau
Quoted 32 lines · Usama Arif
When a swap entry is installed in a page table, the mm must be added to init_mm.mmlist so that swapoff can find and unuse its swap entries. This double-checked locking pattern is currently open-coded in
try_to_unmap_one()andcopy_nonpresent_pte().Move it into
mm_prepare_for_swap_entries()inmm/internal.hand convert both callers so it can be reused by upcoming PMD-level swap entry code paths that also need to register the mm with swapoff.
copy_nonpresent_pte()previously inserted into&src_mm->mmlistrather than &init_mm.mmlist, but the insertion point is irrelevant, mmlist is a circular list and swapoff walks it entirely from init_mm.mmlist, so only membership matters, not position.Reviewed-by Dev Jain <[email protected]>Reviewed-by Zi Yan <[email protected]>Signed-off-by Usama Arif <[email protected]>--- mm/internal.h | 10 ++++++++++ mm/memory.c | 9 +-------- mm/rmap.c | 7 +------ 3 files changed, 12 insertions(+), 14 deletions(-)mm/internal.h +0
-0@@ -1955,4 +1955,14 @@ static inline int get_sysctl_max_map_count(void)bool may_expand_vm (struct mm_struct *mm,const vma_flags_t *vma_flags,unsigned long npages);
Quoted 11 lines
mm/internal.h static inline int get_sysctl_max_map_count(void) · line 1963
Quoted 6 lines
mm/internal.h +6
-0+static inline void mm_prepare_for_swap_entries (struct mm_struct *mm) +{ +if (list_empty (&mm->mmlist)) { +spin_lock (&mmlist_lock); +if (list_empty (&mm->mmlist)) +list_add (&mm->mmlist, &init_mm.mmlist);The patch is fine, but the name of the field is awful. Seeing mmlist I assumed it listed all
mm_structs. It has to have "swap" somewhere in the field name.
I can send a separate patch once this is replaced to replace mmlist with swap_mmlist if that sounds better?
Thanks
Usama
Kiryl Shutsemau
reviewerRe: [PATCH v2 2/6] mm: extract mm_prepare_for_swap_entries() helper
Quoted 48 lines · Usama Arif
Quoted 33 lines · Kiryl Shutsemau
Quoted 32 lines · Usama Arif
When a swap entry is installed in a page table, the mm must be added to init_mm.mmlist so that swapoff can find and unuse its swap entries. This double-checked locking pattern is currently open-coded in
try_to_unmap_one()andcopy_nonpresent_pte().Move it into
mm_prepare_for_swap_entries()inmm/internal.hand convert both callers so it can be reused by upcoming PMD-level swap entry code paths that also need to register the mm with swapoff.
copy_nonpresent_pte()previously inserted into&src_mm->mmlistrather than &init_mm.mmlist, but the insertion point is irrelevant, mmlist is a circular list and swapoff walks it entirely from init_mm.mmlist, so only membership matters, not position.Reviewed-by Dev Jain <[email protected]>Reviewed-by Zi Yan <[email protected]>Signed-off-by Usama Arif <[email protected]>--- mm/internal.h | 10 ++++++++++ mm/memory.c | 9 +-------- mm/rmap.c | 7 +------ 3 files changed, 12 insertions(+), 14 deletions(-)mm/internal.h +0
-0@@ -1955,4 +1955,14 @@ static inline int get_sysctl_max_map_count(void)bool may_expand_vm (struct mm_struct *mm,const vma_flags_t *vma_flags,unsigned long npages);Quoted 11 lines
mm/internal.h static inline int get_sysctl_max_map_count(void) · line 1963
Quoted 6 lines
mm/internal.h +6
-0+static inline void mm_prepare_for_swap_entries (struct mm_struct *mm) +{ +if (list_empty (&mm->mmlist)) { +spin_lock (&mmlist_lock); +if (list_empty (&mm->mmlist)) +list_add (&mm->mmlist, &init_mm.mmlist);The patch is fine, but the name of the field is awful. Seeing mmlist I assumed it listed all
mm_structs. It has to have "swap" somewhere in the field name.
Quoted 2 lines
I can send a separate patch once this is replaced to replace mmlist with
swap_mmlistif that sounds better?
Yep, better.
Signature · 1 line
Kiryl Shutsemau / Kirill A. Shutemov
Usama Arif
reviewerPATCH v2 3/6 fs/proc: use softleaf_has_pfn() in pagemap PMD walker
In reply to Usama Arifpagemap_pmd_range_thp() assumes that every non-present PMD is a migration entry and unconditionally calls softleaf_to_page(). This will crash on any non-present PMD type that does not encode a PFN, such as the upcoming PMD-level swap entries.
Guard the page lookup with softleaf_has_pfn(), matching how pte_to_pagemap_entry() already handles non-present PTEs.
--- fs/proc/task_mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/proc/task_mmu.c +2 -1
@@ -2129,7 +2129,8 @@ static int pagemap_pmd_range_thp(pmd_t *pmdp, unsigned long addr, flags |=PM_SOFT_DIRTY ;if (pmd_swp_uffd_wp (pmd)) flags |=PM_UFFD_WP ; - page =softleaf_to_page (entry); +if (softleaf_has_pfn (entry)) + page =softleaf_to_page (entry); }if (page) {
Signature · 1 line
2.53.0-Meta
Usama Arif
reviewerPATCH v2 4/6 mm/huge_memory: move softleaf_to_folio() inside migration branch
In reply to Usama Arifchange_non_present_huge_pmd() calls softleaf_to_folio() unconditionally at the top of the function. softleaf_to_folio() extracts a PFN from the entry and converts it to a folio pointer, which is only meaningful for migration and device_private entries that encode a real PFN.
A swap entry encodes a swap offset instead, so softleaf_to_folio() would produce a bogus pointer and crash on mprotect() when a PMD swap entry is present.
Move the call into the migration_write branch where the folio is actually used, so the function is safe for any non-present PMD type.
--- mm/huge_memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/huge_memory.c +2 -1
@@ -2557,11 +2557,12 @@ static void change_non_present_huge_pmd(struct mm_struct *mm, bool uffd_wp_resolve) {softleaf_t entry =softleaf_from_pmd (*pmd); -const struct folio *folio =softleaf_to_folio (entry);pmd_t newpmd;VM_WARN_ON (!pmd_is_valid_softleaf (*pmd));if (softleaf_is_migration_write (entry)) { +const struct folio *folio =softleaf_to_folio (entry); +/* * A protection check is difficult so * just be safe and disable write
Signature · 1 line
2.53.0-Meta
Usama Arif
reviewerPATCH v2 5/6 mm/migrate_device: move softleaf_to_folio() inside device-private branch
In reply to Usama Arifmigrate_vma_collect_pmd() calls softleaf_to_folio() on a non-present PMD before checking the entry's type. softleaf_to_folio() converts the entry's offset to a PFN, which is only meaningful for migration or device-private entries.
A PMD swap entry's offset is a swap offset, not a PFN, so the lookup would either return a bogus folio pointer or trip pfn_to_page validation on a debug kernel. In the non-device-private path the returned folio is then unused (the OR short-circuits to migrate_vma_collect_skip()), but the lookup itself is already unsafe.
Move the softleaf_to_folio() call inside the device-private branch where the folio is actually needed, mirroring the equivalent change_non_present_huge_pmd() fix.
--- mm/migrate_device.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
mm/migrate_device.c +7 -4
@@ -166,11 +166,14 @@ static int migrate_vma_collect_huge_pmd(pmd_t *pmdp, unsigned long start, }else if (!pmd_present (*pmdp)) {const softleaf_t entry =softleaf_from_pmd (*pmdp); - folio =softleaf_to_folio (entry); -if (!softleaf_is_device_private (entry) || - !(migrate->flags &MIGRATE_VMA_SELECT_DEVICE_PRIVATE ) || - (folio->pgmap->owner != migrate->pgmap_owner)) { + !(migrate->flags &MIGRATE_VMA_SELECT_DEVICE_PRIVATE )) { +spin_unlock (ptl); +return migrate_vma_collect_skip (start, end, walk); + } + + folio =softleaf_to_folio (entry); +if (folio->pgmap->owner != migrate->pgmap_owner) {spin_unlock (ptl);return migrate_vma_collect_skip (start, end, walk); }
Signature · 1 line
2.53.0-Meta
Usama Arif
reviewerPATCH v2 6/6 mm: rename ARCH_ENABLE_THP_MIGRATION to ARCH_HAS_PMD_SOFTLEAVES
In reply to Usama ArifCONFIG_ARCH_ENABLE_THP_MIGRATION gates PMD-level migration entries. PMD-level device-private entries use the same migration mechanism and therefore require the same architecture support.
Upcoming PMD-level swap entries can use the same PMD softleaf helpers without depending on page migration, so rename the architecture gate to CONFIG_ARCH_HAS_PMD_SOFTLEAVES. This describes the PMD entry capability rather than one current user of it.
This is a pure rename: the set of selecting architectures (x86, arm64, s390, riscv, loongarch, and powerpc on PPC_BOOK3S_64) and the gating semantics are unchanged.
No functional change intended.
--- arch/arm64/Kconfig | 2 +- arch/arm64/include/asm/pgtable.h | 4 ++-- arch/loongarch/Kconfig | 2 +- arch/powerpc/include/asm/book3s/64/pgtable.h | 2 +- arch/powerpc/platforms/Kconfig.cputype | 2 +- arch/riscv/Kconfig | 2 +- arch/riscv/include/asm/pgtable.h | 8 ++++---- arch/s390/Kconfig | 2 +- arch/s390/include/asm/pgtable.h | 2 +- arch/x86/Kconfig | 2 +- arch/x86/include/asm/pgtable.h | 2 +- include/linux/huge_mm.h | 2 +- include/linux/leafops.h | 8 ++++---- include/linux/pgtable.h | 2 +- include/linux/swapops.h | 6 +++--- mm/Kconfig | 2 +- mm/debug_vm_pgtable.c | 8 ++++---- mm/hmm.c | 4 ++-- mm/huge_memory.c | 2 +- mm/migrate.c | 4 ++-- mm/migrate_device.c | 6 +++--- mm/rmap.c | 2 +- 22 files changed, 38 insertions(+), 38 deletions(-)
arch/arm64/Kconfig +1 -1
@@ -17,7 +17,7 @@ config ARM64 select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION select ARCH_ENABLE_MEMORY_HOTPLUG select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2 - select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE + select ARCH_HAS_PMD_SOFTLEAVES if TRANSPARENT_HUGEPAGE select ARCH_HAS_CACHE_LINE_SIZE select ARCH_HAS_CC_PLATFORM select ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION
arch/arm64/include/asm/pgtable.h +2 -2
@@ -1534,10 +1534,10 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma,#define __pte_to_swp_entry (pte) ((swp_entry_t) { pte_val(pte) })#define __swp_entry_to_pte (swp) ((pte_t) { (swp).val }) -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES #define __pmd_to_swp_entry (pmd) ((swp_entry_t) { pmd_val(pmd) })#define __swp_entry_to_pmd (swp) __pmd((swp).val) -#endif /* CONFIG_ARCH_ENABLE_THP_MIGRATION */ +#endif /* CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ /* * Ensure that there are not more swap files than can be encoded in the kernel
arch/loongarch/Kconfig +1 -1
@@ -12,7 +12,7 @@ config LOONGARCH select ARCH_NEEDS_DEFER_KASAN select ARCH_DISABLE_KASAN_INLINE select ARCH_ENABLE_MEMORY_HOTPLUG - select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE + select ARCH_HAS_PMD_SOFTLEAVES if TRANSPARENT_HUGEPAGE select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI select ARCH_HAS_CPU_FINALIZE_INIT select ARCH_HAS_CURRENT_STACK_POINTER
arch/powerpc/include/asm/book3s/64/pgtable.h +1 -1
@@ -1060,7 +1060,7 @@ static inline pte_t *pmdp_ptep(pmd_t *pmd)#define pmd_mksoft_dirty (pmd) pte_pmd(pte_mksoft_dirty(pmd_pte(pmd)))#define pmd_clear_soft_dirty (pmd) pte_pmd(pte_clear_soft_dirty(pmd_pte(pmd))) -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES #define pmd_swp_mksoft_dirty (pmd) pte_pmd(pte_swp_mksoft_dirty(pmd_pte(pmd)))#define pmd_swp_soft_dirty (pmd) pte_swp_soft_dirty(pmd_pte(pmd))#define pmd_swp_clear_soft_dirty (pmd) pte_pmd(pte_swp_clear_soft_dirty(pmd_pte(pmd)))
arch/powerpc/platforms/Kconfig.cputype +1 -1
@@ -112,7 +112,7 @@ config PPC_THP depends on PPC_RADIX_MMU || (PPC_64S_HASH_MMU && PAGE_SIZE_64KB) select HAVE_ARCH_TRANSPARENT_HUGEPAGE select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD - select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE + select ARCH_HAS_PMD_SOFTLEAVES if TRANSPARENT_HUGEPAGE choice prompt "CPU selection"
arch/riscv/Kconfig +1 -1
@@ -22,7 +22,7 @@ config RISCV select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM_VMEMMAP select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2 - select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE + select ARCH_HAS_PMD_SOFTLEAVES if TRANSPARENT_HUGEPAGE select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_CC_CAN_LINK select ARCH_HAS_CURRENT_STACK_POINTER
arch/riscv/include/asm/pgtable.h +4 -4
@@ -946,7 +946,7 @@ static inline pmd_t pmd_clear_soft_dirty(pmd_t pmd)return pte_pmd (pte_clear_soft_dirty (pmd_pte (pmd))); } -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES static inline bool pmd_swp_soft_dirty (pmd_t pmd) {return pte_swp_soft_dirty (pmd_pte (pmd));
@@ -961,7 +961,7 @@ static inline pmd_t pmd_swp_clear_soft_dirty(pmd_t pmd) {return pte_pmd (pte_swp_clear_soft_dirty (pmd_pte (pmd))); } -#endif /* CONFIG_ARCH_ENABLE_THP_MIGRATION */ +#endif /* CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ #endif /* CONFIG_HAVE_ARCH_SOFT_DIRTY */ static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr,
@@ -1208,10 +1208,10 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte)return __pte (pte_val (pte) & ~_PAGE_SWP_EXCLUSIVE); } -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES #define __pmd_to_swp_entry (pmd) ((swp_entry_t) { pmd_val(pmd) })#define __swp_entry_to_pmd (swp) __pmd((swp).val) -#endif /* CONFIG_ARCH_ENABLE_THP_MIGRATION */ +#endif /* CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ /* * In the RV64 Linux scheme, we give the user half of the virtual-address space
arch/s390/Kconfig +1 -1
@@ -82,7 +82,7 @@ config S390 select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2 - select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE + select ARCH_HAS_PMD_SOFTLEAVES if TRANSPARENT_HUGEPAGE select ARCH_HAS_CC_CAN_LINK select ARCH_HAS_CPU_FINALIZE_INIT select ARCH_HAS_CURRENT_STACK_POINTER
arch/s390/include/asm/pgtable.h +1 -1
@@ -903,7 +903,7 @@ static inline pmd_t pmd_clear_soft_dirty(pmd_t pmd)return clear_pmd_bit (pmd,__pgprot (_SEGMENT_ENTRY_SOFT_DIRTY)); } -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES #define pmd_swp_soft_dirty (pmd) pmd_soft_dirty(pmd)#define pmd_swp_mksoft_dirty (pmd) pmd_mksoft_dirty(pmd)#define pmd_swp_clear_soft_dirty (pmd) pmd_clear_soft_dirty(pmd)
arch/x86/Kconfig +1 -1
@@ -70,7 +70,7 @@ config X86 select ARCH_ENABLE_HUGEPAGE_MIGRATION if X86_64 && HUGETLB_PAGE && MIGRATION select ARCH_ENABLE_MEMORY_HOTPLUG if X86_64 select ARCH_ENABLE_SPLIT_PMD_PTLOCK if (PGTABLE_LEVELS > 2) && (X86_64 || X86_PAE) - select ARCH_ENABLE_THP_MIGRATION if X86_64 && TRANSPARENT_HUGEPAGE + select ARCH_HAS_PMD_SOFTLEAVES if X86_64 && TRANSPARENT_HUGEPAGE select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI select ARCH_HAS_CPU_ATTACK_VECTORS if CPU_MITIGATIONS select ARCH_HAS_CACHE_LINE_SIZE
arch/x86/include/asm/pgtable.h +1 -1
@@ -1545,7 +1545,7 @@ static inline pte_t pte_swp_clear_soft_dirty(pte_t pte)return pte_clear_flags (pte, _PAGE_SWP_SOFT_DIRTY); } -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES static inline pmd_t pmd_swp_mksoft_dirty (pmd_t pmd) {return pmd_set_flags (pmd, _PAGE_SWP_SOFT_DIRTY);
include/linux/huge_mm.h +1 -1
@@ -567,7 +567,7 @@ static inline struct folio *get_persistent_huge_zero_folio(void)static inline bool thp_migration_supported (void ) { -return IS_ENABLED (CONFIG_ARCH_ENABLE_THP_MIGRATION ); +return IS_ENABLED (CONFIG_ARCH_HAS_PMD_SOFTLEAVES ); } void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address,
include/linux/leafops.h +4 -4
@@ -81,7 +81,7 @@ static inline pte_t softleaf_to_pte(softleaf_t entry)return swp_entry_to_pte (entry); } -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES /** * softleaf_from_pmd() - Obtain a leaf entry from a PMD entry. * @pmd: PMD entry.
@@ -587,7 +587,7 @@ static inline bool pte_is_uffd_marker(pte_t pte)return false; } -#if defined(CONFIG_ZONE_DEVICE ) && defined(CONFIG_ARCH_ENABLE_THP_MIGRATION ) +#if defined(CONFIG_ZONE_DEVICE ) && defined(CONFIG_ARCH_HAS_PMD_SOFTLEAVES )/** * pmd_is_device_private_entry() - Check if PMD contains a device private swap
@@ -606,14 +606,14 @@ static inline bool pmd_is_device_private_entry(pmd_t pmd) return softleaf_is_device_private(softleaf_from_pmd(pmd)); } -#else /* CONFIG_ZONE_DEVICE && CONFIG_ARCH_ENABLE_THP_MIGRATION */ +#else /* CONFIG_ZONE_DEVICE && CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ static inline bool pmd_is_device_private_entry (pmd_t pmd) {return false; } -#endif /* CONFIG_ZONE_DEVICE && CONFIG_ARCH_ENABLE_THP_MIGRATION */ +#endif /* CONFIG_ZONE_DEVICE && CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ /** * pmd_is_migration_entry() - Does this PMD entry encode a migration entry?
include/linux/pgtable.h +1 -1
@@ -1839,7 +1839,7 @@ static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)#endif #ifdef CONFIG_HAVE_ARCH_SOFT_DIRTY -#ifndef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifndef CONFIG_ARCH_HAS_PMD_SOFTLEAVES static inline pmd_t pmd_swp_mksoft_dirty(pmd_t pmd) { return pmd;
include/linux/swapops.h +3 -3
@@ -321,7 +321,7 @@ static inline swp_entry_t make_guard_swp_entry(void)struct page_vma_mapped_walk ; -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES extern int set_pmd_migration_entry (struct page_vma_mapped_walk *pvmw,struct page *page);
@@ -338,7 +338,7 @@ static inline pmd_t swp_entry_to_pmd(swp_entry_t entry) return __swp_entry_to_pmd(arch_entry); } -#else /* CONFIG_ARCH_ENABLE_THP_MIGRATION */ +#else /* CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ static inline int set_pmd_migration_entry (struct page_vma_mapped_walk *pvmw,struct page *page) {
@@ -358,7 +358,7 @@ static inline pmd_t swp_entry_to_pmd(swp_entry_t entry)return __pmd (0 ); } -#endif /* CONFIG_ARCH_ENABLE_THP_MIGRATION */ +#endif /* CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ #endif /* CONFIG_MMU */ #endif /* _LINUX_SWAPOPS_H */
mm/Kconfig +1 -1
@@ -703,7 +703,7 @@ config DEVICE_MIGRATION config ARCH_ENABLE_HUGEPAGE_MIGRATION bool -config ARCH_ENABLE_THP_MIGRATION +config ARCH_HAS_PMD_SOFTLEAVES bool config HUGETLB_PAGE_SIZE_VARIABLE
mm/debug_vm_pgtable.c +4 -4
@@ -751,7 +751,7 @@ static void __init pmd_leaf_soft_dirty_tests(struct pgtable_debug_args *args)pmd_t pmd;if (!pgtable_supports_soft_dirty () || - !IS_ENABLED (CONFIG_ARCH_ENABLE_THP_MIGRATION )) + !IS_ENABLED (CONFIG_ARCH_HAS_PMD_SOFTLEAVES ))return ;if (!has_transparent_hugepage ())
@@ -819,7 +819,7 @@ static void __init pte_swap_tests(struct pgtable_debug_args *args)WARN_ON (memcmp (&pte1, &pte2,sizeof (pte1))); } -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES static void __init pmd_softleaf_tests (struct pgtable_debug_args *args) {swp_entry_t arch_entry;
@@ -837,9 +837,9 @@ static void __init pmd_softleaf_tests(struct pgtable_debug_args *args) pmd2 =__swp_entry_to_pmd (arch_entry); WARN_ON(memcmp(&pmd1, &pmd2, sizeof(pmd1))); } -#else /* !CONFIG_ARCH_ENABLE_THP_MIGRATION */ +#else /* !CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ static void __init pmd_softleaf_tests (struct pgtable_debug_args *args) { } -#endif /* CONFIG_ARCH_ENABLE_THP_MIGRATION */ +#endif /* CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ static void __init swap_migration_tests (struct pgtable_debug_args *args) {
mm/hmm.c +2 -2
@@ -331,7 +331,7 @@ static int hmm_vma_handle_pte(struct mm_walk *walk, unsigned long addr,return hmm_vma_fault (addr, end, required_fault, walk); } -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES static int hmm_vma_handle_absent_pmd (struct mm_walk *walk,unsigned long start,unsigned long end,unsigned long *hmm_pfns,pmd_t pmd)
@@ -391,7 +391,7 @@ static int hmm_vma_handle_absent_pmd(struct mm_walk *walk, unsigned long start,return -EFAULT ;return hmm_pfns_fill (start, end, range,HMM_PFN_ERROR ); } -#endif /* CONFIG_ARCH_ENABLE_THP_MIGRATION */ +#endif /* CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ static int hmm_vma_walk_pmd(pmd_t *pmdp, unsigned long start,
mm/huge_memory.c +1 -1
@@ -4868,7 +4868,7 @@ static int __init split_huge_pages_debugfs(void)late_initcall (split_huge_pages_debugfs);#endif -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES int set_pmd_migration_entry (struct page_vma_mapped_walk *pvmw,struct page *page) {
mm/migrate.c +2 -2
@@ -362,7 +362,7 @@ static bool remove_migration_pte(struct folio *folio, idx =linear_page_index (vma, pvmw.address) - pvmw.pgoff; new =folio_page (folio, idx); -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES /* PMD-mapped THP migration entry */ if (!pvmw.pte) { VM_BUG_ON_FOLIO(folio_test_hugetlb(folio) ||
@@ -545,7 +545,7 @@ void migration_entry_wait_huge(struct vm_area_struct *vma, unsigned long addr, p }#endif -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES void pmd_migration_entry_wait (struct mm_struct *mm,pmd_t *pmd) {spinlock_t *ptl;
mm/migrate_device.c +3 -3
@@ -771,7 +771,7 @@ int migrate_vma_setup(struct migrate_vma *args) }EXPORT_SYMBOL (migrate_vma_setup); -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES /** * migrate_vma_insert_huge_pmd_page: Insert a huge folio into @migrate->vma->vm_mm * at @addr. folio is already allocated as a part of the migration process with
@@ -926,7 +926,7 @@ static int migrate_vma_split_unmapped_folio(struct migrate_vma *migrate, migrate->src[i+idx] =migrate_pfn (pfn + i) | flags;return ret; } -#else /* !CONFIG_ARCH_ENABLE_THP_MIGRATION */ +#else /* !CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ static int migrate_vma_insert_huge_pmd_page(struct migrate_vma *migrate, unsigned long addr, struct page *page,
@@ -947,7 +947,7 @@ static int migrate_vma_split_unmapped_folio(struct migrate_vma *migrate,static unsigned long migrate_vma_nr_pages (unsigned long *src) {unsigned long nr =1 ; -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES if (*src &MIGRATE_PFN_COMPOUND ) nr =HPAGE_PMD_NR ;#else
mm/rmap.c +1 -1
@@ -2472,7 +2472,7 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma,page_vma_mapped_walk_restart (&pvmw);continue ; } -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES pmdval =pmdp_get (pvmw.pmd);if (likely (pmd_present (pmdval))) pfn =pmd_pfn (pmdval);
Signature · 1 line
2.53.0-Meta
Re: [PATCH v2 6/6] mm: rename ARCH_ENABLE_THP_MIGRATION to ARCH_HAS_PMD_SOFTLEAVES
Quoted 13 lines · Usama Arif
CONFIG_ARCH_ENABLE_THP_MIGRATIONgates PMD-level migration entries. PMD-level device-private entries use the same migration mechanism and therefore require the same architecture support.Upcoming PMD-level swap entries can use the same PMD softleaf helpers without depending on page migration, so rename the architecture gate to
CONFIG_ARCH_HAS_PMD_SOFTLEAVES. This describes the PMD entry capability rather than one current user of it.This is a pure rename: the set of selecting architectures (x86, arm64, s390, riscv, loongarch, and powerpc on
PPC_BOOK3S_64) and the gating semantics are unchanged.
Quoted 5 lines
No functional change intended.
Reviewed-by Zi Yan <[email protected]>Signed-off-by Usama Arif <[email protected]>---
Signature · 3 lines
Cheers, David
Andrew Morton
maintainerQuoted 1 line · On Mon, 6 Jul 2026 04:42:02 -0700 Usama Arif <[email protected]> wrote:
This is the preparatory part of the PMD page table swapin work.
Thanks, I updated mm.git to this version.
Sashiko might have found several serious looking pre-existing issues:
https://sashiko.dev/#/patchset/[email protected]
Quoted 5 lines
v1 -> v2: https://lore.kernel.org/all/[email protected]/
- Remove unnecessary comment in patch 2 (David)
- s/ARCH_SUPPORTS_PMD_SOFTLEAF/ARCH_HAS_PMD_SOFTLEAVES/ and rewrite the commit message (David)
Here's how v2 altered mm.git:
arch/arm64/Kconfig | 2 +- arch/arm64/include/asm/pgtable.h | 4 ++-- arch/loongarch/Kconfig | 2 +- arch/powerpc/include/asm/book3s/64/pgtable.h | 2 +- arch/powerpc/platforms/Kconfig.cputype | 2 +- arch/riscv/Kconfig | 2 +- arch/riscv/include/asm/pgtable.h | 8 ++++---- arch/s390/Kconfig | 2 +- arch/s390/include/asm/pgtable.h | 2 +- arch/x86/Kconfig | 2 +- arch/x86/include/asm/pgtable.h | 2 +- include/linux/huge_mm.h | 2 +- include/linux/leafops.h | 8 ++++---- include/linux/pgtable.h | 2 +- include/linux/swapops.h | 6 +++--- mm/Kconfig | 2 +- mm/debug_vm_pgtable.c | 8 ++++---- mm/hmm.c | 4 ++-- mm/huge_memory.c | 2 +- mm/internal.h | 3 --- mm/migrate.c | 4 ++-- mm/migrate_device.c | 6 +++--- mm/rmap.c | 2 +- 23 files changed, 38 insertions(+), 41 deletions(-)
arch/arm64/include/asm/pgtable.h renamed from arch/arm64/include/asm/pgtable.h~b +2 -2
@@ -1534,10 +1534,10 @@ static inline pmd_t pmdp_establish(struc#define __pte_to_swp_entry (pte) ((swp_entry_t) { pte_val(pte) })#define __swp_entry_to_pte (swp) ((pte_t) { (swp).val }) -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES #define __pmd_to_swp_entry (pmd) ((swp_entry_t) { pmd_val(pmd) })#define __swp_entry_to_pmd (swp) __pmd((swp).val) -#endif /* CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF */ +#endif /* CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ /* * Ensure that there are not more swap files than can be encoded in the kernel
arch/arm64/Kconfig renamed from arch/arm64/Kconfig~b +1 -1
@@ -17,7 +17,7 @@ config ARM64 select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION select ARCH_ENABLE_MEMORY_HOTPLUG select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2 - select ARCH_SUPPORTS_PMD_SOFTLEAF if TRANSPARENT_HUGEPAGE + select ARCH_HAS_PMD_SOFTLEAVES if TRANSPARENT_HUGEPAGE select ARCH_HAS_CACHE_LINE_SIZE select ARCH_HAS_CC_PLATFORM select ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION
arch/loongarch/Kconfig renamed from arch/loongarch/Kconfig~b +1 -1
@@ -12,7 +12,7 @@ config LOONGARCH select ARCH_NEEDS_DEFER_KASAN select ARCH_DISABLE_KASAN_INLINE select ARCH_ENABLE_MEMORY_HOTPLUG - select ARCH_SUPPORTS_PMD_SOFTLEAF if TRANSPARENT_HUGEPAGE + select ARCH_HAS_PMD_SOFTLEAVES if TRANSPARENT_HUGEPAGE select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI select ARCH_HAS_CPU_FINALIZE_INIT select ARCH_HAS_CURRENT_STACK_POINTER
arch/powerpc/include/asm/book3s/64/pgtable.h renamed from arch/powerpc/include/asm/book3s/64/pgtable.h~b +1 -1
@@ -1060,7 +1060,7 @@ static inline pte_t *pmdp_ptep(pmd_t *pm#define pmd_mksoft_dirty (pmd) pte_pmd(pte_mksoft_dirty(pmd_pte(pmd)))#define pmd_clear_soft_dirty (pmd) pte_pmd(pte_clear_soft_dirty(pmd_pte(pmd))) -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES #define pmd_swp_mksoft_dirty (pmd) pte_pmd(pte_swp_mksoft_dirty(pmd_pte(pmd)))#define pmd_swp_soft_dirty (pmd) pte_swp_soft_dirty(pmd_pte(pmd))#define pmd_swp_clear_soft_dirty (pmd) pte_pmd(pte_swp_clear_soft_dirty(pmd_pte(pmd)))
arch/powerpc/platforms/Kconfig.cputype renamed from arch/powerpc/platforms/Kconfig.cputype~b +1 -1
@@ -112,7 +112,7 @@ config PPC_THP depends on PPC_RADIX_MMU || (PPC_64S_HASH_MMU && PAGE_SIZE_64KB) select HAVE_ARCH_TRANSPARENT_HUGEPAGE select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD - select ARCH_SUPPORTS_PMD_SOFTLEAF if TRANSPARENT_HUGEPAGE + select ARCH_HAS_PMD_SOFTLEAVES if TRANSPARENT_HUGEPAGE choice prompt "CPU selection"
arch/riscv/include/asm/pgtable.h renamed from arch/riscv/include/asm/pgtable.h~b +4 -4
@@ -946,7 +946,7 @@ static inline pmd_t pmd_clear_soft_dirtyreturn pte_pmd (pte_clear_soft_dirty (pmd_pte (pmd))); } -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES static inline bool pmd_swp_soft_dirty (pmd_t pmd) {return pte_swp_soft_dirty (pmd_pte (pmd));
@@ -961,7 +961,7 @@ static inline pmd_t pmd_swp_clear_soft_d {return pte_pmd (pte_swp_clear_soft_dirty (pmd_pte (pmd))); } -#endif /* CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF */ +#endif /* CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ #endif /* CONFIG_HAVE_ARCH_SOFT_DIRTY */ static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr,
@@ -1208,10 +1208,10 @@ static inline pte_t pte_swp_clear_exclusreturn __pte (pte_val (pte) & ~_PAGE_SWP_EXCLUSIVE); } -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES #define __pmd_to_swp_entry (pmd) ((swp_entry_t) { pmd_val(pmd) })#define __swp_entry_to_pmd (swp) __pmd((swp).val) -#endif /* CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF */ +#endif /* CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ /* * In the RV64 Linux scheme, we give the user half of the virtual-address space
arch/riscv/Kconfig renamed from arch/riscv/Kconfig~b +1 -1
@@ -22,7 +22,7 @@ config RISCV select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM_VMEMMAP select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2 - select ARCH_SUPPORTS_PMD_SOFTLEAF if TRANSPARENT_HUGEPAGE + select ARCH_HAS_PMD_SOFTLEAVES if TRANSPARENT_HUGEPAGE select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_CC_CAN_LINK select ARCH_HAS_CURRENT_STACK_POINTER
arch/s390/include/asm/pgtable.h renamed from arch/s390/include/asm/pgtable.h~b +1 -1
@@ -903,7 +903,7 @@ static inline pmd_t pmd_clear_soft_dirtyreturn clear_pmd_bit (pmd,__pgprot (_SEGMENT_ENTRY_SOFT_DIRTY)); } -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES #define pmd_swp_soft_dirty (pmd) pmd_soft_dirty(pmd)#define pmd_swp_mksoft_dirty (pmd) pmd_mksoft_dirty(pmd)#define pmd_swp_clear_soft_dirty (pmd) pmd_clear_soft_dirty(pmd)
arch/s390/Kconfig renamed from arch/s390/Kconfig~b +1 -1
@@ -82,7 +82,7 @@ config S390 select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2 - select ARCH_SUPPORTS_PMD_SOFTLEAF if TRANSPARENT_HUGEPAGE + select ARCH_HAS_PMD_SOFTLEAVES if TRANSPARENT_HUGEPAGE select ARCH_HAS_CC_CAN_LINK select ARCH_HAS_CPU_FINALIZE_INIT select ARCH_HAS_CURRENT_STACK_POINTER
arch/x86/include/asm/pgtable.h renamed from arch/x86/include/asm/pgtable.h~b +1 -1
@@ -1545,7 +1545,7 @@ static inline pte_t pte_swp_clear_soft_dreturn pte_clear_flags (pte, _PAGE_SWP_SOFT_DIRTY); } -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES static inline pmd_t pmd_swp_mksoft_dirty (pmd_t pmd) {return pmd_set_flags (pmd, _PAGE_SWP_SOFT_DIRTY);
arch/x86/Kconfig renamed from arch/x86/Kconfig~b +1 -1
@@ -70,7 +70,7 @@ config X86 select ARCH_ENABLE_HUGEPAGE_MIGRATION if X86_64 && HUGETLB_PAGE && MIGRATION select ARCH_ENABLE_MEMORY_HOTPLUG if X86_64 select ARCH_ENABLE_SPLIT_PMD_PTLOCK if (PGTABLE_LEVELS > 2) && (X86_64 || X86_PAE) - select ARCH_SUPPORTS_PMD_SOFTLEAF if X86_64 && TRANSPARENT_HUGEPAGE + select ARCH_HAS_PMD_SOFTLEAVES if X86_64 && TRANSPARENT_HUGEPAGE select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI select ARCH_HAS_CPU_ATTACK_VECTORS if CPU_MITIGATIONS select ARCH_HAS_CACHE_LINE_SIZE
include/linux/huge_mm.h renamed from include/linux/huge_mm.h~b +1 -1
@@ -567,7 +567,7 @@ static inline struct folio *get_persistestatic inline bool thp_migration_supported (void ) { -return IS_ENABLED (CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF ); +return IS_ENABLED (CONFIG_ARCH_HAS_PMD_SOFTLEAVES ); } void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address,
include/linux/leafops.h renamed from include/linux/leafops.h~b +4 -4
@@ -81,7 +81,7 @@ static inline pte_t softleaf_to_pte(softreturn swp_entry_to_pte (entry); } -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES /** * softleaf_from_pmd() - Obtain a leaf entry from a PMD entry. * @pmd: PMD entry.
@@ -587,7 +587,7 @@ static inline bool pte_is_uffd_marker(ptreturn false; } -#if defined(CONFIG_ZONE_DEVICE ) && defined(CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF ) +#if defined(CONFIG_ZONE_DEVICE ) && defined(CONFIG_ARCH_HAS_PMD_SOFTLEAVES )/** * pmd_is_device_private_entry() - Check if PMD contains a device private swap
@@ -606,14 +606,14 @@ static inline bool pmd_is_device_private return softleaf_is_device_private(softleaf_from_pmd(pmd)); } -#else /* CONFIG_ZONE_DEVICE && CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF */ +#else /* CONFIG_ZONE_DEVICE && CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ static inline bool pmd_is_device_private_entry (pmd_t pmd) {return false; } -#endif /* CONFIG_ZONE_DEVICE && CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF */ +#endif /* CONFIG_ZONE_DEVICE && CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ /** * pmd_is_migration_entry() - Does this PMD entry encode a migration entry?
include/linux/pgtable.h renamed from include/linux/pgtable.h~b +1 -1
@@ -1839,7 +1839,7 @@ static inline pgprot_t pgprot_modify(pgp#endif #ifdef CONFIG_HAVE_ARCH_SOFT_DIRTY -#ifndef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifndef CONFIG_ARCH_HAS_PMD_SOFTLEAVES static inline pmd_t pmd_swp_mksoft_dirty(pmd_t pmd) { return pmd;
include/linux/swapops.h renamed from include/linux/swapops.h~b +3 -3
@@ -321,7 +321,7 @@ static inline swp_entry_t make_guard_swpstruct page_vma_mapped_walk ; -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES extern int set_pmd_migration_entry (struct page_vma_mapped_walk *pvmw,struct page *page);
@@ -338,7 +338,7 @@ static inline pmd_t swp_entry_to_pmd(swp return __swp_entry_to_pmd(arch_entry); } -#else /* CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF */ +#else /* CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ static inline int set_pmd_migration_entry (struct page_vma_mapped_walk *pvmw,struct page *page) {
@@ -358,7 +358,7 @@ static inline pmd_t swp_entry_to_pmd(swpreturn __pmd (0 ); } -#endif /* CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF */ +#endif /* CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ #endif /* CONFIG_MMU */ #endif /* _LINUX_SWAPOPS_H */
mm/debug_vm_pgtable.c renamed from mm/debug_vm_pgtable.c~b +4 -4
@@ -751,7 +751,7 @@ static void __init pmd_leaf_soft_dirty_tpmd_t pmd;if (!pgtable_supports_soft_dirty () || - !IS_ENABLED (CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF )) + !IS_ENABLED (CONFIG_ARCH_HAS_PMD_SOFTLEAVES ))return ;if (!has_transparent_hugepage ())
@@ -819,7 +819,7 @@ static void __init pte_swap_tests(structWARN_ON (memcmp (&pte1, &pte2,sizeof (pte1))); } -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES static void __init pmd_softleaf_tests (struct pgtable_debug_args *args) {swp_entry_t arch_entry;
@@ -837,9 +837,9 @@ static void __init pmd_softleaf_tests(st pmd2 =__swp_entry_to_pmd (arch_entry); WARN_ON(memcmp(&pmd1, &pmd2, sizeof(pmd1))); } -#else /* !CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF */ +#else /* !CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ static void __init pmd_softleaf_tests (struct pgtable_debug_args *args) { } -#endif /* CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF */ +#endif /* CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ static void __init swap_migration_tests (struct pgtable_debug_args *args) {
mm/hmm.c renamed from mm/hmm.c~b +2 -2
@@ -331,7 +331,7 @@ fault:return hmm_vma_fault (addr, end, required_fault, walk); } -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES static int hmm_vma_handle_absent_pmd (struct mm_walk *walk,unsigned long start,unsigned long end,unsigned long *hmm_pfns,pmd_t pmd)
@@ -391,7 +391,7 @@ static int hmm_vma_handle_absent_pmd(strreturn -EFAULT ;return hmm_pfns_fill (start, end, range,HMM_PFN_ERROR ); } -#endif /* CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF */ +#endif /* CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ static int hmm_vma_walk_pmd(pmd_t *pmdp, unsigned long start,
mm/huge_memory.c renamed from mm/huge_memory.c~b +1 -1
@@ -4868,7 +4868,7 @@ static int __init split_huge_pages_debuglate_initcall (split_huge_pages_debugfs);#endif -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES int set_pmd_migration_entry (struct page_vma_mapped_walk *pvmw,struct page *page) {
mm/internal.h renamed from mm/internal.h~b +0 -3
@@ -1955,9 +1955,6 @@ static inline int get_sysctl_max_map_coubool may_expand_vm (struct mm_struct *mm,const vma_flags_t *vma_flags,unsigned long npages); -/* -* Ensure @mm is on the init_mm.mmlist so swapoff can find it. -*/ static inline void mm_prepare_for_swap_entries (struct mm_struct *mm) {if (list_empty (&mm->mmlist)) {
mm/Kconfig renamed from mm/Kconfig~b +1 -1
@@ -703,7 +703,7 @@ config DEVICE_MIGRATION config ARCH_ENABLE_HUGEPAGE_MIGRATION bool -config ARCH_SUPPORTS_PMD_SOFTLEAF +config ARCH_HAS_PMD_SOFTLEAVES bool config HUGETLB_PAGE_SIZE_VARIABLE
mm/migrate.c renamed from mm/migrate.c~b +2 -2
@@ -362,7 +362,7 @@ static bool remove_migration_pte(struct idx =linear_page_index (vma, pvmw.address) - pvmw.pgoff; new =folio_page (folio, idx); -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES /* PMD-mapped THP migration entry */ if (!pvmw.pte) { VM_BUG_ON_FOLIO(folio_test_hugetlb(folio) ||
@@ -545,7 +545,7 @@ fail: }#endif -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES void pmd_migration_entry_wait (struct mm_struct *mm,pmd_t *pmd) {spinlock_t *ptl;
mm/migrate_device.c renamed from mm/migrate_device.c~b +3 -3
@@ -771,7 +771,7 @@ int migrate_vma_setup(struct migrate_vma }EXPORT_SYMBOL (migrate_vma_setup); -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES /** * migrate_vma_insert_huge_pmd_page: Insert a huge folio into @migrate->vma->vm_mm * at @addr. folio is already allocated as a part of the migration process with
@@ -926,7 +926,7 @@ static int migrate_vma_split_unmapped_fo migrate->src[i+idx] =migrate_pfn (pfn + i) | flags;return ret; } -#else /* !CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF */ +#else /* !CONFIG_ARCH_HAS_PMD_SOFTLEAVES */ static int migrate_vma_insert_huge_pmd_page(struct migrate_vma *migrate, unsigned long addr, struct page *page,
@@ -947,7 +947,7 @@ static int migrate_vma_split_unmapped_fostatic unsigned long migrate_vma_nr_pages (unsigned long *src) {unsigned long nr =1 ; -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES if (*src &MIGRATE_PFN_COMPOUND ) nr =HPAGE_PMD_NR ;#else
mm/rmap.c renamed from mm/rmap.c~b +1 -1
@@ -2472,7 +2472,7 @@ static bool try_to_migrate_one(struct fopage_vma_mapped_walk_restart (&pvmw);continue ; } -#ifdef CONFIG_ARCH_SUPPORTS_PMD_SOFTLEAF +#ifdef CONFIG_ARCH_HAS_PMD_SOFTLEAVES pmdval =pmdp_get (pvmw.pmd);if (likely (pmd_present (pmdval))) pfn =pmd_pfn (pmdval);
_