From patchwork Wed May 26 16:57:19 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: 43590 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 A68F5386FC1A; Wed, 26 May 2021 16:57:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A68F5386FC1A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1622048260; bh=CK4ZE/JVYBB+YzM2dBTahfYJlk6/4A/mILjpOPvOVu0=; 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=YAMeLTYNedRpNcMdBFsmZCnNaBs0fBMdD8a45IZlmMV6W2WQTMpU5vtInF3xTJm+b tStt0itpUwBMsbSCOZf1benu/JJ8P5ibhaYZTkREpDiUfIxutI92TXE38W0ulosJGG MvDP+MRSBTcgoW2STsQ5O+TDpRNHr8VBipwNsOw0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf32.google.com (mail-qv1-xf32.google.com [IPv6:2607:f8b0:4864:20::f32]) by sourceware.org (Postfix) with ESMTPS id D4189385782E for ; Wed, 26 May 2021 16:57:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D4189385782E Received: by mail-qv1-xf32.google.com with SMTP id ee9so1075931qvb.8 for ; Wed, 26 May 2021 09:57:36 -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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CK4ZE/JVYBB+YzM2dBTahfYJlk6/4A/mILjpOPvOVu0=; b=dUoEux8KosztWm/3FH4h/+BSIZs8UBeDT0EdTa9RckfJU4tcKJnOsmDy9Og+ixNZWI bT9pNcNCgB47PvVHDOKiU4eIv3MFi+NEvzktcAKF423GX1F85Dot3sRHhsUDZV+5mNEQ 1ptDUGQ8FrVqHqJWZiz5Qk9eVG7MuxY0/Lxm/y2zZYOT5NvP/HI7k7IcE9PeWNubnKRZ rfelV8h6/KpP00by0iLwc/+ZViSDbtDMIPkOE94cdFS+ywuvifpf9UIJBACEgdfqehVn YKrCEbx5/CgtYMniryzVFmyynrUSntKLc7G86SyJd5oacZnNNz23GNkf+HVqb3vbhjvx JYhA== X-Gm-Message-State: AOAM533OyozgQ+RrXHesdU/HxzPnwF9Fi5b+G4fyMtBqtUz3VgyGBxSc pdStvh2Sth2jfUoIvdfKaKXExLvsRSPucw== X-Google-Smtp-Source: ABdhPJw4afTCWcLzmADIVf1RxlguD6zREmnPHORL39YFOoWUGH6Z04rpb9JnOB1N6Ilq2TPqLOThag== X-Received: by 2002:ad4:4f21:: with SMTP id fc1mr42868627qvb.16.1622048256151; Wed, 26 May 2021 09:57:36 -0700 (PDT) Received: from birita.. ([177.194.37.86]) by smtp.googlemail.com with ESMTPSA id k125sm1859761qkf.53.2021.05.26.09.57.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 09:57:35 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 02/11] nptl: Move createthread to pthread_create Date: Wed, 26 May 2021 13:57:19 -0300 Message-Id: <20210526165728.1772546-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210526165728.1772546-1-adhemerval.zanella@linaro.org> References: <20210526165728.1772546-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.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 Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The 'create_thread' function is moved to pthread_create.c. It removes the START_THREAD_DEFN and START_THREAD_SELF macros and make the lock usage more clear (no need to cross-reference multiple files). No functional change. --- nptl/createthread.c | 153 ------------------------------------------ nptl/pthread_create.c | 120 +++++++++++++++++++++++++++++++-- 2 files changed, 113 insertions(+), 160 deletions(-) delete mode 100644 nptl/createthread.c diff --git a/nptl/createthread.c b/nptl/createthread.c deleted file mode 100644 index bc3409b326..0000000000 --- a/nptl/createthread.c +++ /dev/null @@ -1,153 +0,0 @@ -/* Low-level thread creation for NPTL. Linux version. - Copyright (C) 2002-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 2002. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#ifdef __NR_clone2 -# define ARCH_CLONE __clone2 -#else -# define ARCH_CLONE __clone -#endif - -/* See the comments in pthread_create.c for the requirements for these - two macros and the create_thread function. */ - -#define START_THREAD_DEFN \ - static int __attribute__ ((noreturn)) start_thread (void *arg) -#define START_THREAD_SELF arg - -/* pthread_create.c defines this using START_THREAD_DEFN - We need a forward declaration here so we can take its address. */ -static int start_thread (void *arg) __attribute__ ((noreturn)); - -static int -create_thread (struct pthread *pd, const struct pthread_attr *attr, - bool *stopped_start, STACK_VARIABLES_PARMS, bool *thread_ran) -{ - /* Determine whether the newly created threads has to be started - stopped since we have to set the scheduling parameters or set the - affinity. */ - bool need_setaffinity = (attr != NULL && attr->extension != NULL - && attr->extension->cpuset != 0); - if (attr != NULL - && (__glibc_unlikely (need_setaffinity) - || __glibc_unlikely ((attr->flags & ATTR_FLAG_NOTINHERITSCHED) != 0))) - *stopped_start = true; - - pd->stopped_start = *stopped_start; - if (__glibc_unlikely (*stopped_start)) - /* See CONCURRENCY NOTES in nptl/pthread_creat.c. */ - lll_lock (pd->lock, LLL_PRIVATE); - - /* We rely heavily on various flags the CLONE function understands: - - CLONE_VM, CLONE_FS, CLONE_FILES - These flags select semantics with shared address space and - file descriptors according to what POSIX requires. - - CLONE_SIGHAND, CLONE_THREAD - This flag selects the POSIX signal semantics and various - other kinds of sharing (itimers, POSIX timers, etc.). - - CLONE_SETTLS - The sixth parameter to CLONE determines the TLS area for the - new thread. - - CLONE_PARENT_SETTID - The kernels writes the thread ID of the newly created thread - into the location pointed to by the fifth parameters to CLONE. - - Note that it would be semantically equivalent to use - CLONE_CHILD_SETTID but it is be more expensive in the kernel. - - CLONE_CHILD_CLEARTID - The kernels clears the thread ID of a thread that has called - sys_exit() in the location pointed to by the seventh parameter - to CLONE. - - The termination signal is chosen to be zero which means no signal - is sent. */ - const int clone_flags = (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SYSVSEM - | CLONE_SIGHAND | CLONE_THREAD - | CLONE_SETTLS | CLONE_PARENT_SETTID - | CLONE_CHILD_CLEARTID - | 0); - - TLS_DEFINE_INIT_TP (tp, pd); - - if (__glibc_unlikely (ARCH_CLONE (&start_thread, STACK_VARIABLES_ARGS, - clone_flags, pd, &pd->tid, tp, &pd->tid) - == -1)) - return errno; - - /* It's started now, so if we fail below, we'll have to cancel it - and let it clean itself up. */ - *thread_ran = true; - - /* Now we have the possibility to set scheduling parameters etc. */ - if (attr != NULL) - { - int res; - - /* Set the affinity mask if necessary. */ - if (need_setaffinity) - { - assert (*stopped_start); - - res = INTERNAL_SYSCALL_CALL (sched_setaffinity, pd->tid, - attr->extension->cpusetsize, - attr->extension->cpuset); - - if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (res))) - err_out: - { - /* The operation failed. We have to kill the thread. - We let the normal cancellation mechanism do the work. */ - - pid_t pid = __getpid (); - INTERNAL_SYSCALL_CALL (tgkill, pid, pd->tid, SIGCANCEL); - - return INTERNAL_SYSCALL_ERRNO (res); - } - } - - /* Set the scheduling parameters. */ - if ((attr->flags & ATTR_FLAG_NOTINHERITSCHED) != 0) - { - assert (*stopped_start); - - res = INTERNAL_SYSCALL_CALL (sched_setscheduler, pd->tid, - pd->schedpolicy, &pd->schedparam); - - if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (res))) - goto err_out; - } - } - - return 0; -} diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c index 5680687efe..b53e3f30a0 100644 --- a/nptl/pthread_create.c +++ b/nptl/pthread_create.c @@ -215,9 +215,6 @@ late_init (void) /* CREATE THREAD NOTES: - createthread.c defines the create_thread function, and two macros: - START_THREAD_DEFN and START_THREAD_SELF (see below). - create_thread must initialize PD->stopped_start. It should be true if the STOPPED_START parameter is true, or if create_thread needs the new thread to synchronize at startup for some other implementation @@ -242,20 +239,129 @@ late_init (void) so create_thread need not do that. On failure, *THREAD_RAN should be set to true iff the thread actually started up and then got canceled before calling user code (*PD->start_routine). */ + +static int _Noreturn start_thread (void *arg); + static int create_thread (struct pthread *pd, const struct pthread_attr *attr, bool *stopped_start, STACK_VARIABLES_PARMS, - bool *thread_ran); + bool *thread_ran) +{ + /* Determine whether the newly created threads has to be started + stopped since we have to set the scheduling parameters or set the + affinity. */ + bool need_setaffinity = (attr != NULL && attr->extension != NULL + && attr->extension->cpuset != 0); + if (attr != NULL + && (__glibc_unlikely (need_setaffinity) + || __glibc_unlikely ((attr->flags & ATTR_FLAG_NOTINHERITSCHED) != 0))) + *stopped_start = true; + + pd->stopped_start = *stopped_start; + if (__glibc_unlikely (*stopped_start)) + lll_lock (pd->lock, LLL_PRIVATE); + + /* We rely heavily on various flags the CLONE function understands: + + CLONE_VM, CLONE_FS, CLONE_FILES + These flags select semantics with shared address space and + file descriptors according to what POSIX requires. + + CLONE_SIGHAND, CLONE_THREAD + This flag selects the POSIX signal semantics and various + other kinds of sharing (itimers, POSIX timers, etc.). + + CLONE_SETTLS + The sixth parameter to CLONE determines the TLS area for the + new thread. + + CLONE_PARENT_SETTID + The kernels writes the thread ID of the newly created thread + into the location pointed to by the fifth parameters to CLONE. + + Note that it would be semantically equivalent to use + CLONE_CHILD_SETTID but it is be more expensive in the kernel. + + CLONE_CHILD_CLEARTID + The kernels clears the thread ID of a thread that has called + sys_exit() in the location pointed to by the seventh parameter + to CLONE. + + The termination signal is chosen to be zero which means no signal + is sent. */ + const int clone_flags = (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SYSVSEM + | CLONE_SIGHAND | CLONE_THREAD + | CLONE_SETTLS | CLONE_PARENT_SETTID + | CLONE_CHILD_CLEARTID + | 0); + + TLS_DEFINE_INIT_TP (tp, pd); + +#ifdef __NR_clone2 +# define ARCH_CLONE __clone2 +#else +# define ARCH_CLONE __clone +#endif + if (__glibc_unlikely (ARCH_CLONE (&start_thread, STACK_VARIABLES_ARGS, + clone_flags, pd, &pd->tid, tp, &pd->tid) + == -1)) + return errno; + + /* It's started now, so if we fail below, we'll have to cancel it + and let it clean itself up. */ + *thread_ran = true; -#include + /* Now we have the possibility to set scheduling parameters etc. */ + if (attr != NULL) + { + int res; + + /* Set the affinity mask if necessary. */ + if (need_setaffinity) + { + assert (*stopped_start); + + res = INTERNAL_SYSCALL_CALL (sched_setaffinity, pd->tid, + attr->extension->cpusetsize, + attr->extension->cpuset); + + if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (res))) + err_out: + { + /* The operation failed. We have to kill the thread. + We let the normal cancellation mechanism do the work. */ + + pid_t pid = __getpid (); + INTERNAL_SYSCALL_CALL (tgkill, pid, pd->tid, SIGCANCEL); + + return INTERNAL_SYSCALL_ERRNO (res); + } + } + + /* Set the scheduling parameters. */ + if ((attr->flags & ATTR_FLAG_NOTINHERITSCHED) != 0) + { + assert (*stopped_start); + + res = INTERNAL_SYSCALL_CALL (sched_setscheduler, pd->tid, + pd->schedpolicy, &pd->schedparam); + + if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (res))) + goto err_out; + } + } + + return 0; +} /* Local function to start thread and handle cleanup. createthread.c defines the macro START_THREAD_DEFN to the declaration that its create_thread function will refer to, and START_THREAD_SELF to the expression to optimally deliver the new thread's THREAD_SELF value. */ -START_THREAD_DEFN +static int _Noreturn +start_thread (void *arg) { - struct pthread *pd = START_THREAD_SELF; + struct pthread *pd = arg; /* Initialize resolver state pointer. */ __resp = &pd->res;