Skip to content

Commit a10c4a5

Browse files
author
Rafael Aquini
committed
mm: migrate_device: use more folio in migrate_device_finalize()
JIRA: https://issues.redhat.com/browse/RHEL-84184 JIRA: https://issues.redhat.com/browse/RHEL-83249 This patch is a backport of the following upstream commit: commit 58bf8c2 Author: Kefeng Wang <wangkefeng.wang@huawei.com> Date: Mon Aug 26 14:58:12 2024 +0800 mm: migrate_device: use more folio in migrate_device_finalize() 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: Rafael Aquini <raquini@redhat.com>
1 parent b014eca commit a10c4a5

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)