From: Lukasz Majewski <lukma@denx.de>
To: Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org>
Cc: Adhemerval Zanella <adhemerval.zanella@linaro.org>,
Michael Kerrisk <mtk.manpages@gmail.com>
Subject: Re: [PATCH 07/13] linux: nptl: Replace __futex_clocklock_wait64 with __futex_abstimed_wait64
Date: Tue, 24 Nov 2020 22:28:26 +0100 [thread overview]
Message-ID: <20201124222826.181a021a@jawa> (raw)
In-Reply-To: <20201123195256.3336217-7-adhemerval.zanella@linaro.org>
[-- Attachment #1: Type: text/plain, Size: 5537 bytes --]
Hi Adhemerval,
> The __futex_abstimed_wait64 needs also to return EINVAL syscall
> errors.
>
> Checked on x86_64-linux-gnu and i686-linux-gnu.
> ---
> nptl/pthread_mutex_timedlock.c | 4 +--
> sysdeps/nptl/futex-internal.c | 57
> +--------------------------------- sysdeps/nptl/futex-internal.h |
> 7 ++--- 3 files changed, 5 insertions(+), 63 deletions(-)
>
> diff --git a/nptl/pthread_mutex_timedlock.c
> b/nptl/pthread_mutex_timedlock.c index 0ec47359be..e643eab258 100644
> --- a/nptl/pthread_mutex_timedlock.c
> +++ b/nptl/pthread_mutex_timedlock.c
> @@ -391,8 +391,8 @@ __pthread_mutex_clocklock_common (pthread_mutex_t
> *mutex, /* Delay the thread until the timeout is reached. Then return
> ETIMEDOUT. */
> do
> - e = __futex_clocklock_wait64 (&(int){0}, 0,
> clockid, abstime,
> - private);
> + e = __futex_abstimed_wait64 (&(unsigned int){0},
> 0, clockid,
> + abstime, private);
I think that it would be nice to have more verbose commit message - to
clearly explain why it is possible to replace "*_clocklock_*" with
"*_abstimed_*".
Reviewed-by: Lukasz Majewski <lukma@denx.de>
> while (e != ETIMEDOUT);
> return ETIMEDOUT;
> }
> diff --git a/sysdeps/nptl/futex-internal.c
> b/sysdeps/nptl/futex-internal.c index 30c662547f..11031cc46a 100644
> --- a/sysdeps/nptl/futex-internal.c
> +++ b/sysdeps/nptl/futex-internal.c
> @@ -90,15 +90,13 @@ __futex_abstimed_wait_common64 (unsigned int*
> futex_word, case -EAGAIN:
> case -EINTR:
> case -ETIMEDOUT:
> + case -EINVAL:
> case -EOVERFLOW: /* Passed absolute timeout uses 64 bit time_t
> type, but underlying kernel does not support 64 bit time_t futex
> syscalls. */
> return -err;
>
> case -EFAULT: /* Must have been caused by a glibc or application
> bug. */
> - case -EINVAL: /* Either due to wrong alignment or due to the
> timeout not
> - being normalized. Must have been caused by a
> glibc or
> - application bug. */
> case -ENOSYS: /* Must have been caused by a glibc bug. */
> /* No other errors are documented at this time. */
> default:
> @@ -124,56 +122,3 @@ __futex_abstimed_wait_cancelable64 (unsigned
> int* futex_word, return __futex_abstimed_wait_common64 (futex_word,
> expected, clockid, abstime, private, true);
> }
> -
> -int
> -__futex_clocklock_wait64 (int *futex, int val, clockid_t clockid,
> - const struct __timespec64 *abstime, int
> private) -{
> - struct __timespec64 ts, *tsp = NULL;
> -
> - if (abstime != NULL)
> - {
> - /* Reject invalid timeouts. */
> - if (! valid_nanoseconds (abstime->tv_nsec))
> - return EINVAL;
> -
> - /* Get the current time. This can only fail if clockid is not
> valid. */
> - if (__glibc_unlikely (__clock_gettime64 (clockid, &ts) != 0))
> - return EINVAL;
> -
> - /* Compute relative timeout. */
> - ts.tv_sec = abstime->tv_sec - ts.tv_sec;
> - ts.tv_nsec = abstime->tv_nsec - ts.tv_nsec;
> - if (ts.tv_nsec < 0)
> - {
> - ts.tv_nsec += 1000000000;
> - --ts.tv_sec;
> - }
> -
> - if (ts.tv_sec < 0)
> - return ETIMEDOUT;
> -
> - tsp = &ts;
> - }
> -
> - int err = INTERNAL_SYSCALL_CALL (futex_time64, futex,
> - __lll_private_flag (FUTEX_WAIT,
> private),
> - val, tsp);
> -#ifndef __ASSUME_TIME64_SYSCALLS
> - if (err == -ENOSYS)
> - {
> - if (tsp != NULL && ! in_time_t_range (tsp->tv_sec))
> - return EOVERFLOW;
> -
> - struct timespec ts32;
> - if (tsp != NULL)
> - ts32 = valid_timespec64_to_timespec (*tsp);
> -
> - err = INTERNAL_SYSCALL_CALL (futex, futex,
> - __lll_private_flag (FUTEX_WAIT,
> private),
> - val, tsp != NULL ? &ts32 : NULL);
> - }
> -#endif
> -
> - return -err;
> -}
> diff --git a/sysdeps/nptl/futex-internal.h
> b/sysdeps/nptl/futex-internal.h index dcc7958d59..632051278b 100644
> --- a/sysdeps/nptl/futex-internal.h
> +++ b/sysdeps/nptl/futex-internal.h
> @@ -417,10 +417,6 @@ __futex_abstimed_wait64 (unsigned int*
> futex_word, unsigned int expected, const struct __timespec64* abstime,
> int private) attribute_hidden;
>
> -int
> -__futex_clocklock_wait64 (int *futex, int val, clockid_t clockid,
> - const struct __timespec64 *abstime,
> - int private) attribute_hidden;
>
> static __always_inline int
> __futex_clocklock64 (int *futex, clockid_t clockid,
> @@ -432,7 +428,8 @@ __futex_clocklock64 (int *futex, clockid_t
> clockid, {
> while (atomic_exchange_acq (futex, 2) != 0)
> {
> - err = __futex_clocklock_wait64 (futex, 2, clockid,
> abstime, private);
> + err = __futex_abstimed_wait64 ((unsigned int *) futex, 2,
> clockid,
> + abstime, private);
> if (err == EINVAL || err == ETIMEDOUT || err == EOVERFLOW)
> break;
> }
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-11-24 21:28 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 19:52 [PATCH 01/13] linux: Remove unused internal futex functions Adhemerval Zanella
2020-11-23 19:52 ` [PATCH 02/13] nptl: Remove futex_wait_cancelable Adhemerval Zanella
2020-11-24 18:01 ` Lukasz Majewski
2020-11-23 19:52 ` [PATCH 03/13] nptl: Remove clockwait_tid Adhemerval Zanella
2020-11-24 18:13 ` Lukasz Majewski
2020-12-14 12:16 ` Florian Weimer
2020-12-14 12:47 ` Andreas Schwab
2020-12-14 13:11 ` Florian Weimer
2020-12-14 14:02 ` Florian Weimer
2020-12-14 12:52 ` Adhemerval Zanella
2020-11-23 19:52 ` [PATCH 04/13] linux: Extend __futex_abstimed_wait_cancelable64 comment Adhemerval Zanella
2020-11-24 18:16 ` Lukasz Majewski
2020-11-23 19:52 ` [PATCH 05/13] linux: nptl: Consolidate __futex_abstimed_wait_{cancelable}64 Adhemerval Zanella
2020-11-24 18:19 ` Lukasz Majewski
2020-11-23 19:52 ` [PATCH 06/13] linux: nptl: Remove _futex_clock_wait_bitset64 Adhemerval Zanella
2020-11-24 18:26 ` Lukasz Majewski
2020-11-23 19:52 ` [PATCH 07/13] linux: nptl: Replace __futex_clocklock_wait64 with __futex_abstimed_wait64 Adhemerval Zanella
2020-11-24 21:28 ` Lukasz Majewski [this message]
2020-11-23 19:52 ` [PATCH 08/13] linux: nptl: Replace lll_timedwait " Adhemerval Zanella
2020-11-24 21:29 ` Lukasz Majewski
2020-11-23 19:52 ` [PATCH 09/13] linux: nptl: Replace lll_futex_{timed_}wait by futex-internal.h Adhemerval Zanella
2020-11-24 21:35 ` Lukasz Majewski
2020-11-25 15:32 ` Mike Crowe
2020-11-25 15:40 ` Adhemerval Zanella
2020-11-25 15:46 ` Mike Crowe
2020-11-25 17:19 ` Adhemerval Zanella
2020-11-25 17:37 ` Mike Crowe
2020-11-25 17:56 ` Adhemerval Zanella
2020-11-23 19:52 ` [PATCH 10/13] linux: nptl: Replace lll_futex_supported_clockid with futex-internal.h Adhemerval Zanella
2020-11-24 21:36 ` Lukasz Majewski
2020-11-23 19:52 ` [PATCH 11/13] nptl: Replace lll_futex_wake " Adhemerval Zanella
2020-11-24 21:38 ` Lukasz Majewski
2020-11-23 19:52 ` [PATCH v2 12/13] nptl: Return EINVAL for pthread_mutex_clocklock/PI with CLOCK_MONOTONIC [BZ #26801] Adhemerval Zanella
2020-11-24 21:43 ` Lukasz Majewski
2020-11-24 21:49 ` Lukasz Majewski
2020-11-27 17:39 ` Adhemerval Zanella
2020-11-23 19:52 ` [PATCH 13/13] linux: Return EINVAL for invalid clock for pthread_clockjoin_np Adhemerval Zanella
2020-11-24 21:48 ` Lukasz Majewski
2020-11-24 22:58 ` Lukasz Majewski
2020-11-24 17:51 ` [PATCH 01/13] linux: Remove unused internal futex functions Lukasz Majewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201124222826.181a021a@jawa \
--to=lukma@denx.de \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
--cc=mtk.manpages@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).