Migrate on fault for device pages
Subsystems (7)
v7 cover Migrate on fault for device pages
From: Mika Penttilä <[email protected]>
Resend due to merge glitch..
Currently, the way device page faulting and migration works is not optimal, if you want to do both fault handling and migration at once.
Being able to migrate not present pages (or pages mapped with incorrect permissions, eg. COW) to the GPU requires doing either of the following sequences:
1. hmm_range_fault() - fault in non-present pages with correct permissions, etc.
2. migrate_vma_*() - migrate the pages
Or:
1. migrate_vma_*() - migrate present pages
2. If non-present pages detected by migrate_vma_*():
a) call hmm_range_fault() to fault pages in
b) call migrate_vma_*() again to migrate now present pages
The problem with the first sequence is that you always have to do two page walks even when most of the time the pages are present or zero page mappings so the common case takes a performance hit.
The second sequence is better for the common case, but far worse if pages aren't present because now you have to walk the page tables three times (once to find the page is not present, once so hmm_range_fault() can find a non-present page to fault in and once again to setup the migration). It is also tricky to code correctly. One page table walk could costs over 1000 cpu cycles on X86-64, which is a significant hit.
We should be able to walk the page table once, faulting pages in as required and replacing them with migration entries if requested.
Add a new flag to HMM APIs, HMM_PFN_REQ_MIGRATE,
which tells to prepare for migration also during fault handling. Also, for the migrate_vma_setup() call paths, a flag, MIGRATE_VMA_FAULT, is added to tell to add fault handling to migrate.
One extra benefit of migrating with hmm_range_fault() path is the migrate_vma.vma gets populated, so no need to retrieve that separataly.
Tested in X86-64 VM with HMM test device, passing the selftests. For performance, the migrate throughput tests from the selftests show similar numbers (within error margin) as unmodified kernel. Tested also rebased on the
"Remove device private pages from physical address space" series:
https://lore.kernel.org/linux-mm/[email protected]/
plus a small patch to adjust with no problems.
Changes v6-v7
- rebase on 7.0.0-rc6
- added documentation and comments
- denote to be migrated zero page as HMM_PFN_MIGRATE alone
- got rid of HMM_PFN_INOUT_FLAGS movement in patch 2
- picked up Acked-By from David for patch 1
Changes v5-v6
- rebase on 7.0.0-rc4
- use range based TLB flushing while unmapping ptes
- gate migration behind HMM_PFN_REQ_MIGRATE for fault and migrate paths
- always infer migration flags from migrate->flags only
Changes v4-v5
- rebase on 6.19
- fixed David's email address
- fixed link issue without CONFIG_TRANSPARENT_HUGEPAGE
- refactored into smaller commits
- added more comments to code
Changes v3-v4:
- rebase on 6.19-rc8
- fixed issues found by kernel test robot with random configs
- fixed typos
Changes v2-v3:
- rebase on 6.19-rc7
- fixed issues found by kernel test robot
- fixed smatch issues reported by Dan Carpenter <[email protected]>
- fixes to lock handling (pmd/pte) on errors
- added assertions for pmd/pte lock states
- other issues discovered by Matthew, thanks!
Changes v1-v2:
- rebase on 6.19-rc6
- fixed issues found by kernel test robot
- fixed locking (pmd/ptl) to cover handle_ and prepare_ regions parts if migrating
- other issues discovered by Matthew, thanks!
Changes RFC-v1:
- rebase on 6.19-rc5
- adjust for the device THP
- changes from feedback
Revisions:
- RFC https://lore.kernel.org/linux-mm/[email protected]/
- v1: https://lore.kernel.org/all/[email protected]/
- v2: https://lore.kernel.org/all/[email protected]/
- v3: https://lore.kernel.org/all/[email protected]/
- v4: https://lore.kernel.org/all/[email protected]/
- v5: https://lore.kernel.org/linux-mm/[email protected]/
- v6: https://lore.kernel.org/linux-mm/[email protected]/
Mika Penttilä (6):
mm:/Kconfig changes for migrate on fault for device pages
mm: Add helper to convert HMM pfn to migrate pfn mm/hmm: do the plumbing for HMM to participate in migration
mm: setup device page migration in HMM pagewalk
mm: add new testcase for the migrate on fault case mm:/migrate_device.c: remove migrate_vma_collect_*()
include/linux/hmm.h | 18 +- include/linux/migrate.h | 26 +- lib/test_hmm.c | 101 ++- lib/test_hmm_uapi.h | 19 +- mm/Kconfig | 2 + mm/hmm.c | 821 +++++++++++++++++++++++-- mm/migrate_device.c | 591 +++--------------- tools/testing/selftests/mm/hmm-tests.c | 54 ++ 8 files changed, 1054 insertions(+), 578 deletions(-)
base-commit: 7aaa8047eafd0bd628065b15757d9b48c5f9c07d
Signature · 1 line
2.50.0
PATCH v7 1/6 mm:/Kconfig changes for migrate on fault for device pages
From: Mika Penttilä <[email protected]>
With the unified HMM/migrate_device page table walk migrate_device needs HMM enabled and HMM needs MMU notifiers. Enable them explicitly to avoid breaking random configs.
--- mm/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
mm/Kconfig +2 -0
@@ -647,6 +647,7 @@ config MIGRATION config DEVICE_MIGRATION def_bool MIGRATION && ZONE_DEVICE + select HMM_MIRROR config ARCH_ENABLE_HUGEPAGE_MIGRATION bool
@@ -1222,6 +1223,7 @@ config ZONE_DEVICE config HMM_MIRROR bool depends on MMU + select MMU_NOTIFIER config GET_FREE_REGION bool
Signature · 1 line
2.50.0
David Hildenbrand (Arm)
maintainerRe: [PATCH v7 1/6] mm:/Kconfig changes for migrate on fault for device pages
Quoted 1 line · On 3/30/26 13:56, [email protected] wrote:
From: Mika Penttilä <[email protected]>
Hi Mika,
nit: subject should be "mm/Kconfig:". It's also wrong on patch #6.
But more general:
1) I have two v7 submissions in my inbox. Which one is the right one?
2) I don't receive cover letters for the series. Please make sure that you CC everybody on the cover letter.
I recommend "b4 prep" + "b4 send" for patch series management, that can simplify both steps.
Regarding 2), if you prefer to do this manually, you best put all CC's in the cover letter, specifying "--cc-cover" for git send-email.
This is also what "b4 prep --auto-to-cc" + "b4 send" will end up doing :)
Signature · 3 lines
Cheers, David
Re: [PATCH v7 1/6] mm:/Kconfig changes for migrate on fault for device pages
Hi,
Quoted 5 lines · David Hildenbrand (Arm)
Quoted 1 line · On 3/30/26 13:56, [email protected] wrote:
From: Mika Penttilä <[email protected]>
Hi Mika,
nit: subject should be "mm/Kconfig:". It's also wrong on patch #6.
Ah yes will change..
Quoted 4 lines
But more general:
1) I have two v7 submissions in my inbox. Which one is the right one?
Sorry about that..had a merge glitch so did a resend, this is the right one:
https://lore.kernel.org/linux-mm/[email protected]/
Quoted 3 lines
2) I don't receive cover letters for the series. Please make sure that you CC everybody on the cover letter.
Yes I seem to have lost my CC section in couple past series.
Quoted 9 lines
I recommend "b4 prep" + "b4 send" for patch series management, that can simplify both steps.
Regarding 2), if you prefer to do this manually, you best put all CC's in the cover letter, specifying "--cc-cover" for git send-email.
This is also what "b4 prep --auto-to-cc" + "b4 send" will end up doing :)
Thanks!
--Mika
PATCH v7 2/6 mm: Add helper to convert HMM pfn to migrate pfn
In reply to [email protected]From: Mika Penttilä <[email protected]>
The unified HMM/migrate_device pagewalk does the "collecting" on the HMM side, so we need a helper to transfer pfns to the migrate_vma world.
--- include/linux/hmm.h | 18 ++++++++++++- include/linux/migrate.h | 3 ++- mm/migrate_device.c | 57 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 2 deletions(-)
include/linux/hmm.h +17 -1
@@ -13,6 +13,8 @@struct mmu_interval_notifier ; +struct migrate_vma ; +/* * On output: * 0 - The page is faultable and a future call with
@@ -27,6 +29,12 @@ struct mmu_interval_notifier;* HMM_PFN_P2PDMA_BUS - Bus mapped P2P transfer * HMM_PFN_DMA_MAPPED - Flag preserved on input-to-output transformation * to mark that page is already DMA mapped +* HMM_PFN_MIGRATE - The entry is to be migrated. Note, HMM_PFN_MIGRATE +* alone without HMM_PFN_VALID denotes the +* empty page. +* This flag together with HMM_PFN_COMPOUND are +* indicators for migrate_hmm_range_setup() to +* setup the migrate pfns. * * On input: * 0 - Return the current state of the page, do not fault it.
@@ -34,6 +42,8 @@ struct mmu_interval_notifier;* will fail * HMM_PFN_REQ_WRITE - The output must have HMM_PFN_WRITE or hmm_range_fault() * will fail. Must be combined with HMM_PFN_REQ_FAULT. +* HMM_PFN_REQ_MIGRATE - For default_flags, request to migrate, according to +* hmm_range.migrate.flags */ enum hmm_pfn_flags {/* Output fields and flags */
@@ -48,11 +58,15 @@ enum hmm_pfn_flags {HMM_PFN_P2PDMA =1UL << (BITS_PER_LONG -5 ),HMM_PFN_P2PDMA_BUS =1UL << (BITS_PER_LONG -6 ), -HMM_PFN_ORDER_SHIFT = (BITS_PER_LONG -11 ), +/* Migrate request */ +HMM_PFN_MIGRATE =1UL << (BITS_PER_LONG -7 ), +HMM_PFN_COMPOUND =1UL << (BITS_PER_LONG -8 ), +HMM_PFN_ORDER_SHIFT = (BITS_PER_LONG -13 ),/* Input flags */ HMM_PFN_REQ_FAULT =HMM_PFN_VALID ,HMM_PFN_REQ_WRITE =HMM_PFN_WRITE , +HMM_PFN_REQ_MIGRATE =HMM_PFN_MIGRATE , HMM_PFN_FLAGS = ~((1UL << HMM_PFN_ORDER_SHIFT) - 1), };
@@ -107,6 +121,7 @@ static inline unsigned int hmm_pfn_to_map_order(unsigned long hmm_pfn)* @default_flags: default flags for the range (write, read, ... see hmm doc) * @pfn_flags_mask: allows to mask pfn flags so that only default_flags matter * @dev_private_owner: owner of device private pages +* @migrate: structure for migrating a range of a VMA */ struct hmm_range {struct mmu_interval_notifier *notifier;
@@ -117,6 +132,7 @@ struct hmm_range {unsigned long default_flags;unsigned long pfn_flags_mask;void *dev_private_owner; +struct migrate_vma *migrate; };/*
include/linux/migrate.h +2 -1
@@ -3,6 +3,7 @@#define _LINUX_MIGRATE_H#include <linux/mm.h> +#include <linux/hmm.h> #include <linux/mempolicy.h> #include <linux/migrate_mode.h> #include <linux/hugetlb.h>
@@ -200,7 +201,7 @@ void migrate_device_pages(unsigned long *src_pfns, unsigned long *dst_pfns, unsigned long npages);void migrate_device_finalize (unsigned long *src_pfns,unsigned long *dst_pfns,unsigned long npages); - +void migrate_hmm_range_setup (struct hmm_range *range);#endif /* CONFIG_MIGRATION */ #endif /* _LINUX_MIGRATE_H */
mm/migrate_device.c +57 -0
60 lines not on this page · raw message
Signature · 1 line
2.50.0
PATCH v7 3/6 mm/hmm: do the plumbing for HMM to participate in migration
In reply to [email protected]From: Mika Penttilä <[email protected]>
Do the preparations in hmm_range_fault() and pagewalk callbacks to do the "collecting" part of migration, needed for migration on fault.
These steps include locking for pmd/pte if migrating, capturing the vma for further migrate actions, and calling the still dummy hmm_vma_handle_migrate_prepare_pmd() and hmm_vma_handle_migrate_prepare() functions in the pagewalk.
--- include/linux/migrate.h | 18 +- lib/test_hmm.c | 2 +- mm/hmm.c | 423 +++++++++++++++++++++++++++++++++++----- 3 files changed, 388 insertions(+), 55 deletions(-)
include/linux/migrate.h +17 -1
@@ -106,6 +106,16 @@ static inline void softleaf_entry_wait_on_locked(softleaf_t entry, spinlock_t *p spin_unlock(ptl); } +enum migrate_vma_info { +MIGRATE_VMA_SELECT_NONE =0 , +MIGRATE_VMA_SELECT_COMPOUND =MIGRATE_VMA_SELECT_NONE , +}; + +static inline enum migrate_vma_info hmm_select_migrate (struct hmm_range *range) +{ +return MIGRATE_VMA_SELECT_NONE ; +} +#endif /* CONFIG_MIGRATION */ #ifdef CONFIG_NUMA_BALANCING
@@ -149,7 +159,7 @@ static inline unsigned long migrate_pfn(unsigned long pfn)return (pfn <<MIGRATE_PFN_SHIFT ) |MIGRATE_PFN_VALID ; } -enum migrate_vma_direction { +enum migrate_vma_info {MIGRATE_VMA_SELECT_SYSTEM =1 <<0 ,MIGRATE_VMA_SELECT_DEVICE_PRIVATE =1 <<1 ,MIGRATE_VMA_SELECT_DEVICE_COHERENT =1 <<2 ,
@@ -191,6 +201,12 @@ struct migrate_vma {struct page *fault_page; }; +// TODO: enable migration +static inline enum migrate_vma_info hmm_select_migrate (struct hmm_range *range) +{ +return 0 ; +} +int migrate_vma_setup (struct migrate_vma *args);void migrate_vma_pages (struct migrate_vma *migrate);void migrate_vma_finalize (struct migrate_vma *migrate);
lib/test_hmm.c +1 -1
@@ -145,7 +145,7 @@ static bool dmirror_is_private_zone(struct dmirror_device *mdevice) HMM_DMIRROR_MEMORY_DEVICE_PRIVATE); } -static enum migrate_vma_direction +static enum migrate_vma_info dmirror_select_device (struct dmirror *dmirror) { return (dmirror->mdevice->zone_device_type ==
mm/hmm.c +370 -53
597 lines not on this page · raw message
Signature · 1 line
2.50.0
PATCH v7 4/6 mm: setup device page migration in HMM pagewalk
In reply to [email protected]From: Mika Penttilä <[email protected]>
Implement the needed hmm_vma_handle_migrate_prepare_pmd() and hmm_vma_handle_migrate_prepare() functions which are mostly carried over from migrate_device.c, as well as the needed split functions.
Make migrate_device take use of HMM pagewalk for collecting part of migration.
--- include/linux/migrate.h | 9 +- mm/hmm.c | 420 ++++++++++++++++++++++++++++++++++++++-- mm/migrate_device.c | 26 ++- 3 files changed, 438 insertions(+), 17 deletions(-)
include/linux/migrate.h +7 -2
@@ -164,6 +164,7 @@ enum migrate_vma_info {MIGRATE_VMA_SELECT_DEVICE_PRIVATE =1 <<1 ,MIGRATE_VMA_SELECT_DEVICE_COHERENT =1 <<2 ,MIGRATE_VMA_SELECT_COMPOUND =1 <<3 , + MIGRATE_VMA_FAULT = 1 << 4, }; struct migrate_vma {
@@ -201,10 +202,14 @@ struct migrate_vma {struct page *fault_page; }; -// TODO: enable migration static inline enum migrate_vma_info hmm_select_migrate (struct hmm_range *range) { -return 0 ; +enum migrate_vma_info minfo; + + minfo = (range->default_flags &HMM_PFN_REQ_MIGRATE ) ? + range->migrate->flags :0 ; + +return minfo; }int migrate_vma_setup (struct migrate_vma *args);
mm/hmm.c +409 -11
478 lines not on this page · raw message
mm/migrate_device.c +22 -4
@@ -734,7 +734,17 @@ static void migrate_vma_unmap(struct migrate_vma *migrate)*/ int migrate_vma_setup (struct migrate_vma *args) { +int ret;long nr_pages = (args->end - args->start) >>PAGE_SHIFT ; +struct hmm_range range = { + .notifier =NULL , + .start = args->start, + .end = args->end, + .hmm_pfns = args->src, + .dev_private_owner = args->pgmap_owner, + .migrate = args, + .default_flags =HMM_PFN_REQ_MIGRATE + }; args->start &=PAGE_MASK ; args->end &=PAGE_MASK ;
@@ -759,17 +769,25 @@ int migrate_vma_setup(struct migrate_vma *args) args->cpages =0 ; args->npages =0 ; -migrate_vma_collect (args); +if (args->flags &MIGRATE_VMA_FAULT ) + range.default_flags |=HMM_PFN_REQ_FAULT ; + + ret =hmm_range_fault (&range); -if (args->cpages) -migrate_vma_unmap (args); +migrate_hmm_range_setup (&range); + +/* Remove migration PTEs */ +if (ret) { +migrate_vma_pages (args); +migrate_vma_finalize (args); + }/* * At this point pages are locked and unmapped, and thus they have * stable content and can safely be copied to destination memory that * is allocated by the drivers. */ -return 0 ; +return ret; }EXPORT_SYMBOL (migrate_vma_setup);
Signature · 1 line
2.50.0
kernel test robot
build botRe: [PATCH v7 4/6] mm: setup device page migration in HMM pagewalk
kernel test robot noticed the following build warnings:
Hi,
kernel test robot noticed the following build warnings:
[auto build test WARNING on 7aaa8047eafd0bd628065b15757d9b48c5f9c07d]
url: https://github.com/intel-lab-lkp/linux/commits/mpenttil-redhat-com/mm-Kconfig-changes-for-migrate-on-fault-for-device-pages/20260330-202258 base: 7aaa8047eafd0bd628065b15757d9b48c5f9c07d patch link: https://lore.kernel.org/r/20260330115611.347988-5-mpenttil%40redhat.com patch subject: [PATCH v7 4/6] mm: setup device page migration in HMM pagewalk config: x86_64-rhel-9.4-kselftests (https://download.01.org/0day-ci/archive/20260403/[email protected]/config) compiler: gcc-14 (Debian 14.2.0-19) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260403/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> mm/migrate_device.c:508:13: warning: 'migrate_vma_collect' defined but not used [-Wunused-function]
508 | static void migrate_vma_collect(struct migrate_vma *migrate)
| ^~~~~~~~~~~~~~~~~~~
vim +/migrate_vma_collect +508 mm/migrate_device.c
76cbbead253ddca Christoph Hellwig 2022-02-16 499
76cbbead253ddca Christoph Hellwig 2022-02-16 500 /*
76cbbead253ddca Christoph Hellwig 2022-02-16 501 * migrate_vma_collect() - collect pages over a range of virtual addresses
76cbbead253ddca Christoph Hellwig 2022-02-16 502 * @migrate: migrate struct containing all migration information
76cbbead253ddca Christoph Hellwig 2022-02-16 503 *
76cbbead253ddca Christoph Hellwig 2022-02-16 504 * This will walk the CPU page table. For each virtual address backed by a
76cbbead253ddca Christoph Hellwig 2022-02-16 505 * valid page, it updates the src array and takes a reference on the page, in
76cbbead253ddca Christoph Hellwig 2022-02-16 506 * order to pin the page until we lock it and unmap it.
76cbbead253ddca Christoph Hellwig 2022-02-16 507 */
76cbbead253ddca Christoph Hellwig 2022-02-16 @508 static void migrate_vma_collect(struct migrate_vma *migrate)
76cbbead253ddca Christoph Hellwig 2022-02-16 509 {
76cbbead253ddca Christoph Hellwig 2022-02-16 510 struct mmu_notifier_range range;
76cbbead253ddca Christoph Hellwig 2022-02-16 511
76cbbead253ddca Christoph Hellwig 2022-02-16 512 /*
76cbbead253ddca Christoph Hellwig 2022-02-16 513 * Note that the pgmap_owner is passed to the mmu notifier callback so
76cbbead253ddca Christoph Hellwig 2022-02-16 514 * that the registered device driver can skip invalidating device
76cbbead253ddca Christoph Hellwig 2022-02-16 515 * private page mappings that won't be migrated.
76cbbead253ddca Christoph Hellwig 2022-02-16 516 */
76cbbead253ddca Christoph Hellwig 2022-02-16 517 mmu_notifier_range_init_owner(&range, MMU_NOTIFY_MIGRATE, 0,
7d4a8be0c4b2b7f Alistair Popple 2023-01-10 518 migrate->vma->vm_mm, migrate->start, migrate->end,
76cbbead253ddca Christoph Hellwig 2022-02-16 519 migrate->pgmap_owner);
76cbbead253ddca Christoph Hellwig 2022-02-16 520 mmu_notifier_invalidate_range_start(&range);
76cbbead253ddca Christoph Hellwig 2022-02-16 521
76cbbead253ddca Christoph Hellwig 2022-02-16 522 walk_page_range(migrate->vma->vm_mm, migrate->start, migrate->end,
76cbbead253ddca Christoph Hellwig 2022-02-16 523 &migrate_vma_walk_ops, migrate);
76cbbead253ddca Christoph Hellwig 2022-02-16 524
76cbbead253ddca Christoph Hellwig 2022-02-16 525 mmu_notifier_invalidate_range_end(&range);
76cbbead253ddca Christoph Hellwig 2022-02-16 526 migrate->end = migrate->start + (migrate->npages << PAGE_SHIFT);
76cbbead253ddca Christoph Hellwig 2022-02-16 527 }
76cbbead253ddca Christoph Hellwig 2022-02-16 528 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
PATCH v7 5/6 mm: add new testcase for the migrate on fault case
In reply to [email protected]From: Mika Penttilä <[email protected]>
--- lib/test_hmm.c | 99 ++++++++++++++++++++++++++ lib/test_hmm_uapi.h | 19 ++--- tools/testing/selftests/mm/hmm-tests.c | 54 ++++++++++++++ 3 files changed, 163 insertions(+), 9 deletions(-)
lib/test_hmm.c +99 -0
@@ -36,6 +36,7 @@#define DMIRROR_RANGE_FAULT_TIMEOUT 1000#define DEVMEM_CHUNK_SIZE (256 * 1024 * 1024U)#define DEVMEM_CHUNKS_RESERVE 16 +#define PFNS_ARRAY_SIZE 64/* * For device_private pages, dpage is just a dummy struct page
@@ -1196,6 +1197,100 @@ static int dmirror_migrate_to_device(struct dmirror *dmirror,return ret; } +static int do_fault_and_migrate (struct dmirror *dmirror,struct hmm_range *range) +{ +struct migrate_vma *migrate = range->migrate; +int ret; + +mmap_read_lock (dmirror->notifier.mm); + +/* Fault-in pages for migration and update device page table */ + ret =dmirror_range_fault (dmirror, range); + +pr_debug ("Migrating from sys mem to device mem\n" ); +migrate_hmm_range_setup (range); + +dmirror_migrate_alloc_and_copy (migrate, dmirror); +migrate_vma_pages (migrate); +dmirror_migrate_finalize_and_map (migrate, dmirror); +migrate_vma_finalize (migrate); + +mmap_read_unlock (dmirror->notifier.mm); +return ret; +} + +static int dmirror_fault_and_migrate_to_device (struct dmirror *dmirror, +struct hmm_dmirror_cmd *cmd) +{ +unsigned long start, size, end, next; +unsigned long src_pfns[PFNS_ARRAY_SIZE ] = {0 }; +unsigned long dst_pfns[PFNS_ARRAY_SIZE ] = {0 }; +struct migrate_vma migrate = {0 }; +struct hmm_range range = {0 }; +struct dmirror_bounce bounce; +int ret =0 ; + +/* Whole range */ + start = cmd->addr; + size = cmd->npages <<PAGE_SHIFT ; + end = start + size; + +if (!mmget_not_zero (dmirror->notifier.mm)) { + ret = -EFAULT ; + goto out; + } + + migrate.pgmap_owner = dmirror->mdevice; + migrate.src = src_pfns; + migrate.dst = dst_pfns; + migrate.flags =MIGRATE_VMA_SELECT_SYSTEM ; + + range.migrate = &migrate; + range.hmm_pfns = src_pfns; + range.pfn_flags_mask =0 ; + range.default_flags =HMM_PFN_REQ_FAULT |HMM_PFN_REQ_MIGRATE ; + range.dev_private_owner = dmirror->mdevice; + range.notifier = &dmirror->notifier; + +for (next = start; next < end; next = range.end) { + range.start = next; + range.end =min (end, next + (PFNS_ARRAY_SIZE <<PAGE_SHIFT )); + +pr_debug ("Fault and migrate range start:%#lx end:%#lx\n" , + range.start, range.end); + + ret =do_fault_and_migrate (dmirror, &range); +if (ret) + goto out_mmput; + } + +/* +* Return the migrated data for verification. +* Only for pages in device zone +*/ + ret =dmirror_bounce_init (&bounce, start, size); +if (ret) + goto out_mmput; + +mutex_lock (&dmirror->mutex); + ret =dmirror_do_read (dmirror, start, end, &bounce); +mutex_unlock (&dmirror->mutex); +if (ret ==0 ) { + ret =copy_to_user (u64_to_user_ptr (cmd->ptr), bounce.ptr, bounce.size); +if (ret) + ret = -EFAULT ; + } + + cmd->cpages = bounce.cpages; +dmirror_bounce_fini (&bounce); + + +out_mmput: +mmput (dmirror->notifier.mm); +out: +return ret; +} +static void dmirror_mkentry (struct dmirror *dmirror,struct hmm_range *range,unsigned char *perm,unsigned long entry) {
@@ -1512,6 +1607,10 @@ static long dmirror_fops_unlocked_ioctl(struct file *filp, ret =dmirror_migrate_to_device (dmirror, &cmd);break ; +case HMM_DMIRROR_MIGRATE_ON_FAULT_TO_DEV : + ret =dmirror_fault_and_migrate_to_device (dmirror, &cmd); +break ; +case HMM_DMIRROR_MIGRATE_TO_SYS : ret =dmirror_migrate_to_system (dmirror, &cmd);break ;
lib/test_hmm_uapi.h +10 -9
@@ -29,15 +29,16 @@ struct hmm_dmirror_cmd { };/* Expose the address space of the calling process through hmm device file */ -#define HMM_DMIRROR_READ _IOWR('H', 0x00, struct hmm_dmirror_cmd) -#define HMM_DMIRROR_WRITE _IOWR('H', 0x01, struct hmm_dmirror_cmd) -#define HMM_DMIRROR_MIGRATE_TO_DEV _IOWR('H', 0x02, struct hmm_dmirror_cmd) -#define HMM_DMIRROR_MIGRATE_TO_SYS _IOWR('H', 0x03, struct hmm_dmirror_cmd) -#define HMM_DMIRROR_SNAPSHOT _IOWR('H', 0x04, struct hmm_dmirror_cmd) -#define HMM_DMIRROR_EXCLUSIVE _IOWR('H', 0x05, struct hmm_dmirror_cmd) -#define HMM_DMIRROR_CHECK_EXCLUSIVE _IOWR('H', 0x06, struct hmm_dmirror_cmd) -#define HMM_DMIRROR_RELEASE _IOWR('H', 0x07, struct hmm_dmirror_cmd) -#define HMM_DMIRROR_FLAGS _IOWR('H', 0x08, struct hmm_dmirror_cmd) +#define HMM_DMIRROR_READ _IOWR('H', 0x00, struct hmm_dmirror_cmd) +#define HMM_DMIRROR_WRITE _IOWR('H', 0x01, struct hmm_dmirror_cmd) +#define HMM_DMIRROR_MIGRATE_TO_DEV _IOWR('H', 0x02, struct hmm_dmirror_cmd) +#define HMM_DMIRROR_MIGRATE_ON_FAULT_TO_DEV _IOWR('H', 0x03, struct hmm_dmirror_cmd) +#define HMM_DMIRROR_MIGRATE_TO_SYS _IOWR('H', 0x04, struct hmm_dmirror_cmd) +#define HMM_DMIRROR_SNAPSHOT _IOWR('H', 0x05, struct hmm_dmirror_cmd) +#define HMM_DMIRROR_EXCLUSIVE _IOWR('H', 0x06, struct hmm_dmirror_cmd) +#define HMM_DMIRROR_CHECK_EXCLUSIVE _IOWR('H', 0x07, struct hmm_dmirror_cmd) +#define HMM_DMIRROR_RELEASE _IOWR('H', 0x08, struct hmm_dmirror_cmd) +#define HMM_DMIRROR_FLAGS _IOWR('H', 0x09, struct hmm_dmirror_cmd)#define HMM_DMIRROR_FLAG_FAIL_ALLOC (1ULL << 0)
tools/testing/selftests/mm/hmm-tests.c +54 -0
66 lines not on this page · raw message
Signature · 1 line
2.50.0
PATCH v7 6/6 mm:/migrate_device.c: remove migrate_vma_collect_*()
In reply to [email protected]From: Mika Penttilä <[email protected]>
With the unified fault handling and migrate path, the migrate_vma_collect_*() functions are unused, let's remove them.
--- mm/migrate_device.c | 508 -------------------------------------------- 1 file changed, 508 deletions(-)
mm/migrate_device.c +0 -508
@@ -18,514 +18,6 @@#include <asm/tlbflush.h> #include "internal.h" -static int migrate_vma_collect_skip (unsigned long start, -unsigned long end, -struct mm_walk *walk) -{ -struct migrate_vma *migrate = walk->private; -unsigned long addr; - -for (addr = start; addr < end; addr +=PAGE_SIZE ) { - migrate->dst[migrate->npages] =0 ; - migrate->src[migrate->npages++] =0 ; - } - -return 0 ; -} - -static int migrate_vma_collect_hole (unsigned long start, -unsigned long end, -__always_unused int depth, -struct mm_walk *walk) -{ -struct migrate_vma *migrate = walk->private; -unsigned long addr; - -/* Only allow populating anonymous memory. */ -if (!vma_is_anonymous (walk->vma)) -return migrate_vma_collect_skip (start, end, walk); - -if (thp_migration_supported () && - (migrate->flags &MIGRATE_VMA_SELECT_COMPOUND ) && - (IS_ALIGNED (start,HPAGE_PMD_SIZE ) && -IS_ALIGNED (end,HPAGE_PMD_SIZE ))) { - migrate->src[migrate->npages] =MIGRATE_PFN_MIGRATE | -MIGRATE_PFN_COMPOUND ; - migrate->dst[migrate->npages] =0 ; - migrate->npages++; - migrate->cpages++; - -/* -* Collect the remaining entries as holes, in case we -* need to split later -*/ -return migrate_vma_collect_skip (start +PAGE_SIZE , end, walk); - } - -for (addr = start; addr < end; addr +=PAGE_SIZE ) { - migrate->src[migrate->npages] =MIGRATE_PFN_MIGRATE ; - migrate->dst[migrate->npages] =0 ; - migrate->npages++; - migrate->cpages++; - } - -return 0 ; -} - -/** -* migrate_vma_split_folio() - Helper function to split a THP folio -* @folio: the folio to split -* @fault_page: struct page associated with the fault if any -* -* Returns 0 on success -*/ -static int migrate_vma_split_folio (struct folio *folio, -struct page *fault_page) -{ -int ret; -struct folio *fault_folio = fault_page ?page_folio (fault_page) :NULL ; -struct folio *new_fault_folio =NULL ; - -if (folio != fault_folio) { -folio_get (folio); -folio_lock (folio); - } - - ret =split_folio (folio); -if (ret) { -if (folio != fault_folio) { -folio_unlock (folio); -folio_put (folio); - } -return ret; - } - - new_fault_folio = fault_page ?page_folio (fault_page) :NULL ; - -/* -* Ensure the lock is held on the correct -* folio after the split -*/ -if (!new_fault_folio) { -folio_unlock (folio); -folio_put (folio); - }else if (folio != new_fault_folio) { -if (new_fault_folio != fault_folio) { -folio_get (new_fault_folio); -folio_lock (new_fault_folio); - } -folio_unlock (folio); -folio_put (folio); - } - -return 0 ; -} - -/** migrate_vma_collect_huge_pmd - collect THP pages without splitting the -* folio for device private pages. -* @pmdp: pointer to pmd entry -* @start: start address of the range for migration -* @end: end address of the range for migration -* @walk: mm_walk callback structure -* @fault_folio: folio associated with the fault if any -* -* Collect the huge pmd entry at @pmdp for migration and set the -* MIGRATE_PFN_COMPOUND flag in the migrate src entry to indicate that -* migration will occur at HPAGE_PMD granularity -*/ -static int migrate_vma_collect_huge_pmd (pmd_t *pmdp,unsigned long start, -unsigned long end,struct mm_walk *walk, -struct folio *fault_folio) -{ -struct mm_struct *mm = walk->mm; -struct folio *folio; -struct migrate_vma *migrate = walk->private; -spinlock_t *ptl; -int ret; -unsigned long write =0 ; - - ptl =pmd_lock (mm, pmdp); -if (pmd_none (*pmdp)) { -spin_unlock (ptl); -return migrate_vma_collect_hole (start, end,-1 , walk); - } - -if (pmd_trans_huge (*pmdp)) { -if (!(migrate->flags &MIGRATE_VMA_SELECT_SYSTEM )) { -spin_unlock (ptl); -return migrate_vma_collect_skip (start, end, walk); - } - - folio =pmd_folio (*pmdp); -if (is_huge_zero_folio (folio)) { -spin_unlock (ptl); -return migrate_vma_collect_hole (start, end,-1 , walk); - } -if (pmd_write (*pmdp)) - write =MIGRATE_PFN_WRITE ; - }else if (!pmd_present (*pmdp)) { -const softleaf_t entry =softleaf_from_pmd (*pmdp); - - folio =softleaf_to_folio (entry); - -if (!softleaf_is_device_private (entry) || - !(migrate->flags &MIGRATE_VMA_SELECT_DEVICE_PRIVATE ) || - (folio->pgmap->owner != migrate->pgmap_owner)) { -spin_unlock (ptl); -return migrate_vma_collect_skip (start, end, walk); - } - -if (softleaf_is_migration (entry)) { -softleaf_entry_wait_on_locked (entry, ptl); -spin_unlock (ptl); -return -EAGAIN ; - } - -if (softleaf_is_device_private_write (entry)) - write =MIGRATE_PFN_WRITE ; - }else { -spin_unlock (ptl); -return -EAGAIN ; - } - -folio_get (folio); -if (folio != fault_folio &&unlikely (!folio_trylock (folio))) { -spin_unlock (ptl); -folio_put (folio); -return migrate_vma_collect_skip (start, end, walk); - } - -if (thp_migration_supported () && - (migrate->flags &MIGRATE_VMA_SELECT_COMPOUND ) && - (IS_ALIGNED (start,HPAGE_PMD_SIZE ) && -IS_ALIGNED (end,HPAGE_PMD_SIZE ))) { - -struct page_vma_mapped_walk pvmw = { - .ptl = ptl, - .address = start, - .pmd = pmdp, - .vma = walk->vma, - }; - -unsigned long pfn =page_to_pfn (folio_page (folio,0 )); - - migrate->src[migrate->npages] =migrate_pfn (pfn) | write - |MIGRATE_PFN_MIGRATE - |MIGRATE_PFN_COMPOUND ; - migrate->dst[migrate->npages++] =0 ; - migrate->cpages++; - ret =set_pmd_migration_entry (&pvmw,folio_page (folio,0 )); -if (ret) { - migrate->npages--; - migrate->cpages--; - migrate->src[migrate->npages] =0 ; - migrate->dst[migrate->npages] =0 ; - goto fallback; - } -migrate_vma_collect_skip (start +PAGE_SIZE , end, walk); -spin_unlock (ptl); -return 0 ; - } - -fallback: -spin_unlock (ptl); -if (!folio_test_large (folio)) - goto done; - ret =split_folio (folio); -if (fault_folio != folio) -folio_unlock (folio); -folio_put (folio); -if (ret) -return migrate_vma_collect_skip (start, end, walk); -if (pmd_none (pmdp_get_lockless (pmdp))) -return migrate_vma_collect_hole (start, end,-1 , walk); - -done: -return -ENOENT ; -} - -static int migrate_vma_collect_pmd (pmd_t *pmdp, -unsigned long start, -unsigned long end, -struct mm_walk *walk) -{ -struct migrate_vma *migrate = walk->private; -struct vm_area_struct *vma = walk->vma; -struct mm_struct *mm = vma->vm_mm; -unsigned long addr = start, unmapped =0 ; -spinlock_t *ptl; -struct folio *fault_folio = migrate->fault_page ? -page_folio (migrate->fault_page) :NULL ; -pte_t *ptep; - -again: -if (pmd_trans_huge (*pmdp) || !pmd_present (*pmdp)) { -int ret =migrate_vma_collect_huge_pmd (pmdp, start, end, walk, fault_folio); - -if (ret == -EAGAIN ) - goto again; -if (ret ==0 ) -return 0 ; - } - - ptep =pte_offset_map_lock (mm, pmdp, start, &ptl); -if (!ptep) - goto again; -lazy_mmu_mode_enable (); - ptep += (addr - start) /PAGE_SIZE ; - -for (; addr < end; addr +=PAGE_SIZE , ptep++) { -struct dev_pagemap *pgmap; -unsigned long mpfn =0 , pfn; -struct folio *folio; -struct page *page; -softleaf_t entry; -pte_t pte; - - pte =ptep_get (ptep); - -if (pte_none (pte)) { -if (vma_is_anonymous (vma)) { - mpfn =MIGRATE_PFN_MIGRATE ; - migrate->cpages++; - } - goto next; - } - -if (!pte_present (pte)) { -/* -* Only care about unaddressable device page special -* page table entry. Other special swap entries are not -* migratable, and we ignore regular swapped page. -*/ - entry =softleaf_from_pte (pte); -if (!softleaf_is_device_private (entry)) - goto next; - - page =softleaf_to_page (entry); - pgmap =page_pgmap (page); -if (!(migrate->flags & -MIGRATE_VMA_SELECT_DEVICE_PRIVATE ) || - pgmap->owner != migrate->pgmap_owner) - goto next; - - folio =page_folio (page); -if (folio_test_large (folio)) { -int ret; - -lazy_mmu_mode_disable (); -pte_unmap_unlock (ptep, ptl); - ret =migrate_vma_split_folio (folio, - migrate->fault_page); - -if (ret) { -if (unmapped) -flush_tlb_range (walk->vma, start, end); - -return migrate_vma_collect_skip (addr, end, walk); - } - - goto again; - } - - mpfn =migrate_pfn (page_to_pfn (page)) | -MIGRATE_PFN_MIGRATE ; -if (softleaf_is_device_private_write (entry)) - mpfn |=MIGRATE_PFN_WRITE ; - }else { - pfn =pte_pfn (pte); -if (is_zero_pfn (pfn) && - (migrate->flags &MIGRATE_VMA_SELECT_SYSTEM )) { - mpfn =MIGRATE_PFN_MIGRATE ; - migrate->cpages++; - goto next; - } - page =vm_normal_page (migrate->vma, addr, pte); -if (page && !is_zone_device_page (page) && - !(migrate->flags &MIGRATE_VMA_SELECT_SYSTEM )) { - goto next; - }else if (page &&is_device_coherent_page (page)) { - pgmap =page_pgmap (page); - -if (!(migrate->flags & -MIGRATE_VMA_SELECT_DEVICE_COHERENT ) || - pgmap->owner != migrate->pgmap_owner) - goto next; - } - folio = page ?page_folio (page) :NULL ; -if (folio &&folio_test_large (folio)) { -int ret; - -lazy_mmu_mode_disable (); -pte_unmap_unlock (ptep, ptl); - ret =migrate_vma_split_folio (folio, - migrate->fault_page); - -if (ret) { -if (unmapped) -flush_tlb_range (walk->vma, start, end); - -return migrate_vma_collect_skip (addr, end, walk); - } - - goto again; - } - mpfn =migrate_pfn (pfn) |MIGRATE_PFN_MIGRATE ; - mpfn |=pte_write (pte) ?MIGRATE_PFN_WRITE :0 ; - } - -if (!page || !page->mapping) { - mpfn =0 ; - goto next; - } - -/* -* By getting a reference on the folio we pin it and that blocks -* any kind of migration. Side effect is that it "freezes" the -* pte. -* -* We drop this reference after isolating the folio from the lru -* for non device folio (device folio are not on the lru and thus -* can't be dropped from it). -*/ - folio =page_folio (page); -folio_get (folio); - -/* -* We rely on folio_trylock() to avoid deadlock between -* concurrent migrations where each is waiting on the others -* folio lock. If we can't immediately lock the folio we fail this -* migration as it is only best effort anyway. -* -* If we can lock the folio it's safe to set up a migration entry -* now. In the common case where the folio is mapped once in a -* single process setting up the migration entry now is an -* optimisation to avoid walking the rmap later with -* try_to_migrate(). -*/ -if (fault_folio == folio ||folio_trylock (folio)) { -bool anon_exclusive; -pte_t swp_pte; - -flush_cache_page (vma, addr,pte_pfn (pte)); - anon_exclusive =folio_test_anon (folio) && -PageAnonExclusive (page); -if (anon_exclusive) { - pte =ptep_clear_flush (vma, addr, ptep); - -if (folio_try_share_anon_rmap_pte (folio, page)) { -set_pte_at (mm, addr, ptep, pte); -if (fault_folio != folio) -folio_unlock (folio); -folio_put (folio); - mpfn =0 ; - goto next; - } - }else { - pte =ptep_get_and_clear (mm, addr, ptep); - } - - migrate->cpages++; - -/* Set the dirty flag on the folio now the pte is gone. */ -if (pte_dirty (pte)) -folio_mark_dirty (folio); - -/* Setup special migration page table entry */ -if (mpfn &MIGRATE_PFN_WRITE ) - entry =make_writable_migration_entry ( -page_to_pfn (page)); -else if (anon_exclusive) - entry =make_readable_exclusive_migration_entry ( -page_to_pfn (page)); -else - entry =make_readable_migration_entry ( -page_to_pfn (page)); -if (pte_present (pte)) { -if (pte_young (pte)) - entry =make_migration_entry_young (entry); -if (pte_dirty (pte)) - entry =make_migration_entry_dirty (entry); - } - swp_pte =swp_entry_to_pte (entry); -if (pte_present (pte)) { -if (pte_soft_dirty (pte)) - swp_pte =pte_swp_mksoft_dirty (swp_pte); -if (pte_uffd_wp (pte)) - swp_pte =pte_swp_mkuffd_wp (swp_pte); - }else { -if (pte_swp_soft_dirty (pte)) - swp_pte =pte_swp_mksoft_dirty (swp_pte); -if (pte_swp_uffd_wp (pte)) - swp_pte =pte_swp_mkuffd_wp (swp_pte); - } -set_pte_at (mm, addr, ptep, swp_pte); - -/* -* This is like regular unmap: we remove the rmap and -* drop the folio refcount. The folio won't be freed, as -* we took a reference just above. -*/ -folio_remove_rmap_pte (folio, page, vma); -folio_put (folio); - -if (pte_present (pte)) - unmapped++; - }else { -folio_put (folio); - mpfn =0 ; - } - -next: - migrate->dst[migrate->npages] =0 ; - migrate->src[migrate->npages++] = mpfn; - } - -/* Only flush the TLB if we actually modified any entries */ -if (unmapped) -flush_tlb_range (walk->vma, start, end); - -lazy_mmu_mode_disable (); -pte_unmap_unlock (ptep -1 , ptl); - -return 0 ; -} - -static const struct mm_walk_ops migrate_vma_walk_ops = { - .pmd_entry = migrate_vma_collect_pmd, - .pte_hole = migrate_vma_collect_hole, - .walk_lock =PGWALK_RDLOCK , -}; - -/* -* migrate_vma_collect() - collect pages over a range of virtual addresses -* @migrate: migrate struct containing all migration information -* -* This will walk the CPU page table. For each virtual address backed by a -* valid page, it updates the src array and takes a reference on the page, in -* order to pin the page until we lock it and unmap it. -*/ -static void migrate_vma_collect (struct migrate_vma *migrate) -{ -struct mmu_notifier_range range; - -/* -* Note that the pgmap_owner is passed to the mmu notifier callback so -* that the registered device driver can skip invalidating device -* private page mappings that won't be migrated. -*/ -mmu_notifier_range_init_owner (&range,MMU_NOTIFY_MIGRATE ,0 , - migrate->vma->vm_mm, migrate->start, migrate->end, - migrate->pgmap_owner); -mmu_notifier_invalidate_range_start (&range); - -walk_page_range (migrate->vma->vm_mm, migrate->start, migrate->end, - &migrate_vma_walk_ops, migrate); - -mmu_notifier_invalidate_range_end (&range); - migrate->end = migrate->start + (migrate->npages <<PAGE_SHIFT ); -} -/* * migrate_vma_check_page() - check if page is pinned or not * @page: struct page to check
Signature · 1 line
2.50.0