Skip to content

Commit e90b83f

Browse files
Jonathan-Cavittintel-lab-lkp
authored andcommitted
drm/xe/xe_vm: Implement xe_vm_get_property_ioctl
Add support for userspace to request a list of observed faults 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) v7: - Revert back to using xe_vm_get_property_ioctl - Apply better copy_to_user logic (jcavitt) v8: - Fix and clean up error value handling in ioctl (jcavitt) - Reapply return mask for fill_faults (jcavitt) v9: - Future-proof size logic for zero-size properties (jcavitt) - Add access and fault types (Jianxun) - Remove address type (Jianxun) v10: - Remove unnecessary switch case logic (Raag) - Compress size get, size validation, and property fill functions into a single helper function (jcavitt) - Assert valid size (jcavitt) v11: - Remove unnecessary else condition - Correct backwards helper function size logic (jcavitt) v12: - Use size_t instead of int (Raag) v13: - Remove engine class and instance (Ivan) v14: - Map access type, fault type, and fault level to user macros (Matt Brost, Ivan) v15: - Remove unnecessary size assertion (jcavitt) v16: - Nit fixes (Matt Brost) v17: - Rebase and refactor (jcavitt) v18: - Do not copy_to_user in critical section (Matt Brost) - Assert args->size is multiple of sizeof(struct xe_vm_fault) (Matt Brost) v19: - Remove unnecessary memset (Matt Brost) v20: - Report canonicalized address (Jose) - Mask out prefetch data from access type (Jose, jcavitt) uAPI: intel/compute-runtime#878 Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com> Suggested-by: Matthew Brost <matthew.brost@intel.com> Reviewed-by: Matthew Brost <matthew.brost@intel.com> Acked-by: Michal Mrozek <michal.mrozek@intel.com> Cc: Jainxun Zhang <jianxun.zhang@intel.com> Cc: Shuicheng Lin <shuicheng.lin@intel.com> Cc: Raag Jadav <raag.jadav@intel.com> Cc: Ivan Briano <ivan.briano@intel.com> Cc: Jose Souza <jose.souza@intel.com>
1 parent eb389f6 commit e90b83f

3 files changed

Lines changed: 122 additions & 0 deletions

File tree

drivers/gpu/drm/xe/xe_device.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,8 @@ static const struct drm_ioctl_desc xe_ioctls[] = {
211211
DRM_RENDER_ALLOW),
212212
DRM_IOCTL_DEF_DRV(XE_EXEC_QUEUE_SET_PROPERTY, xe_exec_queue_set_property_ioctl,
213213
DRM_RENDER_ALLOW),
214+
DRM_IOCTL_DEF_DRV(XE_VM_GET_PROPERTY, xe_vm_get_property_ioctl,
215+
DRM_RENDER_ALLOW),
214216
};
215217

216218
static long xe_drm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

drivers/gpu/drm/xe/xe_vm.c

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3936,6 +3936,123 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
39363936
return err;
39373937
}
39383938

3939+
/*
3940+
* Map access type, fault type, and fault level from current bspec
3941+
* specification to user spec abstraction. The current mapping is
3942+
* approximately 1-to-1, with access type being the only notable
3943+
* exception as it carries additional data with respect to prefetch
3944+
* status that needs to be masked out.
3945+
*/
3946+
static u8 xe_to_user_access_type(u8 access_type)
3947+
{
3948+
return access_type & XE_PAGEFAULT_ACCESS_TYPE_MASK;
3949+
}
3950+
3951+
static u8 xe_to_user_fault_type(u8 fault_type)
3952+
{
3953+
return fault_type;
3954+
}
3955+
3956+
static u8 xe_to_user_fault_level(u8 fault_level)
3957+
{
3958+
return fault_level;
3959+
}
3960+
3961+
static int fill_faults(struct xe_vm *vm,
3962+
struct drm_xe_vm_get_property *args)
3963+
{
3964+
struct xe_vm_fault __user *usr_ptr = u64_to_user_ptr(args->data);
3965+
struct xe_vm_fault *fault_list, fault_entry = { 0 };
3966+
struct xe_vm_fault_entry *entry;
3967+
int ret = 0, i = 0, count, entry_size;
3968+
3969+
entry_size = sizeof(struct xe_vm_fault);
3970+
count = args->size / entry_size;
3971+
3972+
fault_list = kcalloc(count, sizeof(struct xe_vm_fault), GFP_KERNEL);
3973+
if (!fault_list)
3974+
return -ENOMEM;
3975+
3976+
spin_lock(&vm->faults.lock);
3977+
list_for_each_entry(entry, &vm->faults.list, list) {
3978+
if (i == count)
3979+
break;
3980+
3981+
fault_entry.address = xe_device_canonicalize_addr(vm->xe, entry->address);
3982+
fault_entry.address_precision = entry->address_precision;
3983+
3984+
fault_entry.access_type = xe_to_user_access_type(entry->access_type);
3985+
fault_entry.fault_type = xe_to_user_fault_type(entry->fault_type);
3986+
fault_entry.fault_level = xe_to_user_fault_level(entry->fault_level);
3987+
3988+
memcpy(&fault_list[i], &fault_entry, entry_size);
3989+
3990+
i++;
3991+
}
3992+
spin_unlock(&vm->faults.lock);
3993+
3994+
ret = copy_to_user(usr_ptr, fault_list, args->size);
3995+
3996+
kfree(fault_list);
3997+
return ret ? -EFAULT : 0;
3998+
}
3999+
4000+
static int xe_vm_get_property_helper(struct xe_vm *vm,
4001+
struct drm_xe_vm_get_property *args)
4002+
{
4003+
size_t size;
4004+
4005+
switch (args->property) {
4006+
case DRM_XE_VM_GET_PROPERTY_FAULTS:
4007+
spin_lock(&vm->faults.lock);
4008+
size = size_mul(sizeof(struct xe_vm_fault), vm->faults.len);
4009+
spin_unlock(&vm->faults.lock);
4010+
4011+
if (!args->size) {
4012+
args->size = size;
4013+
return 0;
4014+
}
4015+
4016+
/*
4017+
* Number of faults may increase between calls to
4018+
* xe_vm_get_property_ioctl, so just report the number of
4019+
* faults the user requests if it's less than or equal to
4020+
* the number of faults in the VM fault array.
4021+
*
4022+
* We should also at least assert that the args->size value
4023+
* is a multiple of the xe_vm_fault struct size.
4024+
*/
4025+
if (args->size > size || args->size % sizeof(struct xe_vm_fault))
4026+
return -EINVAL;
4027+
4028+
return fill_faults(vm, args);
4029+
}
4030+
return -EINVAL;
4031+
}
4032+
4033+
int xe_vm_get_property_ioctl(struct drm_device *drm, void *data,
4034+
struct drm_file *file)
4035+
{
4036+
struct xe_device *xe = to_xe_device(drm);
4037+
struct xe_file *xef = to_xe_file(file);
4038+
struct drm_xe_vm_get_property *args = data;
4039+
struct xe_vm *vm;
4040+
int ret = 0;
4041+
4042+
if (XE_IOCTL_DBG(xe, args->reserved[0] || args->reserved[1] ||
4043+
args->reserved[2]))
4044+
return -EINVAL;
4045+
4046+
vm = xe_vm_lookup(xef, args->vm_id);
4047+
if (XE_IOCTL_DBG(xe, !vm))
4048+
return -ENOENT;
4049+
4050+
ret = xe_vm_get_property_helper(vm, args);
4051+
4052+
xe_vm_put(vm);
4053+
return ret;
4054+
}
4055+
39394056
/**
39404057
* xe_vm_bind_kernel_bo - bind a kernel BO to a VM
39414058
* @vm: VM to bind the BO to

drivers/gpu/drm/xe/xe_vm.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@ int xe_vm_destroy_ioctl(struct drm_device *dev, void *data,
210210
int xe_vm_bind_ioctl(struct drm_device *dev, void *data,
211211
struct drm_file *file);
212212
int xe_vm_query_vmas_attrs_ioctl(struct drm_device *dev, void *data, struct drm_file *file);
213+
int xe_vm_get_property_ioctl(struct drm_device *dev, void *data,
214+
struct drm_file *file);
215+
213216
void xe_vm_close_and_put(struct xe_vm *vm);
214217

215218
static inline bool xe_vm_in_fault_mode(struct xe_vm *vm)

0 commit comments

Comments
 (0)