Update the migration entry creation helpers to automatically create device private migration entries when invoked on device private pages.
The corresponding softleaf predicates have already been updated to expect both migration and device private migration entries. Signed-off-by: Jordan Niethe <[email protected]> --- v3: - Provided as an individual patch --- include/linux/swapops.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/linux/swapops.h b/include/linux/swapops.h index a70a6809e9c6..2591ed914d22 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -205,6 +205,10 @@ static inline swp_entry_t make_readable_migration_entry(pgoff_t offset) static inline swp_entry_t make_readable_migration_entry_from_page(struct page *page, pgoff_t flags) { + if (is_device_private_page(page)) + return make_readable_migration_device_private_entry( + page_to_pfn(page) | flags); + return swp_entry(SWP_MIGRATION_READ, page_to_pfn(page) | flags); } @@ -216,6 +220,10 @@ static inline swp_entry_t make_readable_exclusive_migration_entry(pgoff_t offset static inline swp_entry_t make_readable_exclusive_migration_entry_from_page(struct page *page, pgoff_t flags) { + if (is_device_private_page(page)) + return make_readable_exclusive_migration_device_private_entry( + page_to_pfn(page) | flags); + return swp_entry(SWP_MIGRATION_READ_EXCLUSIVE, page_to_pfn(page) | flags); } @@ -227,6 +235,10 @@ static inline swp_entry_t make_writable_migration_entry(pgoff_t offset) static inline swp_entry_t make_writable_migration_entry_from_page(struct page *page, pgoff_t flags) { + if (is_device_private_page(page)) + return make_writable_migration_device_private_entry( + page_to_pfn(page) | flags); + return swp_entry(SWP_MIGRATION_WRITE, page_to_pfn(page) | flags); } -- 2.34.1
