mm-move-most-of-core-mm-initialization-to-mm-mm_initc.patch removed from -mm tree
The quilt patch titled
Subject: mm: move most of core MM initialization to mm/mm_init.c
has been removed from the -mm tree. Its filename was
mm-move-most-of-core-mm-initialization-to-mm-mm_initc.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: "Mike Rapoport (IBM)" <[email protected]>
Subject: mm: move most of core MM initialization to mm/mm_init.c
Date: Tue, 21 Mar 2023 19:05:02 +0200
The bulk of memory management initialization code is spread all over mm/page_alloc.c and makes navigating through page allocator functionality difficult.
Move most of the functions marked __init and __meminit to mm/mm_init.c to make it better localized and allow some more spare room before mm/page_alloc.c reaches 10k lines.
No functional changes.
---
include/linux/gfp.h | 5 mm/cma.c | 1 mm/internal.h | 38 mm/mm_init.c | 2304 +++++++++++++++++++++++++++++++++++++++++ mm/page_alloc.c | 2344 ------------------------------------------ 5 files changed, 2353 insertions(+), 2339 deletions(-)
include/linux/gfp.h renamed from include/linux/gfp.h~mm-move-most-of-core-mm-initialization-to-mm-mm_initc +0 -5
@@ -361,9 +361,4 @@ extern struct page *alloc_contig_pages(u#endif void free_contig_range (unsigned long pfn,unsigned long nr_pages); -#ifdef CONFIG_CMA -/* CMA stuff */ -extern void init_cma_reserved_pageblock (struct page *page); -#endif -#endif /* __LINUX_GFP_H */
mm/cma.c renamed from mm/cma.c~mm-move-most-of-core-mm-initialization-to-mm-mm_initc +1 -0
@@ -33,6 +33,7 @@#include <linux/kmemleak.h> #include <trace/events/cma.h> +#include "internal.h" #include "cma.h" struct cma cma_areas[MAX_CMA_AREAS ];
mm/internal.h renamed from mm/internal.h~mm-move-most-of-core-mm-initialization-to-mm-mm_initc +37 -1
@@ -202,6 +202,8 @@ pmd_t *mm_find_pmd(struct mm_struct *mm,* in mm/page_alloc.c */ +extern char *const zone_names[MAX_NR_ZONES ]; +/* * Structure for holding the mostly immutable allocation parameters passed * between functions involved in allocations, including the alloc_pages*
@@ -366,7 +368,29 @@ extern void __putback_isolated_page(struextern void memblock_free_pages (struct page *page,unsigned long pfn,unsigned int order);extern void __free_pages_core (struct page *page,unsigned int order); + +static inline void prep_compound_head (struct page *page,unsigned int order) +{ +struct folio *folio = (struct folio *)page; + +set_compound_page_dtor (page,COMPOUND_PAGE_DTOR ); +set_compound_order (page, order); +atomic_set (&folio->_entire_mapcount,-1 ); +atomic_set (&folio->_nr_pages_mapped,0 ); +atomic_set (&folio->_pincount,0 ); +} + +static inline void prep_compound_tail (struct page *head,int tail_idx) +{ +struct page *p = head + tail_idx; + + p->mapping =TAIL_MAPPING ; +set_compound_head (p, head); +set_page_private (p,0 ); +} +extern void prep_compound_page (struct page *page,unsigned int order); +extern void post_alloc_hook (struct page *page,unsigned int order,gfp_t gfp_flags);extern int user_min_free_kbytes;
@@ -377,6 +401,7 @@ extern void free_unref_page_list(structextern void zone_pcp_reset (struct zone *zone);extern void zone_pcp_disable (struct zone *zone);extern void zone_pcp_enable (struct zone *zone); +extern void zone_pcp_init (struct zone *zone); extern void *memmap_alloc(phys_addr_t size, phys_addr_t align, phys_addr_t min_addr,
@@ -474,7 +499,12 @@ isolate_migratepages_range(struct compacint __alloc_contig_migrate_range (struct compact_control *cc,unsigned long start,unsigned long end); -#endif + +/* Free whole pageblock and set its migration type to MIGRATE_CMA. */ +void init_cma_reserved_pageblock (struct page *page); + +#endif /* CONFIG_COMPACTION || CONFIG_CMA */ +int find_suitable_fallback (struct free_area *area,unsigned int order,int migratetype,bool only_stealable,bool *can_steal);
@@ -658,6 +688,12 @@ static inline void vunmap_range_noflush(#endif /* !CONFIG_MMU */ /* Memory initialisation debug and verification */ +#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT +DECLARE_STATIC_KEY_TRUE (deferred_pages); + +bool __init deferred_grow_zone (struct zone *zone,unsigned int order); +#endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */ +enum mminit_level {MMINIT_WARNING ,MMINIT_VERIFY ,
mm/mm_init.c renamed from mm/mm_init.c~mm-move-most-of-core-mm-initialization-to-mm-mm_initc +2304 -0
2,314 lines not on this page · raw message
mm/page_alloc.c renamed from mm/page_alloc.c~mm-move-most-of-core-mm-initialization-to-mm-mm_initc +11 -2333
601 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
_
Patches currently in -mm which might be from [email protected] are
arm-reword-arch_force_max_order-prompt-and-help-text.patch arm64-drop-ranges-in-definition-of-arch_force_max_order.patch arm64-reword-arch_force_max_order-prompt-and-help-text.patch arm64-reword-arch_force_max_order-prompt-and-help-text-v3.patch csky-drop-arch_force_max_order.patch ia64-dont-allow-users-to-override-arch_force_max_order.patch m68k-reword-arch_force_max_order-prompt-and-help-text.patch nios2-reword-arch_force_max_order-prompt-and-help-text.patch nios2-drop-ranges-for-definition-of-arch_force_max_order.patch powerpc-reword-arch_force_max_order-prompt-and-help-text.patch powerpc-drop-ranges-for-definition-of-arch_force_max_order.patch sh-reword-arch_force_max_order-prompt-and-help-text.patch sh-reword-arch_force_max_order-prompt-and-help-text-v3.patch sh-drop-ranges-for-definition-of-arch_force_max_order.patch sh-drop-ranges-for-definition-of-arch_force_max_order-v3.patch sparc-reword-arch_force_max_order-prompt-and-help-text.patch xtensa-reword-arch_force_max_order-prompt-and-help-text.patch mm-move-free_area_empty-to-mm-internalh.patch
Part of the diff is not shown here. View the raw message.