Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 26 Jan 2022 19:57:26 -0100
From:   Melissa Wen <mwen@igalia.com>
To:     Yongzhi Liu <lyz_cs@pku.edu.cn>
Cc:     emma@anholt.net, airlied@linux.ie, daniel@ffwll.ch,
        linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/v3d: Add missing unlock
Message-ID: <20220126205726.phfikh7kn3lks5ib@mail.igalia.com>
References: <1642868787-61384-1-git-send-email-lyz_cs@pku.edu.cn>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="qjusil2tsea5ma46"
Content-Disposition: inline
In-Reply-To: <1642868787-61384-1-git-send-email-lyz_cs@pku.edu.cn>
Precedence: bulk


--qjusil2tsea5ma46
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On 01/22, Yongzhi Liu wrote:
> [why]
> Unlock is needed on the error handling path to prevent dead lock.
>=20
> [how]
> Fix this by adding drm_gem_unlock_reservations on the error handling path.
>=20
> Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
> ---
>  drivers/gpu/drm/v3d/v3d_gem.c | 4 ++++
>  1 file changed, 4 insertions(+)
>=20
> diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
> index c7ed2e1..0c989dc 100644
> --- a/drivers/gpu/drm/v3d/v3d_gem.c
> +++ b/drivers/gpu/drm/v3d/v3d_gem.c
> @@ -798,6 +798,8 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *dat=
a,
> =20
>  		if (!render->base.perfmon) {
>  			ret =3D -ENOENT;
> +			drm_gem_unlock_reservations(last_job->bo,
> +				    last_job->bo_count, &acquire_ctx);
>  			goto fail;
Hi,

Nice catch!

As unlock is handle in fail_unreserve, I would suggest you to keep the
failures handling around there. In that case, the goto will target a
place between `fail_unreserve:` and `fail:`, i.e. calls
drm_gem_unlock_reservations (and the following cleanings) but don't call
mutex_unlock.

Thanks,

Melissa

>  		}
>  	}
> @@ -1027,6 +1029,8 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *=
data,
>  						     args->perfmon_id);
>  		if (!job->base.perfmon) {
>  			ret =3D -ENOENT;
> +			drm_gem_unlock_reservations(clean_job->bo, clean_job->bo_count,
> +						    &acquire_ctx);
>  			goto fail;
>  		}
>  	}
> --=20
> 2.7.4
>=20

--qjusil2tsea5ma46
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEd8WOo/JViG+Tu+XIwqF3j0dLehwFAmHxtbIACgkQwqF3j0dL
ehxmmhAAls6eo7gT76XvCoDqs3iMlPsv655BIOg65UFxTFirde5AiItWnvNwT3e5
Iyf3a1LnRPjvCB+YM793XU14YbVxgGgwQcRjlo00j93bBPAtTGK9ko+nyZnNn4ns
OMr+GZpXL9DNFaY9evlgKXlplbOotkDlQbf0TwHjuxyfuyKdLxtwaSs3/EXGsgjP
WKAtOBoP5Cdk112rvQg3u4IunKETNcm7a9tzbJU5u7SnwGKBsqPBqB0P+jtkD5ww
MZDtxCpoGJAHG8w9sgWainPn7qDtLpPnNUbQVhYtnTeJpyGrCzj/V+mt9lj5WCt+
+f4JkdUhDZrxmTwbwDifM3boUN4tHE89ab5QiQ8xzB+kG1Ui64RvokZT2S6Xk+Yw
J+hrYTsd9Ta+kieSVVKuka65qGxsuPcZ2hWFA8sEb4WbCjn6yuke5MVhsouH0SlF
+9LjIHLSuAvY5Z/mGY9WnMCYJn71hQoSyKJS8aAkyeE2uGi/hTYyyTMdtUtBSnuQ
lWKP8r/TuJFoUudVpzEVJZfStg4vDOO5M1lFnXqvaOUKzqTESfIWhbm2urHqwZnI
rPS+Fq8d1w7gcDI28l1EA5cR+P7bf7A536bXb4aP10JL8ZLWEW87hyYAUA/hbcI4
5DPNmTwDzGLhV2gnxGoUI8tMPCLwCcVsPl7nULC5IVY0D3/f7Zc=
=1pGY
-----END PGP SIGNATURE-----

--qjusil2tsea5ma46--