Skip to content

Commit 97e7d43

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) 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> 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>
1 parent 5a07666 commit 97e7d43

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
@@ -3929,6 +3929,123 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
39293929
return err;
39303930
}
39313931

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