From: Pankaj Raghav <p.raghav@xxxxxxxxxxx> There are many places in the kernel where we need to zeroout larger chunks but the maximum segment we can zeroout at a time by ZERO_PAGE is limited by PAGE_SIZE. This is especially annoying in block devices and filesystems where we attach multiple ZERO_PAGEs to the bio in different bvecs. With multipage bvec support in block layer, it is much more efficient to send out larger zero pages as a part of single bvec. This concern was raised during the review of adding LBS support to XFS[1][2]. Usually huge_zero_folio is allocated on demand, and it will be deallocated by the shrinker if there are no users of it left. At moment, huge_zero_folio infrastructure refcount is tied to the process lifetime that created it. This might not work for bio layer as the completitions can be async and the process that created the huge_zero_folio might no longer be alive. Add a config option STATIC_PMD_ZERO_PAGE that will always allocate the huge_zero_folio, and it will never be freed. This makes using the huge_zero_folio without having to pass any mm struct and does not tie the lifetime of the zero folio to anything. memblock is used to allocated this PMD zero page during early boot. If STATIC_PMD_ZERO_PAGE config option is enabled, then mm_get_huge_zero_folio() will simply return this page instead of dynamically allocating a new PMD page. As STATIC_PMD_ZERO_PAGE does not depend on THP, declare huge_zero_folio and huge_zero_pfn outside the THP config. [1] https://lore.kernel.org/linux-xfs/20231027051847.GA7885@xxxxxx/ [2] https://lore.kernel.org/linux-xfs/ZitIK5OnR7ZNY0IG@xxxxxxxxxxxxx/ Suggested-by: David Hildenbrand <david@xxxxxxxxxx> Signed-off-by: Pankaj Raghav <p.raghav@xxxxxxxxxxx> --- include/linux/mm.h | 25 ++++++++++++++++++++++++- mm/Kconfig | 9 +++++++++ mm/huge_memory.c | 24 ++++++++++++++++++++---- mm/memory.c | 25 +++++++++++++++++++++++++ mm/mm_init.c | 1 + 5 files changed, 79 insertions(+), 5 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index c8fbeaacf896..428fe6d36b3c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -4018,10 +4018,19 @@ static inline bool vma_is_special_huge(const struct vm_area_struct *vma) #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */ -#ifdef CONFIG_TRANSPARENT_HUGEPAGE +#ifdef CONFIG_STATIC_PMD_ZERO_PAGE +extern void __init static_pmd_zero_init(void); +#else +static inline void __init static_pmd_zero_init(void) +{ + return; +} +#endif + extern struct folio *huge_zero_folio; extern unsigned long huge_zero_pfn; +#ifdef CONFIG_TRANSPARENT_HUGEPAGE static inline bool is_huge_zero_folio(const struct folio *folio) { return READ_ONCE(huge_zero_folio) == folio; @@ -4032,9 +4041,23 @@ static inline bool is_huge_zero_pmd(pmd_t pmd) return pmd_present(pmd) && READ_ONCE(huge_zero_pfn) == pmd_pfn(pmd); } +#ifdef CONFIG_STATIC_PMD_ZERO_PAGE +static inline struct folio *mm_get_huge_zero_folio(struct mm_struct *mm) +{ + return READ_ONCE(huge_zero_folio); +} + +static inline void mm_put_huge_zero_folio(struct mm_struct *mm) +{ + return; +} + +#else struct folio *mm_get_huge_zero_folio(struct mm_struct *mm); void mm_put_huge_zero_folio(struct mm_struct *mm); +#endif /* CONFIG_STATIC_PMD_ZERO_PAGE */ + #else static inline bool is_huge_zero_folio(const struct folio *folio) { diff --git a/mm/Kconfig b/mm/Kconfig index 781be3240e21..89d5971cf180 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -826,6 +826,15 @@ config ARCH_WANTS_THP_SWAP config MM_ID def_bool n +config STATIC_PMD_ZERO_PAGE + bool "Allocate a PMD page for zeroing" + help + Typically huge_zero_folio, which is a PMD page of zeroes, is allocated + on demand and deallocated when not in use. This option will + allocate a PMD sized zero page during early boot and huge_zero_folio will + use it instead allocating dynamically. + Not suitable for memory constrained systems. + menuconfig TRANSPARENT_HUGEPAGE bool "Transparent Hugepage Support" depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE && !PREEMPT_RT diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 101b67ab2eb6..c12ca7134e88 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -75,9 +75,6 @@ static unsigned long deferred_split_scan(struct shrinker *shrink, struct shrink_control *sc); static bool split_underused_thp = true; -static atomic_t huge_zero_refcount; -struct folio *huge_zero_folio __read_mostly; -unsigned long huge_zero_pfn __read_mostly = ~0UL; unsigned long huge_anon_orders_always __read_mostly; unsigned long huge_anon_orders_madvise __read_mostly; unsigned long huge_anon_orders_inherit __read_mostly; @@ -208,6 +205,23 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, return orders; } +#ifdef CONFIG_STATIC_PMD_ZERO_PAGE +static int huge_zero_page_shrinker_init(void) +{ + return 0; +} + +static void huge_zero_page_shrinker_exit(void) +{ + return; +} +#else + +static struct shrinker *huge_zero_page_shrinker; +static atomic_t huge_zero_refcount; +struct folio *huge_zero_folio __read_mostly; +unsigned long huge_zero_pfn __read_mostly = ~0UL; + static bool get_huge_zero_page(void) { struct folio *zero_folio; @@ -288,7 +302,6 @@ static unsigned long shrink_huge_zero_page_scan(struct shrinker *shrink, return 0; } -static struct shrinker *huge_zero_page_shrinker; static int huge_zero_page_shrinker_init(void) { huge_zero_page_shrinker = shrinker_alloc(0, "thp-zero"); @@ -307,6 +320,7 @@ static void huge_zero_page_shrinker_exit(void) return; } +#endif #ifdef CONFIG_SYSFS static ssize_t enabled_show(struct kobject *kobj, @@ -2843,6 +2857,8 @@ static void __split_huge_zero_page_pmd(struct vm_area_struct *vma, pte_t *pte; int i; + // FIXME: can this be called with static zero page? + VM_BUG_ON(IS_ENABLED(CONFIG_STATIC_PMD_ZERO_PAGE)); /* * Leave pmd empty until pte is filled note that it is fine to delay * notification until mmu_notifier_invalidate_range_end() as we are diff --git a/mm/memory.c b/mm/memory.c index b0cda5aab398..42c4c31ad14c 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -42,6 +42,7 @@ #include <linux/kernel_stat.h> #include <linux/mm.h> #include <linux/mm_inline.h> +#include <linux/memblock.h> #include <linux/sched/mm.h> #include <linux/sched/numa_balancing.h> #include <linux/sched/task.h> @@ -159,6 +160,30 @@ static int __init init_zero_pfn(void) } early_initcall(init_zero_pfn); +#ifdef CONFIG_STATIC_PMD_ZERO_PAGE +struct folio *huge_zero_folio __read_mostly = NULL; +unsigned long huge_zero_pfn __read_mostly = ~0UL; + +void __init static_pmd_zero_init(void) +{ + void *alloc = memblock_alloc(PMD_SIZE, PAGE_SIZE); + + if (!alloc) + return; + + huge_zero_folio = virt_to_folio(alloc); + huge_zero_pfn = page_to_pfn(virt_to_page(alloc)); + + __folio_set_head(huge_zero_folio); + prep_compound_head((struct page *)huge_zero_folio, PMD_ORDER); + /* Ensure zero folio won't have large_rmappable flag set. */ + folio_clear_large_rmappable(huge_zero_folio); + folio_zero_range(huge_zero_folio, 0, PMD_SIZE); + + return; +} +#endif + void mm_trace_rss_stat(struct mm_struct *mm, int member) { trace_rss_stat(mm, member); diff --git a/mm/mm_init.c b/mm/mm_init.c index f2944748f526..56d7ec372af1 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2765,6 +2765,7 @@ void __init mm_core_init(void) */ kho_memory_init(); + static_pmd_zero_init(); memblock_free_all(); mem_init(); kmem_cache_init(); -- 2.49.0
