Skip to content

Commit a99d34e

Browse files
Thomas Hellströmrodrigovivi
authored andcommitted
Revert "drm/pagemap: Disable device-to-device migration"
With commit a69d1ab ("mm: Fix a hmm_range_fault() livelock / starvation problem") device-to-device migration is not functional again and the disabling can be reverted. Add the above commit as a Fixes: tag in order for the revert to not take place unless that commit is present. This reverts commit 10dd1ea. Cc: Matthew Brost <matthew.brost@intel.com> Fixes: b570f37 ("mm: Fix a hmm_range_fault() livelock / starvation problem") Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Reviewed-by: Matthew Brost <matthew.brost@intel.com> Link: https://patch.msgid.link/20260211104159.114947-1-thomas.hellstrom@linux.intel.com (cherry picked from commit 1a3c004) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> [Rodrigo updated Fixes tag]
1 parent b570f37 commit a99d34e

1 file changed

Lines changed: 2 additions & 12 deletions

File tree

drivers/gpu/drm/drm_pagemap.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -480,18 +480,8 @@ int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation,
480480
.start = start,
481481
.end = end,
482482
.pgmap_owner = pagemap->owner,
483-
/*
484-
* FIXME: MIGRATE_VMA_SELECT_DEVICE_PRIVATE intermittently
485-
* causes 'xe_exec_system_allocator --r *race*no*' to trigger aa
486-
* engine reset and a hard hang due to getting stuck on a folio
487-
* lock. This should work and needs to be root-caused. The only
488-
* downside of not selecting MIGRATE_VMA_SELECT_DEVICE_PRIVATE
489-
* is that device-to-device migrations won’t work; instead,
490-
* memory will bounce through system memory. This path should be
491-
* rare and only occur when the madvise attributes of memory are
492-
* changed or atomics are being used.
493-
*/
494-
.flags = MIGRATE_VMA_SELECT_SYSTEM | MIGRATE_VMA_SELECT_DEVICE_COHERENT,
483+
.flags = MIGRATE_VMA_SELECT_SYSTEM | MIGRATE_VMA_SELECT_DEVICE_COHERENT |
484+
MIGRATE_VMA_SELECT_DEVICE_PRIVATE,
495485
};
496486
unsigned long i, npages = npages_in_range(start, end);
497487
unsigned long own_pages = 0, migrated_pages = 0;

0 commit comments

Comments
 (0)