Commit aa81d55a authored by Christoph Manszewski's avatar Christoph Manszewski Committed by Matthew Brost
Browse files

drm/xe: Untangle vm_bind_ioctl cleanup order 



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

Cc: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarChristoph Manszewski <christoph.manszewski@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20250813101231.196632-3-christoph.manszewski@intel.com
parent a01b7045

drivers/gpu/drm/xe/xe_vm.c

+9 −6
Original line number Diff line number Diff line
@@ -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;

}