Commit d186e51b authored by Moti Haimovski's avatar Moti Haimovski Committed by Thomas Hellström
Browse files

drm/xe/vm: bugfix in xe_vm_create_ioctl 



Fix xe_vm_create_ioctl routine not freeing the vm-id allocated to it
when the function fails.

Fixes: dd08ebf6 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Signed-off-by: default avatarMoti Haimovski <mhaimovski@habana.ai>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarTomer Tayar <ttayar@habana.ai>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240122102424.4008095-1-mhaimovski@habana.ai


(cherry picked from commit f6bf0424)
Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
parent c0e2508c

drivers/gpu/drm/xe/xe_vm.c

+14 −9
Original line number Diff line number Diff line
@@ -1855,10 +1855,8 @@ int xe_vm_create_ioctl(struct drm_device *dev, void *data, 
	mutex_lock(&xef->vm.lock);

	err = xa_alloc(&xef->vm.xa, &id, vm, xa_limit_32b, GFP_KERNEL);

	mutex_unlock(&xef->vm.lock);

	if (err) {

		xe_vm_close_and_put(vm);

		return err;

	}

	if (err)

		goto err_close_and_put;



	if (xe->info.has_asid) {

		mutex_lock(&xe->usm.lock);
@@ -1866,11 +1864,9 @@ int xe_vm_create_ioctl(struct drm_device *dev, void *data, 
				      XA_LIMIT(1, XE_MAX_ASID - 1),

				      &xe->usm.next_asid, GFP_KERNEL);

		mutex_unlock(&xe->usm.lock);

		if (err < 0) {

			xe_vm_close_and_put(vm);

			return err;

		}

		err = 0;

		if (err < 0)

			goto err_free_id;



		vm->usm.asid = asid;

	}
@@ -1888,6 +1884,15 @@ int xe_vm_create_ioctl(struct drm_device *dev, void *data, 
#endif



	return 0;



err_free_id:

	mutex_lock(&xef->vm.lock);

	xa_erase(&xef->vm.xa, id);

	mutex_unlock(&xef->vm.lock);

err_close_and_put:

	xe_vm_close_and_put(vm);



	return err;

}



int xe_vm_destroy_ioctl(struct drm_device *dev, void *data,