| Message ID | 20250307224125.111430-7-jonathan.cavitt@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/xe/xe_vm: Implement xe_vm_get_faults_ioctl | expand |
Hi Jonathan,
kernel test robot noticed the following build warnings:
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Jonathan-Cavitt/drm-xe-xe_gt_pagefault-Disallow-writes-to-read-only-VMAs/20250308-064247
base: https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe-next
patch link: https://lore.kernel.org/r/20250307224125.111430-7-jonathan.cavitt%40intel.com
patch subject: [PATCH v6 6/6] drm/xe/xe_vm: Implement xe_vm_get_faults_ioctl
config: i386-randconfig-141-20250309 (https://download.01.org/0day-ci/archive/20250309/202503091053.Hg9hUB8c-lkp@intel.com/config)
compiler: clang version 19.1.7 (https://github.com/llvm/llvm-project cd708029e0b2869e80abe31ddb175f7c35361f90)
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 <lkp@intel.com>
| Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
| Closes: https://lore.kernel.org/r/202503091053.Hg9hUB8c-lkp@intel.com/
New smatch warnings:
drivers/gpu/drm/xe/xe_vm.c:3557 fill_faults() warn: iterator 'i' not incremented
vim +/i +3557 drivers/gpu/drm/xe/xe_vm.c
24e54814071dd04 Jonathan Cavitt 2025-03-07 3552 static int fill_faults(struct xe_vm *vm,
24e54814071dd04 Jonathan Cavitt 2025-03-07 3553 struct drm_xe_vm_get_faults *args)
24e54814071dd04 Jonathan Cavitt 2025-03-07 3554 {
24e54814071dd04 Jonathan Cavitt 2025-03-07 3555 struct xe_vm_fault __user *usr_ptr = u64_to_user_ptr(args->faults);
24e54814071dd04 Jonathan Cavitt 2025-03-07 3556 struct xe_vm_pf_entry *entry;
24e54814071dd04 Jonathan Cavitt 2025-03-07 @3557 int ret = 0, i = 0;
24e54814071dd04 Jonathan Cavitt 2025-03-07 3558
24e54814071dd04 Jonathan Cavitt 2025-03-07 3559 spin_lock(&vm->pfs.lock);
24e54814071dd04 Jonathan Cavitt 2025-03-07 3560 list_for_each_entry(entry, &vm->pfs.list, list) {
24e54814071dd04 Jonathan Cavitt 2025-03-07 3561 struct xe_pagefault *pf = entry->pf;
24e54814071dd04 Jonathan Cavitt 2025-03-07 3562
24e54814071dd04 Jonathan Cavitt 2025-03-07 3563 ret = put_user(pf->page_addr, &usr_ptr->address);
24e54814071dd04 Jonathan Cavitt 2025-03-07 3564 if (ret)
24e54814071dd04 Jonathan Cavitt 2025-03-07 3565 break;
24e54814071dd04 Jonathan Cavitt 2025-03-07 3566
24e54814071dd04 Jonathan Cavitt 2025-03-07 3567 ret = put_user(pf->address_type, &usr_ptr->address_type);
24e54814071dd04 Jonathan Cavitt 2025-03-07 3568 if (ret)
24e54814071dd04 Jonathan Cavitt 2025-03-07 3569 break;
24e54814071dd04 Jonathan Cavitt 2025-03-07 3570
24e54814071dd04 Jonathan Cavitt 2025-03-07 3571 ret = put_user(1, &usr_ptr->address_precision);
24e54814071dd04 Jonathan Cavitt 2025-03-07 3572 if (ret)
24e54814071dd04 Jonathan Cavitt 2025-03-07 3573 break;
24e54814071dd04 Jonathan Cavitt 2025-03-07 3574
24e54814071dd04 Jonathan Cavitt 2025-03-07 3575 usr_ptr++;
24e54814071dd04 Jonathan Cavitt 2025-03-07 3576
24e54814071dd04 Jonathan Cavitt 2025-03-07 3577 if (i == args->fault_count)
if (++i >= args->fault_count) ?
24e54814071dd04 Jonathan Cavitt 2025-03-07 3578 break;
24e54814071dd04 Jonathan Cavitt 2025-03-07 3579 }
24e54814071dd04 Jonathan Cavitt 2025-03-07 3580 spin_unlock(&vm->pfs.lock);
24e54814071dd04 Jonathan Cavitt 2025-03-07 3581
24e54814071dd04 Jonathan Cavitt 2025-03-07 3582 return ret ? -EFAULT : 0;
24e54814071dd04 Jonathan Cavitt 2025-03-07 3583 }
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index 5d79b439dd62..2d22b3c2df09 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -194,6 +194,9 @@ static const struct drm_ioctl_desc xe_ioctls[] = { DRM_IOCTL_DEF_DRV(XE_WAIT_USER_FENCE, xe_wait_user_fence_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(XE_OBSERVATION, xe_observation_ioctl, DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(XE_VM_GET_FAULTS, xe_vm_get_faults_ioctl, + DRM_RENDER_ALLOW), + }; static long xe_drm_ioctl(struct file *file, unsigned int cmd, unsigned long arg) diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c index eada3ecc2364..e24601707f2a 100644 --- a/drivers/gpu/drm/xe/xe_vm.c +++ b/drivers/gpu/drm/xe/xe_vm.c @@ -3538,6 +3538,84 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) return err; } +static int xe_vm_get_faults_size(struct xe_vm *vm) +{ + int size; + + spin_lock(&vm->pfs.lock); + size = vm->pfs.len * sizeof(struct xe_vm_fault); + spin_unlock(&vm->pfs.lock); + + return size; +} + +static int fill_faults(struct xe_vm *vm, + struct drm_xe_vm_get_faults *args) +{ + struct xe_vm_fault __user *usr_ptr = u64_to_user_ptr(args->faults); + struct xe_vm_pf_entry *entry; + int ret = 0, i = 0; + + spin_lock(&vm->pfs.lock); + list_for_each_entry(entry, &vm->pfs.list, list) { + struct xe_pagefault *pf = entry->pf; + + ret = put_user(pf->page_addr, &usr_ptr->address); + if (ret) + break; + + ret = put_user(pf->address_type, &usr_ptr->address_type); + if (ret) + break; + + ret = put_user(1, &usr_ptr->address_precision); + if (ret) + break; + + usr_ptr++; + + if (i == args->fault_count) + break; + } + spin_unlock(&vm->pfs.lock); + + return ret ? -EFAULT : 0; +} + +int xe_vm_get_faults_ioctl(struct drm_device *drm, void *data, + struct drm_file *file) +{ + struct xe_device *xe = to_xe_device(drm); + struct xe_file *xef = to_xe_file(file); + struct drm_xe_vm_get_faults *args = data; + struct xe_vm *vm; + int size, fault_count; + + if (XE_IOCTL_DBG(xe, args->reserved[0] || args->reserved[1])) + return -EINVAL; + + vm = xe_vm_lookup(xef, args->vm_id); + if (XE_IOCTL_DBG(xe, !vm)) + return -ENOENT; + + size = xe_vm_get_faults_size(vm); + fault_count = size / sizeof(struct xe_vm_fault); + + if (size < 0) { + return size; + } else if (!args->size && !args->fault_count) { + args->size = size; + args->fault_count = fault_count; + return 0; + } else if (args->size > size || args->fault_count > fault_count) { + return -EINVAL; + } else if (args->size / sizeof(struct xe_vm_fault) != args->fault_count) { + return -EINVAL; + } + + return fill_faults(vm, args); +} + /** * xe_vm_bind_kernel_bo - bind a kernel BO to a VM * @vm: VM to bind the BO to diff --git a/drivers/gpu/drm/xe/xe_vm.h b/drivers/gpu/drm/xe/xe_vm.h index fe068e4448a6..c48bd6e6fe34 100644 --- a/drivers/gpu/drm/xe/xe_vm.h +++ b/drivers/gpu/drm/xe/xe_vm.h @@ -191,6 +191,8 @@ int xe_vm_destroy_ioctl(struct drm_device *dev, void *data, struct drm_file *file); int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file); +int xe_vm_get_faults_ioctl(struct drm_device *dev, void *data, + struct drm_file *file); void xe_vm_close_and_put(struct xe_vm *vm);
Add support for userspace to request a list of observed failed pagefaults from a specified VM. v2: - Only allow querying of failed pagefaults (Matt Brost) v3: - Remove unnecessary size parameter from helper function, as it is a property of the arguments. (jcavitt) - Remove unnecessary copy_from_user (Jainxun) - Set address_precision to 1 (Jainxun) - Report max size instead of dynamic size for memory allocation purposes. Total memory usage is reported separately. v4: - Return int from xe_vm_get_property_size (Shuicheng) - Fix memory leak (Shuicheng) - Remove unnecessary size variable (jcavitt) v5: - Rename ioctl to xe_vm_get_faults_ioctl (jcavitt) Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> Suggested-by: Matthew Brost <matthew.brost@intel.com> CC: Jainxun Zhang <jianxun.zhang@intel.com> CC: Shuicheng Lin <shuicheng.lin@intel.com> --- drivers/gpu/drm/xe/xe_device.c | 3 ++ drivers/gpu/drm/xe/xe_vm.c | 78 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/xe/xe_vm.h | 2 + 3 files changed, 83 insertions(+)