mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mm: migrate: use a folio in add_page_for_migration() 

Use a folio in add_page_for_migration() to save compound_head() calls.

Link: https://lkml.kernel.org/r/20230913095131.2426871-7-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Zi Yan <ziy@nvidia.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Kefeng Wang 2023-09-13 17:51:29 +08:00 committed by Andrew Morton
parent 7e2a5e5ab2
commit d64cfccbc8
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mm/migrate.c
View File

@ -2060,6 +2060,7 @@ static int add_page_for_migration(struct mm_struct *mm, const void __user *p,
struct vm_area_struct *vma;
unsigned long addr;
struct page *page;
struct folio *folio;
int err;
bool isolated;
@ -2082,45 +2083,42 @@ static int add_page_for_migration(struct mm_struct *mm, const void __user *p,
if (!page)
goto out;
if (is_zone_device_page(page))
goto out_putpage;
folio = page_folio(page);
if (folio_is_zone_device(folio))
goto out_putfolio;
err = 0;
if (page_to_nid(page) == node)
goto out_putpage;
if (folio_nid(folio) == node)
goto out_putfolio;
err = -EACCES;
if (page_mapcount(page) > 1 && !migrate_all)
goto out_putpage;
goto out_putfolio;
if (PageHuge(page)) {
if (folio_test_hugetlb(folio)) {
if (PageHead(page)) {
isolated = isolate_hugetlb(page_folio(page), pagelist);
isolated = isolate_hugetlb(folio, pagelist);
err = isolated ? 1 : -EBUSY;
}
} else {
struct page *head;
head = compound_head(page);
isolated = isolate_lru_page(head);
isolated = folio_isolate_lru(folio);
if (!isolated) {
err = -EBUSY;
goto out_putpage;
goto out_putfolio;
}
err = 1;
list_add_tail(&head->lru, pagelist);
mod_node_page_state(page_pgdat(head),
NR_ISOLATED_ANON + page_is_file_lru(head),
thp_nr_pages(head));
list_add_tail(&folio->lru, pagelist);
node_stat_mod_folio(folio,
NR_ISOLATED_ANON + folio_is_file_lru(folio),
folio_nr_pages(folio));
}
out_putpage:
out_putfolio:
/*
* Either remove the duplicate refcount from
* isolate_lru_page() or drop the page ref if it was
* not isolated.
* Either remove the duplicate refcount from folio_isolate_lru()
* or drop the folio ref if it was not isolated.
*/
put_page(page);
folio_put(folio);
out:
mmap_read_unlock(mm);
return err;