Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Sun, 3 Feb 2019 18:57:30 -0200
From:   Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
To:     Shayenne Moura <shayenneluzmoura@gmail.com>
Cc:     Haneen Mohammed <hamohammed.sa@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        David Airlie <airlied@linux.ie>,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] drm: vkms: Bugfix racing hrtimer vblank handle
Message-ID: <20190203205730.yvf6n2hz4bnar3nx@smtp.gmail.com>
References: <cover.1548856186.git.shayenneluzmoura@gmail.com>
 <e2e4b8f3a5cab7b2dba75bf1930f86b0a4ee08c9.1548856186.git.shayenneluzmoura@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="k6zlh2lzjh4gptp4"
Content-Disposition: inline
In-Reply-To: <e2e4b8f3a5cab7b2dba75bf1930f86b0a4ee08c9.1548856186.git.shayenneluzmoura@gmail.com>
User-Agent: NeoMutt/20180716
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--k6zlh2lzjh4gptp4
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On 01/30, Shayenne Moura wrote:
> When the vblank irq happens, kernel time subsystem executes
> `vkms_vblank_simulate`. In parallel or not, it prepares all stuff
> necessary to the next vblank with arm, and it must flush these
> stuff before the next vblank irq. However, vblank counter is ahead
> when arm is executed in parallel with handle vblank.
>=20
> CPU 0:					CPU 1:
>  |					 |
> atomic_commit_tail is ongoing		 |
>  |					 |
>  |					hrtimer: vkms_vblank_simulate()
>  |					 |
>  |					drm_crtc_handle_vblank()
>  |					 |
> drm_crtc_arm_vblank()			 |
>  |					 |
> ->get_vblank_timestamp()		 |
>  |					 |
>  |					hrtimer_forward_now()
>=20
> Then, we should guarantee that the vblank interval time is correct
> (not changed) before finish the vblank handle.
>=20
> Fix the bug including the call to `hrtimer_forward_now()` in the same
> lock of `drm_crtc_handle_vblank()` to ensure that the timestamp update
> is correct when finish the vblank handle.
>=20
> Signed-off-by: Shayenne Moura <shayenneluzmoura@gmail.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  drivers/gpu/drm/vkms/vkms_crtc.c | 18 ++++++------------
>  1 file changed, 6 insertions(+), 12 deletions(-)
>=20
> diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms=
_crtc.c
> index 23146ff2a25b..5a095610726b 100644
> --- a/drivers/gpu/drm/vkms/vkms_crtc.c
> +++ b/drivers/gpu/drm/vkms/vkms_crtc.c
> @@ -10,13 +10,17 @@
>  #include <drm/drm_atomic_helper.h>
>  #include <drm/drm_probe_helper.h>
> =20
> -static void _vblank_handle(struct vkms_output *output)
> +static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
>  {
> +	struct vkms_output *output =3D container_of(timer, struct vkms_output,
> +						  vblank_hrtimer);
>  	struct drm_crtc *crtc =3D &output->crtc;
>  	struct vkms_crtc_state *state =3D to_vkms_crtc_state(crtc->state);
> +	int ret_overrun;
>  	bool ret;
> =20
>  	spin_lock(&output->lock);
> +
>  	ret =3D drm_crtc_handle_vblank(crtc);
>  	if (!ret)
>  		DRM_ERROR("vkms failure on handling vblank");
> @@ -37,19 +41,9 @@ static void _vblank_handle(struct vkms_output *output)
>  			DRM_WARN("failed to queue vkms_crc_work_handle");
>  	}
> =20
> -	spin_unlock(&output->lock);
> -}
> -
> -static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
> -{
> -	struct vkms_output *output =3D container_of(timer, struct vkms_output,
> -						  vblank_hrtimer);
> -	int ret_overrun;
> -
> -	_vblank_handle(output);
> -
>  	ret_overrun =3D hrtimer_forward_now(&output->vblank_hrtimer,
>  					  output->period_ns);
> +	spin_unlock(&output->lock);
> =20
>  	return HRTIMER_RESTART;
>  }
> --=20
> 2.17.1
>=20

Reviewed-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>

--=20
Rodrigo Siqueira
https://siqueira.tech
Graduate Student
Department of Computer Science
University of S=E3o Paulo

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

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

iQIzBAEBCgAdFiEE4tZ+ii1mjMCMQbfkWJzP/comvP8FAlxXVbkACgkQWJzP/com
vP/rXA//YF/dspbfoHpbLz6ZJGCpPTozDpljkDD3Id18EiOyhUZwSmuvkl60kwSu
KKRtdoctVnQ+psYUCfkXNkmPjttsNfVGUwbyF2TAc/z8qZ14paWPzlQrsB7emmeK
bsbEdZi9nlQzfjR8m7mRFsmdzIGXJPeGcxUVibyMHiVlALBj7aJ1zbmtynMS9iIC
0vvRkPWGgB95iqH2szdWAauU2Il3edOEmFEoIqw/tEwzAmYYHi659HfBdZTrh6z0
5b8fdfIopgQNn8vp7igNAjYkkpe6oDuUKaPmXo3GnPWKDbgITijWt4Tv8BK3IFUb
4SnPKHRIzdV9E46Gas1GdQpYa9CIzXptykY/T+Ce9O2iKuRnH2GigSK2SHik+etv
lTK/4ao5gGITcpzPEUjePYbTWFH/PdYYzh2+HvjLu+Rcl/+taBDxN4uCgAjWFSOB
n4CPOnIL9hMna3Z6I9PMZ4nOVAT3dObdB/oYrUBzm9SqHD6qXl0I6wPssSGrwmCe
kcsFNIybeVk13NZxrZcm+0N6WPc/Gcm5N0KqymXcegJ/qCQOdvQYcu+Ftuem42ds
KXowhmmzgWWnjeFcyro8Xb4rNARzwvPIhut7Ir94yqg/U5uzwTKjg3NcGbYUOddF
IW//mVkZorKEUve3QrNujtpkYaPsLydWBqJlJYxx5FQoqMlYEm4=
=ZmM7
-----END PGP SIGNATURE-----

--k6zlh2lzjh4gptp4--