From patchwork Mon Aug 23 19:50:38 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: 44756 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 0E5233857C6B for ; Mon, 23 Aug 2021 19:59:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0E5233857C6B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1629748784; bh=u2lKyvdSBEZmAC9HCYWTtKT/5rIjn2JhtzKQpOH1nQs=; 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=qHHgvmTlFgCXwg8T9AHJ802xNq9jVsdtxOz0B3JxgFXm57ov0omkTMiJsq9avXbvT /4pZw0FUQH8QFSru//H2pbXYcMy3Y/SgyV7EIzLxeEaQK205XoHTjxOymSa04vavHH LIrPZ5Z/uETr29SGm5nbkNoRSZzmIe0pK2jcFuaw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) by sourceware.org (Postfix) with ESMTPS id 8BB97385781C for ; Mon, 23 Aug 2021 19:52:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8BB97385781C Received: by mail-qk1-x733.google.com with SMTP id a10so11656707qka.12 for ; Mon, 23 Aug 2021 12:52:12 -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=u2lKyvdSBEZmAC9HCYWTtKT/5rIjn2JhtzKQpOH1nQs=; b=I6A1dD2dW78c0bmG528a+e0Z/7E0jHzmTMjH/MriQuwmFvcOV3ZepY0Mpe1dDV6w4p o6OWTlvV9OV8r6wo+A8WryBnpjFA2RDsxPatNdLZ9sTzx0SR7nB1MgbpL2i0CbV6pByp cgVlz3e2kCflaN25Y+eJZYXfFXykTK3Fl/pJe8viTltW31VgamWFS+VoDjdmzYKBC3Gz oHsH78Ma0A21HddfPNvVMDKa002G2UDeKCkp9UgYWhBJ+nhvRgx/Yl9SQTxkAqojpF3Z G+8ItvUHrTILIbfBVV/xsF3xReajVb1t3ILg9wzclalovmoyetAAKjbo1wP5qEZPxVR4 wngg== X-Gm-Message-State: AOAM5338RanDpsh5q6UnCQowVWjwu2ViRg2MSdEuPaVrWijUl4mcxUL/ ThKljgkIbUcyBJPJq21tAlEWlzOnolcUYA== X-Google-Smtp-Source: ABdhPJzl611YhzIVVRuffKaUIFdtg396QjRvLbx1zUSQOCe5hsth1eSPQF4DKCDPz/GE9keA3NuGkg== X-Received: by 2002:a05:620a:1435:: with SMTP id k21mr22761009qkj.442.1629748332020; Mon, 23 Aug 2021 12:52:12 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 12:52:11 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 10/19] nptl: Use tidlock when accessing TID on pthread_getaffinity_np Date: Mon, 23 Aug 2021 16:50:38 -0300 Message-Id: <20210823195047.543237-11-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.5 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 Netto 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_getaffinity.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/nptl/pthread_getaffinity.c b/nptl/pthread_getaffinity.c index 18261ddae0..5268d86e6e 100644 --- a/nptl/pthread_getaffinity.c +++ b/nptl/pthread_getaffinity.c @@ -29,12 +29,24 @@ int __pthread_getaffinity_np (pthread_t th, size_t cpusetsize, cpu_set_t *cpuset) { - const struct pthread *pd = (const struct pthread *) th; + struct pthread *pd = (struct pthread *) th; - int res = INTERNAL_SYSCALL_CALL (sched_getaffinity, pd->tid, - MIN (INT_MAX, cpusetsize), cpuset); - if (INTERNAL_SYSCALL_ERROR_P (res)) - return INTERNAL_SYSCALL_ERRNO (res); + /* Block all signal, since the lock is recursive and used on pthread_cancel + (which should be async-signal-safe). */ + sigset_t oldmask; + __libc_signal_block_all (&oldmask); + lll_lock (pd->tidlock, LLL_PRIVATE); + + int res = pd->tid == 0 + ? -ESRCH + : INTERNAL_SYSCALL_CALL (sched_getaffinity, pd->tid, + MIN (INT_MAX, cpusetsize), cpuset); + + lll_unlock (pd->tidlock, LLL_PRIVATE); + __libc_signal_restore_set (&oldmask); + + if (res < 0) + return -res; /* Clean the rest of the memory the kernel didn't do. */ memset ((char *) cpuset + res, '\0', cpusetsize - res);