drm/gpusvm, drm/xe: Fix userptr to not allow device private pages
Subsystems (4)
Thomas Hellström
maintainerPATCH 1/1 drm/gpusvm, drm/xe: Fix userptr to not allow device private pages
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.
--- drivers/gpu/drm/drm_gpusvm.c | 24 +++++++++++++----------- drivers/gpu/drm/xe/xe_svm.c | 11 +++-------- drivers/gpu/drm/xe/xe_svm.h | 6 ++++++ drivers/gpu/drm/xe/xe_userptr.c | 1 + drivers/gpu/drm/xe/xe_vm.c | 1 + include/drm/drm_gpusvm.h | 7 ++++--- 6 files changed, 28 insertions(+), 22 deletions(-)
drivers/gpu/drm/drm_gpusvm.c +13 -11
@@ -361,7 +361,6 @@ static const struct mmu_interval_notifier_ops drm_gpusvm_notifier_ops = {* @name: Name of the GPU SVM. * @drm: Pointer to the DRM device structure. * @mm: Pointer to the mm_struct for the address space. -* @device_private_page_owner: Device private pages owner. * @mm_start: Start address of GPU SVM. * @mm_range: Range of the GPU SVM. * @notifier_size: Size of individual notifiers.
@@ -383,7 +382,7 @@ static const struct mmu_interval_notifier_ops drm_gpusvm_notifier_ops = {*/ int drm_gpusvm_init(struct drm_gpusvm *gpusvm, const char *name, struct drm_device *drm, - struct mm_struct *mm, void *device_private_page_owner, + struct mm_struct *mm, unsigned long mm_start, unsigned long mm_range, unsigned long notifier_size, const struct drm_gpusvm_ops *ops,
@@ -395,15 +394,13 @@ int drm_gpusvm_init(struct drm_gpusvm *gpusvm,mmgrab (mm); }else {/* No full SVM mode, only core drm_gpusvm_pages API. */ -if (ops || num_chunks || mm_range || notifier_size || - device_private_page_owner) +if (ops || num_chunks || mm_range || notifier_size)return -EINVAL ; } gpusvm->name = name; gpusvm->drm = drm; gpusvm->mm = mm; - gpusvm->device_private_page_owner = device_private_page_owner; gpusvm->mm_start = mm_start; gpusvm->mm_range = mm_range; gpusvm->notifier_size = notifier_size;
@@ -684,6 +681,7 @@ static unsigned int drm_gpusvm_hmm_pfn_to_order(unsigned long hmm_pfn,* @notifier: Pointer to the GPU SVM notifier structure * @start: Start address * @end: End address +* @dev_private_owner: The device private page owner * * Check if pages between start and end have been faulted in on the CPU. Use to * prevent migration of pages without CPU backing store.
@@ -692,14 +690,15 @@ static unsigned int drm_gpusvm_hmm_pfn_to_order(unsigned long hmm_pfn,*/ static bool drm_gpusvm_check_pages (struct drm_gpusvm *gpusvm,struct drm_gpusvm_notifier *notifier, -unsigned long start,unsigned long end) +unsigned long start,unsigned long end, +void *dev_private_owner) {struct hmm_range hmm_range = { .default_flags =0 , .notifier = ¬ifier->notifier, .start = start, .end = end, - .dev_private_owner = gpusvm->device_private_page_owner, + .dev_private_owner = dev_private_owner, };unsigned long timeout = jiffies +msecs_to_jiffies (HMM_RANGE_DEFAULT_TIMEOUT );
@@ -753,6 +752,7 @@ static bool drm_gpusvm_check_pages(struct drm_gpusvm *gpusvm,* @gpuva_start: Start address of GPUVA which mirrors CPU * @gpuva_end: End address of GPUVA which mirrors CPU * @check_pages_threshold: Check CPU pages for present threshold +* @dev_private_owner: The device private page owner * * This function determines the chunk size for the GPU SVM range based on the * fault address, GPU SVM chunk sizes, existing GPU SVM ranges, and the virtual
@@ -767,7 +767,8 @@ drm_gpusvm_range_chunk_size(struct drm_gpusvm *gpusvm,unsigned long fault_addr, unsigned long gpuva_start, unsigned long gpuva_end, - unsigned long check_pages_threshold) + unsigned long check_pages_threshold, + void *dev_private_owner) { unsigned long start, end;int i =0 ;
@@ -814,7 +815,7 @@ drm_gpusvm_range_chunk_size(struct drm_gpusvm *gpusvm,* process-many-malloc' mallocs at least 64k at a time. */ if (end - start <= check_pages_threshold && - !drm_gpusvm_check_pages (gpusvm, notifier, start, end)) { + !drm_gpusvm_check_pages (gpusvm, notifier, start, end, dev_private_owner)) { ++i; goto retry; }
@@ -957,7 +958,8 @@ drm_gpusvm_range_find_or_insert(struct drm_gpusvm *gpusvm, chunk_size =drm_gpusvm_range_chunk_size (gpusvm, notifier, vas, fault_addr, gpuva_start, gpuva_end, - ctx->check_pages_threshold); + ctx->check_pages_threshold, + ctx->device_private_page_owner);if (chunk_size ==LONG_MAX ) { err = -EINVAL ; goto err_notifier_remove;
@@ -1268,7 +1270,7 @@ int drm_gpusvm_get_pages(struct drm_gpusvm *gpusvm, .notifier = notifier, .start = pages_start, .end = pages_end, - .dev_private_owner = gpusvm->device_private_page_owner, + .dev_private_owner = ctx->device_private_page_owner, };void *zdd; unsigned long timeout =
drivers/gpu/drm/xe/xe_svm.c +3 -8
@@ -67,11 +67,6 @@ void xe_svm_range_debug(struct xe_svm_range *range, const char *operation)range_debug (range, operation); } -static void *xe_svm_devm_owner (struct xe_device *xe) -{ -return xe; -} -static struct drm_gpusvm_range *xe_svm_range_alloc (struct drm_gpusvm *gpusvm) {
@@ -744,15 +739,14 @@ int xe_svm_init(struct xe_vm *vm) xe_svm_garbage_collector_work_func); err =drm_gpusvm_init (&vm->svm.gpusvm,"Xe SVM" , &vm->xe->drm, - current->mm,xe_svm_devm_owner (vm->xe),0 , - vm->size, + current->mm,0 , vm->size, xe_modparam.svm_notifier_size *SZ_1M , &gpusvm_ops, fault_chunk_sizes,ARRAY_SIZE (fault_chunk_sizes));drm_gpusvm_driver_set_lock (&vm->svm.gpusvm, &vm->lock); }else { err =drm_gpusvm_init (&vm->svm.gpusvm,"Xe SVM (simple)" , - &vm->xe->drm,NULL ,NULL ,0 ,0 ,0 ,NULL , + &vm->xe->drm,NULL ,0 ,0 ,0 ,NULL ,NULL ,0 ); }
@@ -1017,6 +1011,7 @@ static int __xe_svm_handle_pagefault(struct xe_vm *vm, struct xe_vma *vma, .devmem_only = need_vram && devmem_possible, .timeslice_ms = need_vram && devmem_possible ? vm->xe->atomic_svm_timeslice_ms : 0, + .device_private_page_owner = xe_svm_devm_owner(vm->xe), };struct xe_validation_ctx vctx;struct drm_exec exec;
drivers/gpu/drm/xe/xe_svm.h +6 -0
@@ -14,6 +14,7 @@#define XE_INTERCONNECT_VRAM DRM_INTERCONNECT_DRIVERstruct xe_bo ; +struct xe_device ;struct xe_gt ;struct xe_tile ;struct xe_vm ;
@@ -157,6 +158,11 @@ static inline unsigned long xe_svm_range_size(struct xe_svm_range *range)void xe_svm_flush (struct xe_vm *vm); +static inline void *xe_svm_devm_owner (struct xe_device *xe) +{ +return xe; +} +#else #include <linux/interval_tree.h> #include "xe_vm.h"
drivers/gpu/drm/xe/xe_userptr.c +1 -0
@@ -54,6 +54,7 @@ int xe_vma_userptr_pin_pages(struct xe_userptr_vma *uvma)struct xe_device *xe = vm->xe;struct drm_gpusvm_ctx ctx = { .read_only =xe_vma_read_only (vma), + .device_private_page_owner =NULL , };lockdep_assert_held (&vm->lock);
drivers/gpu/drm/xe/xe_vm.c +1 -0
@@ -2883,6 +2883,7 @@ static int prefetch_ranges(struct xe_vm *vm, struct xe_vma_op *op) ctx.read_only =xe_vma_read_only (vma); ctx.devmem_possible = devmem_possible; ctx.check_pages_threshold = devmem_possible ?SZ_64K :0 ; + ctx.device_private_page_owner =xe_svm_devm_owner (vm->xe);/* TODO: Threading the migration */ xa_for_each (&op->prefetch_range.range, i, svm_range) {
include/drm/drm_gpusvm.h +4 -3
@@ -179,7 +179,6 @@ struct drm_gpusvm_range {* @name: Name of the GPU SVM * @drm: Pointer to the DRM device structure * @mm: Pointer to the mm_struct for the address space -* @device_private_page_owner: Device private pages owner * @mm_start: Start address of GPU SVM * @mm_range: Range of the GPU SVM * @notifier_size: Size of individual notifiers
@@ -204,7 +203,6 @@ struct drm_gpusvm {const char *name;struct drm_device *drm;struct mm_struct *mm; -void *device_private_page_owner;unsigned long mm_start;unsigned long mm_range;unsigned long notifier_size;
@@ -226,6 +224,8 @@ struct drm_gpusvm {/** * struct drm_gpusvm_ctx - DRM GPU SVM context * +* @device_private_page_owner: The device-private page owner to use for +* this operation * @check_pages_threshold: Check CPU pages for present if chunk is less than or * equal to threshold. If not present, reduce chunk * size.
@@ -239,6 +239,7 @@ struct drm_gpusvm {* Context that is DRM GPUSVM is operating in (i.e. user arguments). */ struct drm_gpusvm_ctx { +void *device_private_page_owner;unsigned long check_pages_threshold;unsigned long timeslice_ms;unsigned int in_notifier :1 ;
@@ -249,7 +250,7 @@ struct drm_gpusvm_ctx { int drm_gpusvm_init(struct drm_gpusvm *gpusvm, const char *name, struct drm_device *drm, - struct mm_struct *mm, void *device_private_page_owner, + struct mm_struct *mm, unsigned long mm_start, unsigned long mm_range, unsigned long notifier_size, const struct drm_gpusvm_ops *ops,
Signature · 1 line
2.51.0
Patchwork
CI✗ CI.KUnit: failure for drm/gpusvm, drm/xe: Fix userptr to not allow device private pages
== Series Details ==
== Series Details ==
Series: drm/gpusvm, drm/xe: Fix userptr to not allow device private pages
URL : https://patchwork.freedesktop.org/series/155175/
State : failure
== Summary ==
+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig ERROR:root:../drivers/gpu/drm/xe/xe_vm.c: In function ‘prefetch_ranges’:../drivers/gpu/drm/xe/xe_vm.c:2886:41: error: implicit declaration of function ‘xe_svm_devm_owner’ [-Werror=implicit-function-declaration]
2886 | ctx.device_private_page_owner = xe_svm_devm_owner(vm->xe);
| ^~~~~~~~~~~~~~~~~../drivers/gpu/drm/xe/xe_vm.c:2886:39: warning: assignment to ‘void *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
2886 | ctx.device_private_page_owner = xe_svm_devm_owner(vm->xe);
| ^
cc1: some warnings being treated as errors
make[7]: *** [../scripts/Makefile.build:287: drivers/gpu/drm/xe/xe_vm.o] Error 1
make[6]: *** [../scripts/Makefile.build:556: drivers/gpu/drm/xe] Error 2
make[5]: *** [../scripts/Makefile.build:556: drivers/gpu/drm] Error 2
make[4]: *** [../scripts/Makefile.build:556: drivers/gpu] Error 2
make[3]: *** [../scripts/Makefile.build:556: drivers] Error 2
make[2]: *** [/kernel/Makefile:2011: .] Error 2
make[1]: *** [/kernel/Makefile:248: __sub-make] Error 2
make: *** [Makefile:248: __sub-make] Error 2
[15:37:49] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig [15:37:53] Building KUnit Kernel ... Populating config with: $ make ARCH=um O=.kunit olddefconfig Building with: $ make all compile_commands.json scripts_gdb ARCH=um O=.kunit --jobs=48 + cleanup ++ stat -c %u:%g /kernel + chown -R 1003:1003 /kernel