mm-khugepaged-remove-read_only_thp_for_fs-check.patch removed from -mm tree
The quilt patch titled
Subject: mm/khugepaged: remove READ_ONLY_THP_FOR_FS check
has been removed from the -mm tree. Its filename was
mm-khugepaged-remove-read_only_thp_for_fs-check.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Zi Yan <[email protected]>
Subject: mm/khugepaged: remove READ_ONLY_THP_FOR_FS check
Date: Sun, 17 May 2026 09:54:03 -0400
Patch series "Remove CONFIG_READ_ONLY_THP_FOR_FS and enable file THP for writable files", v6.
This patch (of 14):
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_folio_support() for FSes supporting large folio with at least PMD_ORDER.
---
include/linux/pagemap.h | 27 +++++++++++++++++++++++++++ mm/khugepaged.c | 10 ++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-)
include/linux/pagemap.h renamed from include/linux/pagemap.h~mm-khugepaged-remove-read_only_thp_for_fs-check +27 -0
@@ -513,6 +513,33 @@ static inline bool mapping_large_folio_sreturn mapping_max_folio_order (mapping) >0 ; } +/** +* mapping_pmd_folio_support() - Check if a mapping supports PMD-sized folio +* @mapping: The address_space +* +* While some mappings support large folios, they might not support PMD-sized +* folios. This function checks whether a mapping supports PMD-sized folios. +* For example, khugepaged needs this information before attempting to +* collapsing THPs. +* +* Return: True if PMD-sized folios are supported, otherwise false. +*/ +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +static inline bool mapping_pmd_folio_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_min_folio_order (mapping) <=PMD_ORDER && +mapping_max_folio_order (mapping) >=PMD_ORDER ; +} +#else +static inline bool mapping_pmd_folio_support (const struct address_space *mapping) +{ +return false; +} +#endif +/* 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 renamed from mm/khugepaged.c~mm-khugepaged-remove-read_only_thp_for_fs-check +8 -2
@@ -2246,8 +2246,14 @@ static enum scan_result collapse_file(stint 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_folio_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 )
_
Patches currently in -mm which might be from [email protected] are