iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate: expand the use of folio in __migrate_device_pages()

Browse Source 
Removes a few calls to compound_head() and a call to page_mapping().

Link: https://lkml.kernel.org/r/20240423225552.4113447-5-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Eric Biggers <ebiggers@google.com>
Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle)
2024-04-23 23:55:35 +01:00
committed by Andrew Morton
parent 89f5c54b22
commit e18a9faf06
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mm/migrate_device.c
View File

@@ -696,6 +696,7 @@ static void __migrate_device_pages(unsigned long *src_pfns,
struct page *newpage = migrate_pfn_to_page(dst_pfns[i]); struct page *newpage = migrate_pfn_to_page(dst_pfns[i]);
struct page *page = migrate_pfn_to_page(src_pfns[i]); struct page *page = migrate_pfn_to_page(src_pfns[i]);
struct address_space *mapping; struct address_space *mapping;
struct folio *folio;
int r; int r;
if (!newpage) { if (!newpage) {
@@ -730,15 +731,12 @@ static void __migrate_device_pages(unsigned long *src_pfns,
continue; continue;
} }
mapping = page_mapping(page); folio = page_folio(page);
mapping = folio_mapping(folio);
if (is_device_private_page(newpage) || if (is_device_private_page(newpage) ||
is_device_coherent_page(newpage)) { is_device_coherent_page(newpage)) {
if (mapping) { if (mapping) {
struct folio *folio;
folio = page_folio(page);
/* /*
* For now only support anonymous memory migrating to * For now only support anonymous memory migrating to
* device private or coherent memory. * device private or coherent memory.
@@ -761,11 +759,10 @@ static void __migrate_device_pages(unsigned long *src_pfns,
if (migrate && migrate->fault_page == page) if (migrate && migrate->fault_page == page)
r = migrate_folio_extra(mapping, page_folio(newpage), r = migrate_folio_extra(mapping, page_folio(newpage),
page_folio(page), folio, MIGRATE_SYNC_NO_COPY, 1);
MIGRATE_SYNC_NO_COPY, 1);
else else
r = migrate_folio(mapping, page_folio(newpage), r = migrate_folio(mapping, page_folio(newpage),
page_folio(page), MIGRATE_SYNC_NO_COPY); folio, MIGRATE_SYNC_NO_COPY);
if (r != MIGRATEPAGE_SUCCESS) if (r != MIGRATEPAGE_SUCCESS)
src_pfns[i] &= ~MIGRATE_PFN_MIGRATE; src_pfns[i] &= ~MIGRATE_PFN_MIGRATE;
} }