Skip to content

Commit 192fe94

Browse files
Kefeng Wanggregkh
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/20240826065814.1336616-5-wangkefeng.wang@huawei.com Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> Reviewed-by: Vishal Moola (Oracle) <vishal.moola@gmail.com> Reviewed-by: Alistair Popple <apopple@nvidia.com> Cc: Baolin Wang <baolin.wang@linux.alibaba.com> Cc: David Hildenbrand <david@redhat.com> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Zi Yan <ziy@nvidia.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David Hildenbrand <david@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d7dbe5f commit 192fe94

1 file changed

Lines changed: 22 additions & 19 deletions

File tree

mm/migrate_device.c

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

831831
for (i = 0; i < npages; i++) {
832-
struct folio *dst, *src;
832+
struct folio *dst = NULL, *src = NULL;
833833
struct page *newpage = migrate_pfn_to_page(dst_pfns[i]);
834834
struct page *page = migrate_pfn_to_page(src_pfns[i]);
835835

836+
if (newpage)
837+
dst = page_folio(newpage);
838+
836839
if (!page) {
837-
if (newpage) {
838-
unlock_page(newpage);
839-
put_page(newpage);
840+
if (dst) {
841+
folio_unlock(dst);
842+
folio_put(dst);
840843
}
841844
continue;
842845
}
843846

844-
if (!(src_pfns[i] & MIGRATE_PFN_MIGRATE) || !newpage) {
845-
if (newpage) {
846-
unlock_page(newpage);
847-
put_page(newpage);
847+
src = page_folio(page);
848+
849+
if (!(src_pfns[i] & MIGRATE_PFN_MIGRATE) || !dst) {
850+
if (dst) {
851+
folio_unlock(dst);
852+
folio_put(dst);
848853
}
849-
newpage = page;
854+
dst = src;
850855
}
851856

852-
src = page_folio(page);
853-
dst = page_folio(newpage);
854857
remove_migration_ptes(src, dst, false);
855858
folio_unlock(src);
856859

857-
if (is_zone_device_page(page))
858-
put_page(page);
860+
if (folio_is_zone_device(src))
861+
folio_put(src);
859862
else
860-
putback_lru_page(page);
863+
folio_putback_lru(src);
861864

862-
if (newpage != page) {
863-
unlock_page(newpage);
864-
if (is_zone_device_page(newpage))
865-
put_page(newpage);
865+
if (dst != src) {
866+
folio_unlock(dst);
867+
if (folio_is_zone_device(dst))
868+
folio_put(dst);
866869
else
867-
putback_lru_page(newpage);
870+
folio_putback_lru(dst);
868871
}
869872
}
870873
}

0 commit comments

Comments
 (0)