summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorMika Penttilä <mpenttil@redhat.com>2023-06-07 20:29:44 +0300
committerAndrew Morton <akpm@linux-foundation.org>2023-08-18 10:12:09 -0700
commitdf263d9a7dffee94ca5391120ee3b0587efa07f1 (patch)
tree60c2dff63775a9797c1ac21247a5d8c190cc8062 /mm
parentd9cfaf405b8ffe2c716b1ce4c82e0a19d50951da (diff)
mm/migrate_device: try to handle swapcache pages
Migrating file pages and swapcache pages into device memory is not supported. Try to get rid of the swap cache, and if successful, go ahead as with other anonymous pages. Link: https://lkml.kernel.org/r/20230607172944.11713-1-mpenttil@redhat.com Signed-off-by: Mika Penttilä <mpenttil@redhat.com> Reviewed-by: "Huang, Ying" <ying.huang@intel.com> Reviewed-by: Alistair Popple <apopple@nvidia.com> Cc: John Hubbard <jhubbard@nvidia.com> Cc: Ralph Campbell <rcampbell@nvidia.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/migrate_device.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/mm/migrate_device.c b/mm/migrate_device.c
index 8365158460ed..e29626e1329e 100644
--- a/mm/migrate_device.c
+++ b/mm/migrate_device.c
@@ -727,13 +727,22 @@ static void __migrate_device_pages(unsigned long *src_pfns,
if (is_device_private_page(newpage) ||
is_device_coherent_page(newpage)) {
- /*
- * For now only support anonymous memory migrating to
- * device private or coherent memory.
- */
if (mapping) {
- src_pfns[i] &= ~MIGRATE_PFN_MIGRATE;
- continue;
+ struct folio *folio;
+
+ folio = page_folio(page);
+
+ /*
+ * For now only support anonymous memory migrating to
+ * device private or coherent memory.
+ *
+ * Try to get rid of swap cache if possible.
+ */
+ if (!folio_test_anon(folio) ||
+ !folio_free_swap(folio)) {
+ src_pfns[i] &= ~MIGRATE_PFN_MIGRATE;
+ continue;
+ }
}
} else if (is_zone_device_page(newpage)) {
/*