From patchwork Mon Aug 23 19:50:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 44758 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 20C4A3857818 for ; Mon, 23 Aug 2021 20:01:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 20C4A3857818 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1629748877; bh=8Krt9hLFcv2iHzvR3fk2qk3j/lOSbVmBF3KK3OAV89c=; 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=VXJCLD6jtZfMOVo9u8CW/mN4jfaynFFzvQWVylGlal69c5/xrSRswAW8+znKy7cx8 IbDUrvz3F5E/Qq6MPehvYjK8t78Fv99JZMlUA9y0Ytk+GQQzSFp/05A1pdUTvsHEYe b5N10JXxnryvpzq00adNtEsCdv4rgVafN/ZjuVFc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) by sourceware.org (Postfix) with ESMTPS id E268A3858038 for ; Mon, 23 Aug 2021 19:52:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E268A3858038 Received: by mail-qk1-x736.google.com with SMTP id ay33so9029353qkb.10 for ; Mon, 23 Aug 2021 12:52:14 -0700 (PDT) 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=8Krt9hLFcv2iHzvR3fk2qk3j/lOSbVmBF3KK3OAV89c=; b=LwPXNJUdSlVgFVG9yW1MH1HNOB7ZEqbrQz+3/Ru6/BnkV7P5Pw1ENdKQGmVrvRyqSH 3gAuiHsdIl3waPsItifnddBmQmj0w4Lp2mGgntIqeojLZD8/RRY5TW0YbNlK2lUnAg6Y uaL5PXwG9Z2CszeI+24DfUm4jXgKwhq46Ts/6ufoNfR1u0eSQzGUhBL4VUjn8Vs/lWbA YCootROETiw4WaMxOh2d46QZL6gMQQs7SHDrj4w1onlu20s1kNAT5HR6d96ZwwU/8M2K vhGo/J+i1Or+1Q4uG1IqpU9QNyZQnojWjJlLWOjYbz+gcuIbPWACCVIfBaZTKoLvcr1q J8OA== X-Gm-Message-State: AOAM531Dbt/ukIoVFjqRb82QuCkUhewvDZtnEFhSmFmusHq6TfdPrNPu ZV6M8KFzcUJTFggyCDsMqDF0zPkbDxIR2w== X-Google-Smtp-Source: ABdhPJww84DoD1Jun9M5q+GN6W2yjIZhCK1RWvjijSQK5cWqbBlBPTGHzKEqIpgm4TejryGWl79Krg== X-Received: by 2002:a37:6c43:: with SMTP id h64mr23207053qkc.362.1629748334454; Mon, 23 Aug 2021 12:52:14 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:cd83:c38b:b50d:5d9a:43d4]) by smtp.gmail.com with ESMTPSA id s10sm9210935qko.134.2021.08.23.12.52.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 12:52:14 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 12/19] nptl: Use tidlock when accessing TID on pthread_getcpuclockid Date: Mon, 23 Aug 2021 16:50:40 -0300 Message-Id: <20210823195047.543237-13-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210823195047.543237-1-adhemerval.zanella@linaro.org> References: <20210823195047.543237-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 Reply-To: Adhemerval Zanella Cc: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Checked on x86_64-linux-gnu. --- nptl/pthread_getcpuclockid.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/nptl/pthread_getcpuclockid.c b/nptl/pthread_getcpuclockid.c index 0a6656ea4c..8c0db0b9ba 100644 --- a/nptl/pthread_getcpuclockid.c +++ b/nptl/pthread_getcpuclockid.c @@ -29,16 +29,23 @@ __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; - - /* The clockid_t value is a simple computation from the TID. */ - - const clockid_t tidclock = MAKE_THREAD_CPUCLOCK (pd->tid, CPUCLOCK_SCHED); - - *clockid = tidclock; - return 0; + sigset_t oldmask; + __libc_signal_block_all (&oldmask); + lll_lock (pd->tidlock, LLL_PRIVATE); + + int res; + if (pd->tid != 0) + { + *clockid = MAKE_THREAD_CPUCLOCK (pd->tid, CPUCLOCK_SCHED); + res = 0; + } + else + res = -ESRCH; + + lll_unlock (pd->tidlock, LLL_PRIVATE); + __libc_signal_restore_set (&oldmask); + + return res; } versioned_symbol (libc, __pthread_getcpuclockid, pthread_getcpuclockid, GLIBC_2_34);