From patchwork Mon Nov 23 19:52:51 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: 41166 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 A43EC383F840; Mon, 23 Nov 2020 19:53:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A43EC383F840 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1606161198; bh=m9r8ByyDjFCxxJHNzXbB0OToLdJXk3efTfu/oq8Va+Q=; 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=OkiY+6dabCUaf9AJvn/7tHleguv3sLoK8eIr3rnpA2oVz2Pr7oy/axNCl+Z+zd8gl xViED279HiAXraBKtffDdQQDmPXFdHUsp0NWt27BnjG+hMZFCRIOOvbT6HT1EdDXSx VgKUVH2TT3RPFn5NR7g3sIJoslL6rDXO6jvak3rU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by sourceware.org (Postfix) with ESMTPS id 74503383F84F for ; Mon, 23 Nov 2020 19:53:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 74503383F84F Received: by mail-qt1-x844.google.com with SMTP id z3so14295841qtw.9 for ; Mon, 23 Nov 2020 11:53:15 -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=m9r8ByyDjFCxxJHNzXbB0OToLdJXk3efTfu/oq8Va+Q=; b=AMJ/i2ALxPu9fHsgrbHCoOvSMHci6Rj/TxYr7+hVb36PB2TXc/UTP205Z7EEoSfrRf g0lwmUitzzhIF9dym2OuKUiNtpjhqJHGY3HpDVyY+cQcqvaw9UyrcqcgkFLejEx2WMJa VbUYJWnMa8usfRBUiMBAOYSzSAB2pvqTgwgz3G3KIbaFFq6nqG+roTgVBnRhF+mE21T8 YRfeqyCBQz/2a3ZQ1nRdalhy4loJFPTMJmG4vn2ClQFtTodFQMNZnILtLPQB54G1ymOF lguB9jromfL+q8FhJyGDaxtLhIMFTfb/UaDAOR7j5wtmlEoYfMt6UEQZges/Plcs5s4P k+qg== X-Gm-Message-State: AOAM531C6tL0en6q1Yx61HmUElcV3Po3o45W48n0/mbS51FNUXavVd+R H2fH2qlLYC2L5W20r5chGAWLyojC7EhKQg== X-Google-Smtp-Source: ABdhPJxdNTpXTVHJPr0w2EvuLlq9ovat1s8TWaznTQ/q4CVc3XUzQulbURD3kN5brSkL/wW6FOh6XQ== X-Received: by 2002:a05:622a:28b:: with SMTP id z11mr831314qtw.94.1606161194819; Mon, 23 Nov 2020 11:53:14 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id v9sm10440432qkv.34.2020.11.23.11.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:53:14 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 08/13] linux: nptl: Replace lll_timedwait with __futex_abstimed_wait64 Date: Mon, 23 Nov 2020 16:52:51 -0300 Message-Id: <20201123195256.3336217-8-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, KAM_SHORT, 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" Checked with x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Lukasz Majewski --- nptl/Makefile | 1 - nptl/lll_timedlock_wait.c | 62 ------------------------------------- nptl/pthread_mutex_lock.c | 4 +-- sysdeps/nptl/lowlevellock.h | 32 ------------------- 4 files changed, 2 insertions(+), 97 deletions(-) delete mode 100644 nptl/lll_timedlock_wait.c diff --git a/nptl/Makefile b/nptl/Makefile index 74ab758c12..968768d33b 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -147,7 +147,6 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \ pt-longjmp pt-cleanup\ cancellation \ lowlevellock \ - lll_timedlock_wait \ pt-fork pt-fcntl \ $(pthread-compat-wrappers) \ pt-raise pt-system \ diff --git a/nptl/lll_timedlock_wait.c b/nptl/lll_timedlock_wait.c deleted file mode 100644 index eabdca70c8..0000000000 --- a/nptl/lll_timedlock_wait.c +++ /dev/null @@ -1,62 +0,0 @@ -/* Timed low level locking for pthread library. Generic futex-using version. - Copyright (C) 2003-2020 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Paul Mackerras , 2003. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include -#include -#include - - -int -__lll_clocklock_wait (int *futex, int val, clockid_t clockid, - const struct timespec *abstime, int private) -{ - struct timespec 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_gettime (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; - } - - /* If *futex == val, wait until woken or timeout. */ - lll_futex_timed_wait (futex, val, tsp, private); - - return 0; -} diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c index 0439002454..1f137f6201 100644 --- a/nptl/pthread_mutex_lock.c +++ b/nptl/pthread_mutex_lock.c @@ -425,8 +425,8 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex) /* Delay the thread indefinitely. */ while (1) - lll_timedwait (&(int){0}, 0, 0 /* ignored */, NULL, - private); + __futex_abstimed_wait64 (&(unsigned int){0}, 0, + 0 /* ignored */, NULL, private); } oldval = mutex->__data.__lock; diff --git a/sysdeps/nptl/lowlevellock.h b/sysdeps/nptl/lowlevellock.h index 68b3be8819..3de87d31a9 100644 --- a/sysdeps/nptl/lowlevellock.h +++ b/sysdeps/nptl/lowlevellock.h @@ -122,38 +122,6 @@ extern void __lll_lock_wait (int *futex, int private) attribute_hidden; #define lll_cond_lock(futex, private) __lll_cond_lock (&(futex), private) -extern int __lll_clocklock_wait (int *futex, int val, clockid_t, - const struct timespec *, - int private) attribute_hidden; - -#define lll_timedwait(futex, val, clockid, abstime, private) \ - __lll_clocklock_wait (futex, val, clockid, abstime, private) - -/* As __lll_lock, but with an absolute timeout measured against the clock - specified in CLOCKID. If the timeout occurs then return ETIMEDOUT. If - ABSTIME is invalid, return EINVAL. */ -#define __lll_clocklock(futex, clockid, abstime, private) \ - ({ \ - int *__futex = (futex); \ - int __val = 0; \ - \ - if (__glibc_unlikely \ - (atomic_compare_and_exchange_bool_acq (__futex, 1, 0))) \ - { \ - while (atomic_exchange_acq (futex, 2) != 0) \ - { \ - __val = __lll_clocklock_wait (__futex, 2, clockid, \ - abstime, private); \ - if (__val == EINVAL || __val == ETIMEDOUT) \ - break; \ - } \ - } \ - __val; \ - }) -#define lll_clocklock(futex, clockid, abstime, private) \ - __lll_clocklock (&(futex), clockid, abstime, private) - - /* This is an expression rather than a statement even though its value is void, so that it can be used in a comma expression or as an expression that's cast to void. */