[PATCH] accel/ivpu: Correct mutex unlock order in job submission
Jeff Hugo
jeff.hugo at oss.qualcomm.com
Mon Apr 28 14:21:01 UTC 2025
On 4/28/2025 12:47 AM, Jacek Lawrynowicz wrote:
> Hi,
>
> On 4/25/2025 7:22 PM, Jeff Hugo wrote:
>> On 4/25/2025 3:36 AM, Jacek Lawrynowicz wrote:
>>> From: Karol Wachowski <karol.wachowski at intel.com>
>>>
>>> The mutex unlock for vdev->submitted_jobs_lock was incorrectly placed
>>> after unlocking file_priv->lock. Change order of unlocks to avoid potential
>>
>> This should read "before unlocking", right?
>
> Yes, I will correct the commit message after submitting this patch :)
It does not look like this would apply to -next. Does it depend on
something else? The locking order in -next appears correct.
>
>>> race conditions.
>>>
>>> Fixes: 5bbccadaf33e ("accel/ivpu: Abort all jobs after command queue unregister")
>>> Signed-off-by: Karol Wachowski <karol.wachowski at intel.com>
>>> Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz at linux.intel.com>
>>> ---
>>> drivers/accel/ivpu/ivpu_job.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/accel/ivpu/ivpu_job.c b/drivers/accel/ivpu/ivpu_job.c
>>> index 863e3cd6ace51..540923ffcbf8d 100644
>>> --- a/drivers/accel/ivpu/ivpu_job.c
>>> +++ b/drivers/accel/ivpu/ivpu_job.c
>>> @@ -681,8 +681,8 @@ static int ivpu_job_submit(struct ivpu_job *job, u8 priority, u32 cmdq_id)
>>> err_erase_xa:
>>> xa_erase(&vdev->submitted_jobs_xa, job->job_id);
>>> err_unlock:
>>> - mutex_unlock(&vdev->submitted_jobs_lock);
>>> mutex_unlock(&file_priv->lock);
>>> + mutex_unlock(&vdev->submitted_jobs_lock);
>>> ivpu_rpm_put(vdev);
>>> return ret;
>>> }
>>
>
More information about the dri-devel
mailing list