korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-30 15:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

mm/migrate: convert putback_movable_pages() to use folios

Browse Source 
Removes 6 calls to compound_head(), and replaces putback_movable_page()
with putback_movable_folio() as well.

Link: https://lkml.kernel.org/r/20230130214352.40538-5-vishal.moola@gmail.com
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Vishal Moola (Oracle) 2023-01-30 13:43:52 -08:00 committed by Andrew Morton
parent 19979497c0
commit 280d724ac2
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
mm/migrate.c
View File

@ -129,12 +129,12 @@ out:
return -EBUSY;
}
static void putback_movable_page(struct page *page)
static void putback_movable_folio(struct folio *folio)
{
const struct movable_operations *mops = page_movable_ops(page);
const struct movable_operations *mops = folio_movable_ops(folio);
mops->putback_page(page);
ClearPageIsolated(page);
mops->putback_page(&folio->page);
folio_clear_isolated(folio);
}
/*
@ -147,33 +147,33 @@ static void putback_movable_page(struct page *page)
*/
void putback_movable_pages(struct list_head *l)
{
struct page *page;
struct page *page2;
struct folio *folio;
struct folio *folio2;
list_for_each_entry_safe(page, page2, l, lru) {
if (unlikely(PageHuge(page))) {
folio_putback_active_hugetlb(page_folio(page));
list_for_each_entry_safe(folio, folio2, l, lru) {
if (unlikely(folio_test_hugetlb(folio))) {
folio_putback_active_hugetlb(folio);
continue;
}
list_del(&page->lru);
list_del(&folio->lru);
/*
* We isolated non-lru movable page so here we can use
* __PageMovable because LRU page's mapping cannot have
* We isolated non-lru movable folio so here we can use
* __PageMovable because LRU folio's mapping cannot have
* PAGE_MAPPING_MOVABLE.
*/
if (unlikely(__PageMovable(page))) {
VM_BUG_ON_PAGE(!PageIsolated(page), page);
lock_page(page);
if (PageMovable(page))
putback_movable_page(page);
if (unlikely(__folio_test_movable(folio))) {
VM_BUG_ON_FOLIO(!folio_test_isolated(folio), folio);
folio_lock(folio);
if (folio_test_movable(folio))
putback_movable_folio(folio);
else
ClearPageIsolated(page);
unlock_page(page);
put_page(page);
folio_clear_isolated(folio);
folio_unlock(folio);
folio_put(folio);
} else {
mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON +
page_is_file_lru(page), -thp_nr_pages(page));
putback_lru_page(page);
node_stat_mod_folio(folio, NR_ISOLATED_ANON +
folio_is_file_lru(folio), -folio_nr_pages(folio));
folio_putback_lru(folio);
}
}
}