Remove read-only THP support for FSes without large folio support
Subsystems (9)
Zi Yan
reviewerv4 cover Remove read-only THP support for FSes without large folio support
Hi all,
This patchset removes READ_ONLY_THP_FOR_FS Kconfig and enables creating read-only THPs for FSes with large folio support (the supported orders need to include PMD_ORDER) by default. It is on top of mm-new.
Before the patchset, the status of creating read-only THPs is below:
| PF | MADV_COLLAPSE | khugepaged |
|-----------|---------------|------------|
large folio FSes only | ✓ | x | x |
READ_ONLY_THP_FOR_FS only | x | ✓ | ✓ |
both | ✓ | ✓ | ✓ |where READ_ONLY_THP_FOR_FS implies no large folio FSes.
Now without READ_ONLY_THP_FOR_FS:
| PF | MADV_COLLAPSE | khugepaged |
|-----------|---------------|------------|
large folio FSes | ✓ | ✓ | ✓ |
no large folio FSes | x | x | x |This means no large folio FSes need to add large folio support (the supported orders need to include PMD_ORDER), so that they can leverage read-only THP creation function.
To prevent breaking read-only THP support for large folio FSes,
1. first 4 patches enables the support, so that without READ_ONLY_THP_FOR_FS, read-only THP still works for large folio FSes,
2. Patch 5 removes READ_ONLY_THP_FOR_FS Kconfig,
3. the rest of patches remove code related to READ_ONLY_THP_FOR_FS.
NOTE: collapsing writable MAP_PRIVATE pagecache folios is not supported, since:
1. PMD THP CoW only faults in at PTE level to avoid long CoW latency,
2. the first check, due to 1, in file_backed_vma_is_retractable() prevents it.
The overview of the changes is:
1. collapse_file() checks for to-be-collapsed folio dirtiness after they are locked, unmapped to make sure no new write happens. Before, mapping->nr_thps and inode->i_writecount are used to cause read-only THP truncation before a fd becomes writable.
2. hugepage_enabled() is true for anon, shmem, and file-backed cases if the global khugepaged control is on, otherwise, khugepaged for file-backed case is turned off and anon and shmem depend on per-size control knobs.
3. collapse_file() from mm/khugepaged.c, instead of checking CONFIG_READ_ONLY_THP_FOR_FS, makes sure the mapping_max_folio_order() of struct address_space of the file is at least PMD_ORDER.
4. file_thp_enabled() also checks mapping_max_folio_order() instead and no longer checks if the input file is opened as read-only (Change 1 handles read-write files).
5. truncate_inode_partial_folio() calls folio_split() directly instead of the removed try_folio_split_to_order(), since large folios can only show up on a FS with large folio support.
6. nr_thps is removed from struct address_space, since it is no longer needed to drop all read-only THPs from a FS without large folio support when the fd becomes writable. Its related filemap_nr_thps*() are removed too.
7. folio_check_splittable() no longer checks READ_ONLY_THP_FOR_FS.
8. Updated comments in various places.
Changelog
===
From V3[4]:
1. added a TODO comment in patch 1 noting that the is_shmem exception in the VM_WARN_ON_ONCE() check can be removed once shmem always calls mapping_set_large_folios() on its mapping. Used VM_WARN_ON_ONCE() in mapping_pmd_thp_support() instead.
2. fixed the dirty folio bail-out path in patch 2: add xas_unlock_irq() and folio_putback_lru() before the goto, which were missing and would have left the XA lock held and the LRU isolation ref leaked.
3. renamed hugepage_pmd_enabled() to hugepage_enabled() to reflect it controls khugepaged for all transparent hugepage types.
4. reverted the comment in hugepage_enabled() in patch 4 to the original; only removed the phrase "when configured in," which referred to CONFIG_READ_ONLY_THP_FOR_FS.
5. fixed commit message in patch 6: the dirty folio check is added after try_to_unmap() in collapse_file(), not after try_to_unmap_flush().
From V2[3]:
1. removed unnecessary check in collapse_scan_file().
2. removed inode_is_open_for_write() check in file_thp_enabled().
3. changed hugepage_enabled() to return true if khugepaged global control is on instead of false. cleaned up anon and shmem code in the function.
4. moved folio dirtiness check after try_to_unmap() but before try_to_unmap_flush(), since that is sufficient to prevent new writes.
5. reordered patch 4 and 5, so that khugepaged behavior does not change after READ_ONLY_THP_FOR_FS is removed.
6. added read-write file test in khugepaged selftest.
7. removed the read-only file restriction from guard-region selftest.
From V1[2]:
1. removed inode_is_open_for_write() check in collapse_file(), since the added folio dirtiness check after try_to_unmap_flush() should be sufficient to prevent writes to candidate folios.
2. removed READ_ONLY_THP_FOR_FS check in hugepage_enabled(), please see Patch 5 and item 2 in the overview for more details.
3. moved the patch removing READ_ONLY_THP_FOR_FS Kconfig after enabling khugepaged and MADV_COLLAPSE to create read-only THPs.
4. added mapping_pmd_thp_support() helper function.
5. used VM_WARN_ON_ONCE() in collapse_file() for mapping eligibility check and address alignment check instead of if + return error code. Always allow shmem, since MADV_COLLAPSE ignore shmem huge config.
6. added mapping eligibility check in collapse_scan_file().
7. removed trailing ; for folio_split() in the !CONFIG_TRANSPARENT_HUGEPAGE.
8. simplified code in folio_check_splittable() after removing READ_ONLY_THP_FOR_FS code.
9. clarified that read-only THP works for FSes with PMD THP support by default.
From RFC[1]:
1. instead of removing READ_ONLY_THP_FOR_FS function entirely, turn it on by default for all FSes with large folio support and the supported orders includes PMD_ORDER.
Suggestions and comments are welcome.
Zi Yan (12):
mm/khugepaged: remove READ_ONLY_THP_FOR_FS check mm/khugepaged: add folio dirty check after try_to_unmap() mm/huge_memory: remove READ_ONLY_THP_FOR_FS from file_thp_enabled() mm/khugepaged: remove READ_ONLY_THP_FOR_FS check in hugepage_enabled()
mm: remove READ_ONLY_THP_FOR_FS Kconfig option
mm: fs: remove filemap_nr_thps*() functions and their users
fs: remove nr_thps from struct address_space mm/huge_memory: remove folio split check for READ_ONLY_THP_FOR_FS mm/truncate: use folio_split() in truncate_inode_partial_folio() fs/btrfs: remove a comment referring to READ_ONLY_THP_FOR_FS selftests/mm: remove READ_ONLY_THP_FOR_FS in khugepaged selftests/mm: remove READ_ONLY_THP_FOR_FS code from guard-regions
fs/btrfs/defrag.c | 3 - fs/inode.c | 3 - fs/open.c | 27 ----- include/linux/fs.h | 5 - include/linux/huge_mm.h | 25 +---- include/linux/pagemap.h | 34 ++----- include/linux/shmem_fs.h | 2 +- mm/Kconfig | 11 --- mm/filemap.c | 1 - mm/huge_memory.c | 39 ++------ mm/khugepaged.c | 92 ++++++++--------- mm/truncate.c | 8 +- tools/testing/selftests/mm/guard-regions.c | 18 +--- tools/testing/selftests/mm/khugepaged.c | 110 +++++++++++++++------ tools/testing/selftests/mm/run_vmtests.sh | 12 ++- 15 files changed, 163 insertions(+), 227 deletions(-)
Signature · 1 line
2.43.0
Zi Yan
reviewerPATCH v4 1/12 mm/khugepaged: remove READ_ONLY_THP_FOR_FS check
collapse_file() requires FSes supporting large folio with at least PMD_ORDER, so replace the READ_ONLY_THP_FOR_FS check with that. MADV_COLLAPSE ignores shmem huge config, so exclude the check for shmem.
While at it, replace VM_BUG_ON with VM_WARN_ON_ONCE.
Add a helper function mapping_pmd_thp_support() for FSes supporting large folio with at least PMD_ORDER.
--- include/linux/pagemap.h | 9 +++++++++ mm/khugepaged.c | 10 ++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)
include/linux/pagemap.h +9 -0
@@ -513,6 +513,15 @@ static inline bool mapping_large_folio_support(const struct address_space *mappireturn mapping_max_folio_order (mapping) >0 ; } +static inline bool mapping_pmd_thp_support (const struct address_space *mapping) +{ +/* AS_FOLIO_ORDER is only reasonable for pagecache folios */ +VM_WARN_ON_ONCE ((unsigned long )mapping &FOLIO_MAPPING_ANON ); + +return mapping_max_folio_order (mapping) >=PMD_ORDER ; +} + +/* Return the maximum folio size for this pagecache mapping, in bytes. */ static inline size_t mapping_max_folio_size (const struct address_space *mapping) {
mm/khugepaged.c +8 -2
@@ -2235,8 +2235,14 @@ static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr,int nr_none =0 ;bool is_shmem =shmem_file (file); -VM_BUG_ON (!IS_ENABLED (CONFIG_READ_ONLY_THP_FOR_FS ) && !is_shmem); -VM_BUG_ON (start & (HPAGE_PMD_NR -1 )); +/* +* MADV_COLLAPSE ignores shmem huge config, so do not check shmem +* +* TODO: once shmem always calls mapping_set_large_folios() on its +* mapping, the shmem check can be removed. +*/ +VM_WARN_ON_ONCE (!is_shmem && !mapping_pmd_thp_support (mapping)); +VM_WARN_ON_ONCE (start & (HPAGE_PMD_NR -1 )); result =alloc_charge_folio (&new_folio, mm, cc,HPAGE_PMD_ORDER );if (result !=SCAN_SUCCEED )
Signature · 1 line
2.43.0
David Hildenbrand (Arm)
maintainerRe: [PATCH 7.2 v4 01/12] mm/khugepaged: remove READ_ONLY_THP_FOR_FS check
Quoted 22 lines · Zi Yan
collapse_file()requires FSes supporting large folio with at leastPMD_ORDER, so replace theREAD_ONLY_THP_FOR_FScheck with that.MADV_COLLAPSEignores shmem huge config, so exclude the check for shmem.While at it, replace
VM_BUG_ONwithVM_WARN_ON_ONCE.Add a helper function
mapping_pmd_thp_support()for FSes supporting large folio with at leastPMD_ORDER.Signed-off-by Zi Yan <[email protected]>Reviewed-by Lance Yang <[email protected]>Reviewed-by Baolin Wang <[email protected]>--- include/linux/pagemap.h | 9 +++++++++ mm/khugepaged.c | 10 ++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)include/linux/pagemap.h +0
-0
include/linux/pagemap.h static inline bool mapping_large_folio_support(const struct address_space *mappi · line 522
Quoted 10 lines
include/linux/pagemap.h +7
-0@@ -513,6 +513,15 @@ static inline bool mapping_large_folio_support(const struct address_space *mappireturn mapping_max_folio_order (mapping) >0 ; } +static inline bool mapping_pmd_thp_support (const struct address_space *mapping) +{ +/* AS_FOLIO_ORDER is only reasonable for pagecache folios */ +VM_WARN_ON_ONCE ((unsigned long )mapping &FOLIO_MAPPING_ANON ); + +return mapping_max_folio_order (mapping) >=PMD_ORDER ; +}
Given mapping_large_folio_support(), I wonder whether we should call that mapping_pmd_folio_support() ?
Quoted 12 lines
include/linux/pagemap.h +2
-0+ +/* Return the maximum folio size for this pagecache mapping, in bytes. */ static inline size_t mapping_max_folio_size (const struct address_space *mapping) {mm/khugepaged.c +0
-0@@ -2235,8 +2235,14 @@ static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr,int nr_none =0 ;bool is_shmem =shmem_file (file);
mm/khugepaged.c static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr, · line 2244
Quoted 10 lines
mm/khugepaged.c +7
-2-VM_BUG_ON (!IS_ENABLED (CONFIG_READ_ONLY_THP_FOR_FS ) && !is_shmem); -VM_BUG_ON (start & (HPAGE_PMD_NR -1 )); +/* +* MADV_COLLAPSE ignores shmem huge config, so do not check shmem +* +* TODO: once shmem always calls mapping_set_large_folios() on its +* mapping, the shmem check can be removed. +*/ +VM_WARN_ON_ONCE (!is_shmem && !mapping_pmd_thp_support (mapping));
When we always make shmem to set the mapping to enable large folios, can we then drop this special casing no?
Quoted 4 lines
mm/khugepaged.c +1
-0+VM_WARN_ON_ONCE (start & (HPAGE_PMD_NR -1 )); result =alloc_charge_folio (&new_folio, mm, cc,HPAGE_PMD_ORDER );if (result !=SCAN_SUCCEED )
Signature · 3 lines
Cheers, David
Zi Yan
reviewerRe: [PATCH 7.2 v4 01/12] mm/khugepaged: remove READ_ONLY_THP_FOR_FS check
Quoted 26 lines · David Hildenbrand (Arm)
Quoted 25 lines · Zi Yan
collapse_file()requires FSes supporting large folio with at leastPMD_ORDER, so replace theREAD_ONLY_THP_FOR_FScheck with that.MADV_COLLAPSEignores shmem huge config, so exclude the check for shmem.While at it, replace
VM_BUG_ONwithVM_WARN_ON_ONCE.Add a helper function
mapping_pmd_thp_support()for FSes supporting large folio with at leastPMD_ORDER.Signed-off-by Zi Yan <[email protected]>Reviewed-by Lance Yang <[email protected]>Reviewed-by Baolin Wang <[email protected]>--- include/linux/pagemap.h | 9 +++++++++ mm/khugepaged.c | 10 ++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)include/linux/pagemap.h +0
-0@@ -513,6 +513,15 @@ static inline bool mapping_large_folio_support(const struct address_space *mappireturn mapping_max_folio_order (mapping) >0 ; }
Quoted 10 lines
include/linux/pagemap.h static inline bool mapping_large_folio_support(const struct address_space *mappi · line 522
Quoted 7 lines
include/linux/pagemap.h +7
-0+static inline bool mapping_pmd_thp_support (const struct address_space *mapping) +{ +/* AS_FOLIO_ORDER is only reasonable for pagecache folios */ +VM_WARN_ON_ONCE ((unsigned long )mapping &FOLIO_MAPPING_ANON ); + +return mapping_max_folio_order (mapping) >=PMD_ORDER ; +}Given
mapping_large_folio_support(), I wonder whether we should call thatmapping_pmd_folio_support()?
OK, will rename it.
Quoted 14 lines
Quoted 14 lines
include/linux/pagemap.h +2
-0+ +/* Return the maximum folio size for this pagecache mapping, in bytes. */ static inline size_t mapping_max_folio_size (const struct address_space *mapping) {mm/khugepaged.c +0
-0@@ -2235,8 +2235,14 @@ static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr,int nr_none =0 ;bool is_shmem =shmem_file (file);
Quoted 13 lines
mm/khugepaged.c static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr, · line 2244
Quoted 9 lines
mm/khugepaged.c +7
-2-VM_BUG_ON (!IS_ENABLED (CONFIG_READ_ONLY_THP_FOR_FS ) && !is_shmem); -VM_BUG_ON (start & (HPAGE_PMD_NR -1 )); +/* +* MADV_COLLAPSE ignores shmem huge config, so do not check shmem +* +* TODO: once shmem always calls mapping_set_large_folios() on its +* mapping, the shmem check can be removed. +*/ +VM_WARN_ON_ONCE (!is_shmem && !mapping_pmd_thp_support (mapping));When we always make shmem to set the mapping to enable large folios, can we then drop this special casing no?
Yes, I added the TODO above it to remind us. I have not changed the code here to avoid a dependency on Baolin’s patch[1]. I will do that once Baolin’s patch gets into mm-stable.
Quoted 11 lines
Quoted 5 lines
mm/khugepaged.c +1
-0+VM_WARN_ON_ONCE (start & (HPAGE_PMD_NR -1 )); result =alloc_charge_folio (&new_folio, mm, cc,HPAGE_PMD_ORDER );if (result !=SCAN_SUCCEED )Signature · 3 lines
Cheers, David
Best Regards,
Yan, Zi
Andrew Morton
maintainerRe: [PATCH 7.2 v4 01/12] mm/khugepaged: remove READ_ONLY_THP_FOR_FS check
In reply to Zi YanQuoted 8 lines · On Thu, 23 Apr 2026 22:49:04 -0400 Zi Yan <[email protected]> wrote:
collapse_file()requires FSes supporting large folio with at leastPMD_ORDER, so replace theREAD_ONLY_THP_FOR_FScheck with that.MADV_COLLAPSEignores shmem huge config, so exclude the check for shmem.While at it, replace
VM_BUG_ONwithVM_WARN_ON_ONCE.Add a helper function
mapping_pmd_thp_support()for FSes supporting large folio with at leastPMD_ORDER.
My arm allnoconfig blew up.
Quoted 5 lines
include/linux/pagemap.h +0
-0@@ -513,6 +513,15 @@ static inline bool mapping_large_folio_support(const struct address_space *mappireturn mapping_max_folio_order (mapping) >0 ; }
include/linux/pagemap.h static inline bool mapping_large_folio_support(const struct address_space *mappi · line 524
Quoted 10 lines
include/linux/pagemap.h +9
-0+static inline bool mapping_pmd_thp_support (const struct address_space *mapping) +{ +/* AS_FOLIO_ORDER is only reasonable for pagecache folios */ +VM_WARN_ON_ONCE ((unsigned long )mapping &FOLIO_MAPPING_ANON ); + +return mapping_max_folio_order (mapping) >=PMD_ORDER ; +} + +
- Should it be named "mapping_pmd_thp_supported"?
- What does it actually *do*? A little comment explaining this would be appropriate.
- Is it appropriate that this be inlined?
I added the below.
From: Andrew Morton <[email protected]>
Subject: mm-khugepaged-remove-read_only_thp_for_fs-check-fix
Date: Sat Apr 25 02:54:04 PM PDT 2026
fix arm64 allnoconfig by uninlining mapping_pmd_thp_support()
In file included from ./include/linux/mm.h:31,
from fs/inode.c:9:
./include/linux/pagemap.h: In function 'mapping_pmd_thp_support':./include/linux/pgtable.h:8:26: error: 'PMD_SHIFT' undeclared (first use in this function); did you mean 'PUD_SHIFT'?
8 | #define PMD_ORDER (PMD_SHIFT - PAGE_SHIFT)
| ^~~~~~~~~./include/linux/pagemap.h:521:52: note: in expansion of macro 'PMD_ORDER'
521 | return mapping_max_folio_order(mapping) >= PMD_ORDER;
| ^~~~~~~~~./include/linux/pgtable.h:8:26: note: each undeclared identifier is reported only once for each function it appears in
8 | #define PMD_ORDER (PMD_SHIFT - PAGE_SHIFT)
| ^~~~~~~~~./include/linux/pagemap.h:521:52: note: in expansion of macro 'PMD_ORDER'
521 | return mapping_max_folio_order(mapping) >= PMD_ORDER;
| ^~~~~~~~~
make[3]: *** [scripts/Makefile.build:289: fs/inode.o] Error 1
make[2]: *** [scripts/Makefile.build:548: fs] Error 2
make[1]: *** [/usr/src/25/Makefile:2139: .] Error 2
make: *** [Makefile:248: __sub-make] Error 2
---
include/linux/pagemap.h | 9 +-------- mm/filemap.c | 8 ++++++++ 2 files changed, 9 insertions(+), 8 deletions(-)
include/linux/pagemap.h renamed from include/linux/pagemap.h~mm-khugepaged-remove-read_only_thp_for_fs-check-fix +1 -8
@@ -513,14 +513,7 @@ static inline bool mapping_large_folio_sreturn mapping_max_folio_order (mapping) >0 ; } -static inline bool mapping_pmd_thp_support (const struct address_space *mapping) -{ -/* AS_FOLIO_ORDER is only reasonable for pagecache folios */ -VM_WARN_ON_ONCE ((unsigned long )mapping &FOLIO_MAPPING_ANON ); - -return mapping_max_folio_order (mapping) >=PMD_ORDER ; -} - +bool mapping_pmd_thp_support (const struct address_space *mapping);/* Return the maximum folio size for this pagecache mapping, in bytes. */ static inline size_t mapping_max_folio_size (const struct address_space *mapping)
mm/filemap.c renamed from mm/filemap.c~mm-khugepaged-remove-read_only_thp_for_fs-check-fix +8 -0
@@ -126,6 +126,14 @@* ->private_lock (zap_pte_range->block_dirty_folio) */ +bool mapping_pmd_thp_support (const struct address_space *mapping) +{ +/* AS_FOLIO_ORDER is only reasonable for pagecache folios */ +VM_WARN_ON_ONCE ((unsigned long )mapping &FOLIO_MAPPING_ANON ); + +return mapping_max_folio_order (mapping) >=PMD_ORDER ; +} +static void page_cache_delete (struct address_space *mapping,struct folio *folio,void *shadow) {
_
Andrew Morton
maintainerRe: [PATCH 7.2 v4 01/12] mm/khugepaged: remove READ_ONLY_THP_FOR_FS check
Quoted 1 line · On Sat, 25 Apr 2026 15:01:31 -0700 Andrew Morton <[email protected]>…
I added the below.
Nope, still doesn't work. I guess 32-bit arm doesn't have a PMD_SHIFT.
The series has a few todo notes:
https://lore.kernel.org/[email protected]
https://sashiko.dev/#/patchset/20260413192030.3275825-1-ziy%40nvidia.com
https://lore.kernel.org/[email protected]
https://lore.kernel.org/[email protected]
so I'll drop this version.
Zi Yan
reviewerRe: [PATCH 7.2 v4 01/12] mm/khugepaged: remove READ_ONLY_THP_FOR_FS check
Quoted 6 lines · Andrew Morton
Quoted 1 line · On Sat, 25 Apr 2026 15:01:31 -0700 Andrew Morton <[email protected]>…
I added the below.
Nope, still doesn't work. I guess 32-bit arm doesn't have a
PMD_SHIFT.
Quoted 8 lines
The series has a few todo notes:
https://lore.kernel.org/[email protected]
https://sashiko.dev/#/patchset/20260413192030.3275825-1-ziy%40nvidia.com
https://lore.kernel.org/[email protected]
https://lore.kernel.org/[email protected]so I'll drop this version.
Sure. Will fix this along with other TODOs.
--
Best Regards,
Yan, Zi
Zi Yan
reviewerPATCH v4 2/12 mm/khugepaged: add folio dirty check after try_to_unmap()
In reply to Zi YanThis check ensures the correctness of collapse read-only THPs for FSes after READ_ONLY_THP_FOR_FS is enabled by default for all FSes supporting PMD THP pagecache.
READ_ONLY_THP_FOR_FS only supports read-only fd and uses mapping->nr_thps and inode->i_writecount to prevent any write to read-only to-be-collapsed folios. In upcoming commits, READ_ONLY_THP_FOR_FS will be removed and the aforementioned mechanism will go away too. To ensure khugepaged functions as expected after the changes, skip if any folio is dirty after try_to_unmap(), since a dirty folio means this read-only folio got some writes via mmap can happen between try_to_unmap() and try_to_unmap_flush() via cached TLB entries and khugepaged does not support writable pagecache folio collapse yet.
--- mm/khugepaged.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)
mm/khugepaged.c +24 -4
@@ -2327,8 +2327,7 @@ static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr, } }else if (folio_test_dirty (folio)) {/* -* khugepaged only works on read-only fd, -* so this page is dirty because it hasn't +* This page is dirty because it hasn't * been flushed since first write. There * won't be new dirty pages. *
@@ -2386,8 +2385,8 @@ static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr,if (!is_shmem && (folio_test_dirty (folio) ||folio_test_writeback (folio))) {/* -* khugepaged only works on read-only fd, so this -* folio is dirty because it hasn't been flushed +* khugepaged only works on clean file-backed folios, +* so this folio is dirty because it hasn't been flushed * since first write. */ result =SCAN_PAGE_DIRTY_OR_WRITEBACK ;
@@ -2431,6 +2430,27 @@ static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr, goto out_unlock; } +/* +* At this point, the folio is locked and unmapped. If the PTE +* was dirty, try_to_unmap() has transferred the dirty bit to +* the folio and we must not collapse it into a clean +* file-backed folio. +* +* If the folio is clean here, no one can write it until we +* drop the folio lock. A write through a stale TLB entry came +* from a clean PTE and must fault because the PTE has been +* cleared; the fault path has to take the folio lock before +* installing a writable mapping. Buffered write paths also +* have to take the folio lock before modifying file contents +* without a mapping, typically via write_begin_get_folio(). +*/ +if (!is_shmem &&folio_test_dirty (folio)) { + result =SCAN_PAGE_DIRTY_OR_WRITEBACK ; +xas_unlock_irq (&xas); +folio_putback_lru (folio); + goto out_unlock; + } +/* * Accumulate the folios that are being collapsed. */
Signature · 1 line
2.43.0
Re: [PATCH 7.2 v4 02/12] mm/khugepaged: add folio dirty check after try_to_unmap()
Quoted 14 lines · Zi Yan
This check ensures the correctness of collapse read-only THPs for FSes after
READ_ONLY_THP_FOR_FSis enabled by default for all FSes supporting PMD THP pagecache.
READ_ONLY_THP_FOR_FSonly supports read-only fd and usesmapping->nr_thpsandinode->i_writecountto prevent any write to read-only to-be-collapsed folios. In upcoming commits,READ_ONLY_THP_FOR_FSwill be removed and the aforementioned mechanism will go away too. To ensure khugepaged functions as expected after the changes, skip if any folio is dirty aftertry_to_unmap(), since a dirty folio means this read-only folio got some writes via mmap can happen betweentry_to_unmap()andtry_to_unmap_flush()via cached TLB entries and khugepaged does not support writable pagecache folio collapse yet.
Quoted 2 lines
Signed-off-by Zi Yan <[email protected]>---
Signature · 3 lines
Cheers, David
Re: [PATCH 7.2 v4 02/12] mm/khugepaged: add folio dirty check after try_to_unmap()
In reply to Zi YanQuoted 14 lines · Zi Yan
This check ensures the correctness of collapse read-only THPs for FSes after
READ_ONLY_THP_FOR_FSis enabled by default for all FSes supporting PMD THP pagecache.
READ_ONLY_THP_FOR_FSonly supports read-only fd and usesmapping->nr_thpsandinode->i_writecountto prevent any write to read-only to-be-collapsed folios. In upcoming commits,READ_ONLY_THP_FOR_FSwill be removed and the aforementioned mechanism will go away too. To ensure khugepaged functions as expected after the changes, skip if any folio is dirty aftertry_to_unmap(), since a dirty folio means this read-only folio got some writes via mmap can happen betweentry_to_unmap()andtry_to_unmap_flush()via cached TLB entries and khugepaged does not support writable pagecache folio collapse yet.
Quoted 2 lines
Signed-off-by Zi Yan <[email protected]>---
LGTM (Thanks to Lance for pointing out the xas lock issue in the previous version). Feel free to add:
Zi Yan
reviewerPATCH v4 3/12 mm/huge_memory: remove READ_ONLY_THP_FOR_FS from file_thp_enabled()
In reply to Zi YanReplace it with a check on the max folio order of the file's address space mapping, making sure PMD THP is supported. Also remove the read-only fd check, since collapse_file() now makes sure all to-be-collapsed folios are clean and the created PMD file THP can be handled by FSes properly.
--- mm/huge_memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
mm/huge_memory.c +4 -4
@@ -86,9 +86,6 @@ static inline bool file_thp_enabled(struct vm_area_struct *vma) {struct inode *inode; -if (!IS_ENABLED (CONFIG_READ_ONLY_THP_FOR_FS )) -return false; -if (!vma->vm_file)return false;
@@ -97,7 +94,10 @@ static inline bool file_thp_enabled(struct vm_area_struct *vma)if (IS_ANON_FILE (inode))return false; -return !inode_is_open_for_write (inode) &&S_ISREG (inode->i_mode); +if (!mapping_pmd_thp_support (inode->i_mapping)) +return false; + +return S_ISREG (inode->i_mode); }/* If returns true, we are unable to access the VMA's folios. */
Signature · 1 line
2.43.0
Re: [PATCH 7.2 v4 03/12] mm/huge_memory: remove READ_ONLY_THP_FOR_FS from file_thp_enabled()
Quoted 8 lines · Zi Yan
Replace it with a check on the max folio order of the file's address space mapping, making sure PMD THP is supported. Also remove the read-only fd check, since
collapse_file()now makes sure all to-be-collapsed folios are clean and the created PMD file THP can be handled by FSes properly.Signed-off-by Zi Yan <[email protected]>Reviewed-by Baolin Wang <[email protected]>---
Signature · 3 lines
Cheers, David
Zi Yan
reviewerRe: [PATCH 7.2 v4 03/12] mm/huge_memory: remove READ_ONLY_THP_FOR_FS from file_thp_enabled()
In reply to Zi YanQuoted 26 lines · Zi Yan
Replace it with a check on the max folio order of the file's address space mapping, making sure PMD THP is supported. Also remove the read-only fd check, since
collapse_file()now makes sure all to-be-collapsed folios are clean and the created PMD file THP can be handled by FSes properly.Signed-off-by Zi Yan <[email protected]>Reviewed-by Baolin Wang <[email protected]>--- mm/huge_memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)mm/huge_memory.c +0
-3@@ -86,9 +86,6 @@ static inline bool file_thp_enabled(struct vm_area_struct *vma) {struct inode *inode; -if (!IS_ENABLED (CONFIG_READ_ONLY_THP_FOR_FS )) -return false; -if (!vma->vm_file)return false;
mm/huge_memory.c static inline bool file_thp_enabled(struct vm_area_struct *vma) · line 98
Quoted 6 lines
mm/huge_memory.c +2
-1@@ -97,7 +94,10 @@ static inline bool file_thp_enabled(struct vm_area_struct *vma)if (IS_ANON_FILE (inode))return false; -return !inode_is_open_for_write (inode) &&S_ISREG (inode->i_mode); +if (!mapping_pmd_thp_support (inode->i_mapping)) +return false;
sashiko told me that I need to check vma->vm_file->f_mapping, since folio->mapping needs to match vma->vm_file->f_mapping and inode->i_mapping and vma->vm_file->f_mapping can diverge.
I will fix this one.
Quoted 7 lines
mm/huge_memory.c +2
-0+ +return S_ISREG (inode->i_mode); }/* If returns true, we are unable to access the VMA's folios. */ Signature · 1 line
2.43.0
Best Regards,
Yan, Zi
Zi Yan
reviewerRe: [PATCH 7.2 v4 03/12] mm/huge_memory: remove READ_ONLY_THP_FOR_FS from file_thp_enabled()
In reply to Zi YanQuoted 26 lines · Zi Yan
Replace it with a check on the max folio order of the file's address space mapping, making sure PMD THP is supported. Also remove the read-only fd check, since
collapse_file()now makes sure all to-be-collapsed folios are clean and the created PMD file THP can be handled by FSes properly.Signed-off-by Zi Yan <[email protected]>Reviewed-by Baolin Wang <[email protected]>--- mm/huge_memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)mm/huge_memory.c +0
-3@@ -86,9 +86,6 @@ static inline bool file_thp_enabled(struct vm_area_struct *vma) {struct inode *inode; -if (!IS_ENABLED (CONFIG_READ_ONLY_THP_FOR_FS )) -return false; -if (!vma->vm_file)return false;
mm/huge_memory.c static inline bool file_thp_enabled(struct vm_area_struct *vma) · line 100
Quoted 4 lines
mm/huge_memory.c +0
-1@@ -97,7 +94,10 @@ static inline bool file_thp_enabled(struct vm_area_struct *vma)if (IS_ANON_FILE (inode))return false; -return !inode_is_open_for_write (inode) &&S_ISREG (inode->i_mode);
(resend to V4, since I accidentally replied to V3, sorry about that)
Hi Matthew, David, and Lorenzo,
After some discussions on irc, I feel that we probably should not allow read-write fd for PMD THP collapse at the moment. Combining with the filemap_flush() under folio_dirty() check from collapse_file(), khugepaged would become a kwritebackd that scans pagecache folios and writes them back. If we limit it to read-only fds, at least khugepaged would only write back once for the pagecache folios from these fds.
I am planning to restore inode_is_open_for_write() check in the next version. Let me know your thoughts.
Quoted 9 lines
mm/huge_memory.c +4
-0+if (!mapping_pmd_thp_support (inode->i_mapping)) +return false; + +return S_ISREG (inode->i_mode); }/* If returns true, we are unable to access the VMA's folios. */ Signature · 1 line
2.43.0
--
Best Regards,
Yan, Zi
Zi Yan
reviewerPATCH v4 4/12 mm/khugepaged: remove READ_ONLY_THP_FOR_FS check in hugepage_enabled()
In reply to Zi YanRemove READ_ONLY_THP_FOR_FS and khugepaged for file-backed pmd-sized hugepages are enabled by the global transparent hugepage control. khugepaged can still be enabled by per-size control for anon and shmem when the global control is off.
Add shmem_hpage_pmd_enabled() stub for !CONFIG_SHMEM to remove IS_ENABLED(SHMEM) in hugepage_enabled().
Clean up hugepage_enabled() by moving anon code to anon_hpage_enabled().
--- include/linux/shmem_fs.h | 2 +- mm/khugepaged.c | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-)
include/linux/shmem_fs.h +1 -1
@@ -127,7 +127,7 @@ int shmem_writeout(struct folio *folio, struct swap_iocb **plug,void shmem_truncate_range (struct inode *inode,loff_t start,uoff_t end);int shmem_unuse (unsigned int type); -#ifdef CONFIG_TRANSPARENT_HUGEPAGE +#if defined(CONFIG_TRANSPARENT_HUGEPAGE ) && defined(CONFIG_SHMEM )unsigned long shmem_allowable_huge_orders (struct inode *inode,struct vm_area_struct *vma,pgoff_t index,loff_t write_end,bool shmem_huge_force);
mm/khugepaged.c +16 -10
@@ -524,26 +524,32 @@ static inline int collapse_test_exit_or_disable(struct mm_struct *mm)mm_flags_test (MMF_DISABLE_THP_COMPLETELY , mm); } +static inline bool anon_hpage_enabled (void ) +{ +if (READ_ONCE (huge_anon_orders_always)) +return true; +if (READ_ONCE (huge_anon_orders_madvise)) +return true; +if (READ_ONCE (huge_anon_orders_inherit) && +hugepage_global_enabled ()) +return true; +return false; +} +static bool hugepage_enabled (void ) {/* * We cover the anon, shmem and the file-backed case here; file-backed -* hugepages, when configured in, are determined by the global control. +* hugepages are determined by the global control. * Anon hugepages are determined by its per-size mTHP control. * Shmem pmd-sized hugepages are also determined by its pmd-size control, * except when the global shmem_huge is set to SHMEM_HUGE_DENY. */ -if (IS_ENABLED (CONFIG_READ_ONLY_THP_FOR_FS ) && -hugepage_global_enabled ()) -return true; -if (READ_ONCE (huge_anon_orders_always)) +if (hugepage_global_enabled ())return true; -if (READ_ONCE (huge_anon_orders_madvise)) -return true; -if (READ_ONCE (huge_anon_orders_inherit) && -hugepage_global_enabled ()) +if (anon_hpage_enabled ())return true; -if (IS_ENABLED (CONFIG_SHMEM ) &&shmem_hpage_pmd_enabled ()) +if (shmem_hpage_pmd_enabled ())return true;return false; }
Signature · 1 line
2.43.0
Re: [PATCH 7.2 v4 04/12] mm/khugepaged: remove READ_ONLY_THP_FOR_FS check in hugepage_enabled()
Quoted 39 lines · Zi Yan
Remove
READ_ONLY_THP_FOR_FSand khugepaged for file-backed pmd-sized hugepages are enabled by the global transparent hugepage control. khugepaged can still be enabled by per-size control for anon and shmem when the global control is off.Add
shmem_hpage_pmd_enabled()stub for !CONFIG_SHMEM to removeIS_ENABLED(SHMEM)inhugepage_enabled().Clean up
hugepage_enabled()by moving anon code toanon_hpage_enabled().Signed-off-by Zi Yan <[email protected]>Reviewed-by Baolin Wang <[email protected]>--- include/linux/shmem_fs.h | 2 +- mm/khugepaged.c | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-)include/linux/shmem_fs.h +1
-1@@ -127,7 +127,7 @@ int shmem_writeout(struct folio *folio, struct swap_iocb **plug,void shmem_truncate_range (struct inode *inode,loff_t start,uoff_t end);int shmem_unuse (unsigned int type); -#ifdef CONFIG_TRANSPARENT_HUGEPAGE +#if defined(CONFIG_TRANSPARENT_HUGEPAGE ) && defined(CONFIG_SHMEM )unsigned long shmem_allowable_huge_orders (struct inode *inode,struct vm_area_struct *vma,pgoff_t index,loff_t write_end,bool shmem_huge_force);mm/khugepaged.c +1
-0@@ -524,26 +524,32 @@ static inline int collapse_test_exit_or_disable(struct mm_struct *mm)mm_flags_test (MMF_DISABLE_THP_COMPLETELY , mm); } +static inline bool anon_hpage_enabled (void )
mm/khugepaged.c static inline int collapse_test_exit_or_disable(struct mm_struct *mm) · line 537
Quoted 10 lines
mm/khugepaged.c +10
-0+{ +if (READ_ONCE (huge_anon_orders_always)) +return true; +if (READ_ONCE (huge_anon_orders_madvise)) +return true; +if (READ_ONCE (huge_anon_orders_inherit) && +hugepage_global_enabled ()) +return true; +return false; +}
Ah, that is based on Nicos work, right?
Quoted 18 lines
mm/khugepaged.c +3
-6+static bool hugepage_enabled (void ) {/* * We cover the anon, shmem and the file-backed case here; file-backed -* hugepages, when configured in, are determined by the global control. +* hugepages are determined by the global control. * Anon hugepages are determined by its per-size mTHP control. * Shmem pmd-sized hugepages are also determined by its pmd-size control, * except when the global shmem_huge is set to SHMEM_HUGE_DENY. */ -if (IS_ENABLED (CONFIG_READ_ONLY_THP_FOR_FS ) && -hugepage_global_enabled ()) -return true; -if (READ_ONCE (huge_anon_orders_always)) +if (hugepage_global_enabled ())return true; -if (READ_ONCE (huge_anon_orders_madvise))
mm/khugepaged.c static inline int collapse_test_exit_or_disable(struct mm_struct *mm) · line 555
Quoted 10 lines
mm/khugepaged.c +2
-4-return true; -if (READ_ONCE (huge_anon_orders_inherit) && -hugepage_global_enabled ()) +if (anon_hpage_enabled ())return true; -if (IS_ENABLED (CONFIG_SHMEM ) &&shmem_hpage_pmd_enabled ()) +if (shmem_hpage_pmd_enabled ())return true;return false; }
Signature · 3 lines
Cheers, David
Zi Yan
reviewerRe: [PATCH 7.2 v4 04/12] mm/khugepaged: remove READ_ONLY_THP_FOR_FS check in hugepage_enabled()
Quoted 39 lines · David Hildenbrand (Arm)
Quoted 38 lines · Zi Yan
Remove
READ_ONLY_THP_FOR_FSand khugepaged for file-backed pmd-sized hugepages are enabled by the global transparent hugepage control. khugepaged can still be enabled by per-size control for anon and shmem when the global control is off.Add
shmem_hpage_pmd_enabled()stub for !CONFIG_SHMEM to removeIS_ENABLED(SHMEM)inhugepage_enabled().Clean up
hugepage_enabled()by moving anon code toanon_hpage_enabled().Signed-off-by Zi Yan <[email protected]>Reviewed-by Baolin Wang <[email protected]>--- include/linux/shmem_fs.h | 2 +- mm/khugepaged.c | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-)include/linux/shmem_fs.h +1
-1@@ -127,7 +127,7 @@ int shmem_writeout(struct folio *folio, struct swap_iocb **plug,void shmem_truncate_range (struct inode *inode,loff_t start,uoff_t end);int shmem_unuse (unsigned int type); -#ifdef CONFIG_TRANSPARENT_HUGEPAGE +#if defined(CONFIG_TRANSPARENT_HUGEPAGE ) && defined(CONFIG_SHMEM )unsigned long shmem_allowable_huge_orders (struct inode *inode,struct vm_area_struct *vma,pgoff_t index,loff_t write_end,bool shmem_huge_force);mm/khugepaged.c +0
-0@@ -524,26 +524,32 @@ static inline int collapse_test_exit_or_disable(struct mm_struct *mm)mm_flags_test (MMF_DISABLE_THP_COMPLETELY , mm); }
Quoted 13 lines
mm/khugepaged.c static inline int collapse_test_exit_or_disable(struct mm_struct *mm) · line 537
Quoted 11 lines
mm/khugepaged.c +11
-0+static inline bool anon_hpage_enabled (void ) +{ +if (READ_ONCE (huge_anon_orders_always)) +return true; +if (READ_ONCE (huge_anon_orders_madvise)) +return true; +if (READ_ONCE (huge_anon_orders_inherit) && +hugepage_global_enabled ()) +return true; +return false; +}Ah, that is based on Nicos work, right?
Yes, since mm-new has Nico’s patchset now.
Quoted 23 lines
Quoted 23 lines
mm/khugepaged.c +4
-9+static bool hugepage_enabled (void ) {/* * We cover the anon, shmem and the file-backed case here; file-backed -* hugepages, when configured in, are determined by the global control. +* hugepages are determined by the global control. * Anon hugepages are determined by its per-size mTHP control. * Shmem pmd-sized hugepages are also determined by its pmd-size control, * except when the global shmem_huge is set to SHMEM_HUGE_DENY. */ -if (IS_ENABLED (CONFIG_READ_ONLY_THP_FOR_FS ) && -hugepage_global_enabled ()) -return true; -if (READ_ONCE (huge_anon_orders_always)) +if (hugepage_global_enabled ())return true; -if (READ_ONCE (huge_anon_orders_madvise)) -return true; -if (READ_ONCE (huge_anon_orders_inherit) && -hugepage_global_enabled ()) +if (anon_hpage_enabled ())
Quoted 13 lines
mm/khugepaged.c static inline int collapse_test_exit_or_disable(struct mm_struct *mm) · line 555
Quoted 6 lines
mm/khugepaged.c +1
-1return true; -if (IS_ENABLED (CONFIG_SHMEM ) &&shmem_hpage_pmd_enabled ()) +if (shmem_hpage_pmd_enabled ())return true;return false; }Signature · 3 lines
Cheers, David
Best Regards,
Yan, Zi
Zi Yan
reviewerPATCH v4 5/12 mm: remove READ_ONLY_THP_FOR_FS Kconfig option
In reply to Zi YanAfter removing READ_ONLY_THP_FOR_FS check in file_thp_enabled(), khugepaged and MADV_COLLAPSE can run on FSes with PMD THP pagecache support even without READ_ONLY_THP_FOR_FS enabled. Remove the Kconfig first so that no one can use READ_ONLY_THP_FOR_FS as upcoming commits remove mapping->nr_thps, which its safe guard mechanism relies on.
--- mm/Kconfig | 11 ----------- 1 file changed, 11 deletions(-)
mm/Kconfig +0 -11
@@ -938,17 +938,6 @@ config THP_SWAP For selection by architectures with reasonable THP sizes. -config READ_ONLY_THP_FOR_FS - bool "Read-only THP for filesystems (EXPERIMENTAL)" - depends on TRANSPARENT_HUGEPAGE - - help - Allow khugepaged to put read-only file-backed pages in THP. - - This is marked experimental because it is a new feature. Write - support of file THPs will be developed in the next few release - cycles. - config NO_PAGE_MAPCOUNT bool "No per-page mapcount (EXPERIMENTAL)" help
Signature · 1 line
2.43.0
Zi Yan
reviewerPATCH v4 6/12 mm: fs: remove filemap_nr_thps*() functions and their users
In reply to Zi YanThey are used by READ_ONLY_THP_FOR_FS to handle writes to FSes without large folio support, so that read-only THPs created in these FSes are not seen by the FSes when the underlying fd becomes writable. Now read-only PMD THPs only appear in a FS with large folio support and the supported orders include PMD_ORDRE.
READ_ONLY_THP_FOR_FS was using mapping->nr_thps, inode->i_writecount, and smp_mb() to prevent writes to a read-only THP and collapsing writable folios into a THP. In collapse_file(), mapping->nr_thps is increased, then smp_mb(), and if inode->i_writecount > 0, collapse is stopped, while do_dentry_open() first increases inode->i_writecount, then a full memory fence, and if mapping->nr_thps > 0, all read-only THPs are truncated.
Now this mechanism can be removed along with READ_ONLY_THP_FOR_FS code, since a dirty folio check has been added after try_to_unmap() in collapse_file() to make sure no writable folio can be collapsed.
--- fs/open.c | 27 --------------------------- include/linux/pagemap.h | 29 ----------------------------- mm/filemap.c | 1 - mm/huge_memory.c | 1 - mm/khugepaged.c | 28 ---------------------------- 5 files changed, 86 deletions(-)
fs/open.c +0 -27
@@ -968,33 +968,6 @@ static int do_dentry_open(struct file *f,if ((f->f_flags &O_DIRECT ) && !(f->f_mode &FMODE_CAN_ODIRECT ))return -EINVAL ; -/* -* XXX: Huge page cache doesn't support writing yet. Drop all page -* cache for this file before processing writes. -*/ -if (f->f_mode &FMODE_WRITE ) { -/* -* Depends on full fence from get_write_access() to synchronize -* against collapse_file() regarding i_writecount and nr_thps -* updates. Ensures subsequent insertion of THPs into the page -* cache will fail. -*/ -if (filemap_nr_thps (inode->i_mapping)) { -struct address_space *mapping = inode->i_mapping; - -filemap_invalidate_lock (inode->i_mapping); -/* -* unmap_mapping_range just need to be called once -* here, because the private pages is not need to be -* unmapped mapping (e.g. data segment of dynamic -* shared libraries here). -*/ -unmap_mapping_range (mapping,0 ,0 ,0 ); -truncate_inode_pages (mapping,0 ); -filemap_invalidate_unlock (inode->i_mapping); - } - } -return 0 ; cleanup_all:
include/linux/pagemap.h +0 -29
@@ -528,35 +528,6 @@ static inline size_t mapping_max_folio_size(const struct address_space *mapping)return PAGE_SIZE <<mapping_max_folio_order (mapping); } -static inline int filemap_nr_thps (const struct address_space *mapping) -{ -#ifdef CONFIG_READ_ONLY_THP_FOR_FS -return atomic_read (&mapping->nr_thps); -#else -return 0 ; -#endif -} - -static inline void filemap_nr_thps_inc (struct address_space *mapping) -{ -#ifdef CONFIG_READ_ONLY_THP_FOR_FS -if (!mapping_large_folio_support (mapping)) -atomic_inc (&mapping->nr_thps); -#else -WARN_ON_ONCE (mapping_large_folio_support (mapping) ==0 ); -#endif -} - -static inline void filemap_nr_thps_dec (struct address_space *mapping) -{ -#ifdef CONFIG_READ_ONLY_THP_FOR_FS -if (!mapping_large_folio_support (mapping)) -atomic_dec (&mapping->nr_thps); -#else -WARN_ON_ONCE (mapping_large_folio_support (mapping) ==0 ); -#endif -} -struct address_space *folio_mapping (const struct folio *folio);/**
mm/filemap.c +0 -1
@@ -189,7 +189,6 @@ static void filemap_unaccount_folio(struct address_space *mapping,lruvec_stat_mod_folio (folio,NR_SHMEM_THPS , -nr); }else if (folio_test_pmd_mappable (folio)) {lruvec_stat_mod_folio (folio,NR_FILE_THPS , -nr); -filemap_nr_thps_dec (mapping); }if (test_bit (AS_KERNEL_FILE , &folio->mapping->flags)) mod_node_page_state(folio_pgdat(folio),
mm/huge_memory.c +0 -1
@@ -3937,7 +3937,6 @@ static int __folio_freeze_and_split_unmapped(struct folio *folio, unsigned int n }else {lruvec_stat_mod_folio (folio,NR_FILE_THPS , -nr); -filemap_nr_thps_dec (mapping); } } }
mm/khugepaged.c +0 -28
@@ -2469,21 +2469,6 @@ static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr, goto xa_unlocked; } -if (!is_shmem) { -filemap_nr_thps_inc (mapping); -/* -* Paired with the fence in do_dentry_open() -> get_write_access() -* to ensure i_writecount is up to date and the update to nr_thps -* is visible. Ensures the page cache will be truncated if the -* file is opened writable. -*/ -smp_mb (); -if (inode_is_open_for_write (mapping->host)) { - result =SCAN_FAIL ; -filemap_nr_thps_dec (mapping); - } - } - xa_locked:xas_unlock_irq (&xas); xa_unlocked:
@@ -2661,19 +2646,6 @@ static enum scan_result collapse_file(struct mm_struct *mm, unsigned long addr,folio_putback_lru (folio);folio_put (folio); } -/* -* Undo the updates of filemap_nr_thps_inc for non-SHMEM -* file only. This undo is not needed unless failure is -* due to SCAN_COPY_MC. -*/ -if (!is_shmem && result ==SCAN_COPY_MC ) { -filemap_nr_thps_dec (mapping); -/* -* Paired with the fence in do_dentry_open() -> get_write_access() -* to ensure the update to nr_thps is visible. -*/ -smp_mb (); - } new_folio->mapping =NULL ;
Signature · 1 line
2.43.0
Zi Yan
reviewerPATCH v4 7/12 fs: remove nr_thps from struct address_space
In reply to Zi Yanfilemap_nr_thps*() are removed, the related field, address_space->nr_thps, is no longer needed. Remove it. This shrinks struct address_space by 8 bytes on 64-bit systems which may increase the number of inodes we can cache.
--- fs/inode.c | 3 --- include/linux/fs.h | 5 ----- 2 files changed, 8 deletions(-)
fs/inode.c +0 -3
@@ -279,9 +279,6 @@ int inode_init_always_gfp(struct super_block *sb, struct inode *inode, gfp_t gfp mapping->flags =0 ; mapping->wb_err =0 ;atomic_set (&mapping->i_mmap_writable,0 ); -#ifdef CONFIG_READ_ONLY_THP_FOR_FS -atomic_set (&mapping->nr_thps,0 ); -#endif mapping_set_gfp_mask (mapping,GFP_HIGHUSER_MOVABLE ); mapping->writeback_index =0 ;init_rwsem (&mapping->invalidate_lock);
include/linux/fs.h +0 -5
@@ -460,7 +460,6 @@ struct mapping_metadata_bhs {* memory mappings. * @gfp_mask: Memory allocation flags to use for allocating pages. * @i_mmap_writable: Number of VM_SHARED, VM_MAYWRITE mappings. -* @nr_thps: Number of THPs in the pagecache (non-shmem only). * @i_mmap: Tree of private and shared mappings. * @i_mmap_rwsem: Protects @i_mmap and @i_mmap_writable. * @nrpages: Number of page entries, protected by the i_pages lock.
@@ -476,10 +475,6 @@ struct address_space {struct rw_semaphore invalidate_lock;gfp_t gfp_mask;atomic_t i_mmap_writable; -#ifdef CONFIG_READ_ONLY_THP_FOR_FS -/* number of thp, only for non-shmem files */ -atomic_t nr_thps; -#endif struct rb_root_cached i_mmap;unsigned long nrpages;pgoff_t writeback_index;
Signature · 1 line
2.43.0
Zi Yan
reviewerPATCH v4 8/12 mm/huge_memory: remove folio split check for READ_ONLY_THP_FOR_FS
In reply to Zi YanWithout READ_ONLY_THP_FOR_FS, large file-backed folios cannot be created by a FS without large folio support. The check is no longer needed.
--- mm/huge_memory.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-)
mm/huge_memory.c +3 -27
@@ -3832,33 +3832,9 @@ int folio_check_splittable(struct folio *folio, unsigned int new_order,if (!folio->mapping && !folio_test_anon (folio))return -EBUSY ; -if (folio_test_anon (folio)) { -/* order-1 is not supported for anonymous THP. */ -if (new_order ==1 ) -return -EINVAL ; - }else if (split_type ==SPLIT_TYPE_NON_UNIFORM || new_order) { -if (IS_ENABLED (CONFIG_READ_ONLY_THP_FOR_FS ) && - !mapping_large_folio_support (folio->mapping)) { -/* -* We can always split a folio down to a single page -* (new_order == 0) uniformly. -* -* For any other scenario -* a) uniform split targeting a large folio -* (new_order > 0) -* b) any non-uniform split -* we must confirm that the file system supports large -* folios. -* -* Note that we might still have THPs in such -* mappings, which is created from khugepaged when -* CONFIG_READ_ONLY_THP_FOR_FS is enabled. But in that -* case, the mapping does not actually support large -* folios properly. -*/ -return -EINVAL ; - } - } +/* order-1 is not supported for anonymous THP. */ +if (folio_test_anon (folio) && new_order ==1 ) +return -EINVAL ;/* * swapcache folio could only be split to order 0
Signature · 1 line
2.43.0
Re: [PATCH 7.2 v4 08/12] mm/huge_memory: remove folio split check for READ_ONLY_THP_FOR_FS
Quoted 8 lines · Zi Yan
Without
READ_ONLY_THP_FOR_FS, large file-backed folios cannot be created by a FS without large folio support. The check is no longer needed.Signed-off-by Zi Yan <[email protected]>Reviewed-by Lance Yang <[email protected]>Reviewed-by Lorenzo Stoakes (Oracle) <[email protected]>Reviewed-by Baolin Wang <[email protected]>---
Signature · 3 lines
Cheers, David
Zi Yan
reviewerPATCH v4 9/12 mm/truncate: use folio_split() in truncate_inode_partial_folio()
In reply to Zi YanAfter READ_ONLY_THP_FOR_FS is removed, FS either supports large folio or not. folio_split() can be used on a FS with large folio support without worrying about getting a THP on a FS without large folio support.
When READ_ONLY_THP_FOR_FS was present, a PMD large pagecache folio can appear in a FS without large folio support after khugepaged or madvise(MADV_COLLAPSE) creates it. During truncate_inode_partial_folio(), such a PMD large pagecache folio is split and if the FS does not support large folio, it needs to be split to order-0 ones and could not be split non uniformly to ones with various orders. try_folio_split_to_order() was added to handle this situation by checking folio_check_splittable(..., SPLIT_TYPE_NON_UNIFORM) to detect if the large folio is created due to READ_ONLY_THP_FOR_FS and the FS does not support large folio. Now READ_ONLY_THP_FOR_FS is removed, all large pagecache folios are created with FSes supporting large folio, this function is no longer needed and all large pagecache folios can be split non uniformly.
--- include/linux/huge_mm.h | 25 ++----------------------- mm/truncate.c | 8 ++++---- 2 files changed, 6 insertions(+), 27 deletions(-)
include/linux/huge_mm.h +2 -23
@@ -394,27 +394,6 @@ static inline int split_huge_page_to_order(struct page *page, unsigned int new_oreturn split_huge_page_to_list_to_order (page,NULL , new_order); } -/** -* try_folio_split_to_order() - try to split a @folio at @page to @new_order -* using non uniform split. -* @folio: folio to be split -* @page: split to @new_order at the given page -* @new_order: the target split order -* -* Try to split a @folio at @page using non uniform split to @new_order, if -* non uniform split is not supported, fall back to uniform split. After-split -* folios are put back to LRU list. Use min_order_for_split() to get the lower -* bound of @new_order. -* -* Return: 0 - split is successful, otherwise split failed. -*/ -static inline int try_folio_split_to_order (struct folio *folio, -struct page *page,unsigned int new_order) -{ -if (folio_check_splittable (folio, new_order,SPLIT_TYPE_NON_UNIFORM )) -return split_huge_page_to_order (&folio->page, new_order); -return folio_split (folio, new_order, page,NULL ); -}static inline int split_huge_page (struct page *page) {return split_huge_page_to_list_to_order (page,NULL ,0 );
@@ -647,8 +626,8 @@ static inline int split_folio_to_list(struct folio *folio, struct list_head *lisreturn -EINVAL ; } -static inline int try_folio_split_to_order (struct folio *folio, -struct page *page,unsigned int new_order) +static inline int folio_split (struct folio *folio,unsigned int new_order, +struct page *page,struct list_head *list) {VM_WARN_ON_ONCE_FOLIO (1 , folio);return -EINVAL ;
mm/truncate.c +4 -4
@@ -177,7 +177,7 @@ int truncate_inode_folio(struct address_space *mapping, struct folio *folio)return 0 ; } -static int try_folio_split_or_unmap (struct folio *folio,struct page *split_at, +static int folio_split_or_unmap (struct folio *folio,struct page *split_at,unsigned long min_order) { enum ttu_flags ttu_flags =
@@ -186,7 +186,7 @@ static int try_folio_split_or_unmap(struct folio *folio, struct page *split_at,TTU_IGNORE_MLOCK ;int ret; - ret =try_folio_split_to_order (folio, split_at, min_order); + ret =folio_split (folio, min_order, split_at,NULL );/* * If the split fails, unmap the folio, so it will be refaulted
@@ -252,7 +252,7 @@ bool truncate_inode_partial_folio(struct folio *folio, loff_t start, loff_t end) min_order =mapping_min_folio_order (folio->mapping); split_at =folio_page (folio,PAGE_ALIGN_DOWN (offset) /PAGE_SIZE ); -if (!try_folio_split_or_unmap (folio, split_at, min_order)) { +if (!folio_split_or_unmap (folio, split_at, min_order)) {/* * try to split at offset + length to make sure folios within * the range can be dropped, especially to avoid memory waste
@@ -279,7 +279,7 @@ bool truncate_inode_partial_folio(struct folio *folio, loff_t start, loff_t end)/* make sure folio2 is large and does not change its mapping */ if (folio_test_large (folio2) && folio2->mapping == folio->mapping) -try_folio_split_or_unmap (folio2, split_at2, min_order); +folio_split_or_unmap (folio2, split_at2, min_order);folio_unlock (folio2); out:
Signature · 1 line
2.43.0
David Hildenbrand (Arm)
maintainerRe: [PATCH 7.2 v4 09/12] mm/truncate: use folio_split() in truncate_inode_partial_folio()
Quoted 4 lines · Zi Yan
After
READ_ONLY_THP_FOR_FSis removed, FS either supports large folio or not.folio_split()can be used on a FS with large folio support without worrying about getting a THP on a FS without large folio support.
Quoted 12 lines
When
READ_ONLY_THP_FOR_FSwas present, a PMD large pagecache folio can appear in a FS without large folio support after khugepaged ormadvise(MADV_COLLAPSE)creates it. Duringtruncate_inode_partial_folio(), such a PMD large pagecache folio is split and if the FS does not support large folio, it needs to be split to order-0 ones and could not be split non uniformly to ones with various orders.try_folio_split_to_order()was added to handle this situation by checkingfolio_check_splittable(..., SPLIT_TYPE_NON_UNIFORM)to detect if the large folio is created due toREAD_ONLY_THP_FOR_FSand the FS does not support large folio. NowREAD_ONLY_THP_FOR_FSis removed, all large pagecache folios are created with FSes supporting large folio, this function is no longer needed and all large pagecache folios can be split non uniformly.
In general looks good. Just one question:
folio_check_splittable() also rejects SPLIT_TYPE_NON_UNIFORM / new_order for swapcache pages.
It's confusing, but truncate would never stumble over such folios, correct?
Signature · 3 lines
Cheers, David
Zi Yan
reviewerRe: [PATCH 7.2 v4 09/12] mm/truncate: use folio_split() in truncate_inode_partial_folio()
Quoted 18 lines · David Hildenbrand (Arm)
Quoted 4 lines · Zi Yan
After
READ_ONLY_THP_FOR_FSis removed, FS either supports large folio or not.folio_split()can be used on a FS with large folio support without worrying about getting a THP on a FS without large folio support.Quoted 12 lines
When
READ_ONLY_THP_FOR_FSwas present, a PMD large pagecache folio can appear in a FS without large folio support after khugepaged ormadvise(MADV_COLLAPSE)creates it. Duringtruncate_inode_partial_folio(), such a PMD large pagecache folio is split and if the FS does not support large folio, it needs to be split to order-0 ones and could not be split non uniformly to ones with various orders.try_folio_split_to_order()was added to handle this situation by checkingfolio_check_splittable(..., SPLIT_TYPE_NON_UNIFORM)to detect if the large folio is created due toREAD_ONLY_THP_FOR_FSand the FS does not support large folio. NowREAD_ONLY_THP_FOR_FSis removed, all large pagecache folios are created with FSes supporting large folio, this function is no longer needed and all large pagecache folios can be split non uniformly.
Quoted 4 lines
In general looks good. Just one question:
folio_check_splittable()also rejectsSPLIT_TYPE_NON_UNIFORM/new_orderfor swapcache pages.
Since swapcache only supports PMD order or 0 order yet.
Quoted 2 lines
It's confusing, but truncate would never stumble over such folios, correct?
Right.
Best Regards,
Yan, Zi
Zi Yan
reviewerRe: [PATCH 7.2 v4 09/12] mm/truncate: use folio_split() in truncate_inode_partial_folio()
Quoted 25 lines · Zi Yan
Quoted 18 lines · David Hildenbrand (Arm)
Quoted 4 lines · Zi Yan
After
READ_ONLY_THP_FOR_FSis removed, FS either supports large folio or not.folio_split()can be used on a FS with large folio support without worrying about getting a THP on a FS without large folio support.Quoted 12 lines
When
READ_ONLY_THP_FOR_FSwas present, a PMD large pagecache folio can appear in a FS without large folio support after khugepaged ormadvise(MADV_COLLAPSE)creates it. Duringtruncate_inode_partial_folio(), such a PMD large pagecache folio is split and if the FS does not support large folio, it needs to be split to order-0 ones and could not be split non uniformly to ones with various orders.try_folio_split_to_order()was added to handle this situation by checkingfolio_check_splittable(..., SPLIT_TYPE_NON_UNIFORM)to detect if the large folio is created due toREAD_ONLY_THP_FOR_FSand the FS does not support large folio. NowREAD_ONLY_THP_FOR_FSis removed, all large pagecache folios are created with FSes supporting large folio, this function is no longer needed and all large pagecache folios can be split non uniformly.Quoted 4 lines
In general looks good. Just one question:
folio_check_splittable()also rejectsSPLIT_TYPE_NON_UNIFORM/new_orderfor swapcache pages.
Quoted 6 lines
Since swapcache only supports PMD order or 0 order yet.
Quoted 2 lines
It's confusing, but truncate would never stumble over such folios, correct?
Right.
BTW, sashiko had a similar question when it reviewed v2[1]. It also complained about when the split fails, the entire folio remains in memory. But that is the consequence of failed split, unless we want to keep retrying the split.
[1] https://sashiko.dev/#/patchset/20260413192030.3275825-1-ziy%40nvidia.com?part=9
Best Regards,
Yan, Zi
David Hildenbrand (Arm)
maintainerRe: [PATCH 7.2 v4 09/12] mm/truncate: use folio_split() in truncate_inode_partial_folio()
Quoted 13 lines · Zi Yan
Quoted 11 lines · Zi Yan
Quoted 5 lines · David Hildenbrand (Arm)
In general looks good. Just one question:
folio_check_splittable()also rejectsSPLIT_TYPE_NON_UNIFORM/new_orderfor swapcache pages.Since swapcache only supports PMD order or 0 order yet.
Quoted 1 line
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
It's confusing, but truncate would never stumble over such folios, correct?
Right.
BTW, sashiko had a similar question when it reviewed v2[1]. It also complained about when the split fails, the entire folio remains in memory. But that is the consequence of failed split, unless we want to keep retrying the split.
Retry isn't guaranteed to make progress, so it's the current expected behavior.
Signature · 3 lines
Cheers, David
Zi Yan
reviewerPATCH v4 10/12 fs/btrfs: remove a comment referring to READ_ONLY_THP_FOR_FS
In reply to Zi YanREAD_ONLY_THP_FOR_FS is no longer present, remove related comment.
--- fs/btrfs/defrag.c | 3 --- 1 file changed, 3 deletions(-)
fs/btrfs/defrag.c +0 -3
@@ -860,9 +860,6 @@ static struct folio *defrag_prepare_one_folio(struct btrfs_inode *inode, pgoff_treturn folio;/* -* Since we can defragment files opened read-only, we can encounter -* transparent huge pages here (see CONFIG_READ_ONLY_THP_FOR_FS). -* * The IO for such large folios is not fully tested, thus return * an error to reject such folios unless it's an experimental build. *
Signature · 1 line
2.43.0
Zi Yan
reviewerPATCH v4 11/12 selftests/mm: remove READ_ONLY_THP_FOR_FS in khugepaged
In reply to Zi YanChange the requirement to a file system with large folio support and the supported order needs to include PMD_ORDER.
Also add tests of opening a file with read write permission and populating folios with writes. Reuse the XFS image from split_huge_page_test.
--- tools/testing/selftests/mm/khugepaged.c | 110 ++++++++++++++++------ tools/testing/selftests/mm/run_vmtests.sh | 12 ++- 2 files changed, 90 insertions(+), 32 deletions(-)
tools/testing/selftests/mm/khugepaged.c +80 -30
@@ -49,7 +49,8 @@ struct mem_ops {const char *name; }; -static struct mem_ops *file_ops; +static struct mem_ops *read_only_file_ops; +static struct mem_ops *read_write_file_ops;static struct mem_ops *anon_ops;static struct mem_ops *shmem_ops;
@@ -112,7 +113,8 @@ static void restore_settings(int sig)static void save_settings (void ) {printf ("Save THP and khugepaged settings..." ); -if (file_ops && finfo.type ==VMA_FILE ) +if ((read_only_file_ops || read_write_file_ops) && + finfo.type ==VMA_FILE )thp_set_read_ahead_path (finfo.dev_queue_read_ahead_path);thp_save_settings ();
@@ -364,11 +366,14 @@ static bool anon_check_huge(void *addr, int nr_hpages)return check_huge_anon (addr, nr_hpages, hpage_pmd_size); } -static void *file_setup_area (int nr_hpages) +static void *file_setup_area_common (int nr_hpages,bool read_only) {int fd;void *p;unsigned long size; +int open_opt = read_only ?O_RDONLY :O_RDWR ; +int mmap_prot = read_only ?PROT_READ : (PROT_READ |PROT_WRITE ); +int mmap_opt = read_only ?MAP_PRIVATE :MAP_SHARED ;unlink (finfo.path);/* Cleanup from previous failed tests */ printf("Creating %s for collapse%s...", finfo.path,
@@ -388,14 +393,15 @@ static void *file_setup_area(int nr_hpages)munmap (p, size);success ("OK" ); -printf ("Opening %s read only for collapse..." , finfo.path); - finfo.fd =open (finfo.path,O_RDONLY ,777 ); +printf ("Opening %s %s for collapse..." , finfo.path, + read_only ?"read only" :"read-write" ); + finfo.fd =open (finfo.path, open_opt,777 );if (finfo.fd <0 ) {perror ("open()" );exit (EXIT_FAILURE ); } - p =mmap (BASE_ADDR , size,PROT_READ , -MAP_PRIVATE , finfo.fd,0 ); + p =mmap (BASE_ADDR , size, mmap_prot, + mmap_opt, finfo.fd,0 );if (p ==MAP_FAILED || p !=BASE_ADDR ) {perror ("mmap()" );exit (EXIT_FAILURE );
@@ -407,6 +413,15 @@ static void *file_setup_area(int nr_hpages)return p; } +static void *file_setup_read_only_area (int nr_hpages) +{ +return file_setup_area_common (nr_hpages,/* read_only= */ true); +} + +static void *file_setup_read_write_area (int nr_hpages) +{ +return file_setup_area_common (nr_hpages,/* read_only= */ false); +}static void file_cleanup_area (void *p,unsigned long size) {munmap (p, size);
@@ -414,14 +429,25 @@ static void file_cleanup_area(void *p, unsigned long size)unlink (finfo.path); } -static void file_fault (void *p,unsigned long start,unsigned long end) +static void file_fault_common (void *p,unsigned long start,unsigned long end, +int madv_ops) { -if (madvise (((char *)p) + start, end - start,MADV_POPULATE_READ )) { +if (madvise (((char *)p) + start, end - start, madv_ops)) {perror ("madvise(MADV_POPULATE_READ" );exit (EXIT_FAILURE ); } } +static void file_fault_read (void *p,unsigned long start,unsigned long end) +{ +file_fault_common (p, start, end,MADV_POPULATE_READ ); +} + +static void file_fault_write (void *p,unsigned long start,unsigned long end) +{ +file_fault_common (p, start, end,MADV_POPULATE_WRITE ); +} +static bool file_check_huge (void *addr,int nr_hpages) {switch (finfo.type) {
@@ -477,10 +503,18 @@ static struct mem_ops __anon_ops = { .name = "anon", }; -static struct mem_ops __file_ops = { - .setup_area = &file_setup_area, +static struct mem_ops __read_only_file_ops = { + .setup_area = &file_setup_read_only_area, + .cleanup_area = &file_cleanup_area, + .fault = &file_fault_read, + .check_huge = &file_check_huge, + .name ="file" , +}; + +static struct mem_ops __read_write_file_ops = { + .setup_area = &file_setup_read_write_area, .cleanup_area = &file_cleanup_area, - .fault = &file_fault, + .fault = &file_fault_write, .check_huge = &file_check_huge, .name ="file" , };
@@ -603,7 +637,9 @@ static struct collapse_context __madvise_context = {static bool is_tmpfs (struct mem_ops *ops) { -return ops == &__file_ops && finfo.type ==VMA_SHMEM ; +return (ops == &__read_only_file_ops || + ops == &__read_write_file_ops) && + finfo.type ==VMA_SHMEM ; }static bool is_anon (struct mem_ops *ops)
@@ -1086,8 +1122,8 @@ static void usage(void)fprintf (stderr,"\t<context>\t: [all|khugepaged|madvise]\n" );fprintf (stderr,"\t<mem_type>\t: [all|anon|file|shmem]\n" );fprintf (stderr,"\n\t\"file,all\" mem_type requires [dir] argument\n" ); -fprintf (stderr,"\n\t\"file,all\" mem_type requires kernel built with\n" ); -fprintf (stderr,"\tCONFIG_READ_ONLY_THP_FOR_FS=y\n" ); +fprintf (stderr,"\n\t\"file,all\" mem_type requires a file system\n" ); +fprintf (stderr,"\twith large folio support (order >= PMD order)\n" );fprintf (stderr,"\n\tif [dir] is a (sub)directory of a tmpfs mount, tmpfs must be\n" );fprintf (stderr,"\tmounted with huge=advise option for khugepaged tests to work\n" );fprintf (stderr,"\n\tSupported Options:\n" );
@@ -1143,20 +1179,22 @@ static void parse_test_type(int argc, char **argv)usage ();if (!strcmp (buf,"all" )) { - file_ops = &__file_ops; + read_only_file_ops = &__read_only_file_ops; + read_write_file_ops = &__read_write_file_ops; anon_ops = &__anon_ops; shmem_ops = &__shmem_ops; }else if (!strcmp (buf,"anon" )) { anon_ops = &__anon_ops; }else if (!strcmp (buf,"file" )) { - file_ops = &__file_ops; + read_only_file_ops = &__read_only_file_ops; + read_write_file_ops = &__read_write_file_ops; }else if (!strcmp (buf,"shmem" )) { shmem_ops = &__shmem_ops; }else {usage (); } -if (!file_ops) +if (!read_only_file_ops && !read_write_file_ops)return ;if (argc !=2 )
@@ -1228,37 +1266,47 @@ int main(int argc, char **argv) }while (0 )TEST (collapse_full, khugepaged_context, anon_ops); -TEST (collapse_full, khugepaged_context, file_ops); +TEST (collapse_full, khugepaged_context, read_only_file_ops); +TEST (collapse_full, khugepaged_context, read_write_file_ops);TEST (collapse_full, khugepaged_context, shmem_ops);TEST (collapse_full, madvise_context, anon_ops); -TEST (collapse_full, madvise_context, file_ops); +TEST (collapse_full, madvise_context, read_only_file_ops); +TEST (collapse_full, madvise_context, read_write_file_ops);TEST (collapse_full, madvise_context, shmem_ops);TEST (collapse_empty, khugepaged_context, anon_ops);TEST (collapse_empty, madvise_context, anon_ops);TEST (collapse_single_pte_entry, khugepaged_context, anon_ops); -TEST (collapse_single_pte_entry, khugepaged_context, file_ops); +TEST (collapse_single_pte_entry, khugepaged_context, read_only_file_ops); +TEST (collapse_single_pte_entry, khugepaged_context, read_write_file_ops);TEST (collapse_single_pte_entry, khugepaged_context, shmem_ops);TEST (collapse_single_pte_entry, madvise_context, anon_ops); -TEST (collapse_single_pte_entry, madvise_context, file_ops); +TEST (collapse_single_pte_entry, madvise_context, read_only_file_ops); +TEST (collapse_single_pte_entry, madvise_context, read_write_file_ops);TEST (collapse_single_pte_entry, madvise_context, shmem_ops);TEST (collapse_max_ptes_none, khugepaged_context, anon_ops); -TEST (collapse_max_ptes_none, khugepaged_context, file_ops); +TEST (collapse_max_ptes_none, khugepaged_context, read_only_file_ops); +TEST (collapse_max_ptes_none, khugepaged_context, read_write_file_ops);TEST (collapse_max_ptes_none, madvise_context, anon_ops); -TEST (collapse_max_ptes_none, madvise_context, file_ops); +TEST (collapse_max_ptes_none, madvise_context, read_only_file_ops); +TEST (collapse_max_ptes_none, madvise_context, read_write_file_ops);TEST (collapse_single_pte_entry_compound, khugepaged_context, anon_ops); -TEST (collapse_single_pte_entry_compound, khugepaged_context, file_ops); +TEST (collapse_single_pte_entry_compound, khugepaged_context, read_only_file_ops); +TEST (collapse_single_pte_entry_compound, khugepaged_context, read_write_file_ops);TEST (collapse_single_pte_entry_compound, madvise_context, anon_ops); -TEST (collapse_single_pte_entry_compound, madvise_context, file_ops); +TEST (collapse_single_pte_entry_compound, madvise_context, read_only_file_ops); +TEST (collapse_single_pte_entry_compound, madvise_context, read_write_file_ops);TEST (collapse_full_of_compound, khugepaged_context, anon_ops); -TEST (collapse_full_of_compound, khugepaged_context, file_ops); +TEST (collapse_full_of_compound, khugepaged_context, read_only_file_ops); +TEST (collapse_full_of_compound, khugepaged_context, read_write_file_ops);TEST (collapse_full_of_compound, khugepaged_context, shmem_ops);TEST (collapse_full_of_compound, madvise_context, anon_ops); -TEST (collapse_full_of_compound, madvise_context, file_ops); +TEST (collapse_full_of_compound, madvise_context, read_only_file_ops); +TEST (collapse_full_of_compound, madvise_context, read_write_file_ops);TEST (collapse_full_of_compound, madvise_context, shmem_ops);TEST (collapse_compound_extreme, khugepaged_context, anon_ops);
@@ -1280,10 +1328,12 @@ int main(int argc, char **argv)TEST (collapse_max_ptes_shared, madvise_context, anon_ops);TEST (madvise_collapse_existing_thps, madvise_context, anon_ops); -TEST (madvise_collapse_existing_thps, madvise_context, file_ops); +TEST (madvise_collapse_existing_thps, madvise_context, read_only_file_ops); +TEST (madvise_collapse_existing_thps, madvise_context, read_write_file_ops);TEST (madvise_collapse_existing_thps, madvise_context, shmem_ops); -TEST (madvise_retracted_page_tables, madvise_context, file_ops); +TEST (madvise_retracted_page_tables, madvise_context, read_only_file_ops); +TEST (madvise_retracted_page_tables, madvise_context, read_write_file_ops);TEST (madvise_retracted_page_tables, madvise_context, shmem_ops);restore_settings (0 );
tools/testing/selftests/mm/run_vmtests.sh +10 -2
@@ -489,8 +489,6 @@ CATEGORY="thp" run_test ./khugepaged all:shmem CATEGORY="thp" run_test ./khugepaged -s 4 all:shmem -CATEGORY="thp" run_test ./transhuge-stress -d 20 - # Try to create XFS if not provided if [ -z "${SPLIT_HUGE_PAGE_TEST_XFS_PATH}" ]; then if [ "${HAVE_HUGEPAGES}" = "1" ]; then
@@ -507,6 +505,14 @@ if [ -z "${SPLIT_HUGE_PAGE_TEST_XFS_PATH}" ]; then fi fi +if [ -n "${SPLIT_HUGE_PAGE_TEST_XFS_PATH}" ]; then +CATEGORY="thp" run_test ./khugepaged all:file ${SPLIT_HUGE_PAGE_TEST_XFS_PATH} +else + count_total=$(( count_total + 1 )) + count_skip=$(( count_skip + 1 )) + echo "[SKIP] ./khugepaged all:file" | tap_prefix +fi + CATEGORY="thp" run_test ./split_huge_page_test ${SPLIT_HUGE_PAGE_TEST_XFS_PATH} if [ -n "${MOUNTED_XFS}" ]; then
@@ -515,6 +521,8 @@ if [ -n "${MOUNTED_XFS}" ]; then rm -f ${XFS_IMG} fi +CATEGORY="thp" run_test ./transhuge-stress -d 20 + CATEGORY="thp" run_test ./folio_split_race_test CATEGORY="migration" run_test ./migration
Signature · 1 line
2.43.0
Zi Yan
reviewerPATCH v4 12/12 selftests/mm: remove READ_ONLY_THP_FOR_FS code from guard-regions
In reply to Zi YanAny file system with large folio support and the supported orders include PMD_ORDER can be used. There is no need to open a file with read-only.
--- tools/testing/selftests/mm/guard-regions.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
tools/testing/selftests/mm/guard-regions.c +4 -14
@@ -2203,17 +2203,6 @@ TEST_F(guard_regions, collapse)if (variant->backing !=ANON_BACKED )ASSERT_EQ (ftruncate (self->fd, size),0 ); -/* -* We must close and re-open local-file backed as read-only for -* CONFIG_READ_ONLY_THP_FOR_FS to work. -*/ -if (variant->backing ==LOCAL_FILE_BACKED ) { -ASSERT_EQ (close (self->fd),0 ); - - self->fd =open (self->path,O_RDONLY ); -ASSERT_GE (self->fd,0 ); - } - ptr =mmap_ (self, variant,NULL , size,PROT_READ ,0 ,0 );ASSERT_NE (ptr,MAP_FAILED );
@@ -2237,9 +2226,10 @@ TEST_F(guard_regions, collapse)/* * Now collapse the entire region. This should fail in all cases. * -* The madvise() call will also fail if CONFIG_READ_ONLY_THP_FOR_FS is -* not set for the local file case, but we can't differentiate whether -* this occurred or if the collapse was rightly rejected. +* The madvise() call will also fail if the file system does not support +* large folio or the supported orders do not include PMD_ORDER for the +* local file case, but we can't differentiate whether this occurred or +* if the collapse was rightly rejected. */ EXPECT_NE (madvise (ptr, size,MADV_COLLAPSE ),0 );
Signature · 1 line
2.43.0
Re: [PATCH 7.2 v4 12/12] selftests/mm: remove READ_ONLY_THP_FOR_FS code from guard-regions
Quoted 16 lines · Zi Yan
Any file system with large folio support and the supported orders include
PMD_ORDERcan be used. There is no need to open a file with read-only.Signed-off-by Zi Yan <[email protected]>--- tools/testing/selftests/mm/guard-regions.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)tools/testing/selftests/mm/guard-regions.c +0
-0@@ -2203,17 +2203,6 @@ TEST_F(guard_regions, collapse)if (variant->backing !=ANON_BACKED )ASSERT_EQ (ftruncate (self->fd, size),0 );
tools/testing/selftests/mm/guard-regions.c TEST_F(guard_regions, collapse) · line 2215
Quoted 10 lines
tools/testing/selftests/mm/guard-regions.c +0
-10-/* -* We must close and re-open local-file backed as read-only for -* CONFIG_READ_ONLY_THP_FOR_FS to work. -*/ -if (variant->backing ==LOCAL_FILE_BACKED ) { -ASSERT_EQ (close (self->fd),0 ); - - self->fd =open (self->path,O_RDONLY ); -ASSERT_GE (self->fd,0 ); - }
What if someone runs this with a filesystem that does not support large folios?
Would we want an allowlist for known-good fs'es, similar to how we handle gup_longterm.c, and SKIP otherwise, because we know that MADV_COLLAPSE would always fail for a different reason?
In any case, the test would not misbehave if passed an unsupported FS, so LGTM
Signature · 3 lines
Cheers, David
Andrew Morton
maintainerQuoted 3 lines · On Thu, 23 Apr 2026 22:49:03 -0400 Zi Yan <[email protected]> wrote:
This patchset removes
READ_ONLY_THP_FOR_FSKconfigand enables creating read-only THPs for FSes with large folio support (the supported orders need to includePMD_ORDER) by default. It is on top of mm-new.
Thanks, I'll add this for testing.
4 of 12 aren't yet reviewed, but that's what we have akpm nagmails for ;)