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 05/13] linux: nptl: Consolidate __futex_abstimed_wait_{cancelable}64
Date: Tue, 24 Nov 2020 19:19:09 +0100 [thread overview]
Message-ID: <20201124191909.20913ef4@jawa> (raw)
In-Reply-To: <20201123195256.3336217-5-adhemerval.zanella@linaro.org>
[-- Attachment #1: Type: text/plain, Size: 7605 bytes --]
Hi Adhemerval,
> The only different is how to issue the syscall.
>
> Checked on x86_64-linux-gnu and i686-linux-gnu.
> ---
> sysdeps/nptl/futex-internal.c | 111
> +++++++++++----------------------- 1 file changed, 35 insertions(+),
> 76 deletions(-)
>
> diff --git a/sysdeps/nptl/futex-internal.c
> b/sysdeps/nptl/futex-internal.c index e4a14b477c..f9a2e28ee6 100644
> --- a/sysdeps/nptl/futex-internal.c
> +++ b/sysdeps/nptl/futex-internal.c
> @@ -24,10 +24,10 @@
>
> #ifndef __ASSUME_TIME64_SYSCALLS
> static int
> -__futex_abstimed_wait_cancelable32 (unsigned int* futex_word,
> - unsigned int expected, int op,
> - const struct __timespec64*
> abstime,
> - int private)
> +__futex_abstimed_wait_common32 (unsigned int* futex_word,
> + unsigned int expected, int op,
> + const struct __timespec64* abstime,
> + int private, bool cancel)
> {
> struct timespec ts32, *pts32 = NULL;
> if (abstime != NULL)
> @@ -39,34 +39,16 @@ __futex_abstimed_wait_cancelable32 (unsigned int*
> futex_word, pts32 = &ts32;
> }
>
> - return INTERNAL_SYSCALL_CANCEL (futex, futex_word, op, expected,
> + if (cancel)
> + return INTERNAL_SYSCALL_CANCEL (futex, futex_word, op, expected,
> + pts32, NULL /* Unused. */,
> + FUTEX_BITSET_MATCH_ANY);
> + else
> + return INTERNAL_SYSCALL_CALL (futex, futex_word, op, expected,
> pts32, NULL /* Unused. */,
> FUTEX_BITSET_MATCH_ANY);
> }
>
> -static int
> -__futex_abstimed_wait32 (unsigned int* futex_word,
> - unsigned int expected, clockid_t clockid,
> - const struct __timespec64* abstime,
> - int private)
> -{
> - struct timespec ts32;
> -
> - if (abstime != NULL && ! in_time_t_range (abstime->tv_sec))
> - return -EOVERFLOW;
> -
> - unsigned int clockbit = (clockid == CLOCK_REALTIME) ?
> - FUTEX_CLOCK_REALTIME : 0;
> - int op = __lll_private_flag (FUTEX_WAIT_BITSET | clockbit,
> private); -
> - if (abstime != NULL)
> - ts32 = valid_timespec64_to_timespec (*abstime);
> -
> - return INTERNAL_SYSCALL_CALL (futex, futex_word, op, expected,
> - abstime != NULL ? &ts32 : NULL,
> - NULL /* Unused. */,
> FUTEX_BITSET_MATCH_ANY); -}
> -
> static int
> __futex_clock_wait_bitset32 (int *futexp, int val, clockid_t clockid,
> const struct __timespec64 *abstime, int
> private) @@ -89,11 +71,11 @@ __futex_clock_wait_bitset32 (int
> *futexp, int val, clockid_t clockid, }
> #endif /* ! __ASSUME_TIME64_SYSCALLS */
>
> -int
> -__futex_abstimed_wait_cancelable64 (unsigned int* futex_word,
> - unsigned int expected, clockid_t
> clockid,
> - const struct __timespec64*
> abstime,
> - int private)
> +static int
> +__futex_abstimed_wait_common64 (unsigned int* futex_word,
> + unsigned int expected, clockid_t
> clockid,
> + const struct __timespec64* abstime,
> + int private, bool cancel)
> {
> unsigned int clockbit;
> int err;
> @@ -109,13 +91,18 @@ __futex_abstimed_wait_cancelable64 (unsigned
> int* futex_word, clockbit = (clockid == CLOCK_REALTIME) ?
> FUTEX_CLOCK_REALTIME : 0; int op = __lll_private_flag
> (FUTEX_WAIT_BITSET | clockbit, private);
> - err = INTERNAL_SYSCALL_CANCEL (futex_time64, futex_word, op,
> expected,
> - abstime, NULL /* Unused. */,
> + if (cancel)
> + err = INTERNAL_SYSCALL_CANCEL (futex_time64, futex_word, op,
> expected,
> + abstime, NULL /* Unused. */,
> + FUTEX_BITSET_MATCH_ANY);
> + else
> + err = INTERNAL_SYSCALL_CALL (futex_time64, futex_word, op,
> expected,
> + abstime, NULL /* Ununsed. */,
> FUTEX_BITSET_MATCH_ANY);
> #ifndef __ASSUME_TIME64_SYSCALLS
> if (err == -ENOSYS)
> - err = __futex_abstimed_wait_cancelable32 (futex_word, expected,
> - op, abstime, private);
> + err = __futex_abstimed_wait_common32 (futex_word, expected, op,
> abstime,
> + private, cancel);
> #endif
>
> switch (err)
> @@ -145,46 +132,18 @@ __futex_abstimed_wait64 (unsigned int*
> futex_word, unsigned int expected, clockid_t clockid,
> const struct __timespec64* abstime, int
> private) {
> - unsigned int clockbit;
> - int err;
> -
> - /* Work around the fact that the kernel rejects negative timeout
> values
> - despite them being valid. */
> - if (__glibc_unlikely ((abstime != NULL) && (abstime->tv_sec < 0)))
> - return ETIMEDOUT;
> -
> - if (! lll_futex_supported_clockid (clockid))
> - return EINVAL;
> -
> - clockbit = (clockid == CLOCK_REALTIME) ? FUTEX_CLOCK_REALTIME : 0;
> - int op = __lll_private_flag (FUTEX_WAIT_BITSET | clockbit,
> private); -
> - err = INTERNAL_SYSCALL_CALL (futex_time64, futex_word, op,
> expected,
> - abstime, NULL /* Unused. */,
> - FUTEX_BITSET_MATCH_ANY);
> -#ifndef __ASSUME_TIME64_SYSCALLS
> - if (err == -ENOSYS)
> - err = __futex_abstimed_wait32 (futex_word, expected,
> - clockid, abstime, private);
> -#endif
> - switch (err)
> - {
> - case 0:
> - case -EAGAIN:
> - case -EINTR:
> - case -ETIMEDOUT:
> - return -err;
> + return __futex_abstimed_wait_common64 (futex_word, expected,
> clockid,
> + abstime, private, false);
> +}
>
> - case -EFAULT: /* Must have been caused by a glibc or application
> bug. */
> - case -EINVAL: /* Either due to wrong alignment, unsupported
> - clockid 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:
> - futex_fatal_error ();
> - }
> +int
> +__futex_abstimed_wait_cancelable64 (unsigned int* futex_word,
> + unsigned int expected, clockid_t
> clockid,
> + const struct __timespec64*
> abstime,
> + int private)
> +{
> + return __futex_abstimed_wait_common64 (futex_word, expected,
> clockid,
> + abstime, private, true);
> }
>
> int
Thanks for making this consolidation. Indeed there is now only
difference in issuing the syscall.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
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 18:20 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 [this message]
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
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=20201124191909.20913ef4@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).