Skip to content

Commit 06f8520

Browse files
Kefeng Wangopsiff
authored andcommitted
mm: migrate_device: use more folio in migrate_device_finalize()
commit 58bf8c2 upstream. Saves a couple of calls to compound_head() and remove last two callers of putback_lru_page(). Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Kefeng Wang <[email protected]> Reviewed-by: Vishal Moola (Oracle) <[email protected]> Reviewed-by: Alistair Popple <[email protected]> Cc: Baolin Wang <[email protected]> Cc: David Hildenbrand <[email protected]> Cc: Jonathan Corbet <[email protected]> Cc: Matthew Wilcox (Oracle) <[email protected]> Cc: Zi Yan <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: David Hildenbrand <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit e7a85efb873fa6f109c21ec99326b381f55e849e)
1 parent 8ed7b08 commit 06f8520

File tree

1 file changed

+22
-19
lines changed

1 file changed

+22
-19
lines changed

mm/migrate_device.c

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -814,42 +814,45 @@ void migrate_device_finalize(unsigned long *src_pfns,
814814
unsigned long i;
815815

816816
for (i = 0; i < npages; i++) {
817-
struct folio *dst, *src;
817+
struct folio *dst = NULL, *src = NULL;
818818
struct page *newpage = migrate_pfn_to_page(dst_pfns[i]);
819819
struct page *page = migrate_pfn_to_page(src_pfns[i]);
820820

821+
if (newpage)
822+
dst = page_folio(newpage);
823+
821824
if (!page) {
822-
if (newpage) {
823-
unlock_page(newpage);
824-
put_page(newpage);
825+
if (dst) {
826+
folio_unlock(dst);
827+
folio_put(dst);
825828
}
826829
continue;
827830
}
828831

829-
if (!(src_pfns[i] & MIGRATE_PFN_MIGRATE) || !newpage) {
830-
if (newpage) {
831-
unlock_page(newpage);
832-
put_page(newpage);
832+
src = page_folio(page);
833+
834+
if (!(src_pfns[i] & MIGRATE_PFN_MIGRATE) || !dst) {
835+
if (dst) {
836+
folio_unlock(dst);
837+
folio_put(dst);
833838
}
834-
newpage = page;
839+
dst = src;
835840
}
836841

837-
src = page_folio(page);
838-
dst = page_folio(newpage);
839842
remove_migration_ptes(src, dst, false);
840843
folio_unlock(src);
841844

842-
if (is_zone_device_page(page))
843-
put_page(page);
845+
if (folio_is_zone_device(src))
846+
folio_put(src);
844847
else
845-
putback_lru_page(page);
848+
folio_putback_lru(src);
846849

847-
if (newpage != page) {
848-
unlock_page(newpage);
849-
if (is_zone_device_page(newpage))
850-
put_page(newpage);
850+
if (dst != src) {
851+
folio_unlock(dst);
852+
if (folio_is_zone_device(dst))
853+
folio_put(dst);
851854
else
852-
putback_lru_page(newpage);
855+
folio_putback_lru(dst);
853856
}
854857
}
855858
}

0 commit comments

Comments
 (0)