From patchwork Mon Nov 23 19:52:52 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: 41167 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 30A48383F861; Mon, 23 Nov 2020 19:53:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 30A48383F861 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1606161199; bh=VNWLh5f9uLbeGJlhRkHyzAraaGL9uUM69xrEtv83m6c=; 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=VEzdEZqok7qTbScbebtO0EYLJR7xu/YmdSahM4keqzP7hJy17oQeHkOHo6BjTgLi3 0inIpvUqaXb6ku4Oq0ZWEoNVtuwJ0j88ZvhhWwvadUFW956KUJH8B+s4vzGDhsdurT TORwJD6HRQH7Q7gg+4oAytNnaGdSZkIW5CMPz8rc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf41.google.com (mail-qv1-xf41.google.com [IPv6:2607:f8b0:4864:20::f41]) by sourceware.org (Postfix) with ESMTPS id 2A35C383F84F for ; Mon, 23 Nov 2020 19:53:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2A35C383F84F Received: by mail-qv1-xf41.google.com with SMTP id x13so9409639qvk.8 for ; Mon, 23 Nov 2020 11:53:17 -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=VNWLh5f9uLbeGJlhRkHyzAraaGL9uUM69xrEtv83m6c=; b=GHUczlEFZlNHIiER/eNMBf6m1w/+TWyFTu0t/MsRoT1RQ10zLCd8uBcoBLGvQ6ftw7 ELW9Fwzj+Ar3/OXfcDNgWd4lZTcyg4o2jGw5wNb86fJ6qPzl+piJDvtKj/1jbrKGwAJu iwp9WrEuZRU1MWdz2ZzKLAnON/7GqBGaSZSXM05UhaGdsO/1JV1qODp5LDkqeWmBU3XB gDjVLfOHejcjkF1LVxQFYOq/7ohErvOnzXm/kq+4hJ+mg2w1BzMGW1Ag3vHTT6SIX0Il SLZBJMbWmt2aoGpl/rfxe3ZubQJMQIMYP0dxDIHZg37o9rA7rVgoL3iyhPaPxIQmWAXK mQQw== X-Gm-Message-State: AOAM531mu0DTzD39lYF3+1LA/oF30fP6D5WE+M2/DBiej1moDHOLre5V O1DVrHo1KejqiH/OpsdGb7gdnIbYYNE1Lg== X-Google-Smtp-Source: ABdhPJzlLPMwx+V7sPdTa2AA8WXApBcW0WaAWziw/6KUIqDg0f9o4XogB99FgEM7VTTYZ+3G0N7N9w== X-Received: by 2002:ad4:4b01:: with SMTP id r1mr965629qvw.51.1606161196546; Mon, 23 Nov 2020 11:53:16 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id v9sm10440432qkv.34.2020.11.23.11.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:53:16 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 09/13] linux: nptl: Replace lll_futex_{timed_}wait by futex-internal.h Date: Mon, 23 Nov 2020 16:52:52 -0300 Message-Id: <20201123195256.3336217-9-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.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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" The idea is to make NPTL implementation to use on the functions provided by futex-internal.h. Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Lukasz Majewski --- nptl/lowlevellock.c | 6 +++--- nptl/pthread_mutex_lock.c | 9 +++++---- nptl/pthread_mutex_setprioceiling.c | 5 +++-- nptl/pthread_mutex_timedlock.c | 6 +++--- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/nptl/lowlevellock.c b/nptl/lowlevellock.c index f69547a235..973df4d03a 100644 --- a/nptl/lowlevellock.c +++ b/nptl/lowlevellock.c @@ -18,7 +18,7 @@ . */ #include -#include +#include #include #include @@ -32,7 +32,7 @@ __lll_lock_wait_private (int *futex) { futex: LIBC_PROBE (lll_lock_wait_private, 1, futex); - lll_futex_wait (futex, 2, LLL_PRIVATE); /* Wait if *futex == 2. */ + futex_wait ((unsigned int *) futex, 2, LLL_PRIVATE); /* Wait if *futex == 2. */ } } @@ -49,7 +49,7 @@ __lll_lock_wait (int *futex, int private) { futex: LIBC_PROBE (lll_lock_wait, 1, futex); - lll_futex_wait (futex, 2, private); /* Wait if *futex == 2. */ + futex_wait ((unsigned int *) futex, 2, private); /* Wait if *futex == 2. */ } } #endif diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c index 1f137f6201..965c5a3f4a 100644 --- a/nptl/pthread_mutex_lock.c +++ b/nptl/pthread_mutex_lock.c @@ -307,8 +307,8 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex) assume_other_futex_waiters |= FUTEX_WAITERS; /* Block using the futex and reload current lock value. */ - lll_futex_wait (&mutex->__data.__lock, oldval, - PTHREAD_ROBUST_MUTEX_PSHARED (mutex)); + futex_wait ((unsigned int *) &mutex->__data.__lock, oldval, + PTHREAD_ROBUST_MUTEX_PSHARED (mutex)); oldval = mutex->__data.__lock; } @@ -568,8 +568,9 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex) break; if (oldval != ceilval) - lll_futex_wait (&mutex->__data.__lock, ceilval | 2, - PTHREAD_MUTEX_PSHARED (mutex)); + futex_wait ((unsigned int * ) &mutex->__data.__lock, + ceilval | 2, + PTHREAD_MUTEX_PSHARED (mutex)); } while (atomic_compare_and_exchange_val_acq (&mutex->__data.__lock, ceilval | 2, ceilval) diff --git a/nptl/pthread_mutex_setprioceiling.c b/nptl/pthread_mutex_setprioceiling.c index 521da72622..cbef202579 100644 --- a/nptl/pthread_mutex_setprioceiling.c +++ b/nptl/pthread_mutex_setprioceiling.c @@ -21,6 +21,7 @@ #include #include #include +#include int @@ -84,8 +85,8 @@ pthread_mutex_setprioceiling (pthread_mutex_t *mutex, int prioceiling, break; if (oldval != ceilval) - lll_futex_wait (&mutex->__data.__lock, ceilval | 2, - PTHREAD_MUTEX_PSHARED (mutex)); + futex_wait ((unsigned int *) &mutex->__data.__lock, ceilval | 2, + PTHREAD_MUTEX_PSHARED (mutex)); } while (atomic_compare_and_exchange_val_acq (&mutex->__data.__lock, ceilval | 2, ceilval) diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c index e643eab258..343acf6107 100644 --- a/nptl/pthread_mutex_timedlock.c +++ b/nptl/pthread_mutex_timedlock.c @@ -561,9 +561,9 @@ __pthread_mutex_clocklock_common (pthread_mutex_t *mutex, goto failpp; } - lll_futex_timed_wait (&mutex->__data.__lock, - ceilval | 2, &rt, - PTHREAD_MUTEX_PSHARED (mutex)); + __futex_abstimed_wait64 ( + (unsigned int *) &mutex->__data.__lock, clockid, + ceilval | 2, &rt, PTHREAD_MUTEX_PSHARED (mutex)); } } while (atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,