From patchwork Thu Sep 30 20:00:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 45630 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 4F0D23857C6C for ; Thu, 30 Sep 2021 20:07:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4F0D23857C6C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1633032428; bh=sjE49JWIdy2xYlX6iKwTZ7uGMcsmC/Zcl/H71OG39tQ=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ynt9/DJ992ZU9ohEBSe+P3SSHlVNtdrn4/jDAWWw5HxyqToLJu6KvTuGRnAOLYSYg Mm98o6x0z/SapRe43c27KvHLbDBqJGrSkvwItgDnBpLyhZNtXDSaGTLqlusI/vLN8O KQ/AeFfWRZni/AJ6f9EyhuxC6ncIgV4MHxtO7ET8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) by sourceware.org (Postfix) with ESMTPS id 161323857C62 for ; Thu, 30 Sep 2021 20:01:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 161323857C62 Received: by mail-qk1-x72b.google.com with SMTP id 194so7017550qkj.11 for ; Thu, 30 Sep 2021 13:01:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sjE49JWIdy2xYlX6iKwTZ7uGMcsmC/Zcl/H71OG39tQ=; b=NM70OqBbgDIog/a4XEtiSPcTIm1QisfMaHjmobhxLmguJ4QaBBfObV5EiVO0MkYMGX F/bV/0OEnbcplvXzfLHfdAH4PmDDmlLVXJKGXF91AAaBTwvovR+xpZj1LYfteJxzT6qQ LjUNjKNJGhximblyZpbA6El7uffX/1DPvb9wNTrbD5SmH3xmCiq5ZrUA8prgkzrMMpTB TwxyJc8KNPOqa2qadG2ry2vPiBvXHhq2KJmcCRsi+hS6JPUjZW8k047FvxtxMkOA/0yF 1SkuZXhN0YE5qZhXQA7hLsB7yGscxPdcDttAvom9dBoJCsgAuLYaoFvhK9+uWGkgoajv AEog== X-Gm-Message-State: AOAM530T3tBTGp19/FlY+NhFC+k8L3aLVsSWdNQPm6mI9x5B+Mu56Swe vmU59aM8SE7IXzNZoRwFd+Sr98z9xvOcQg== X-Google-Smtp-Source: ABdhPJyORa1aBcCG89Ube+cGGsjrup51siVNFz8AKuA+2d89GE5jdC0ewFUF30MxTRoqFXOQknGQYA== X-Received: by 2002:a37:a155:: with SMTP id k82mr6363345qke.349.1633032065491; Thu, 30 Sep 2021 13:01:05 -0700 (PDT) Received: from birita.. ([2804:431:c7cb:b338:b20e:53f8:8b5:1bb2]) by smtp.gmail.com with ESMTPSA id r196sm1910203qka.119.2021.09.30.13.01.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 13:01:04 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 08/15] nptl: Use exit_lock when accessing TID on pthread_getcpuclockid Date: Thu, 30 Sep 2021 17:00:44 -0300 Message-Id: <20210930200051.1017457-9-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210930200051.1017457-1-adhemerval.zanella@linaro.org> References: <20210930200051.1017457-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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 Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Checked on x86_64-linux-gnu. --- nptl/pthread_getcpuclockid.c | 26 ++++++++++++++------------ sysdeps/pthread/tst-pthread-exited.c | 7 +++++++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/nptl/pthread_getcpuclockid.c b/nptl/pthread_getcpuclockid.c index 0a6656ea4c..63f1978665 100644 --- a/nptl/pthread_getcpuclockid.c +++ b/nptl/pthread_getcpuclockid.c @@ -16,11 +16,9 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, see . */ -#include -#include -#include -#include +#include #include +#include #include int @@ -28,17 +26,21 @@ __pthread_getcpuclockid (pthread_t threadid, clockid_t *clockid) { struct pthread *pd = (struct pthread *) threadid; - /* Make sure the descriptor is valid. */ - if (INVALID_TD_P (pd)) - /* Not a valid thread handle. */ - return ESRCH; + /* Block all signals, as required by pd->exit_lock. */ + sigset_t old_mask; + __libc_signal_block_all (&old_mask); + __libc_lock_lock (pd->exit_lock); - /* The clockid_t value is a simple computation from the TID. */ + int res = 0; + if (pd->tid != 0) + *clockid = MAKE_THREAD_CPUCLOCK (pd->tid, CPUCLOCK_SCHED); + else + res = ESRCH; - const clockid_t tidclock = MAKE_THREAD_CPUCLOCK (pd->tid, CPUCLOCK_SCHED); + __libc_lock_unlock (pd->exit_lock); + __libc_signal_restore_set (&old_mask); - *clockid = tidclock; - return 0; + return res; } versioned_symbol (libc, __pthread_getcpuclockid, pthread_getcpuclockid, GLIBC_2_34); diff --git a/sysdeps/pthread/tst-pthread-exited.c b/sysdeps/pthread/tst-pthread-exited.c index 567d6b9b49..d33e6b28fe 100644 --- a/sysdeps/pthread/tst-pthread-exited.c +++ b/sysdeps/pthread/tst-pthread-exited.c @@ -23,6 +23,7 @@ #include #include #include +#include static void * noop_thread (void *closure) @@ -50,6 +51,12 @@ do_test (void) TEST_COMPARE (r, ESRCH); } + { + clockid_t clkid; + int r = pthread_getcpuclockid (thr, &clkid); + TEST_COMPARE (r, ESRCH); + } + xpthread_join (thr); return 0;