linux-stable.git/drivers/gpu/drm/drm_gpusvm.c, branch linux-rolling-lts

drm/gpusvm: Force unmapping on error in drm_gpusvm_get_pages

2026-05-17T15:15:27+00:00

commit 556dba95473900073a6c03121361c11f646dc551 upstream.

drm_gpusvm_get_pages() only sets the local flags prior to committing the
pages. If an error occurs mid-mapping, has_dma_mapping will be clear,
causing the unmap function to skip unmapping pages that were
successfully mapped before the error. Fix this by forcibly setting
has_dma_mapping in the error path to ensure all previously mapped pages
are properly unmapped.

Fixes: 99624bdff867 ("drm/gpusvm: Add support for GPU Shared Virtual Memory")
Cc: stable@vger.kernel.org
Signed-off-by: Matthew Brost 
Reviewed-by: Francois Dugast 
Link: https://patch.msgid.link/20260130194928.3255613-2-matthew.brost@intel.com
Signed-off-by: Greg Kroah-Hartman

drm/gpusvm, drm/xe: Fix userptr to not allow device private pages

2025-10-03T04:57:52+00:00

When userptr is used on SVM-enabled VMs, a non-NULL
hmm_range::dev_private_owner value might mean that
hmm_range_fault() attempts to return device private pages.
Either that will fail, or the userptr code will not know
how to handle those.

Use NULL for hmm_range::dev_private_owner to migrate
such pages to system. In order to do that, move the
struct drm_gpusvm::device_private_page_owner field to
struct drm_gpusvm_ctx::device_private_page_owner so that
it doesn't remain immutable over the drm_gpusvm lifetime.

v2:
- Don't conditionally compile xe_svm_devm_owner().
- Kerneldoc xe_svm_devm_owner().

Fixes: 9e9787414882 ("drm/xe/userptr: replace xe_hmm with gpusvm")
Cc: Matthew Auld 
Cc: Himal Prasad Ghimiray 
Cc: Matthew Brost 
Signed-off-by: Thomas Hellström 
Reviewed-by: Matthew Auld 
Reviewed-by: Matthew Brost 
Acked-by: Maarten Lankhorst 
Link: https://lore.kernel.org/r/20250930122752.96034-1-thomas.hellstrom@linux.intel.com
(cherry picked from commit ad298d9ec957414dbf3d51f3c8bca4b6d2416c0c)
Signed-off-by: Lucas De Marchi

drm/gpusvm: export drm_gpusvm_pages API

2025-09-05T10:45:47+00:00

Export get/unmap/free pages API. We also need to tweak the SVM init to
allow skipping much of the unneeded parts.

Signed-off-by: Matthew Auld 
Cc: Thomas Hellström 
Cc: Matthew Brost 
Reviewed-by: Matthew Brost 
Link: https://lore.kernel.org/r/20250828142430.615826-15-matthew.auld@intel.com

drm/gpusvm: refactor core API to use pages struct

2025-09-05T10:45:46+00:00

Refactor the core API of get/unmap/free pages to all operate on
drm_gpusvm_pages. In the next patch we want to export a simplified core
API without needing fully blown svm range etc.

Suggested-by: Matthew Brost 
Signed-off-by: Matthew Auld 
Cc: Thomas Hellström 
Reviewed-by: Matthew Brost 
Link: https://lore.kernel.org/r/20250828142430.615826-14-matthew.auld@intel.com

drm/gpusvm: pull out drm_gpusvm_pages substructure

2025-09-05T10:45:46+00:00

Pull the pages stuff from the svm range into its own substructure, with
the idea of having the main pages related routines, like get_pages(),
unmap_pages() and free_pages() all operating on some lower level
structures, which can then be re-used for stuff like userptr.

v2:
  - Move seq into pages struct (Matt B)
v3:
  - Small kernel-doc fixes

Suggested-by: Matthew Brost 
Signed-off-by: Matthew Auld 
Cc: Thomas Hellström 
Reviewed-by: Matthew Brost 
Link: https://lore.kernel.org/r/20250828142430.615826-13-matthew.auld@intel.com

drm/gpusvm: use more selective dma dir in get_pages()

2025-09-05T10:45:46+00:00

If we are only reading the memory then from the device pov the direction
can be DMA_TO_DEVICE. This aligns with the xe-userptr code. Using the
most restrictive data direction to represent the access is normally a
good idea.

Signed-off-by: Matthew Auld 
Cc: Thomas Hellström 
Cc: Matthew Brost 
Reviewed-by: Thomas Hellström 
Reviewed-by: Matthew Brost 
Link: https://lore.kernel.org/r/20250828142430.615826-12-matthew.auld@intel.com

drm/gpusvm: fix hmm_pfn_to_map_order() usage

2025-09-05T10:45:46+00:00

Handle the case where the hmm range partially covers a huge page (like
2M), otherwise we can potentially end up doing something nasty like
mapping memory which is outside the range, and maybe not even mapped by
the mm. Fix is based on the xe userptr code, which in a future patch
will directly use gpusvm, so needs alignment here.

v2:
  - Add kernel-doc (Matt B)
  - s/fls/ilog2/ (Thomas)

Reported-by: Thomas Hellström 
Signed-off-by: Matthew Auld 
Cc: Matthew Brost 
Reviewed-by: Thomas Hellström 
Link: https://lore.kernel.org/r/20250828142430.615826-11-matthew.auld@intel.com

Merge drm/drm-next into drm-xe-next

2025-08-26T05:08:34+00:00

Sync with drm-misc-next which is necessary for changes in gpuvm
and gpusvm that will be used in xe.

Signed-off-by: Lucas De Marchi

drm/gpusvm: Make drm_gpusvm_for_each_* macros public

2025-08-20T04:19:36+00:00

The drm_gpusvm_for_each_notifier, drm_gpusvm_for_each_notifier_safe and
drm_gpusvm_for_each_range_safe macros are useful for locating notifiers
and ranges within a user-specified range. By making these macros public,
we enable broader access and utility for developers who need to leverage
them in their implementations.

v2 (Matthew Brost)
- drop inline __drm_gpusvm_range_find
- /s/notifier_iter_first/drm_gpusvm_notifier_find

Signed-off-by: Himal Prasad Ghimiray 
Reviewed-by: Matthew Brost 
Signed-off-by: Matthew Brost 
Link: https://lore.kernel.org/r/20250819162058.2777306-5-himal.prasad.ghimiray@intel.com

drm/pagemap: Rename drm_pagemap_device_addr to drm_pagemap_addr

2025-08-06T11:34:32+00:00

Rename this struct to the more generic name drm_pagemap_addr so it can be
used in a broader context, such as DMA mappings of CPU memory.

Reviewed-by: Matthew Brost 
Acked-by: Maarten Lankhorst 
Link: https://lore.kernel.org/r/20250805140028.599361-2-francois.dugast@intel.com
Signed-off-by: Francois Dugast