mm-hugetlb-mm-memory_hotplug-use-a-folio-in-scan_movable_pages.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: mm/memory_hotplug: use a folio in scan_movable_pages()
has been removed from the -mm tree. Its filename was
mm-hugetlb-mm-memory_hotplug-use-a-folio-in-scan_movable_pages.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: Sidhartha Kumar <[email protected]>
Subject: mm/hugetlb: mm/memory_hotplug: use a folio in scan_movable_pages()
Date: Thu, 30 May 2024 10:14:27 -0700
By using a folio in scan_movable_pages() we convert the last user of the page-based hugetlb information macro functions to the folio version. After this conversion, we can safely remove the page-based definitions from include/linux/hugetlb.h.
---
include/linux/hugetlb.h | 6 +----- mm/memory_hotplug.c | 11 +++++------ 2 files changed, 6 insertions(+), 11 deletions(-)
include/linux/hugetlb.h renamed from include/linux/hugetlb.h~mm-hugetlb-mm-memory_hotplug-use-a-folio-in-scan_movable_pages +1 -5
@@ -616,9 +616,7 @@ static __always_inline \ bool folio_test_hugetlb_##flname(struct folio *folio) \ { void *private = &folio->private; \ return test_bit(HPG_##flname, private); \ - } \ -static inline int HPage##uname(struct page *page) \ - { return test_bit(HPG_##flname, &(page->private)); } + }#define SETHPAGEFLAG (uname, flname) \ static __always_inline \
@@ -637,8 +635,6 @@ void folio_clear_hugetlb_##flname(struct#define TESTHPAGEFLAG (uname, flname) \ static inline bool \ folio_test_hugetlb_##flname(struct folio *folio) \ - { return 0; } \ -static inline int HPage##uname(struct page *page) \ { return 0; }#define SETHPAGEFLAG (uname, flname) \
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-hugetlb-mm-memory_hotplug-use-a-folio-in-scan_movable_pages +5 -6
@@ -1731,8 +1731,8 @@ static int scan_movable_pages(unsigned lunsigned long pfn;for (pfn = start; pfn < end; pfn++) { -struct page *page, *head; -unsigned long skip; +struct page *page; +struct folio *folio;if (!pfn_valid (pfn))continue ;
@@ -1753,7 +1753,7 @@ static int scan_movable_pages(unsigned lif (!PageHuge (page))continue ; - head =compound_head (page); + folio =page_folio (page);/* * This test is racy as we hold no reference or lock. The * hugetlb page could have been free'ed and head is no longer
@@ -1761,10 +1761,9 @@ static int scan_movable_pages(unsigned l* cases false positives and negatives are possible. Calling * code must deal with these scenarios. */ -if (HPageMigratable (head)) +if (folio_test_hugetlb_migratable (folio)) goto found; - skip =compound_nr (head) - (pfn -page_to_pfn (head)); - pfn += skip -1 ; + pfn |=folio_nr_pages (folio) -1 ; }return -ENOENT ; found:
_
Patches currently in -mm which might be from [email protected] are
maple_tree-introduce-store_type-enum.patch maple_tree-introduce-mas_wr_prealloc_setup.patch maple_tree-move-up-mas_wr_store_setup-and-mas_wr_prealloc_setup.patch maple_tree-introduce-mas_wr_store_type.patch maple_tree-remove-mas_destroy-from-mas_nomem.patch maple_tree-use-mas_store_gfp-in-mas_erase.patch maple_tree-use-mas_store_gfp-in-mtree_store_range.patch maple_tree-print-store-type-in-mas_dump.patch maple_tree-use-store-type-in-mas_wr_store_entry.patch maple_tree-convert-mas_insert-to-preallocate-nodes.patch maple_tree-simplify-mas_commit_b_node.patch maple_tree-remove-mas_wr_modify.patch maple_tree-have-mas_store-allocate-nodes-if-needed.patch maple_tree-remove-node-allocations-from-various-write-helper-functions.patch maple_tree-remove-repeated-sanity-checks-from-mas_wr_append.patch maple_tree-remove-unneeded-mas_wr_walk-in-mas_store_prealloc.patch tools-testing-radix-tree-add-missing-module_description-definition.patch