mm-add-pageblock_aligned-macro.patch removed from -mm tree
The quilt patch titled
Subject: mm: add pageblock_aligned() macro
has been removed from the -mm tree. Its filename was
mm-add-pageblock_aligned-macro.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: Kefeng Wang <[email protected]>
Subject: mm: add pageblock_aligned() macro
Date: Wed, 7 Sep 2022 14:08:44 +0800
Add pageblock_aligned() and use it to simplify code.
Signed-off-by Kefeng Wang <[email protected]>
Acked-by Mike Rapoport <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Oscar Salvador <[email protected]>
Cc Vlastimil Babka <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/pageblock-flags.h | 1 + mm/compaction.c | 8 ++++---- mm/memory_hotplug.c | 6 ++---- mm/page_alloc.c | 17 +++++++---------- mm/page_isolation.c | 2 +- 5 files changed, 15 insertions(+), 19 deletions(-)
include/linux/pageblock-flags.h renamed from include/linux/pageblock-flags.h~mm-add-pageblock_aligned-macro +1 -0
@@ -54,6 +54,7 @@ extern unsigned int pageblock_order;#define pageblock_nr_pages (1UL << pageblock_order)#define pageblock_align (pfn) ALIGN((pfn), pageblock_nr_pages) +#define pageblock_aligned (pfn) IS_ALIGNED((pfn), pageblock_nr_pages)#define pageblock_start_pfn (pfn) ALIGN_DOWN((pfn), pageblock_nr_pages)#define pageblock_end_pfn (pfn) ALIGN((pfn) + 1, pageblock_nr_pages)
mm/compaction.c renamed from mm/compaction.c~mm-add-pageblock_aligned-macro +4 -4
@@ -402,7 +402,7 @@ static bool test_and_set_skip(struct comif (cc->ignore_skip_hint)return false; -if (!IS_ALIGNED (pfn, pageblock_nr_pages)) +if (!pageblock_aligned (pfn))return false; skip =get_pageblock_skip (page);
@@ -884,7 +884,7 @@ isolate_migratepages_block(struct compac* COMPACT_CLUSTER_MAX at a time so the second call must * not falsely conclude that the block should be skipped. */ -if (!valid_page &&IS_ALIGNED (low_pfn, pageblock_nr_pages)) { +if (!valid_page &&pageblock_aligned (low_pfn)) {if (!isolation_suitable (cc, page)) { low_pfn = end_pfn; page =NULL ;
@@ -1937,7 +1937,7 @@ static isolate_migrate_t isolate_migrate* before making it "skip" so other compaction instances do * not scan the same block. */ -if (IS_ALIGNED (low_pfn, pageblock_nr_pages) && +if (pageblock_aligned (low_pfn) && !fast_find_block && !isolation_suitable (cc, page))continue ;
@@ -2123,7 +2123,7 @@ static enum compact_result __compact_fin* migration source is unmovable/reclaimable but it's not worth * special casing. */ -if (!IS_ALIGNED (cc->migrate_pfn, pageblock_nr_pages)) +if (!pageblock_aligned (cc->migrate_pfn))return COMPACT_CONTINUE ;/* Direct compactor: Is a suitable page free? */
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-add-pageblock_aligned-macro +2 -4
@@ -1085,8 +1085,7 @@ int __ref online_pages(unsigned long pfn* of the physical memory space for vmemmaps. That space is pageblock * aligned. */ -if (WARN_ON_ONCE (!nr_pages || - !IS_ALIGNED (pfn, pageblock_nr_pages) || +if (WARN_ON_ONCE (!nr_pages || !pageblock_aligned (pfn) || !IS_ALIGNED (pfn + nr_pages,PAGES_PER_SECTION )))return -EINVAL ;
@@ -1806,8 +1805,7 @@ int __ref offline_pages(unsigned long st* of the physical memory space for vmemmaps. That space is pageblock * aligned. */ -if (WARN_ON_ONCE (!nr_pages || - !IS_ALIGNED (start_pfn, pageblock_nr_pages) || +if (WARN_ON_ONCE (!nr_pages || !pageblock_aligned (start_pfn) || !IS_ALIGNED (start_pfn + nr_pages,PAGES_PER_SECTION )))return -EINVAL ;
mm/page_alloc.c renamed from mm/page_alloc.c~mm-add-pageblock_aligned-macro +7 -10
@@ -1892,15 +1892,14 @@ static void __init deferred_free_range(u page =pfn_to_page (pfn);/* Free a large naturally-aligned chunk if possible */ -if (nr_pages == pageblock_nr_pages && - (pfn & (pageblock_nr_pages -1 )) ==0 ) { +if (nr_pages == pageblock_nr_pages &&pageblock_aligned (pfn)) {set_pageblock_migratetype (page,MIGRATE_MOVABLE );__free_pages_core (page, pageblock_order);return ; }for (i =0 ; i < nr_pages; i++, page++, pfn++) { -if ((pfn & (pageblock_nr_pages -1 )) ==0 ) +if (pageblock_aligned (pfn))set_pageblock_migratetype (page,MIGRATE_MOVABLE );__free_pages_core (page,0 ); }
@@ -1928,7 +1927,7 @@ static inline void __init pgdat_init_rep*/ static inline bool __init deferred_pfn_valid (unsigned long pfn) { -if (!(pfn & (pageblock_nr_pages -1 )) && !pfn_valid (pfn)) +if (pageblock_aligned (pfn) && !pfn_valid (pfn))return false;return true; }
@@ -1940,14 +1939,13 @@ static inline bool __init deferred_pfn_vstatic void __init deferred_free_pages (unsigned long pfn,unsigned long end_pfn) { -unsigned long nr_pgmask = pageblock_nr_pages -1 ;unsigned long nr_free =0 ;for (; pfn < end_pfn; pfn++) {if (!deferred_pfn_valid (pfn)) {deferred_free_range (pfn - nr_free, nr_free); nr_free =0 ; - }else if (!(pfn & nr_pgmask)) { + }else if (pageblock_aligned (pfn)) {deferred_free_range (pfn - nr_free, nr_free); nr_free =1 ; }else {
@@ -1967,7 +1965,6 @@ static unsigned long __init deferred_inunsigned long pfn, unsigned long end_pfn) { -unsigned long nr_pgmask = pageblock_nr_pages -1 ; int nid = zone_to_nid(zone);unsigned long nr_pages =0 ;int zid =zone_idx (zone);
@@ -1977,7 +1974,7 @@ static unsigned long __init deferred_inif (!deferred_pfn_valid (pfn)) { page =NULL ;continue ; - }else if (!page || !(pfn & nr_pgmask)) { + }else if (!page ||pageblock_aligned (pfn)) { page =pfn_to_page (pfn); }else { page++;
@@ -6759,7 +6756,7 @@ void __meminit memmap_init_range(unsigne* such that unmovable allocations won't be scattered all * over the place during system boot. */ -if (IS_ALIGNED (pfn, pageblock_nr_pages)) { +if (pageblock_aligned (pfn)) {set_pageblock_migratetype (page, migratetype);cond_resched (); }
@@ -6802,7 +6799,7 @@ static void __ref __init_zone_device_pag* Please note that MEMINIT_HOTPLUG path doesn't clear memmap * because this is done early in section_activate() */ -if (IS_ALIGNED (pfn, pageblock_nr_pages)) { +if (pageblock_aligned (pfn)) {set_pageblock_migratetype (page,MIGRATE_MOVABLE );cond_resched (); }
mm/page_isolation.c renamed from mm/page_isolation.c~mm-add-pageblock_aligned-macro +1 -1
@@ -312,7 +312,7 @@ static int isolate_single_pageblock(unsistruct zone *zone;int ret; -VM_BUG_ON (!IS_ALIGNED (boundary_pfn, pageblock_nr_pages)); +VM_BUG_ON (!pageblock_aligned (boundary_pfn));if (isolate_before) isolate_pageblock = boundary_pfn - pageblock_nr_pages;
_
Patches currently in -mm which might be from [email protected] are