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:   Fri, 23 Apr 2021 11:34:24 +0200
From:   Lukasz Majewski <lukma@denx.de>
To:     Thomas Gleixner <tglx@linutronix.de>
Cc:     LKML <linux-kernel@vger.kernel.org>,
        Peter Zijlstra <peterz@infradead.org>,
        Adhemerval Zanella <adhemerval.zanella@linaro.org>,
        Florian Weimer <fweimer@redhat.com>,
        Carlos O'Donell <carlos@redhat.com>,
        "Michael Kerrisk (man-pages)" <mtk.manpages@gmail.com>,
        Davidlohr Bueso <dave@stgolabs.net>,
        Ingo Molnar <mingo@kernel.org>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        Darren Hart <dvhart@infradead.org>,
        Andrei Vagin <avagin@gmail.com>
Subject: Re: [patch 5/6] futex: Prepare futex_lock_pi() for runtime clock
 selection
Message-ID: <20210423113424.19e26b77@jawa>
In-Reply-To: <20210422194705.338657741@linutronix.de>
References: <20210422194417.866740847@linutronix.de>
        <20210422194705.338657741@linutronix.de>
Organization: denx.de
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
 boundary="Sig_/3yTGmbENL6O1ZgcusCzSQEf"; protocol="application/pgp-signature"
Precedence: bulk

--Sig_/3yTGmbENL6O1ZgcusCzSQEf
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Thomas,

> futex_lock_pi() is the only futex operation which cannot select the
> clock for timeouts (CLOCK_MONOTONIC/CLOCK_REALTIME). That's
> inconsistent and there is no particular reason why this cannot be
> supported.
>=20
> This was overlooked when CLOCK_REALTIME_FLAG was introduced and
> unfortunately not reported when the inconsistency was discovered in
> glibc.
>=20
> Prepare the function and enforce the CLOCK_REALTIME_FLAG on
> FUTEX_LOCK_PI so that a new FUTEX_LOCK_PI2 can implement it correctly.
>=20
> Reported-by: Kurt Kanzenbach <kurt@linutronix.de>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> ---
>  kernel/futex.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>=20
> --- a/kernel/futex.c
> +++ b/kernel/futex.c
> @@ -2786,7 +2786,7 @@ static int futex_lock_pi(u32 __user *uad
>  	if (refill_pi_state_cache())
>  		return -ENOMEM;
> =20
> -	to =3D futex_setup_timer(time, &timeout, FLAGS_CLOCKRT, 0);
> +	to =3D futex_setup_timer(time, &timeout, flags, 0);
> =20
>  retry:
>  	ret =3D get_futex_key(uaddr, flags & FLAGS_SHARED, &q.key,
> FUTEX_WRITE); @@ -3711,7 +3711,7 @@ long do_futex(u32 __user *uaddr,
> int op,=20
>  	if (op & FUTEX_CLOCK_REALTIME) {
>  		flags |=3D FLAGS_CLOCKRT;
> -		if (cmd !=3D FUTEX_WAIT_BITSET &&	cmd !=3D
> FUTEX_WAIT_REQUEUE_PI)
> +		if (cmd !=3D FUTEX_WAIT_BITSET && cmd !=3D
> FUTEX_WAIT_REQUEUE_PI) return -ENOSYS;

What is the exact change for those two lines above? Looks like some
different tab/spaces...

>  	}
> =20
> @@ -3743,6 +3743,7 @@ long do_futex(u32 __user *uaddr, int op,
>  	case FUTEX_WAKE_OP:
>  		return futex_wake_op(uaddr, flags, uaddr2, val,
> val2, val3); case FUTEX_LOCK_PI:
> +		flags |=3D FLAGS_CLOCKRT;
>  		return futex_lock_pi(uaddr, flags, timeout, 0);
>  	case FUTEX_UNLOCK_PI:
>  		return futex_unlock_pi(uaddr, flags);
>=20


Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de

--Sig_/3yTGmbENL6O1ZgcusCzSQEf
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCgAdFiEEgAyFJ+N6uu6+XupJAR8vZIA0zr0FAmCClKAACgkQAR8vZIA0
zr0jiwgAuT8QWLtlVgm2TY+62ki+xaPtLiKTchq+DKy51BhaCDOhjIsrtui3W1Zw
tDXs5IsAJ0Hkns8KCPiPmJD6rxnn1knD0BMaWqUSF4yv9UpiWC2Ab/TA5QMA+e4Z
tOlXMy6Hy7tnXxkJaAeRXy8W2NWLyMul52kGmEESFlY+/xpjdx8QC/D80Rg8jtbx
ErIcJn/Rg2sZpiO/hREXnRE9g15lDGboJ0MSC7ibeU8ZHhlB9/H+5CwI0keT7ZKd
Jeg1bmNcFg+xBq3iINmIHwRNDgQGLIJPyQUpkkAZvLhKaAAe8Www8ZE1t+IY+Ehz
hAsuTyewoQugpD5E5YU78sILzuFVHA==
=OTkZ
-----END PGP SIGNATURE-----

--Sig_/3yTGmbENL6O1ZgcusCzSQEf--