From patchwork Thu Sep 30 20:00:46 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: 45634 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 EB6D2385842F for ; Thu, 30 Sep 2021 20:10:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EB6D2385842F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1633032603; bh=Zwc0d6DUlPsV+wYjRCzGvhWlY71tDx9bnrc+dRk7sVk=; 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=HjkE+edC1VK4swbfvGK+sAcxWFXJbRigVQHRBmi82ecJa6tui+y2Ma3VB5142UUuu ONCFZxZ3ViRUg8WD+I99QZJf5LZVc85z+PxFh2fosTrr3moQcMq/rqf4iul9w1bIaB ubpnNcg/LicCj8faQ9S6v/0AeqHRSR578wLSoSGw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) by sourceware.org (Postfix) with ESMTPS id 3FB253857C69 for ; Thu, 30 Sep 2021 20:01:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3FB253857C69 Received: by mail-qt1-x82b.google.com with SMTP id d8so6892223qtd.5 for ; Thu, 30 Sep 2021 13:01:11 -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=Zwc0d6DUlPsV+wYjRCzGvhWlY71tDx9bnrc+dRk7sVk=; b=FHK1uZP1NZaSGYG7R12AI/xmEp+2u7ZNAzQN7lwQ2YRAmlwyVypxCmb0hIzE/qySs7 in6VuCqlTl/27yADIvLqqYejTwnVLtELrxlAmfIFwNReB2bFT6bNo3h9I+E2uMngPgDi EFGHp2PLFT4y4pu/vz+qfNpYQURfXB6dMkedKd6sjnB7hxB6G9TWvUYIr+MnLzb2mpnp 04OnXv2+ScOtDcdU2cYCsKpSWQdguJ9d596EyfsfOSdHHGzceJ39GC6wAj6TD26hntI3 6lTrZyp4iTV+Ov4xUqh8VzBL8z7Tj7jjTP7ddv5LIBDkGfzIopzj+vlR1Yx4qa9qP/zA iVjg== X-Gm-Message-State: AOAM532XXasYxIvZJzKxpYBY0IxZrimCCTTsag+hKQi1UC3ObS+vpMF9 naF+eKMDMKV8Il2AC8nGcSyD9dcAmnnJvw== X-Google-Smtp-Source: ABdhPJwKUreh1LAk8t/GDm9FqpJUN7JdfKPXy4g66jXo9S2w/Nirnz9png8Pl80MpzgAKcxR2glQ6Q== X-Received: by 2002:ac8:6e8f:: with SMTP id c15mr8710738qtv.179.1633032067647; Thu, 30 Sep 2021 13:01:07 -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.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 13:01:07 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 10/15] nptl: Use exit_lock when accessing TID on pthread_getschedparam Date: Thu, 30 Sep 2021 17:00:46 -0300 Message-Id: <20210930200051.1017457-11-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.6 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" The sched_getparam call is also replaced with a INTERNAL_SYSCALL_CALL to avoid clobbering errno. Checked on x86_64-linux-gnu. --- nptl/pthread_getschedparam.c | 55 +++++++++++++++------------- sysdeps/pthread/tst-pthread-exited.c | 7 ++++ 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/nptl/pthread_getschedparam.c b/nptl/pthread_getschedparam.c index ef4022b8ac..09d07c8a17 100644 --- a/nptl/pthread_getschedparam.c +++ b/nptl/pthread_getschedparam.c @@ -15,24 +15,14 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include "pthreadP.h" -#include +#include +#include +#include - -int -__pthread_getschedparam (pthread_t threadid, int *policy, - struct sched_param *param) +static int +getschedparam (struct pthread *pd, int *policy, struct sched_param *param) { - struct pthread *pd = (struct pthread *) threadid; - - /* Make sure the descriptor is valid. */ - if (INVALID_TD_P (pd)) - /* Not a valid thread handle. */ - return ESRCH; - - int result = 0; + int r = 0; /* See CREATE THREAD NOTES in nptl/pthread_create.c. */ lll_lock (pd->lock, LLL_PRIVATE); @@ -44,22 +34,18 @@ __pthread_getschedparam (pthread_t threadid, int *policy, not yet been retrieved do it now. */ if ((pd->flags & ATTR_FLAG_SCHED_SET) == 0) { - if (__sched_getparam (pd->tid, &pd->schedparam) != 0) - result = 1; - else + r = INTERNAL_SYSCALL_CALL (sched_getparam, pd->tid, &pd->schedparam); + if (r == 0) pd->flags |= ATTR_FLAG_SCHED_SET; } - if ((pd->flags & ATTR_FLAG_POLICY_SET) == 0) { - pd->schedpolicy = __sched_getscheduler (pd->tid); - if (pd->schedpolicy == -1) - result = 1; - else + r = pd->schedpolicy = INTERNAL_SYSCALL_CALL (sched_getscheduler, pd->tid); + if (r >= 0) pd->flags |= ATTR_FLAG_POLICY_SET; } - if (result == 0) + if (r >= 0) { *policy = pd->schedpolicy; memcpy (param, &pd->schedparam, sizeof (struct sched_param)); @@ -67,6 +53,25 @@ __pthread_getschedparam (pthread_t threadid, int *policy, lll_unlock (pd->lock, LLL_PRIVATE); + return -r; +} + +int +__pthread_getschedparam (pthread_t threadid, int *policy, + struct sched_param *param) +{ + struct pthread *pd = (struct pthread *) threadid; + + /* 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); + + int result = pd->tid != 0 ? getschedparam (pd, policy, param) : ESRCH; + + __libc_lock_unlock (pd->exit_lock); + __libc_signal_restore_set (&old_mask); + return result; } libc_hidden_def (__pthread_getschedparam) diff --git a/sysdeps/pthread/tst-pthread-exited.c b/sysdeps/pthread/tst-pthread-exited.c index 208546a546..25015d4f74 100644 --- a/sysdeps/pthread/tst-pthread-exited.c +++ b/sysdeps/pthread/tst-pthread-exited.c @@ -63,6 +63,13 @@ do_test (void) TEST_COMPARE (r, ESRCH); } + { + struct sched_param sch; + int policy; + int r = pthread_getschedparam (thr, &policy, &sch); + TEST_COMPARE (r, ESRCH); + } + xpthread_join (thr); return 0;