Commit e5244360 authored by Karol Wachowski's avatar Karol Wachowski Committed by Jacek Lawrynowicz
Browse files

accel/ivpu: Fix locking order in ivpu_cmdq_destroy_ioctl 



Fix deadlock caused by inversed locking order in ivpu_job_submit()
and ivpu_cmdq_destroy_ioctl(). Both functions operate locking
file_priv->lock and submitted_jobs_lock.

Unlock file_priv->lock in ivpu_cmdq_destroy_ioctl() before calling
ivpu_cmdq_abort_all_jobs() function which locks submitted_jobs_lock.
That way locking order is maintained:
 1) global submitted_jobs_lock first
 2) per context file_priv->lock second

Signed-off-by: default avatarKarol Wachowski <karol.wachowski@intel.com>
Signed-off-by: default avatarMaciej Falkowski <maciej.falkowski@linux.intel.com>
Reviewed-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Signed-off-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250107173238.381120-11-maciej.falkowski@linux.intel.com
parent ae06e0b3

drivers/accel/ivpu/ivpu_job.c

+6 −3
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ int ivpu_cmdq_destroy_ioctl(struct drm_device *dev, void *data, struct drm_file 
	struct drm_ivpu_cmdq_destroy *args = data;

	struct ivpu_cmdq *cmdq;

	u32 cmdq_id;

	int ret = 0;

	int ret;



	if (!ivpu_is_capable(vdev, DRM_IVPU_CAP_MANAGE_CMDQ))

		return -ENODEV;
@@ -893,13 +893,16 @@ int ivpu_cmdq_destroy_ioctl(struct drm_device *dev, void *data, struct drm_file 
	cmdq = xa_load(&file_priv->cmdq_xa, args->cmdq_id);

	if (!cmdq || cmdq->is_legacy) {

		ret = -ENOENT;

		goto unlock;

		goto err_unlock;

	}



	cmdq_id = cmdq->id;

	ivpu_cmdq_destroy(file_priv, cmdq);

	mutex_unlock(&file_priv->lock);

	ivpu_cmdq_abort_all_jobs(vdev, file_priv->ctx.id, cmdq_id);

unlock:

	return 0;



err_unlock:

	mutex_unlock(&file_priv->lock);

	return ret;

}