mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-11 12:44:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/xe: Untangle vm_bind_ioctl cleanup order

Browse Source 
Change the resource cleanup order to align with reverse allocation order.

Cc: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Christoph Manszewski <christoph.manszewski@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20250813101231.196632-3-christoph.manszewski@intel.com
This commit is contained in:
Christoph Manszewski
2025-08-13 12:12:31 +02:00
committed by Matthew Brost
parent a01b704527
commit aa81d55a59
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/xe/xe_vm.c
View File

@@ -3567,7 +3567,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
q = xe_exec_queue_lookup(xef, args->exec_queue_id);
if (XE_IOCTL_DBG(xe, !q)) {
err = -ENOENT;
goto put_vm;
goto free_bind_ops;
}
if (XE_IOCTL_DBG(xe, !(q->flags & EXEC_QUEUE_FLAG_VM))) {
@@ -3613,7 +3613,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
__GFP_RETRY_MAYFAIL | __GFP_NOWARN);
if (!ops) {
err = -ENOMEM;
goto release_vm_lock;
goto free_bos;
}
}
@@ -3747,17 +3747,20 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
put_obj:
for (i = 0; i < args->num_binds; ++i)
xe_bo_put(bos[i]);
kvfree(ops);
free_bos:
kvfree(bos);
release_vm_lock:
up_write(&vm->lock);
put_exec_queue:
if (q)
xe_exec_queue_put(q);
put_vm:
xe_vm_put(vm);
kvfree(bos);
kvfree(ops);
free_bind_ops:
if (args->num_binds > 1)
kvfree(bind_ops);
put_vm:
xe_vm_put(vm);
return err;
}