From: Jonathan Cavitt <jonathan.cavitt@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: saurabhg.gupta@intel.com, alex.zuo@intel.com,
jonathan.cavitt@intel.com, joonas.lahtinen@linux.intel.com,
matthew.brost@intel.com, jianxun.zhang@intel.com,
shuicheng.lin@intel.com, dri-devel@lists.freedesktop.org
Subject: [PATCH v7 6/6] drm/xe/xe_vm: Implement xe_vm_get_faults_ioctl
Date: Mon, 10 Mar 2025 17:18:34 +0000 [thread overview]
Message-ID: <20250310171834.78299-7-jonathan.cavitt@intel.com> (raw)
In-Reply-To: <20250310171834.78299-1-jonathan.cavitt@intel.com>
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)
- Update fill_property_pfs to eliminate need for kzalloc (Jianxun)
v6:
- Repair and move fill_faults break condition (Dan Carpenter)
- Free vm after use (jcavitt)
- Combine assertions (jcavitt)
- Expand size check in xe_vm_get_faults_ioctl (jcavitt)
- Remove return mask from fill_faults, as return is already -EFAULT or 0
(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 | 87 ++++++++++++++++++++++++++++++++++
drivers/gpu/drm/xe/xe_vm.h | 2 +
3 files changed, 92 insertions(+)
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 ff79ba8d3794..cb86be26bce2 100644
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -3528,6 +3528,93 @@ 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;
+
+ if (i++ == args->fault_count)
+ break;
+
+ 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++;
+ }
+ spin_unlock(&vm->pfs.lock);
+
+ return ret;
+}
+
+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, ret = 0;
+
+ 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) {
+ ret = size;
+ goto put_vm;
+ } else if (!args->size && !args->fault_count) {
+ args->size = size;
+ args->fault_count = fault_count;
+ goto put_vm;
+ }
+
+ if (XE_IOCTL_DBG(xe, args->size > size) ||
+ XE_IOCTL_DBG(xe, args->fault_count > fault_count) ||
+ XE_IOCTL_DBG(xe, args->size % sizeof(struct xe_vm_fault)) ||
+ XE_IOCTL_DBG(xe, args->size / sizeof(struct xe_vm_fault) != args->fault_count)) {
+ ret = -EINVAL;
+ goto put_vm;
+ }
+
+ ret = fill_faults(vm, args);
+
+put_vm:
+ xe_vm_put(vm);
+ return ret;
+}
+
/**
* 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);
--
2.43.0
next prev parent reply other threads:[~2025-03-10 17:18 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-10 17:18 [PATCH v7 0/6] drm/xe/xe_vm: Implement xe_vm_get_faults_ioctl Jonathan Cavitt
2025-03-10 17:18 ` [PATCH v7 1/6] drm/xe/xe_gt_pagefault: Disallow writes to read-only VMAs Jonathan Cavitt
2025-03-10 17:18 ` [PATCH v7 2/6] drm/xe/xe_gt_pagefault: Migrate pagefault struct to header Jonathan Cavitt
2025-03-10 18:20 ` Michal Wajdeczko
2025-03-10 21:30 ` Cavitt, Jonathan
2025-03-11 8:26 ` Michal Wajdeczko
2025-03-10 17:18 ` [PATCH v7 3/6] drm/xe/xe_vm: Add per VM pagefault info Jonathan Cavitt
2025-03-10 18:36 ` Michal Wajdeczko
2025-03-10 17:18 ` [PATCH v7 4/6] drm/xe/uapi: Define drm_xe_vm_get_faults Jonathan Cavitt
2025-03-11 3:17 ` Zhang, Jianxun
2025-03-11 4:50 ` Matthew Brost
2025-03-11 14:11 ` Cavitt, Jonathan
2025-03-12 16:28 ` Zhang, Jianxun
2025-03-12 16:46 ` Cavitt, Jonathan
2025-03-12 4:18 ` Zhang, Jianxun
2025-03-10 17:18 ` [PATCH v7 5/6] drm/xe/xe_gt_pagefault: Add address_type field to pagefaults Jonathan Cavitt
2025-03-10 17:18 ` Jonathan Cavitt [this message]
2025-03-10 17:45 ` ✓ CI.Patch_applied: success for drm/xe/xe_vm: Implement xe_vm_get_faults_ioctl (rev2) Patchwork
2025-03-10 17:45 ` ✗ CI.checkpatch: warning " Patchwork
2025-03-10 17:46 ` ✓ CI.KUnit: success " Patchwork
2025-03-10 18:03 ` ✓ CI.Build: " Patchwork
2025-03-10 18:05 ` ✓ CI.Hooks: " Patchwork
2025-03-10 18:06 ` ✓ CI.checksparse: " Patchwork
2025-03-10 18:28 ` ✓ Xe.CI.BAT: " Patchwork
2025-03-11 12:39 ` ✗ Xe.CI.Full: failure " Patchwork
2025-03-11 13:57 ` Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250310171834.78299-7-jonathan.cavitt@intel.com \
--to=jonathan.cavitt@intel.com \
--cc=alex.zuo@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jianxun.zhang@intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=matthew.brost@intel.com \
--cc=saurabhg.gupta@intel.com \
--cc=shuicheng.lin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.