From patchwork Mon Nov 23 19:52:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 41163 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 02D3F383F84B; Mon, 23 Nov 2020 19:53:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 02D3F383F84B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1606161193; bh=uLvxg/EyHWEIP6KCE4UiDz5YjdgA5FknSIsg0TnJomw=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=q7Yy9l+Kyxm7Udj9WxZgInrw/Qqp7ma7vdCJgsMZbMm+QUpoqwLNE6klvWKrgMuUR oWQQvnQ8qKNUXIzIkIj75YgGoIb8kC+fBWA0iho0XpeZ1/E3qxIBKxWNUxQHXQ1JjG Af/UiaoSbkbxGAVUbmd+Eu/ejKvYvo/VTTVk/NoQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by sourceware.org (Postfix) with ESMTPS id 1270C3840C22 for ; Mon, 23 Nov 2020 19:53:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1270C3840C22 Received: by mail-qk1-x744.google.com with SMTP id y197so18181210qkb.7 for ; Mon, 23 Nov 2020 11:53:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uLvxg/EyHWEIP6KCE4UiDz5YjdgA5FknSIsg0TnJomw=; b=n2Gras9kXp0VKV3U+UO2JicwbjZfrAeXlUVWViKj7kIjxNSm7LkbwDr+/kvSgeSRDP XU843QzLP6oKfShM4orWRLBUco/HiwFTSxsUGUgJkxy0oUsmY4RXnxhPvRNvkSjEIQuI 91sFVhDgMWnMD7SyRweX/Q0i47ZlR8XNaKOFRbZFCOIAh2QhZYlcBOFhqsSEPnzhyz/d lV0nmxNjdR3APE4td0TGuP9DzmX411bBnf/VdUoBR1v2qFk7/YPftV1bdQ7I1cfYl6ci NtXdr+YBJ3P/mpV4Kcr9n26D8gyMmV+sxDLqpcBRkWFCCtTlVGRjmd3cyVxyg6bVk4Ts uSQw== X-Gm-Message-State: AOAM531X6mAOHJM1wjdJfqtVmPxuA1mlIle2ADIctuc6lXVFUZqb+GCk 36Eca/ltLnmo13aoSP7LxZfEYSG+5l6iZQ== X-Google-Smtp-Source: ABdhPJyOqR5SpTp0V5UfelZ8bZUwOFLj1DbQMp5iNfFujeP6j7at3ksC5t1S8iMOw2u6pfkHC86VIg== X-Received: by 2002:a05:620a:5a5:: with SMTP id q5mr1149406qkq.199.1606161189403; Mon, 23 Nov 2020 11:53:09 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id v9sm10440432qkv.34.2020.11.23.11.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:53:09 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 05/13] linux: nptl: Consolidate __futex_abstimed_wait_{cancelable}64 Date: Mon, 23 Nov 2020 16:52:48 -0300 Message-Id: <20201123195256.3336217-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201123195256.3336217-1-adhemerval.zanella@linaro.org> References: <20201123195256.3336217-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: Michael Kerrisk Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The only different is how to issue the syscall. Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Lukasz Majewski --- 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