From patchwork Thu Mar 11 19:52:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 42460 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com 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 C1054388E824; Thu, 11 Mar 2021 19:52:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C1054388E824 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1615492339; bh=6Ro2gps9oQa/JyTb217NwIGL6lfK6LYi3GPPxFc1Oxc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=GwbtoFibYGyus5aOBCk0z5ES5D3sJlHkGmoyGbpoYFZ66O5QnTezs8UNbwlatPKIl 8lZ4tx74imHNrJxyeS/U1jf3dgWOnrYOpKN2udpzutI0wYaZfoLzGN1EIt2VK7nfRC bw1C7kRSyCd66FNZpQKIy2WRfNDzbe7whgwQqM98= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) by sourceware.org (Postfix) with ESMTPS id 7F4F43860C2E for ; Thu, 11 Mar 2021 19:52:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7F4F43860C2E Received: by mail-qv1-xf2e.google.com with SMTP id j17so3137017qvo.13 for ; Thu, 11 Mar 2021 11:52:15 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=6Ro2gps9oQa/JyTb217NwIGL6lfK6LYi3GPPxFc1Oxc=; b=SB/RTtmH6FZG30ZrEPJ+P4H2bxIlgVqWxNHf2FMSdWXiCqMyBNVPVu1ma4tcL+NT4S x5sQo4sQUNsMC7rdPCntDFbcU1fpFvpUHDPDIRsJ8zVYOSUkXICDzCYUstzQqmvcHk8l dxy7RgierQJir7IBOjT3+5YLzZfW9etBhGZZ/bp6JFhsM79re7nxKhLsoT6VqJhKfndg 0MUZ9pskKwBtP7il5WswqjJlfLrDC3/cDKTgENOF+YHWr2XmwKB2MzbLrcajUFtN35kl e9USmMFtm/oZOHQW98Lf+tahexv3y1fpeAbWspuOlDZtu31s+TdYXUOYANn8ZY/lVx0M VaKg== X-Gm-Message-State: AOAM533m9pDqC0hD/brSVJxWbu+CPPe4hJSzwTZNqgbJMZSs9mqth7S+ GbkSfF4/q2UuF+cgcZf9Pq8V2PbIhnwSOU1a X-Google-Smtp-Source: ABdhPJx3VylbX5D+GuZG90or5jB0zQRyks3xlb5x5bilnaYSFU+7TUL82QHYcQB3NOzlOOaCf8W1ew== X-Received: by 2002:a0c:b71a:: with SMTP id t26mr9180977qvd.38.1615492334625; Thu, 11 Mar 2021 11:52:14 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id b16sm2266976qtx.85.2021.03.11.11.52.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:52:14 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 1/8] posix: Consolidate register-atfork Date: Thu, 11 Mar 2021 16:52:03 -0300 Message-Id: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Changes from v1: * Remove hurd fork.h (the atfork definitions are now at register-atfork.h) --- Both htl and nptl uses a different data structure to implement atfork handlers. The nptl one was refactored by 27761a1042d to use a dynarray which simplifies the code. This patch moves the nptl one to be the generic implementation and replace Hurd linked one. Different than previous NPTL, Hurd also uses a global lock, so performance should be similar. Checked on x86_64-linux-gnu, i686-linux-gnu, and with a build for i686-gnu. --- htl/Makefile | 2 +- htl/register-atfork.c | 157 ------------------ .../htl/fork.h => include/register-atfork.h | 38 ++++- nptl/Makefile | 1 - posix/Makefile | 2 +- {nptl => posix}/register-atfork.c | 8 +- sysdeps/generic/fork.h | 19 +++ sysdeps/htl/pt-atfork.c | 1 + sysdeps/mach/hurd/fork.c | 15 +- sysdeps/nptl/fork.h | 42 +---- 10 files changed, 66 insertions(+), 219 deletions(-) delete mode 100644 htl/register-atfork.c rename sysdeps/htl/fork.h => include/register-atfork.h (54%) rename {nptl => posix}/register-atfork.c (97%) diff --git a/htl/Makefile b/htl/Makefile index c15c1b194e..895a6f777c 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -165,7 +165,7 @@ headers := \ distribute := -routines := forward libc_pthread_init alloca_cutoff register-atfork pt-atfork +routines := forward libc_pthread_init alloca_cutoff pt-atfork shared-only-routines = forward static-only-routines = pt-atfork diff --git a/htl/register-atfork.c b/htl/register-atfork.c deleted file mode 100644 index 8be132f981..0000000000 --- a/htl/register-atfork.c +++ /dev/null @@ -1,157 +0,0 @@ -/* Atfork handling. Hurd pthread version. - Copyright (C) 2002-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - 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 - -struct atfork -{ - void (*prepare) (void); - void (*parent) (void); - void (*child) (void); - void *dso_handle; - struct atfork *prev; - struct atfork *next; -}; - -/* TODO: better locking */ -__libc_lock_define_initialized (static, atfork_lock); -static struct atfork *fork_handlers, *fork_last_handler; - -static void -atfork_pthread_prepare (void) -{ - struct atfork *handlers, *last_handler; - - __libc_lock_lock (atfork_lock); - handlers = fork_handlers; - last_handler = fork_last_handler; - __libc_lock_unlock (atfork_lock); - - if (last_handler == NULL) - return; - - while (1) - { - if (last_handler->prepare != NULL) - last_handler->prepare (); - if (last_handler == handlers) - break; - last_handler = last_handler->prev; - } -} -text_set_element (_hurd_atfork_prepare_hook, atfork_pthread_prepare); - -static void -atfork_pthread_parent (void) -{ - struct atfork *handlers; - - __libc_lock_lock (atfork_lock); - handlers = fork_handlers; - __libc_lock_unlock (atfork_lock); - - while (handlers != NULL) - { - if (handlers->parent != NULL) - handlers->parent (); - handlers = handlers->next; - } -} -text_set_element (_hurd_atfork_parent_hook, atfork_pthread_parent); - -static void -atfork_pthread_child (void) -{ - struct atfork *handlers; - - __libc_lock_lock (atfork_lock); - handlers = fork_handlers; - __libc_lock_unlock (atfork_lock); - - while (handlers != NULL) - { - if (handlers->child != NULL) - handlers->child (); - handlers = handlers->next; - } -} -text_set_element (_hurd_atfork_child_hook, atfork_pthread_child); - -int -__register_atfork (void (*prepare) (void), - void (*parent) (void), - void (*child) (void), - void *dso_handle) -{ - struct atfork *new = malloc (sizeof (*new)); - if (new == NULL) - return errno; - - new->prepare = prepare; - new->parent = parent; - new->child = child; - new->dso_handle = dso_handle; - new->next = NULL; - - __libc_lock_lock (atfork_lock); - new->prev = fork_last_handler; - if (fork_last_handler != NULL) - fork_last_handler->next = new; - if (fork_handlers == NULL) - fork_handlers = new; - fork_last_handler = new; - __libc_lock_unlock (atfork_lock); - - return 0; -} -libc_hidden_def (__register_atfork) - -void -__unregister_atfork (void *dso_handle) -{ - struct atfork **handlers, *prev = NULL, *next; - __libc_lock_lock (atfork_lock); - handlers = &fork_handlers; - while (*handlers != NULL) - { - if ((*handlers)->dso_handle == dso_handle) - { - /* Drop this handler from the list. */ - if (*handlers == fork_last_handler) - { - /* Was last, new last is prev, if any. */ - fork_last_handler = prev; - } - - next = (*handlers)->next; - if (next != NULL) - next->prev = prev; - *handlers = next; - } - else - { - /* Just proceed to next handler. */ - prev = *handlers; - handlers = &prev->next; - } - } - __libc_lock_unlock (atfork_lock); -} diff --git a/sysdeps/htl/fork.h b/include/register-atfork.h similarity index 54% rename from sysdeps/htl/fork.h rename to include/register-atfork.h index 0fccc309f8..fadde14700 100644 --- a/sysdeps/htl/fork.h +++ b/include/register-atfork.h @@ -1,5 +1,5 @@ -/* Register fork handlers. Generic version. - Copyright (C) 2002-2021 Free Software Foundation, Inc. +/* Internal pthread_atfork definitions. + Copyright (C) 2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,10 +16,42 @@ License along with the GNU C Library; if not, see . */ +#ifndef _REGISTER_ATFORK_H +#define _REGISTER_ATFORK_H + +/* Elements of the fork handler lists. */ +struct fork_handler +{ + void (*prepare_handler) (void); + void (*parent_handler) (void); + void (*child_handler) (void); + void *dso_handle; +}; + /* Function to call to unregister fork handlers. */ extern void __unregister_atfork (void *dso_handle) attribute_hidden; #define UNREGISTER_ATFORK(dso_handle) __unregister_atfork (dso_handle) +enum __run_fork_handler_type +{ + atfork_run_prepare, + atfork_run_child, + atfork_run_parent +}; + +/* Run the atfork handlers and lock/unlock the internal lock depending + of the WHO argument: + + - atfork_run_prepare: run all the PREPARE_HANDLER in reverse order of + insertion and locks the internal lock. + - atfork_run_child: run all the CHILD_HANDLER and unlocks the internal + lock. + - atfork_run_parent: run all the PARENT_HANDLER and unlocks the internal + lock. + + Perform locking only if DO_LOCKING. */ +extern void __run_fork_handlers (enum __run_fork_handler_type who, + _Bool do_locking) attribute_hidden; /* C library side function to register new fork handlers. */ extern int __register_atfork (void (*__prepare) (void), @@ -27,3 +59,5 @@ extern int __register_atfork (void (*__prepare) (void), void (*__child) (void), void *dso_handle); libc_hidden_proto (__register_atfork) + +#endif diff --git a/nptl/Makefile b/nptl/Makefile index 33766eaf7a..e5d69e8858 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -74,7 +74,6 @@ routines = \ pthread_self \ pthread_setschedparam \ pthread_sigmask \ - register-atfork \ shared-only-routines = forward static-only-routines = pthread_atfork diff --git a/posix/Makefile b/posix/Makefile index 305ec757cd..be0c72f0bb 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -39,7 +39,7 @@ routines := \ times \ wait waitpid wait3 wait4 waitid \ alarm sleep pause nanosleep \ - fork vfork _exit \ + fork vfork _exit register-atfork \ execve fexecve execv execle execl execvp execlp execvpe \ getpid getppid \ getuid geteuid getgid getegid getgroups setuid setgid group_member \ diff --git a/nptl/register-atfork.c b/posix/register-atfork.c similarity index 97% rename from nptl/register-atfork.c rename to posix/register-atfork.c index 30c16fba40..6fd9e4c56a 100644 --- a/nptl/register-atfork.c +++ b/posix/register-atfork.c @@ -16,11 +16,9 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include -#include -#include +#include +#include +#include #define DYNARRAY_ELEMENT struct fork_handler #define DYNARRAY_STRUCT fork_handler_list diff --git a/sysdeps/generic/fork.h b/sysdeps/generic/fork.h index 623cae28df..6cc842a425 100644 --- a/sysdeps/generic/fork.h +++ b/sysdeps/generic/fork.h @@ -6,3 +6,22 @@ parameter which is the DSO handle for the DSO which gets unloaded. The function so called has to remove the atfork handlers registered by this module. */ + + +/* System specific fork definition. Generic version. + Copyright (C) 2002-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 + . */ diff --git a/sysdeps/htl/pt-atfork.c b/sysdeps/htl/pt-atfork.c index 3d115d3819..dbb3b8f0cc 100644 --- a/sysdeps/htl/pt-atfork.c +++ b/sysdeps/htl/pt-atfork.c @@ -20,6 +20,7 @@ #include #include #include +#include /* Hide the symbol so that no definition but the one locally in the executable or DSO is used. */ diff --git a/sysdeps/mach/hurd/fork.c b/sysdeps/mach/hurd/fork.c index 2b39f4e8b5..1c5299e686 100644 --- a/sysdeps/mach/hurd/fork.c +++ b/sysdeps/mach/hurd/fork.c @@ -30,6 +30,7 @@ #include #include #include +#include #undef __fork @@ -37,12 +38,6 @@ /* Things that want to be locked while forking. */ symbol_set_declare (_hurd_fork_locks) - -/* Application callbacks registered through pthread_atfork. */ -DEFINE_HOOK (_hurd_atfork_prepare_hook, (void)); -DEFINE_HOOK (_hurd_atfork_child_hook, (void)); -DEFINE_HOOK (_hurd_atfork_parent_hook, (void)); - /* Things that want to be called before we fork, to prepare the parent for task_create, when the new child task will inherit our address space. */ DEFINE_HOOK (_hurd_fork_prepare_hook, (void)); @@ -72,7 +67,7 @@ __fork (void) struct hurd_sigstate *volatile ss; struct nss_database_data nss_database_data; - RUN_HOOK (_hurd_atfork_prepare_hook, ()); + __run_fork_handlers (atfork_run_prepare, true); ss = _hurd_self_sigstate (); __spin_lock (&ss->critical_section_lock); @@ -726,10 +721,8 @@ __fork (void) if (!err) { - if (pid != 0) - RUN_HOOK (_hurd_atfork_parent_hook, ()); - else - RUN_HOOK (_hurd_atfork_child_hook, ()); + __run_fork_handlers (pid == 0 ? atfork_run_child : atfork_run_parent, + true); } return err ? __hurd_fail (err) : pid; diff --git a/sysdeps/nptl/fork.h b/sysdeps/nptl/fork.h index 25002287b1..5246754290 100644 --- a/sysdeps/nptl/fork.h +++ b/sysdeps/nptl/fork.h @@ -17,50 +17,10 @@ . */ #include +#include /* The fork generation counter, defined in libpthread. */ extern unsigned long int __fork_generation attribute_hidden; /* Pointer to the fork generation counter in the thread library. */ extern unsigned long int *__fork_generation_pointer attribute_hidden; - -/* Elements of the fork handler lists. */ -struct fork_handler -{ - void (*prepare_handler) (void); - void (*parent_handler) (void); - void (*child_handler) (void); - void *dso_handle; -}; - -/* Function to call to unregister fork handlers. */ -extern void __unregister_atfork (void *dso_handle) attribute_hidden; -#define UNREGISTER_ATFORK(dso_handle) __unregister_atfork (dso_handle) - -enum __run_fork_handler_type -{ - atfork_run_prepare, - atfork_run_child, - atfork_run_parent -}; - -/* Run the atfork handlers and lock/unlock the internal lock depending - of the WHO argument: - - - atfork_run_prepare: run all the PREPARE_HANDLER in reverse order of - insertion and locks the internal lock. - - atfork_run_child: run all the CHILD_HANDLER and unlocks the internal - lock. - - atfork_run_parent: run all the PARENT_HANDLER and unlocks the internal - lock. - - Perform locking only if DO_LOCKING. */ -extern void __run_fork_handlers (enum __run_fork_handler_type who, - _Bool do_locking) attribute_hidden; - -/* C library side function to register new fork handlers. */ -extern int __register_atfork (void (*__prepare) (void), - void (*__parent) (void), - void (*__child) (void), - void *dso_handle); -libc_hidden_proto (__register_atfork) From patchwork Thu Mar 11 19:52:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 42461 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com 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 58A4B3893C14; Thu, 11 Mar 2021 19:52:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 58A4B3893C14 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1615492340; bh=+8BrpZoSeCXPqscJBmsNAQXo5/IWcNcltkp4+M7ZWTc=; 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=HBT9zQwfCO6/AEdZ6zRw1ySu2RD467gCCcnvcm7S2L0pHkybGBQIDHwhnilkCfr0q p9LRYuTxANpui74EZMeMJQ8CWY6RWpuWptkWdYZsIcsNtnvmoz+ADAlIJFZJM2OcOZ WhlbolrZ0GmhjzNnLezjZIoyrFgzwXxdVy38bFxk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) by sourceware.org (Postfix) with ESMTPS id 558B53840C25 for ; Thu, 11 Mar 2021 19:52:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 558B53840C25 Received: by mail-qt1-x834.google.com with SMTP id s2so2078642qtx.10 for ; Thu, 11 Mar 2021 11:52:16 -0800 (PST) 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=+8BrpZoSeCXPqscJBmsNAQXo5/IWcNcltkp4+M7ZWTc=; b=jSF/ILPQw6xaGEyjtmNm9BK2I7C4+LGEabS+MV36uBhRyY22pVoh3chAAfhN1iJ2s9 hbvMo2qw1EYZFU26uwUPYNYSSOOgfke2CoZLmS6l4icQGA0nm7lmnfqAcrGsJMvJzV1m LNhpz61HzJhGNudIx6qBNOydkLYIq6b6blO/hqpZ36WB2Yxf3k5IOr8fGgDtdYNwEzJr dFC2LBFYc4INABOjkH5N+L09raKL0/seNI7IQg2U5AUYbUUz6DG+y44BtKLD283Ebl9S HwOah85nPxTAjs/FmoozN+ph/1PHWQGsNC8c+J3rn7cV8zi94/y5N1tEQHa7ltZZ2gkS UCtA== X-Gm-Message-State: AOAM530CMSQPRIuwmhWQgM7J79y3ZVNvbToK9WHNgNTS7hi5KAGdvLOg hHNeGEiQWQvrA00FQ4WRnc/XFUBwz5+/Uacf X-Google-Smtp-Source: ABdhPJzDh1xV0Hp2VCdnKnsoMrHpe2SUucKNojRwPEH6GPR6ZIgyGDBOKCOGSkAaP1BVKZMc329dOA== X-Received: by 2002:ac8:424b:: with SMTP id r11mr9073734qtm.311.1615492335794; Thu, 11 Mar 2021 11:52:15 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id b16sm2266976qtx.85.2021.03.11.11.52.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:52:15 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 2/8] linux: Use __libc_single_threaded on fork Date: Thu, 11 Mar 2021 16:52:04 -0300 Message-Id: <20210311195210.3153729-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> References: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 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.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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Changes from v1: * Fix __libc_single_threaded backwards usage. --- Checked on x86_64-linux-gnu. --- sysdeps/nptl/fork.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c index 4fb4c2d254..f78267b68c 100644 --- a/sysdeps/nptl/fork.c +++ b/sysdeps/nptl/fork.c @@ -34,6 +34,7 @@ #include #include #include +#include static void fresetlockfiles (void) @@ -55,7 +56,7 @@ __libc_fork (void) handlers in the single-thread case, to make fork safer to use in signal handlers. POSIX requires that fork is async-signal-safe, but our current fork implementation is not. */ - bool multiple_threads = THREAD_GETMEM (THREAD_SELF, header.multiple_threads); + bool multiple_threads = __libc_single_threaded == 0; __run_fork_handlers (atfork_run_prepare, multiple_threads); From patchwork Thu Mar 11 19:52:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 42462 X-Patchwork-Delegate: fweimer@redhat.com 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 630F33894C0C; Thu, 11 Mar 2021 19:52:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 630F33894C0C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1615492341; bh=eUjEmYrMBk6YXucGUmLi0SX1vGr4BbJFzyTSKb05zHo=; 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=KCaPO5UQ3AblVkmsDA1ODYj91/FEkymy7QZPYNL5C/NSSy+dH75nVXWigICkDTkbj j/PJnzwmR2bUzpe+aOm7kwMD3UQnMVS/S2WWB2aMAgV6pnIWtRi2fqsY8aw2D7SUK1 fgitMYOJcqzwCxpU3gIm0rwz2WIgSEtGf03SF6n8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by sourceware.org (Postfix) with ESMTPS id 3B6A7383440D for ; Thu, 11 Mar 2021 19:52:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3B6A7383440D Received: by mail-qt1-x82f.google.com with SMTP id m7so2083943qtq.11 for ; Thu, 11 Mar 2021 11:52:18 -0800 (PST) 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=eUjEmYrMBk6YXucGUmLi0SX1vGr4BbJFzyTSKb05zHo=; b=AFQOrNoNuc+l4/K0Qzkf6pITwZL2slRGhVKTW/jRFij/3e6sxlHTOv2ISa2ILILfG/ NQFMKPTgPVHy4Nspce024pFRkjvS8vtYEEvf4h6NbTDs1fYIzA6FiygugNzLRTz1Z/b5 bYs2PRpnW5hkbQuMJLNeZMEL9MIhi93EQEiz+RU7gKYd8LAamPgzTo+sJy53gr6R1Uv2 hZUH1ZSb/YRY3dUKAhf5Ak/Z8Wfb75XYZYQw6zrW3sWwNHKLmce3TyaKqHs6A6AmnAyH N8oIue4dOAZLrbdXPxAVUNhNvhdVnChI8H6154UVJMM7qDxSZ1SJq1nE3dMdMk6lksd3 1unA== X-Gm-Message-State: AOAM532KUsdMcYNVtTxbEguPdpJbGI9E7aeDAiOinmVbwSojIZulKCBo UbnKmSBAkxFzZrdqovKf6uM/eOUQAFBlj43y X-Google-Smtp-Source: ABdhPJzTLjgkXv3xJ6RuwrBBwqlCy0N3z0ae2rtUhhAifT54xKY966HH4VvzK/NzNjlas3/2KQ+UUA== X-Received: by 2002:ac8:5a8a:: with SMTP id c10mr9074410qtc.30.1615492337069; Thu, 11 Mar 2021 11:52:17 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id b16sm2266976qtx.85.2021.03.11.11.52.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:52:16 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 3/8] posix: Consolidate fork implementation Date: Thu, 11 Mar 2021 16:52:05 -0300 Message-Id: <20210311195210.3153729-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> References: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Changes from v1: * Add the fork_system_setup system hook. * Move the Linux __fork_generation_pointer out of _Fork to the NPTL fork_system_setup hook (called from fork). * Removed comment about POSIX async-signal-safe requirement for fork. --- The Linux nptl implementation is used as base for generic fork implementation to handle the internal locks and mutexes. The system specific bits are moved a new internal _Fork symbol. (This new implementation will be used to provide a async-signal-safe _Fork now that POSIX has clarified that fork might not be async-signal-safe [1]). For Hurd it means hat the __nss_database_fork_prepare_parent and __nss_database_fork_subprocess will be run in a slight different order. [1] https://austingroupbugs.net/view.php?id=62 --- include/unistd.h | 2 + posix/Makefile | 3 +- posix/_Fork.c | 34 ++++++ posix/fork.c | 112 +++++++++++++++--- sysdeps/generic/fork.h | 5 + sysdeps/mach/hurd/{fork.c => _Fork.c} | 21 +--- sysdeps/nptl/_Fork.c | 60 ++++++++++ sysdeps/nptl/fork.c | 162 -------------------------- sysdeps/nptl/fork.h | 10 +- sysdeps/unix/sysv/linux/arch-fork.h | 3 + 10 files changed, 216 insertions(+), 196 deletions(-) create mode 100644 posix/_Fork.c rename sysdeps/mach/hurd/{fork.c => _Fork.c} (98%) create mode 100644 sysdeps/nptl/_Fork.c delete mode 100644 sysdeps/nptl/fork.c diff --git a/include/unistd.h b/include/unistd.h index 54becbc9eb..5010d75d30 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -135,6 +135,8 @@ libc_hidden_proto (__setresuid) libc_hidden_proto (__setresgid) extern __pid_t __vfork (void); libc_hidden_proto (__vfork) +extern __pid_t _Fork (void); +libc_hidden_proto (_Fork); extern int __ttyname_r (int __fd, char *__buf, size_t __buflen) attribute_hidden; extern int __isatty (int __fd) attribute_hidden; diff --git a/posix/Makefile b/posix/Makefile index be0c72f0bb..c59190a3f3 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -39,7 +39,7 @@ routines := \ times \ wait waitpid wait3 wait4 waitid \ alarm sleep pause nanosleep \ - fork vfork _exit register-atfork \ + fork _Fork vfork _exit register-atfork \ execve fexecve execv execle execl execvp execlp execvpe \ getpid getppid \ getuid geteuid getgid getegid getgroups setuid setgid group_member \ @@ -261,6 +261,7 @@ CFLAGS-execl.os = -fomit-frame-pointer CFLAGS-execvp.os = -fomit-frame-pointer CFLAGS-execlp.os = -fomit-frame-pointer CFLAGS-nanosleep.c += -fexceptions -fasynchronous-unwind-tables +CFLAGS-fork.c = $(libio-mtsafe) tstgetopt-ARGS = -a -b -cfoobar --required foobar --optional=bazbug \ --none random --col --color --colour diff --git a/posix/_Fork.c b/posix/_Fork.c new file mode 100644 index 0000000000..4a998c04f1 --- /dev/null +++ b/posix/_Fork.c @@ -0,0 +1,34 @@ +/* _Fork implementation. Generic version. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 + +/* Clone the calling process, creating an exact copy. Return -1 for errors, + 0 to the new process, and the process ID of the new process to the + old process. + Different than fork, this functions is marked as async-signal-safe by + POSIX (by Austin Group issue 62). */ +pid_t +_Fork (void) +{ + __set_errno (ENOSYS); + return -1; +} +libc_hidden_def (_Fork) +stub_warning (_Fork) diff --git a/posix/fork.c b/posix/fork.c index 05bda04ac5..cc1bdc1232 100644 --- a/posix/fork.c +++ b/posix/fork.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991-2021 Free Software Foundation, Inc. +/* fork - create a child process. + Copyright (C) 1991-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -15,20 +16,105 @@ License along with the GNU C Library; if not, see . */ -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +static void +fresetlockfiles (void) +{ + _IO_ITER i; + + for (i = _IO_iter_begin(); i != _IO_iter_end(); i = _IO_iter_next(i)) + if ((_IO_iter_file (i)->_flags & _IO_USER_LOCK) == 0) + _IO_lock_init (*((_IO_lock_t *) _IO_iter_file(i)->_lock)); +} -/* Clone the calling process, creating an exact copy. - Return -1 for errors, 0 to the new process, - and the process ID of the new process to the old process. */ -int -__fork (void) +pid_t +__libc_fork (void) { - __set_errno (ENOSYS); - return -1; + /* Determine if we are running multiple threads. We skip some fork + handlers in the single-thread case, to make fork safer to use in + signal handlers. */ + bool multiple_threads = __libc_single_threaded == 0; + + __run_fork_handlers (atfork_run_prepare, multiple_threads); + + struct nss_database_data nss_database_data; + + /* If we are not running multiple threads, we do not have to + preserve lock state. If fork runs from a signal handler, only + async-signal-safe functions can be used in the child. These data + structures are only used by unsafe functions, so their state does + not matter if fork was called from a signal handler. */ + if (multiple_threads) + { + call_function_static_weak (__nss_database_fork_prepare_parent, + &nss_database_data); + + _IO_list_lock (); + + /* Acquire malloc locks. This needs to come last because fork + handlers may use malloc, and the libio list lock has an + indirect malloc dependency as well (via the getdelim + function). */ + call_function_static_weak (__malloc_fork_lock_parent); + } + + pid_t pid = _Fork (); + + if (pid == 0) + { + fork_system_setup (); + + /* Reset the lock state in the multi-threaded case. */ + if (multiple_threads) + { + __libc_unwind_link_after_fork (); + + /* Release malloc locks. */ + call_function_static_weak (__malloc_fork_unlock_child); + + /* Reset the file list. These are recursive mutexes. */ + fresetlockfiles (); + + /* Reset locks in the I/O code. */ + _IO_list_resetlock (); + + call_function_static_weak (__nss_database_fork_subprocess, + &nss_database_data); + } + + /* Reset the lock the dynamic loader uses to protect its data. */ + __rtld_lock_initialize (GL(dl_load_lock)); + + /* Run the handlers registered for the child. */ + __run_fork_handlers (atfork_run_child, multiple_threads); + } + else + { + /* Release acquired locks in the multi-threaded case. */ + if (multiple_threads) + { + /* Release malloc locks, parent process variant. */ + call_function_static_weak (__malloc_fork_unlock_parent); + + /* We execute this even if the 'fork' call failed. */ + _IO_list_unlock (); + } + + /* Run the handlers registered for the parent. */ + __run_fork_handlers (atfork_run_parent, multiple_threads); + } + + return pid; } +weak_alias (__libc_fork, __fork) libc_hidden_def (__fork) -stub_warning (fork) - -weak_alias (__fork, fork) +weak_alias (__libc_fork, fork) diff --git a/sysdeps/generic/fork.h b/sysdeps/generic/fork.h index 6cc842a425..f7dfa3fdb7 100644 --- a/sysdeps/generic/fork.h +++ b/sysdeps/generic/fork.h @@ -25,3 +25,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, see . */ + +static inline void +fork_system_setup (void) +{ +} diff --git a/sysdeps/mach/hurd/fork.c b/sysdeps/mach/hurd/_Fork.c similarity index 98% rename from sysdeps/mach/hurd/fork.c rename to sysdeps/mach/hurd/_Fork.c index 1c5299e686..f6a16c4ca5 100644 --- a/sysdeps/mach/hurd/fork.c +++ b/sysdeps/mach/hurd/_Fork.c @@ -58,16 +58,13 @@ DEFINE_HOOK (_hurd_fork_parent_hook, (void)); Return -1 for errors, 0 to the new process, and the process ID of the new process to the old process. */ pid_t -__fork (void) +_Fork (void) { jmp_buf env; pid_t pid; size_t i; error_t err; struct hurd_sigstate *volatile ss; - struct nss_database_data nss_database_data; - - __run_fork_handlers (atfork_run_prepare, true); ss = _hurd_self_sigstate (); __spin_lock (&ss->critical_section_lock); @@ -107,9 +104,6 @@ __fork (void) /* Run things that prepare for forking before we create the task. */ RUN_HOOK (_hurd_fork_prepare_hook, ()); - call_function_static_weak (__nss_database_fork_prepare_parent, - &nss_database_data); - /* Lock things that want to be locked before we fork. */ { void *const *p; @@ -669,9 +663,6 @@ __fork (void) _hurd_malloc_fork_child (); call_function_static_weak (__malloc_fork_unlock_child); - call_function_static_weak (__nss_database_fork_subprocess, - &nss_database_data); - /* Run things that want to run in the child task to set up. */ RUN_HOOK (_hurd_fork_child_hook, ()); @@ -719,14 +710,6 @@ __fork (void) _hurd_critical_section_unlock (ss); - if (!err) - { - __run_fork_handlers (pid == 0 ? atfork_run_child : atfork_run_parent, - true); - } - return err ? __hurd_fail (err) : pid; } -libc_hidden_def (__fork) - -weak_alias (__fork, fork) +libc_hidden_def (_Fork) diff --git a/sysdeps/nptl/_Fork.c b/sysdeps/nptl/_Fork.c new file mode 100644 index 0000000000..eb6317e758 --- /dev/null +++ b/sysdeps/nptl/_Fork.c @@ -0,0 +1,60 @@ +/* _Fork implementation. Linux version. + Copyright (C) 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 + +/* Pointer to the fork generation counter in the thread library. */ +extern unsigned long int *__fork_generation_pointer attribute_hidden; + +pid_t +_Fork (void) +{ + pid_t pid = arch_fork (&THREAD_SELF->tid); + if (pid == 0) + { + struct pthread *self = THREAD_SELF; + + /* Initialize the robust mutex list setting in the kernel which has + been reset during the fork. We do not check for errors because if + it fails here, it must have failed at process startup as well and + nobody could have used robust mutexes. + Before we do that, we have to clear the list of robust mutexes + because we do not inherit ownership of mutexes from the parent. + We do not have to set self->robust_head.futex_offset since we do + inherit the correct value from the parent. We do not need to clear + the pending operation because it must have been zero when fork was + called. */ +#if __PTHREAD_MUTEX_HAVE_PREV + self->robust_prev = &self->robust_head; +#endif + self->robust_head.list = &self->robust_head; +#ifdef SHARED + if (__builtin_expect (__libc_pthread_functions_init, 0)) + PTHFCT_CALL (ptr_set_robust, (self)); +#else + extern __typeof (__nptl_set_robust) __nptl_set_robust + __attribute__((weak)); + if (__builtin_expect (__nptl_set_robust != NULL, 0)) + __nptl_set_robust (self); +#endif + } + return pid; +} +libc_hidden_def (_Fork) diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c deleted file mode 100644 index f78267b68c..0000000000 --- a/sysdeps/nptl/fork.c +++ /dev/null @@ -1,162 +0,0 @@ -/* 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static void -fresetlockfiles (void) -{ - _IO_ITER i; - - for (i = _IO_iter_begin(); i != _IO_iter_end(); i = _IO_iter_next(i)) - if ((_IO_iter_file (i)->_flags & _IO_USER_LOCK) == 0) - _IO_lock_init (*((_IO_lock_t *) _IO_iter_file(i)->_lock)); -} - - -pid_t -__libc_fork (void) -{ - pid_t pid; - - /* Determine if we are running multiple threads. We skip some fork - handlers in the single-thread case, to make fork safer to use in - signal handlers. POSIX requires that fork is async-signal-safe, - but our current fork implementation is not. */ - bool multiple_threads = __libc_single_threaded == 0; - - __run_fork_handlers (atfork_run_prepare, multiple_threads); - - struct nss_database_data nss_database_data; - - /* If we are not running multiple threads, we do not have to - preserve lock state. If fork runs from a signal handler, only - async-signal-safe functions can be used in the child. These data - structures are only used by unsafe functions, so their state does - not matter if fork was called from a signal handler. */ - if (multiple_threads) - { - call_function_static_weak (__nss_database_fork_prepare_parent, - &nss_database_data); - - _IO_list_lock (); - - /* Acquire malloc locks. This needs to come last because fork - handlers may use malloc, and the libio list lock has an - indirect malloc dependency as well (via the getdelim - function). */ - call_function_static_weak (__malloc_fork_lock_parent); - } - - pid = arch_fork (&THREAD_SELF->tid); - - if (pid == 0) - { - struct pthread *self = THREAD_SELF; - - /* See __pthread_once. */ - if (__fork_generation_pointer != NULL) - *__fork_generation_pointer += __PTHREAD_ONCE_FORK_GEN_INCR; - - /* Initialize the robust mutex list setting in the kernel which has - been reset during the fork. We do not check for errors because if - it fails here, it must have failed at process startup as well and - nobody could have used robust mutexes. - Before we do that, we have to clear the list of robust mutexes - because we do not inherit ownership of mutexes from the parent. - We do not have to set self->robust_head.futex_offset since we do - inherit the correct value from the parent. We do not need to clear - the pending operation because it must have been zero when fork was - called. */ -#if __PTHREAD_MUTEX_HAVE_PREV - self->robust_prev = &self->robust_head; -#endif - self->robust_head.list = &self->robust_head; -#ifdef SHARED - if (__builtin_expect (__libc_pthread_functions_init, 0)) - PTHFCT_CALL (ptr_set_robust, (self)); -#else - extern __typeof (__nptl_set_robust) __nptl_set_robust - __attribute__((weak)); - if (__builtin_expect (__nptl_set_robust != NULL, 0)) - __nptl_set_robust (self); -#endif - - /* Reset the lock state in the multi-threaded case. */ - if (multiple_threads) - { - __libc_unwind_link_after_fork (); - - /* Release malloc locks. */ - call_function_static_weak (__malloc_fork_unlock_child); - - /* Reset the file list. These are recursive mutexes. */ - fresetlockfiles (); - - /* Reset locks in the I/O code. */ - _IO_list_resetlock (); - - call_function_static_weak (__nss_database_fork_subprocess, - &nss_database_data); - } - - /* Reset the lock the dynamic loader uses to protect its data. */ - __rtld_lock_initialize (GL(dl_load_lock)); - - /* Run the handlers registered for the child. */ - __run_fork_handlers (atfork_run_child, multiple_threads); - } - else - { - /* Release acquired locks in the multi-threaded case. */ - if (multiple_threads) - { - /* Release malloc locks, parent process variant. */ - call_function_static_weak (__malloc_fork_unlock_parent); - - /* We execute this even if the 'fork' call failed. */ - _IO_list_unlock (); - } - - /* Run the handlers registered for the parent. */ - __run_fork_handlers (atfork_run_parent, multiple_threads); - } - - return pid; -} -weak_alias (__libc_fork, __fork) -libc_hidden_def (__fork) -weak_alias (__libc_fork, fork) diff --git a/sysdeps/nptl/fork.h b/sysdeps/nptl/fork.h index 5246754290..c5937530ee 100644 --- a/sysdeps/nptl/fork.h +++ b/sysdeps/nptl/fork.h @@ -16,11 +16,19 @@ License along with the GNU C Library; if not, see . */ -#include #include +#include /* The fork generation counter, defined in libpthread. */ extern unsigned long int __fork_generation attribute_hidden; /* Pointer to the fork generation counter in the thread library. */ extern unsigned long int *__fork_generation_pointer attribute_hidden; + +static inline void +fork_system_setup (void) +{ + /* See __pthread_once. */ + if (__fork_generation_pointer != NULL) + *__fork_generation_pointer += __PTHREAD_ONCE_FORK_GEN_INCR; +} diff --git a/sysdeps/unix/sysv/linux/arch-fork.h b/sysdeps/unix/sysv/linux/arch-fork.h index 35d9397ff8..b846da08f9 100644 --- a/sysdeps/unix/sysv/linux/arch-fork.h +++ b/sysdeps/unix/sysv/linux/arch-fork.h @@ -19,6 +19,9 @@ #ifndef __ARCH_FORK_H #define __ARCH_FORK_H +#include +#include +#include #include /* Call the clone syscall with fork semantic. The CTID address is used From patchwork Thu Mar 11 19:52:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 42464 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com 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 05F953896821; Thu, 11 Mar 2021 19:52:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 05F953896821 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1615492345; bh=xloEYQKiUdoetLkruc80dxXrZx8fVoSBcD9qo304+/4=; 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=Y9WcMZhhFc9rwS0AhbApX1Dv/WIVYdRZjrFzConycnWioSNbCc1Oyu8Pn7Jr+lG55 1tAn7lSoH/kV6FPvzqBQv2/BkXomjge3weTuHRxrq9w7+VQDtOEURLSTO7+/PcnWNz NoWxbnMtZueAtjLb0nQxiqKt7idPl86F2qYe1xeQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf2d.google.com (mail-qv1-xf2d.google.com [IPv6:2607:f8b0:4864:20::f2d]) by sourceware.org (Postfix) with ESMTPS id 3D68E3834411 for ; Thu, 11 Mar 2021 19:52:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3D68E3834411 Received: by mail-qv1-xf2d.google.com with SMTP id by2so3140956qvb.11 for ; Thu, 11 Mar 2021 11:52:19 -0800 (PST) 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=xloEYQKiUdoetLkruc80dxXrZx8fVoSBcD9qo304+/4=; b=iMkciJlmJyAG8v4NHt1XCo58HbR8wA0Io9KdPQM8tMH1osCflAei8WFtVaEZU6HbFD zX8JEDPdPb9909KQBXMoY4bZ/NNLe2d8KoTb0NDBWE68f31que3Fhzhm8J38jhD6KoDq cJsVgU8Slys3FIVrjqgHFJiltx0qVF/Z6m4so51FmQONAuNw1tHkIoVCnNNySXA88KP0 fgiM4UcUThaM1xzpQAbbJ69NGBZA8Ug/WUtxDLhCXaJNinU0imynVLUgpX/qusBke294 lw53KX/8YFmltcqHNQSEZpzkk1eZLdzQEM5920qJcrB6S+wYKE5nYXToFXxyIKSRPrxI 808w== X-Gm-Message-State: AOAM532i+RPGtqA5XM0XifyR553B21jXhuL4UVffz4ZVXkw0RoSzqqc7 ISRyKJy6rxX5nOwPlYdfFPLpZr+oxDk9W8vU X-Google-Smtp-Source: ABdhPJy5LvNvl/PzUqtOmUNu+t0CQriIpSSNpg5w5P8FxK51YtUDnifuQamXYkGKW30MNSmYTkSUeQ== X-Received: by 2002:a0c:b526:: with SMTP id d38mr9121637qve.7.1615492338317; Thu, 11 Mar 2021 11:52:18 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id b16sm2266976qtx.85.2021.03.11.11.52.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:52:18 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 4/8] nptl: Move fork into libc Date: Thu, 11 Mar 2021 16:52:06 -0300 Message-Id: <20210311195210.3153729-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> References: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This is part of the libpthread removal project: Checked on x86_64-linux-gnu. --- nptl/Makefile | 1 - nptl/pt-fork.c | 49 ------------------- .../sysv/linux/aarch64/libpthread.abilist | 2 - .../unix/sysv/linux/alpha/libpthread.abilist | 2 - .../unix/sysv/linux/arm/be/libpthread.abilist | 2 - .../unix/sysv/linux/arm/le/libpthread.abilist | 2 - .../unix/sysv/linux/hppa/libpthread.abilist | 2 - .../unix/sysv/linux/i386/libpthread.abilist | 2 - .../unix/sysv/linux/ia64/libpthread.abilist | 2 - .../linux/m68k/coldfire/libpthread.abilist | 2 - .../sysv/linux/m68k/m680x0/libpthread.abilist | 2 - .../linux/microblaze/be/libpthread.abilist | 2 - .../linux/microblaze/le/libpthread.abilist | 2 - .../sysv/linux/mips/mips32/libpthread.abilist | 2 - .../sysv/linux/mips/mips64/libpthread.abilist | 2 - .../unix/sysv/linux/nios2/libpthread.abilist | 2 - .../powerpc/powerpc32/libpthread.abilist | 2 - .../powerpc/powerpc64/be/libpthread.abilist | 2 - .../powerpc/powerpc64/le/libpthread.abilist | 2 - .../linux/s390/s390-32/libpthread.abilist | 2 - .../linux/s390/s390-64/libpthread.abilist | 2 - .../unix/sysv/linux/sh/be/libpthread.abilist | 2 - .../unix/sysv/linux/sh/le/libpthread.abilist | 2 - .../linux/sparc/sparc32/libpthread.abilist | 2 - .../linux/sparc/sparc64/libpthread.abilist | 2 - .../sysv/linux/x86_64/64/libpthread.abilist | 2 - .../sysv/linux/x86_64/x32/libpthread.abilist | 2 - 27 files changed, 100 deletions(-) delete mode 100644 nptl/pt-fork.c diff --git a/nptl/Makefile b/nptl/Makefile index e5d69e8858..b51deff6a3 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -114,7 +114,6 @@ libpthread-routines = \ pt-allocrtsig \ pt-cleanup \ pt-fcntl \ - pt-fork \ pt-interp \ pt-longjmp \ pt-raise \ diff --git a/nptl/pt-fork.c b/nptl/pt-fork.c deleted file mode 100644 index 5d694cdbbe..0000000000 --- a/nptl/pt-fork.c +++ /dev/null @@ -1,49 +0,0 @@ -/* ABI compatibility for 'fork' symbol in libpthread ABI. - 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 - -/* libpthread once had its own fork, though there was no apparent reason - for it. There is no use in having a separate symbol in libpthread, but - the historical ABI requires it. For static linking, there is no need to - provide anything here--the libc version will be linked in. For shared - library ABI compatibility, there must be __fork and fork symbols in - libpthread.so. - - With an IFUNC resolver, it would be possible to avoid the - indirection, but the IFUNC resolver might run before the - __libc_fork symbol has been relocated, in which case the IFUNC - resolver would not be able to provide the correct address. */ - -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22) - -static pid_t __attribute__ ((used)) -fork_compat (void) -{ - return __libc_fork (); -} - -strong_alias (fork_compat, fork_alias) -compat_symbol (libpthread, fork_alias, fork, GLIBC_2_0); - -strong_alias (fork_compat, __fork_alias) -compat_symbol (libpthread, __fork_alias, __fork, GLIBC_2_0); - -#endif diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index c6b4ea2dc1..336ee51e7e 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -5,7 +5,6 @@ GLIBC_2.17 __close F GLIBC_2.17 __connect F GLIBC_2.17 __errno_location F GLIBC_2.17 __fcntl F -GLIBC_2.17 __fork F GLIBC_2.17 __h_errno_location F GLIBC_2.17 __libc_allocate_rtsig F GLIBC_2.17 __libc_current_sigrtmax F @@ -54,7 +53,6 @@ GLIBC_2.17 close F GLIBC_2.17 connect F GLIBC_2.17 fcntl F GLIBC_2.17 flockfile F -GLIBC_2.17 fork F GLIBC_2.17 fsync F GLIBC_2.17 ftrylockfile F GLIBC_2.17 funlockfile F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index 390b6384d0..5c87b9baa0 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -5,7 +5,6 @@ GLIBC_2.0 __close F GLIBC_2.0 __connect F GLIBC_2.0 __errno_location F GLIBC_2.0 __fcntl F -GLIBC_2.0 __fork F GLIBC_2.0 __h_errno_location F GLIBC_2.0 __lseek F GLIBC_2.0 __open F @@ -34,7 +33,6 @@ GLIBC_2.0 close F GLIBC_2.0 connect F GLIBC_2.0 fcntl F GLIBC_2.0 flockfile F -GLIBC_2.0 fork F GLIBC_2.0 fsync F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist index b6c26c7a50..b0bb1d0e01 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist @@ -40,7 +40,6 @@ GLIBC_2.4 __close F GLIBC_2.4 __connect F GLIBC_2.4 __errno_location F GLIBC_2.4 __fcntl F -GLIBC_2.4 __fork F GLIBC_2.4 __h_errno_location F GLIBC_2.4 __libc_allocate_rtsig F GLIBC_2.4 __libc_current_sigrtmax F @@ -89,7 +88,6 @@ GLIBC_2.4 close F GLIBC_2.4 connect F GLIBC_2.4 fcntl F GLIBC_2.4 flockfile F -GLIBC_2.4 fork F GLIBC_2.4 fsync F GLIBC_2.4 ftrylockfile F GLIBC_2.4 funlockfile F diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist index b6c26c7a50..b0bb1d0e01 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist @@ -40,7 +40,6 @@ GLIBC_2.4 __close F GLIBC_2.4 __connect F GLIBC_2.4 __errno_location F GLIBC_2.4 __fcntl F -GLIBC_2.4 __fork F GLIBC_2.4 __h_errno_location F GLIBC_2.4 __libc_allocate_rtsig F GLIBC_2.4 __libc_current_sigrtmax F @@ -89,7 +88,6 @@ GLIBC_2.4 close F GLIBC_2.4 connect F GLIBC_2.4 fcntl F GLIBC_2.4 flockfile F -GLIBC_2.4 fork F GLIBC_2.4 fsync F GLIBC_2.4 ftrylockfile F GLIBC_2.4 funlockfile F diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist index cabc5af858..a7bb15be58 100644 --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist @@ -13,7 +13,6 @@ GLIBC_2.2 __close F GLIBC_2.2 __connect F GLIBC_2.2 __errno_location F GLIBC_2.2 __fcntl F -GLIBC_2.2 __fork F GLIBC_2.2 __h_errno_location F GLIBC_2.2 __libc_allocate_rtsig F GLIBC_2.2 __libc_current_sigrtmax F @@ -56,7 +55,6 @@ GLIBC_2.2 close F GLIBC_2.2 connect F GLIBC_2.2 fcntl F GLIBC_2.2 flockfile F -GLIBC_2.2 fork F GLIBC_2.2 fsync F GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist index 18177307c8..017a9d9a86 100644 --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist @@ -5,7 +5,6 @@ GLIBC_2.0 __close F GLIBC_2.0 __connect F GLIBC_2.0 __errno_location F GLIBC_2.0 __fcntl F -GLIBC_2.0 __fork F GLIBC_2.0 __h_errno_location F GLIBC_2.0 __lseek F GLIBC_2.0 __open F @@ -34,7 +33,6 @@ GLIBC_2.0 close F GLIBC_2.0 connect F GLIBC_2.0 fcntl F GLIBC_2.0 flockfile F -GLIBC_2.0 fork F GLIBC_2.0 fsync F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist index 335f486cb5..6fb2e05072 100644 --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist @@ -13,7 +13,6 @@ GLIBC_2.2 __close F GLIBC_2.2 __connect F GLIBC_2.2 __errno_location F GLIBC_2.2 __fcntl F -GLIBC_2.2 __fork F GLIBC_2.2 __h_errno_location F GLIBC_2.2 __libc_allocate_rtsig F GLIBC_2.2 __libc_current_sigrtmax F @@ -56,7 +55,6 @@ GLIBC_2.2 close F GLIBC_2.2 connect F GLIBC_2.2 fcntl F GLIBC_2.2 flockfile F -GLIBC_2.2 fork F GLIBC_2.2 fsync F GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist index b6c26c7a50..b0bb1d0e01 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist @@ -40,7 +40,6 @@ GLIBC_2.4 __close F GLIBC_2.4 __connect F GLIBC_2.4 __errno_location F GLIBC_2.4 __fcntl F -GLIBC_2.4 __fork F GLIBC_2.4 __h_errno_location F GLIBC_2.4 __libc_allocate_rtsig F GLIBC_2.4 __libc_current_sigrtmax F @@ -89,7 +88,6 @@ GLIBC_2.4 close F GLIBC_2.4 connect F GLIBC_2.4 fcntl F GLIBC_2.4 flockfile F -GLIBC_2.4 fork F GLIBC_2.4 fsync F GLIBC_2.4 ftrylockfile F GLIBC_2.4 funlockfile F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist index 18177307c8..017a9d9a86 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist @@ -5,7 +5,6 @@ GLIBC_2.0 __close F GLIBC_2.0 __connect F GLIBC_2.0 __errno_location F GLIBC_2.0 __fcntl F -GLIBC_2.0 __fork F GLIBC_2.0 __h_errno_location F GLIBC_2.0 __lseek F GLIBC_2.0 __open F @@ -34,7 +33,6 @@ GLIBC_2.0 close F GLIBC_2.0 connect F GLIBC_2.0 fcntl F GLIBC_2.0 flockfile F -GLIBC_2.0 fork F GLIBC_2.0 fsync F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist index 60397187b6..9356f6183a 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist @@ -5,7 +5,6 @@ GLIBC_2.18 __close F GLIBC_2.18 __connect F GLIBC_2.18 __errno_location F GLIBC_2.18 __fcntl F -GLIBC_2.18 __fork F GLIBC_2.18 __h_errno_location F GLIBC_2.18 __libc_allocate_rtsig F GLIBC_2.18 __libc_current_sigrtmax F @@ -54,7 +53,6 @@ GLIBC_2.18 close F GLIBC_2.18 connect F GLIBC_2.18 fcntl F GLIBC_2.18 flockfile F -GLIBC_2.18 fork F GLIBC_2.18 fsync F GLIBC_2.18 ftrylockfile F GLIBC_2.18 funlockfile F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist index 60397187b6..9356f6183a 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist @@ -5,7 +5,6 @@ GLIBC_2.18 __close F GLIBC_2.18 __connect F GLIBC_2.18 __errno_location F GLIBC_2.18 __fcntl F -GLIBC_2.18 __fork F GLIBC_2.18 __h_errno_location F GLIBC_2.18 __libc_allocate_rtsig F GLIBC_2.18 __libc_current_sigrtmax F @@ -54,7 +53,6 @@ GLIBC_2.18 close F GLIBC_2.18 connect F GLIBC_2.18 fcntl F GLIBC_2.18 flockfile F -GLIBC_2.18 fork F GLIBC_2.18 fsync F GLIBC_2.18 ftrylockfile F GLIBC_2.18 funlockfile F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist index b35d7f19ca..7aff4d018b 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist @@ -5,7 +5,6 @@ GLIBC_2.0 __close F GLIBC_2.0 __connect F GLIBC_2.0 __errno_location F GLIBC_2.0 __fcntl F -GLIBC_2.0 __fork F GLIBC_2.0 __h_errno_location F GLIBC_2.0 __lseek F GLIBC_2.0 __open F @@ -34,7 +33,6 @@ GLIBC_2.0 close F GLIBC_2.0 connect F GLIBC_2.0 fcntl F GLIBC_2.0 flockfile F -GLIBC_2.0 fork F GLIBC_2.0 fsync F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist index b35d7f19ca..7aff4d018b 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist @@ -5,7 +5,6 @@ GLIBC_2.0 __close F GLIBC_2.0 __connect F GLIBC_2.0 __errno_location F GLIBC_2.0 __fcntl F -GLIBC_2.0 __fork F GLIBC_2.0 __h_errno_location F GLIBC_2.0 __lseek F GLIBC_2.0 __open F @@ -34,7 +33,6 @@ GLIBC_2.0 close F GLIBC_2.0 connect F GLIBC_2.0 fcntl F GLIBC_2.0 flockfile F -GLIBC_2.0 fork F GLIBC_2.0 fsync F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist index 924ad6e451..73b4dfbd8e 100644 --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist @@ -5,7 +5,6 @@ GLIBC_2.21 __close F GLIBC_2.21 __connect F GLIBC_2.21 __errno_location F GLIBC_2.21 __fcntl F -GLIBC_2.21 __fork F GLIBC_2.21 __h_errno_location F GLIBC_2.21 __libc_allocate_rtsig F GLIBC_2.21 __libc_current_sigrtmax F @@ -54,7 +53,6 @@ GLIBC_2.21 close F GLIBC_2.21 connect F GLIBC_2.21 fcntl F GLIBC_2.21 flockfile F -GLIBC_2.21 fork F GLIBC_2.21 fsync F GLIBC_2.21 ftrylockfile F GLIBC_2.21 funlockfile F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist index 13b41dafb6..0c68fb1b7c 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist @@ -5,7 +5,6 @@ GLIBC_2.0 __close F GLIBC_2.0 __connect F GLIBC_2.0 __errno_location F GLIBC_2.0 __fcntl F -GLIBC_2.0 __fork F GLIBC_2.0 __h_errno_location F GLIBC_2.0 __lseek F GLIBC_2.0 __open F @@ -34,7 +33,6 @@ GLIBC_2.0 close F GLIBC_2.0 connect F GLIBC_2.0 fcntl F GLIBC_2.0 flockfile F -GLIBC_2.0 fork F GLIBC_2.0 fsync F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist index e9477a3584..c7f6167250 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist @@ -34,7 +34,6 @@ GLIBC_2.3 __close F GLIBC_2.3 __connect F GLIBC_2.3 __errno_location F GLIBC_2.3 __fcntl F -GLIBC_2.3 __fork F GLIBC_2.3 __h_errno_location F GLIBC_2.3 __libc_allocate_rtsig F GLIBC_2.3 __libc_current_sigrtmax F @@ -77,7 +76,6 @@ GLIBC_2.3 close F GLIBC_2.3 connect F GLIBC_2.3 fcntl F GLIBC_2.3 flockfile F -GLIBC_2.3 fork F GLIBC_2.3 fsync F GLIBC_2.3 ftrylockfile F GLIBC_2.3 funlockfile F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist index c6b4ea2dc1..336ee51e7e 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist @@ -5,7 +5,6 @@ GLIBC_2.17 __close F GLIBC_2.17 __connect F GLIBC_2.17 __errno_location F GLIBC_2.17 __fcntl F -GLIBC_2.17 __fork F GLIBC_2.17 __h_errno_location F GLIBC_2.17 __libc_allocate_rtsig F GLIBC_2.17 __libc_current_sigrtmax F @@ -54,7 +53,6 @@ GLIBC_2.17 close F GLIBC_2.17 connect F GLIBC_2.17 fcntl F GLIBC_2.17 flockfile F -GLIBC_2.17 fork F GLIBC_2.17 fsync F GLIBC_2.17 ftrylockfile F GLIBC_2.17 funlockfile F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist index 0a60f1cca2..a198e22445 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist @@ -5,7 +5,6 @@ GLIBC_2.0 __close F GLIBC_2.0 __connect F GLIBC_2.0 __errno_location F GLIBC_2.0 __fcntl F -GLIBC_2.0 __fork F GLIBC_2.0 __h_errno_location F GLIBC_2.0 __lseek F GLIBC_2.0 __open F @@ -34,7 +33,6 @@ GLIBC_2.0 close F GLIBC_2.0 connect F GLIBC_2.0 fcntl F GLIBC_2.0 flockfile F -GLIBC_2.0 fork F GLIBC_2.0 fsync F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist index 0e99688824..6d166d5f97 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist @@ -15,7 +15,6 @@ GLIBC_2.2 __close F GLIBC_2.2 __connect F GLIBC_2.2 __errno_location F GLIBC_2.2 __fcntl F -GLIBC_2.2 __fork F GLIBC_2.2 __h_errno_location F GLIBC_2.2 __libc_allocate_rtsig F GLIBC_2.2 __libc_current_sigrtmax F @@ -58,7 +57,6 @@ GLIBC_2.2 close F GLIBC_2.2 connect F GLIBC_2.2 fcntl F GLIBC_2.2 flockfile F -GLIBC_2.2 fork F GLIBC_2.2 fsync F GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist index cabc5af858..a7bb15be58 100644 --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist @@ -13,7 +13,6 @@ GLIBC_2.2 __close F GLIBC_2.2 __connect F GLIBC_2.2 __errno_location F GLIBC_2.2 __fcntl F -GLIBC_2.2 __fork F GLIBC_2.2 __h_errno_location F GLIBC_2.2 __libc_allocate_rtsig F GLIBC_2.2 __libc_current_sigrtmax F @@ -56,7 +55,6 @@ GLIBC_2.2 close F GLIBC_2.2 connect F GLIBC_2.2 fcntl F GLIBC_2.2 flockfile F -GLIBC_2.2 fork F GLIBC_2.2 fsync F GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist index cabc5af858..a7bb15be58 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist @@ -13,7 +13,6 @@ GLIBC_2.2 __close F GLIBC_2.2 __connect F GLIBC_2.2 __errno_location F GLIBC_2.2 __fcntl F -GLIBC_2.2 __fork F GLIBC_2.2 __h_errno_location F GLIBC_2.2 __libc_allocate_rtsig F GLIBC_2.2 __libc_current_sigrtmax F @@ -56,7 +55,6 @@ GLIBC_2.2 close F GLIBC_2.2 connect F GLIBC_2.2 fcntl F GLIBC_2.2 flockfile F -GLIBC_2.2 fork F GLIBC_2.2 fsync F GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist index 390b6384d0..5c87b9baa0 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist @@ -5,7 +5,6 @@ GLIBC_2.0 __close F GLIBC_2.0 __connect F GLIBC_2.0 __errno_location F GLIBC_2.0 __fcntl F -GLIBC_2.0 __fork F GLIBC_2.0 __h_errno_location F GLIBC_2.0 __lseek F GLIBC_2.0 __open F @@ -34,7 +33,6 @@ GLIBC_2.0 close F GLIBC_2.0 connect F GLIBC_2.0 fcntl F GLIBC_2.0 flockfile F -GLIBC_2.0 fork F GLIBC_2.0 fsync F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist index 335f486cb5..6fb2e05072 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist @@ -13,7 +13,6 @@ GLIBC_2.2 __close F GLIBC_2.2 __connect F GLIBC_2.2 __errno_location F GLIBC_2.2 __fcntl F -GLIBC_2.2 __fork F GLIBC_2.2 __h_errno_location F GLIBC_2.2 __libc_allocate_rtsig F GLIBC_2.2 __libc_current_sigrtmax F @@ -56,7 +55,6 @@ GLIBC_2.2 close F GLIBC_2.2 connect F GLIBC_2.2 fcntl F GLIBC_2.2 flockfile F -GLIBC_2.2 fork F GLIBC_2.2 fsync F GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist index 971269d2ef..f85ab1d3cd 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist @@ -13,7 +13,6 @@ GLIBC_2.2.5 __close F GLIBC_2.2.5 __connect F GLIBC_2.2.5 __errno_location F GLIBC_2.2.5 __fcntl F -GLIBC_2.2.5 __fork F GLIBC_2.2.5 __h_errno_location F GLIBC_2.2.5 __libc_allocate_rtsig F GLIBC_2.2.5 __libc_current_sigrtmax F @@ -56,7 +55,6 @@ GLIBC_2.2.5 close F GLIBC_2.2.5 connect F GLIBC_2.2.5 fcntl F GLIBC_2.2.5 flockfile F -GLIBC_2.2.5 fork F GLIBC_2.2.5 fsync F GLIBC_2.2.5 ftrylockfile F GLIBC_2.2.5 funlockfile F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist index b9bf4324a9..0e24fcd6bf 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist @@ -5,7 +5,6 @@ GLIBC_2.16 __close F GLIBC_2.16 __connect F GLIBC_2.16 __errno_location F GLIBC_2.16 __fcntl F -GLIBC_2.16 __fork F GLIBC_2.16 __h_errno_location F GLIBC_2.16 __libc_allocate_rtsig F GLIBC_2.16 __libc_current_sigrtmax F @@ -54,7 +53,6 @@ GLIBC_2.16 close F GLIBC_2.16 connect F GLIBC_2.16 fcntl F GLIBC_2.16 flockfile F -GLIBC_2.16 fork F GLIBC_2.16 fsync F GLIBC_2.16 ftrylockfile F GLIBC_2.16 funlockfile F From patchwork Thu Mar 11 19:52:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 42463 X-Patchwork-Delegate: fweimer@redhat.com 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 E851D3894C2E; Thu, 11 Mar 2021 19:52:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E851D3894C2E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1615492344; bh=x0FndJxEf2eWxxyEy3sLE4qCjSX7tTDC+DIULZqui4A=; 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=Aqu/Vibn3Ajp/5bR08h5HRkGO/H219cgh0NQStRZVkxWzqT8lRrBkkOw4EnYdEPHr f0DDLffqS/PjYEb7v0ED5+CZecBEQqI4gwLhPXROl/23LkbNZ4dlFh899NOG+JXXoE yTVc2mcSaEDMlsKI+x4vfsMpE+4+NhfcIDBIDztw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) by sourceware.org (Postfix) with ESMTPS id 3F6573893646 for ; Thu, 11 Mar 2021 19:52:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3F6573893646 Received: by mail-qk1-x72d.google.com with SMTP id a9so21909813qkn.13 for ; Thu, 11 Mar 2021 11:52:20 -0800 (PST) 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=x0FndJxEf2eWxxyEy3sLE4qCjSX7tTDC+DIULZqui4A=; b=AUdWD7d7rMA8+YwAy4j76bVLvn54PlyO2gxq1H5R57Oxt5uv+LyyZ9gKXqY6V60kic 58CQgHIKskNw9YqSDRkNCKzOYA+UY2aUrikgiEV7Jo5X2hWc5GmCH7YMnpXpQFEQUEjE m0Y+44t5YnRbyLJ6STrRRKEx7PZnZ561ALQQzj4+CZ33mGmhxb6VH7JZuyvjSavT+Gus L4xbqE1w8Zksj+OQBU3O+pxYsLB8GHpWqr5ErfZ4vL0E5wG+UHE518ZmdeSbh31ad+Hu WLNnq9f7c7LY1aBYtjcYkkGZHHveQusIYDHYOjaj1gDfsm1pRbmJ+zJuIagW1smkuTcL dqhQ== X-Gm-Message-State: AOAM531xhatyUo99nHUwIiKwkBJUlOB6blTSZTUAi1lT9cagHwW8TV7U qYb4pRsnfKE2QxLm7794lEr7lksJgUvvb1cC X-Google-Smtp-Source: ABdhPJxbg1CbjYVeCNuUk7OYSAhtBC3WwYVgOiOsUlX77UfX24kTAy4ERBK4t4Iqswm7I07EhRB7/g== X-Received: by 2002:a37:9f4e:: with SMTP id i75mr9397501qke.283.1615492339730; Thu, 11 Mar 2021 11:52:19 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id b16sm2266976qtx.85.2021.03.11.11.52.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:52:19 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 5/8] posix: Do not clobber errno by atfork handlers Date: Thu, 11 Mar 2021 16:52:07 -0300 Message-Id: <20210311195210.3153729-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> References: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 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.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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Changes from v1: * Move the errno set/restore to parent branch. --- Checked on x86_64-linux-gnu. --- posix/fork.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/posix/fork.c b/posix/fork.c index cc1bdc1232..a4fdd44e1e 100644 --- a/posix/fork.c +++ b/posix/fork.c @@ -68,7 +68,6 @@ __libc_fork (void) } pid_t pid = _Fork (); - if (pid == 0) { fork_system_setup (); @@ -99,6 +98,11 @@ __libc_fork (void) } else { + /* If _Fork failed, preserve its errno value. */ + int save_errno; + if (pid < 0) + save_errno = errno; + /* Release acquired locks in the multi-threaded case. */ if (multiple_threads) { @@ -111,6 +115,9 @@ __libc_fork (void) /* Run the handlers registered for the parent. */ __run_fork_handlers (atfork_run_parent, multiple_threads); + + if (pid < 0) + __set_errno (save_errno); } return pid; From patchwork Thu Mar 11 19:52:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 42465 X-Patchwork-Delegate: fweimer@redhat.com 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 19786389443F; Thu, 11 Mar 2021 19:52:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 19786389443F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1615492347; bh=4hmwH/1K++jk3VZ7XQkuLH3NUtnSDLnTkVaogqQlVXM=; 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=tZ4dy6FfvsM+I6FLFgUNPvg9cljYFYHRwQ+qy0E5K5EkLeHQfcoqVpm5Aj5l3fInk 22A1atwMTlmqxTVliSD08aW8c8cx7D7jA5z7dJUvZJrouutA36JhkVa0ZvXG5YyEUJ b+ZD71KdC3Lgfx9o0NXdZh1BPtAOuLal6sDQ97MI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) by sourceware.org (Postfix) with ESMTPS id CDE6B3894C2E for ; Thu, 11 Mar 2021 19:52:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CDE6B3894C2E Received: by mail-qk1-x732.google.com with SMTP id x10so21938701qkm.8 for ; Thu, 11 Mar 2021 11:52:21 -0800 (PST) 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=4hmwH/1K++jk3VZ7XQkuLH3NUtnSDLnTkVaogqQlVXM=; b=O3wFL9SNn4WdyMq5MppfrgWGdycbjGTKp4gLnzXNfKXe4eX3mMUYe6zaTLRGZGecO/ vqL8aJTO4icnL+pWyAN20SbO/ioHu/hhu05NCcyPKTQDgs+eCB54DFzahTG2xqnRPITG TeHOIqm7rGow9GhxiMdBBDdApEmsmq+jxVXCRB3IZmNkEVgO2LkMFUKaEt9hc+IAH0oi qyNxBHY/pHVEZElN8CJb3JsVXiKKMDPxZTnI6fka4w37s7wHWUZkHZcYJxOnE08NLPKq Zjyafj8T8fF5tI5+ncu0NZDD3ad9ylqErQE6KtHmykvvNH6tIXdpWL3ioYukZW9vrfZY b21g== X-Gm-Message-State: AOAM533YC9KHDfd43Z3+J57Enj4MXEozDa0EHXJbN6oiCW4hLWM9M1l3 3KM4Ze2qgAYosv8XlhjPRaeuDcCuZaY5/VTz X-Google-Smtp-Source: ABdhPJwnLxGxMCBQUgKe+gmmjTZBm+h/5FcKg176sZ8u3Bk0/kTdW1r5WPIxS/P2BjkaTiygSAZbpQ== X-Received: by 2002:a05:620a:9c6:: with SMTP id y6mr9440834qky.39.1615492341039; Thu, 11 Mar 2021 11:52:21 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id b16sm2266976qtx.85.2021.03.11.11.52.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:52:20 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 6/8] Consolidate pthread_atfork Date: Thu, 11 Mar 2021 16:52:08 -0300 Message-Id: <20210311195210.3153729-6-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> References: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Changes from v1: * Add comment on pthread_affork_compat.h. --- The pthread_atfork is similar between Linux and Hurd, only the compat version bits differs. The generic version is place at sysdeps/pthread with a common name. It also fixes an issue with Hurd license, where the static-only object did not use LGPL. Checked on x86_64-linux-gnu, i686-linux-gnu, and with a build for i686-gnu. --- htl/Makefile | 4 +- nptl/Makefile | 3 -- sysdeps/htl/old_pt-atfork.c | 26 ------------ sysdeps/htl/pt-atfork.c | 42 ------------------- sysdeps/htl/pthread_atfork_compat.h | 4 ++ sysdeps/nptl/pthread_atfork_compat.h | 4 ++ sysdeps/pthread/Makefile | 6 ++- {nptl => sysdeps/pthread}/pthread_atfork.c | 1 + .../pthread/pthread_atfork_compat.c | 11 +++-- 9 files changed, 21 insertions(+), 80 deletions(-) delete mode 100644 sysdeps/htl/old_pt-atfork.c delete mode 100644 sysdeps/htl/pt-atfork.c create mode 100644 sysdeps/htl/pthread_atfork_compat.h create mode 100644 sysdeps/nptl/pthread_atfork_compat.h rename {nptl => sysdeps/pthread}/pthread_atfork.c (98%) rename nptl/old_pthread_atfork.c => sysdeps/pthread/pthread_atfork_compat.c (76%) diff --git a/htl/Makefile b/htl/Makefile index 895a6f777c..0e08680615 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -121,7 +121,6 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ pt-sigstate-destroy \ pt-sigstate \ \ - old_pt-atfork \ pt-kill \ pt-getcpuclockid \ \ @@ -165,9 +164,8 @@ headers := \ distribute := -routines := forward libc_pthread_init alloca_cutoff pt-atfork +routines := forward libc_pthread_init alloca_cutoff shared-only-routines = forward -static-only-routines = pt-atfork extra-libs := libpthread extra-libs-others := $(extra-libs) diff --git a/nptl/Makefile b/nptl/Makefile index b51deff6a3..d73ebbeb78 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -44,7 +44,6 @@ routines = \ lowlevellock \ old_pthread_cond_destroy \ old_pthread_cond_init \ - pthread_atfork \ pthread_attr_copy \ pthread_attr_destroy \ pthread_attr_extension \ @@ -76,7 +75,6 @@ routines = \ pthread_sigmask \ shared-only-routines = forward -static-only-routines = pthread_atfork # We need to provide certain routines for compatibility with existing # binaries. @@ -106,7 +104,6 @@ libpthread-routines = \ libpthread-compat \ nptl-init \ nptlfreeres \ - old_pthread_atfork \ old_pthread_cond_broadcast \ old_pthread_cond_signal \ old_pthread_cond_timedwait \ diff --git a/sysdeps/htl/old_pt-atfork.c b/sysdeps/htl/old_pt-atfork.c deleted file mode 100644 index ca38d6ca42..0000000000 --- a/sysdeps/htl/old_pt-atfork.c +++ /dev/null @@ -1,26 +0,0 @@ -/* Register fork handlers. Generic version. - Copyright (C) 2002-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - 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 - -#if SHLIB_COMPAT(libpthread, GLIBC_2_12, GLIBC_2_23) -# define __pthread_atfork __dyn_pthread_atfork -# include "pt-atfork.c" -# undef __pthread_atfork -compat_symbol (libpthread, __dyn_pthread_atfork, pthread_atfork, GLIBC_2_12); -#endif diff --git a/sysdeps/htl/pt-atfork.c b/sysdeps/htl/pt-atfork.c deleted file mode 100644 index dbb3b8f0cc..0000000000 --- a/sysdeps/htl/pt-atfork.c +++ /dev/null @@ -1,42 +0,0 @@ -/* Register fork handlers. Generic version. - Copyright (C) 2002-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - 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 - -/* Hide the symbol so that no definition but the one locally in the - executable or DSO is used. */ -int -#ifndef __pthread_atfork -/* Don't mark the compatibility function as hidden. */ -attribute_hidden -#endif -__pthread_atfork (void (*prepare) (void), - void (*parent) (void), - void (*child) (void)) -{ - return __register_atfork (prepare, parent, child, __dso_handle); -} -#ifndef __pthread_atfork -extern int pthread_atfork (void (*prepare) (void), void (*parent) (void), - void (*child) (void)) attribute_hidden; -weak_alias (__pthread_atfork, pthread_atfork) -#endif diff --git a/sysdeps/htl/pthread_atfork_compat.h b/sysdeps/htl/pthread_atfork_compat.h new file mode 100644 index 0000000000..08afccbb3c --- /dev/null +++ b/sysdeps/htl/pthread_atfork_compat.h @@ -0,0 +1,4 @@ +/* The compat version for the dynamic pthread_atfork provided by libpthread, + before supported __dso_handle was added. */ +#define PTHREAD_ATFORK_COMPAT_INTRODUCED GLIBC_2_12 +#define PTHREAD_ATFORK_COMPAT_OBSOLETED GLIBC_2_23 diff --git a/sysdeps/nptl/pthread_atfork_compat.h b/sysdeps/nptl/pthread_atfork_compat.h new file mode 100644 index 0000000000..38edcbefe5 --- /dev/null +++ b/sysdeps/nptl/pthread_atfork_compat.h @@ -0,0 +1,4 @@ +/* The compat versions for the dynamic pthread_atfork provided by libpthread, + before supported __dso_handle was added. */ +#define PTHREAD_ATFORK_COMPAT_INTRODUCED GLIBC_2_0 +#define PTHREAD_ATFORK_COMPAT_OBSOLETED GLIBC_2_3 diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 53b65ef349..429400f1d2 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -29,7 +29,7 @@ endif ifneq (,$(filter $(subdir),htl nptl)) headers += threads.h -routines += thrd_current thrd_equal thrd_sleep thrd_yield +routines += thrd_current thrd_equal thrd_sleep thrd_yield pthread_atfork libpthread-routines += thrd_create thrd_detach thrd_exit thrd_join \ call_once \ @@ -37,7 +37,8 @@ libpthread-routines += thrd_create thrd_detach thrd_exit thrd_join \ mtx_trylock mtx_unlock \ cnd_broadcast \ cnd_destroy cnd_init cnd_signal cnd_timedwait cnd_wait \ - tss_create tss_delete tss_get tss_set + tss_create tss_delete tss_get tss_set \ + pthread_atfork_compat tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-cnd-timedwait tst-thrd-detach tst-mtx-basic tst-thrd-sleep \ @@ -109,6 +110,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-unwind-thread \ tst-pt-vfork1 tst-pt-vfork2 tst-vfork1x tst-vfork2x \ +static-only-routines = pthread_atfork # Files which must not be linked with libpthread. tests-nolibpthread = tst-unload diff --git a/nptl/pthread_atfork.c b/sysdeps/pthread/pthread_atfork.c similarity index 98% rename from nptl/pthread_atfork.c rename to sysdeps/pthread/pthread_atfork.c index 097a86d059..fc984f1578 100644 --- a/nptl/pthread_atfork.c +++ b/sysdeps/pthread/pthread_atfork.c @@ -36,6 +36,7 @@ #include "pthreadP.h" #include #include +#include /* Hide the symbol so that no definition but the one locally in the diff --git a/nptl/old_pthread_atfork.c b/sysdeps/pthread/pthread_atfork_compat.c similarity index 76% rename from nptl/old_pthread_atfork.c rename to sysdeps/pthread/pthread_atfork_compat.c index 01b7de633d..e01a408103 100644 --- a/nptl/old_pthread_atfork.c +++ b/sysdeps/pthread/pthread_atfork_compat.c @@ -1,6 +1,6 @@ -/* Copyright (C) 2002-2021 Free Software Foundation, Inc. +/* Compat pthread_atfork implementation. + 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 @@ -16,11 +16,14 @@ License along with the GNU C Library; if not, see . */ +#include #include -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3) +#if SHLIB_COMPAT (libpthread, PTHREAD_ATFORK_COMPAT_INTRODUCED, \ + PTHREAD_ATFORK_COMPAT_OBSOLETED) # define __pthread_atfork __dyn_pthread_atfork # include "pthread_atfork.c" # undef __pthread_atfork -compat_symbol (libpthread, __dyn_pthread_atfork, pthread_atfork, GLIBC_2_0); +compat_symbol (libpthread, __dyn_pthread_atfork, pthread_atfork, + PTHREAD_ATFORK_COMPAT_INTRODUCED); #endif From patchwork Thu Mar 11 19:52:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 42466 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com 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 99398389680B; Thu, 11 Mar 2021 19:52:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 99398389680B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1615492347; bh=VUID+1t4VGihecqJdK9bqr2QKG0S2ikb8YUS+mFJkKE=; 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=nZkglHlA1ZyB4qLFIw6A3OHYjUNCUqmQl8kQ4x+uN75xDWLSXmKuWtxXGE8LpTsST r/ypM+MZhHKstVOUdrtq2KCDQooq7XOLcEzY64V5ZWFFcCOCZRYIIpqFqYhbTpRX+M /Y97aFfdlCTVoGXLPpoEaCUM5FcTLeJDXcqYwd7g= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) by sourceware.org (Postfix) with ESMTPS id B57513834411 for ; Thu, 11 Mar 2021 19:52:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B57513834411 Received: by mail-qk1-x729.google.com with SMTP id l132so21946413qke.7 for ; Thu, 11 Mar 2021 11:52:22 -0800 (PST) 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=VUID+1t4VGihecqJdK9bqr2QKG0S2ikb8YUS+mFJkKE=; b=XMZsV0KzxIg4MDCFhaOGkZWLeQupR+iMGi7OeqIXsIQLDlFzrc2aMJjnaxG4TXV+ZM gWJ4yn7ryU+hQi4l89GjjvqSTgVi8Jz9Ol7CKc8stDnXb2rMGq1GtCM/SFYy2HsLBwSw dfkTCylTyw3dkbdPvHUnupBhumZOnWqt+tMqaBa0GrluUkY4CrtsXpZ44jb+VuJWExtO rjdrfZ5vFqgdB8twuYCZ1nrI0pfG0Jp6YpeNwGxsdfs3fT+zty9Hy7IKeACX/TsC43g+ Bli19qEUNo9K0t890JULxrKYOPhvV+AMe/FDi3nKsqKyjJcR1ijtpJcDFPZ4xMmt1nq2 Oqag== X-Gm-Message-State: AOAM532tT8FWLUfBnIVXZr5sYKPD1ZyAg4/qOIZvbG1jea0BxKJfxMwF LCTAAwckVkJJxns0nWEr63wD7usF1VLOJfHj X-Google-Smtp-Source: ABdhPJybEeV3/90BUXxZVzTLPHadaVEXhEI5R7E+xFkpS7lo+VwXDYWxATmp/FPu2nw9StPyv1UTww== X-Received: by 2002:a05:620a:41:: with SMTP id t1mr9290293qkt.322.1615492342160; Thu, 11 Mar 2021 11:52:22 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id b16sm2266976qtx.85.2021.03.11.11.52.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:52:21 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 7/8] support: Add xpthread_kill Date: Thu, 11 Mar 2021 16:52:09 -0300 Message-Id: <20210311195210.3153729-7-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> References: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Checked on x86_64-linux-gnu. --- support/Makefile | 1 + support/xpthread_kill.c | 26 ++++++++++++++++++++++++++ support/xthread.h | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 support/xpthread_kill.c diff --git a/support/Makefile b/support/Makefile index 8d63fbd5da..b1d7976fab 100644 --- a/support/Makefile +++ b/support/Makefile @@ -140,6 +140,7 @@ libsupport-routines = \ xpthread_join \ xpthread_key_create \ xpthread_key_delete \ + xpthread_kill \ xpthread_mutex_consistent \ xpthread_mutex_destroy \ xpthread_mutex_init \ diff --git a/support/xpthread_kill.c b/support/xpthread_kill.c new file mode 100644 index 0000000000..111a75d85e --- /dev/null +++ b/support/xpthread_kill.c @@ -0,0 +1,26 @@ +/* pthread_kill with error checking. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 + +void +xpthread_kill (pthread_t thr, int signo) +{ + xpthread_check_return ("pthread_kill", pthread_kill (thr, signo)); +} diff --git a/support/xthread.h b/support/xthread.h index c2086db347..1ba3f133ad 100644 --- a/support/xthread.h +++ b/support/xthread.h @@ -75,6 +75,8 @@ void xpthread_attr_setstacksize (pthread_attr_t *attr, void xpthread_attr_setguardsize (pthread_attr_t *attr, size_t guardsize); +void xpthread_kill (pthread_t thr, int signo); + /* Return the stack size used on support_set_small_thread_stack_size. */ size_t support_small_thread_stack_size (void); /* Set the stack size in ATTR to a small value, but still large enough From patchwork Thu Mar 11 19:52:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 42467 X-Patchwork-Delegate: fweimer@redhat.com 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 D92D83896C04; Thu, 11 Mar 2021 19:52:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D92D83896C04 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1615492350; bh=k7rRs41m3bhjlnnKsbevrhPf8FLnin0zWnwkEhpCgaU=; 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=Q57B5OdE5z6GZpGUVy7vw/l+/EvRbM7QDzA71ZCBzaildMsQmZ10rZz6xSNijEjSe 5DMILbT3+kFLU4XVYFwiFZhg+P1yQf6W8whJaAlmWOTTpIiKiZwnjmSv/v1myBvoED puBBVc2p6nJJ4P3jKRXBCKKk+8gidHCoL1hghr2E= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by sourceware.org (Postfix) with ESMTPS id 0F6D33896827 for ; Thu, 11 Mar 2021 19:52:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0F6D33896827 Received: by mail-qt1-x82f.google.com with SMTP id a11so2083513qto.2 for ; Thu, 11 Mar 2021 11:52:25 -0800 (PST) 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=k7rRs41m3bhjlnnKsbevrhPf8FLnin0zWnwkEhpCgaU=; b=RruT+ZA76tP3HAvPyTpwJ0xYZTvC01O08it5WqeAztvrvfNaPGvQoqmdclF2UfR7kj 5FLObC9KcPriDFD4pm7S6w6XdBaergo2MWn3GEyMAGfpSuo88T/2iptSN/oNC/ap1Op/ EDS1+2o6C9oZ9/asaaeP39V/+HoR94QAlDZjxGTOBlez8Chz3Pq6MJPOguUY0xQiraN5 4PXJLUgpr/SbQ7aMTemMKlk9USQU52wGLuEH6S/dO4FoP4efzWGe6YwC4GF0eTmQBx0b +sZp2DdcDowhoSTAVLmLwam+Hj+q+u8OWFmxFQCsuUPFUbnrOJDcmIwEf0YlOmr0B+6O USjg== X-Gm-Message-State: AOAM531JH6M9hpvKkADDH8zSpkYie5/b/UMrVFnMwq/zXflBWdBy55L+ slk9flS71kdDTavPeVLdBWuFq/YRCca9ibit X-Google-Smtp-Source: ABdhPJx/8Pm2F1DizlSew5Yx9+7VYw2aQWP3wy3UGNqDrMd9wGFyLXzcf+NFY9SiIwtgUWl1o15IQQ== X-Received: by 2002:ac8:588d:: with SMTP id t13mr8673750qta.292.1615492343773; Thu, 11 Mar 2021 11:52:23 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id b16sm2266976qtx.85.2021.03.11.11.52.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:52:23 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 8/8] posix: Add _Fork [BZ #4737] Date: Thu, 11 Mar 2021 16:52:10 -0300 Message-Id: <20210311195210.3153729-8-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> References: <20210311195210.3153729-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Changes from v1: * Add NEWS entry and fix grammar issue on commit message. --- Austin Group issue 62 [1] dropped the async-signal-safe requirement for fork and provided a async-signal-safe _Fork replacement that does not run the atfork handlers. It will be included in the next POSIX standard. It allow to close a long standing issue to make fork AS-safe (BZ#4737). As indicated on the bug, besides the internal lock for the atfork handlers itself; there is no guarantee that the handlers itself will not introduce more AS-safe issues. The idea is synchronize fork with the required internal locks to allow children in multithread processes to use mostly of standard function (even though POSIX states only AS-safe function should be used). On signal handles, _Fork should be used intead and only AS-safe functions should be used. For testing, the new tst-_Fork only check basic usage. I also added a new tst-mallocfork3 which uses the same strategy to check for deadlock of tst-mallocfork2 but using threads instead of subprocesses (and it does deadlock if it replaces _Fork with fork). [1] https://austingroupbugs.net/view.php?id=62 --- NEWS | 8 + malloc/Makefile | 3 + malloc/tst-mallocfork3.c | 213 +++++++++++++++++ manual/process.texi | 39 ++-- posix/Makefile | 3 +- posix/Versions | 3 + posix/fork.c | 5 +- posix/tst-_Fork.c | 218 ++++++++++++++++++ posix/unistd.h | 7 + sysdeps/mach/hurd/i386/libc.abilist | 1 + sysdeps/unix/sysv/linux/aarch64/libc.abilist | 1 + sysdeps/unix/sysv/linux/alpha/libc.abilist | 1 + sysdeps/unix/sysv/linux/arc/libc.abilist | 1 + sysdeps/unix/sysv/linux/arm/be/libc.abilist | 1 + sysdeps/unix/sysv/linux/arm/le/libc.abilist | 1 + sysdeps/unix/sysv/linux/csky/libc.abilist | 1 + sysdeps/unix/sysv/linux/hppa/libc.abilist | 1 + sysdeps/unix/sysv/linux/i386/libc.abilist | 1 + sysdeps/unix/sysv/linux/ia64/libc.abilist | 1 + .../sysv/linux/m68k/coldfire/libc.abilist | 1 + .../unix/sysv/linux/m68k/m680x0/libc.abilist | 1 + .../sysv/linux/microblaze/be/libc.abilist | 1 + .../sysv/linux/microblaze/le/libc.abilist | 1 + .../sysv/linux/mips/mips32/fpu/libc.abilist | 1 + .../sysv/linux/mips/mips32/nofpu/libc.abilist | 1 + .../sysv/linux/mips/mips64/n32/libc.abilist | 1 + .../sysv/linux/mips/mips64/n64/libc.abilist | 1 + sysdeps/unix/sysv/linux/nios2/libc.abilist | 1 + .../linux/powerpc/powerpc32/fpu/libc.abilist | 1 + .../powerpc/powerpc32/nofpu/libc.abilist | 1 + .../linux/powerpc/powerpc64/be/libc.abilist | 1 + .../linux/powerpc/powerpc64/le/libc.abilist | 1 + .../unix/sysv/linux/riscv/rv32/libc.abilist | 1 + .../unix/sysv/linux/riscv/rv64/libc.abilist | 1 + .../unix/sysv/linux/s390/s390-32/libc.abilist | 1 + .../unix/sysv/linux/s390/s390-64/libc.abilist | 1 + sysdeps/unix/sysv/linux/sh/be/libc.abilist | 1 + sysdeps/unix/sysv/linux/sh/le/libc.abilist | 1 + .../sysv/linux/sparc/sparc32/libc.abilist | 1 + .../sysv/linux/sparc/sparc64/libc.abilist | 1 + .../unix/sysv/linux/x86_64/64/libc.abilist | 1 + .../unix/sysv/linux/x86_64/x32/libc.abilist | 1 + 42 files changed, 515 insertions(+), 17 deletions(-) create mode 100644 malloc/tst-mallocfork3.c create mode 100644 posix/tst-_Fork.c diff --git a/NEWS b/NEWS index aa0f10a891..8de318ea1a 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,14 @@ Major new features: a dump of information related to IFUNC resolver operation and glibc-hwcaps subdirectory selection. +* The function _Fork has been added as a async-signal-safe fork + replacement since Austin Group issue 62 droped the async-signal-safe + requirement for fork (and it will be included in the future POSIX + standard). The new _Fork function does not run any atfork function neither + resets any internal state or lock (such as the malloc one) and only + sets up a minimal state required to call async-signal-safe functions (such + as raise or execve). This function is currently a GNU extension. + Deprecated and removed features, and other changes affecting compatibility: [Add deprecations, removals and changes affecting compatibility here] diff --git a/malloc/Makefile b/malloc/Makefile index 641967c512..833c9c499e 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -31,6 +31,7 @@ tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \ tst-malloc-backtrace tst-malloc-thread-exit \ tst-malloc-thread-fail tst-malloc-fork-deadlock \ tst-mallocfork2 \ + tst-mallocfork3 \ tst-interpose-nothread \ tst-interpose-thread \ tst-alloc_buffer \ @@ -115,6 +116,8 @@ libmemusage-inhibit-o = $(filter-out .os,$(object-suffixes)) $(objpfx)tst-malloc-backtrace: $(shared-thread-library) $(objpfx)tst-malloc-thread-exit: $(shared-thread-library) $(objpfx)tst-malloc-thread-fail: $(shared-thread-library) +$(objpfx)tst-mallocfork3: $(shared-thread-library) +$(objpfx)tst-mallocfork3-mcheck: $(shared-thread-library) $(objpfx)tst-malloc-fork-deadlock: $(shared-thread-library) $(objpfx)tst-malloc-stats-cancellation: $(shared-thread-library) $(objpfx)tst-malloc-backtrace-mcheck: $(shared-thread-library) diff --git a/malloc/tst-mallocfork3.c b/malloc/tst-mallocfork3.c new file mode 100644 index 0000000000..4ac99eea43 --- /dev/null +++ b/malloc/tst-mallocfork3.c @@ -0,0 +1,213 @@ +/* Test case for async-signal-safe _Fork (with respect to malloc). + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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; see the file COPYING.LIB. If + not, see . */ + +/* This test is similar to tst-mallocfork2.c, but specifically stress + the async-signal-safeness of _Fork on multithread environment. */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* How many malloc objects to keep arond. */ +enum { malloc_objects = 1009 }; + +/* The maximum size of an object. */ +enum { malloc_maximum_size = 70000 }; + +/* How many iterations the test performs before exiting. */ +enum { iterations = 10000 }; + +/* Barrier for synchronization with the threads sending SIGUSR1 + signals, to make it more likely that the signals arrive during a + fork/free/malloc call. */ +static pthread_barrier_t barrier; + +/* Set to 1 if SIGUSR1 is received. Used to detect a signal during + fork/free/malloc. */ +static volatile sig_atomic_t sigusr1_received; + +/* Periodically set to 1, to indicate that the thread is making + progress. Checked by liveness_signal_handler. */ +static volatile sig_atomic_t progress_indicator = 1; + +/* Set to 1 if an error occurs in the signal handler. */ +static volatile sig_atomic_t error_indicator = 0; + +static void +sigusr1_handler (int signo) +{ + sigusr1_received = 1; + + /* Perform a fork with a trivial subprocess. */ + pid_t pid = _Fork (); + if (pid == -1) + { + write_message ("error: fork\n"); + error_indicator = 1; + return; + } + if (pid == 0) + _exit (0); + int status; + int ret = TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)); + if (ret < 0) + { + write_message ("error: waitpid\n"); + error_indicator = 1; + return; + } + if (status != 0) + { + write_message ("error: unexpected exit status from subprocess\n"); + error_indicator = 1; + return; + } +} + +static void +liveness_signal_handler (int signo) +{ + if (progress_indicator) + progress_indicator = 0; + else + write_message ("warning: thread seems to be stuck\n"); +} + +struct signal_send_args +{ + pthread_t target; + int signo; + bool sleep; +}; +#define SIGNAL_SEND_GET_ARG(arg, field) \ + (((struct signal_send_args *)(arg))->field) + +/* Send SIGNO to the parent thread. If SLEEP, wait a second between + signals, otherwise use barriers to delay sending signals. */ +static void * +signal_sender (void *args) +{ + int signo = SIGNAL_SEND_GET_ARG (args, signo); + bool sleep = SIGNAL_SEND_GET_ARG (args, sleep); + + pthread_t target = SIGNAL_SEND_GET_ARG (args, target); + while (true) + { + if (!sleep) + xpthread_barrier_wait (&barrier); + xpthread_kill (target, signo); + if (sleep) + usleep (1 * 1000 * 1000); + else + xpthread_barrier_wait (&barrier); + } + return NULL; +} + +static pthread_t sigusr1_sender[5]; +static pthread_t sigusr2_sender; + +static int +do_test (void) +{ + xsignal (SIGUSR1, sigusr1_handler); + xsignal (SIGUSR2, liveness_signal_handler); + + pthread_t self = pthread_self (); + + struct signal_send_args sigusr2_args = { self, SIGUSR2, true }; + sigusr2_sender = xpthread_create (NULL, signal_sender, &sigusr2_args); + + /* Send SIGUSR1 signals from several threads. Hopefully, one + signal will hit one of the ciritical functions. Use a barrier to + avoid sending signals while not running fork/free/malloc. */ + struct signal_send_args sigusr1_args = { self, SIGUSR1, false }; + xpthread_barrier_init (&barrier, NULL, + array_length (sigusr1_sender) + 1); + for (size_t i = 0; i < array_length (sigusr1_sender); ++i) + sigusr1_sender[i] = xpthread_create (NULL, signal_sender, &sigusr1_args); + + void *objects[malloc_objects] = {}; + unsigned int fork_signals = 0; + unsigned int free_signals = 0; + unsigned int malloc_signals = 0; + unsigned int seed = 1; + for (int i = 0; i < iterations; ++i) + { + progress_indicator = 1; + int slot = rand_r (&seed) % malloc_objects; + size_t size = rand_r (&seed) % malloc_maximum_size; + + /* Occasionally do a fork first, to catch deadlocks there as + well (see bug 24161). */ + bool do_fork = (rand_r (&seed) % 7) == 0; + + xpthread_barrier_wait (&barrier); + if (do_fork) + { + sigusr1_received = 0; + pid_t pid = _Fork (); + TEST_VERIFY_EXIT (pid != -1); + if (sigusr1_received) + ++fork_signals; + if (pid == 0) + _exit (0); + int status; + int ret = TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)); + if (ret < 0) + FAIL_EXIT1 ("waitpid: %m"); + TEST_COMPARE (status, 0); + } + sigusr1_received = 0; + free (objects[slot]); + if (sigusr1_received) + ++free_signals; + sigusr1_received = 0; + objects[slot] = malloc (size); + if (sigusr1_received) + ++malloc_signals; + xpthread_barrier_wait (&barrier); + + if (objects[slot] == NULL || error_indicator != 0) + { + printf ("error: malloc: %m\n"); + return 1; + } + } + + /* Clean up allocations. */ + for (int slot = 0; slot < malloc_objects; ++slot) + free (objects[slot]); + + printf ("info: signals received during fork: %u\n", fork_signals); + printf ("info: signals received during free: %u\n", free_signals); + printf ("info: signals received during malloc: %u\n", malloc_signals); + + return 0; +} + +#define TIMEOUT 100 +#include diff --git a/manual/process.texi b/manual/process.texi index 54e65f76c6..e17149ce60 100644 --- a/manual/process.texi +++ b/manual/process.texi @@ -138,8 +138,8 @@ creating a process and making it run another program. @cindex parent process @cindex subprocess A new processes is created when one of the functions -@code{posix_spawn}, @code{fork}, or @code{vfork} is called. (The -@code{system} and @code{popen} also create new processes internally.) +@code{posix_spawn}, @code{fork}, @code{_Fork} or @code{vfork} is called. +(The @code{system} and @code{popen} also create new processes internally.) Due to the name of the @code{fork} function, the act of creating a new process is sometimes called @dfn{forking} a process. Each new process (the @dfn{child process} or @dfn{subprocess}) is allocated a process @@ -155,9 +155,10 @@ limited information about why the child terminated---for example, its exit status code. A newly forked child process continues to execute the same program as -its parent process, at the point where the @code{fork} call returns. -You can use the return value from @code{fork} to tell whether the program -is running in the parent process or the child. +its parent process, at the point where the @code{fork} or @code{_Fork} +call returns. You can use the return value from @code{fork} or +@code{_Fork} to tell whether the program is running in the parent process +or the child. @cindex process image Having several processes run the same program is only occasionally @@ -249,16 +250,13 @@ It is declared in the header file @file{unistd.h}. @deftypefun pid_t fork (void) @standards{POSIX.1, unistd.h} @safety{@prelim{}@mtsafe{}@asunsafe{@ascuplugin{}}@acunsafe{@aculock{}}} -@c The nptl/.../linux implementation safely collects fork_handlers into -@c an alloca()ed linked list and increments ref counters; it uses atomic -@c ops and retries, avoiding locking altogether. It then takes the -@c IO_list lock, resets the thread-local pid, and runs fork. The parent -@c restores the thread-local pid, releases the lock, and runs parent -@c handlers, decrementing the ref count and signaling futex wait if -@c requested by unregister_atfork. The child bumps the fork generation, -@c sets the thread-local pid, resets cpu clocks, initializes the robust -@c mutex list, the stream locks, the IO_list lock, the dynamic loader -@c lock, runs the child handlers, reseting ref counters to 1, and +@c The posix/fork.c implementation iterates over the fork_handlers +@c using a lock. It then takes the IO_list lock, resets the thread-local +@c pid, and runs fork. The parent releases the lock, and runs parent +@c handlers, and unlocks the internal lock. The child bumps the fork +@c generation, sets the thread-local pid, resets cpu clocks, initializes +@c the robust mutex list, the stream locks, the IO_list lock, the dynamic +@c loader lock, runs the child handlers, reseting ref counters to 1, and @c initializes the fork lock. These are all safe, unless atfork @c handlers themselves are unsafe. The @code{fork} function creates a new process. @@ -322,6 +320,17 @@ process is cleared. (The child process inherits its mask of blocked signals and signal actions from the parent process.) @end itemize +@deftypefun pid_t _Fork (void) +@standards{GNU, unistd.h} +@safety{@prelim{}@mtsafe{}@assafe{}@acsafe{}} +The @code{_Fork} function is similar to @code{fork} but does not issue +any atfork callback registered with @code{pthread_atfork} neither reset +any internal state or locks (such as the malloc one) and only setup a +minimal state required to call async-signal-safe functions (such as raise +or execve). + +It is an async-signal-safe replacement of @code{fork}. +@end deftypefun @deftypefun pid_t vfork (void) @standards{BSD, unistd.h} diff --git a/posix/Makefile b/posix/Makefile index c59190a3f3..32f9c9c8eb 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -125,7 +125,7 @@ test-srcs := globtest tests += wordexp-test tst-exec tst-spawn tst-spawn2 tst-spawn3 endif ifeq (yesyes,$(build-shared)$(have-thread-library)) -tests += tst-getopt-cancel +tests += tst-getopt-cancel tst-_Fork endif tests-static = tst-exec-static tst-spawn-static tests += $(tests-static) @@ -294,6 +294,7 @@ $(objpfx)ptestcases.h: PTESTS PTESTS2C.sed $(objpfx)runptests.o: $(objpfx)ptestcases.h $(objpfx)tst-getopt-cancel: $(shared-thread-library) +$(objpfx)tst-_Fork: $(shared-thread-library) test-xfail-annexc = yes $(objpfx)annexc.out: $(objpfx)annexc diff --git a/posix/Versions b/posix/Versions index cfd3819966..0ee433299e 100644 --- a/posix/Versions +++ b/posix/Versions @@ -147,6 +147,9 @@ libc { } GLIBC_2.30 { } + GLIBC_2.34 { + _Fork; + } GLIBC_PRIVATE { __libc_fork; __libc_pread; __libc_pwrite; __nanosleep_nocancel; __pause_nocancel; diff --git a/posix/fork.c b/posix/fork.c index a4fdd44e1e..1e797528da 100644 --- a/posix/fork.c +++ b/posix/fork.c @@ -41,7 +41,10 @@ __libc_fork (void) { /* Determine if we are running multiple threads. We skip some fork handlers in the single-thread case, to make fork safer to use in - signal handlers. */ + signal handlers. Although POSIX has dropped async-signal-safe + requirement for fork (Austin Group tracker issue #62) this is + best effort to make is async-signal-safe at least for single-thread + case. */ bool multiple_threads = __libc_single_threaded == 0; __run_fork_handlers (atfork_run_prepare, multiple_threads); diff --git a/posix/tst-_Fork.c b/posix/tst-_Fork.c new file mode 100644 index 0000000000..29a7ab6aaf --- /dev/null +++ b/posix/tst-_Fork.c @@ -0,0 +1,218 @@ +/* Basic tests for _Fork. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 +#include + +/* For single-thread, _Fork behaves like fork. */ +static int +singlethread_test (void) +{ + const char testdata1[] = "abcdefghijklmnopqrtuvwxz"; + enum { testdatalen1 = array_length (testdata1) }; + const char testdata2[] = "01234567890"; + enum { testdatalen2 = array_length (testdata2) }; + + pid_t ppid = getpid (); + + int tempfd = create_temp_file ("tst-_Fork", NULL); + + /* Check if the opened file is shared between process by read and write + some data on parent and child processes. */ + xwrite (tempfd, testdata1, testdatalen1); + off_t off = xlseek (tempfd, 0, SEEK_CUR); + TEST_COMPARE (off, testdatalen1); + + pid_t pid = _Fork (); + TEST_VERIFY_EXIT (pid != -1); + if (pid == 0) + { + TEST_VERIFY_EXIT (getpid () != ppid); + TEST_COMPARE (getppid(), ppid); + + TEST_COMPARE (xlseek (tempfd, 0, SEEK_CUR), testdatalen1); + + xlseek (tempfd, 0, SEEK_SET); + char buf[testdatalen1]; + TEST_COMPARE (read (tempfd, buf, sizeof (buf)), testdatalen1); + TEST_COMPARE (memcmp (buf, testdata1, testdatalen1), 0); + + xlseek (tempfd, 0, SEEK_SET); + xwrite (tempfd, testdata2, testdatalen2); + + close (tempfd); + + _exit (EXIT_SUCCESS); + } + + int status; + xwaitpid (pid, &status, 0); + TEST_VERIFY (WIFEXITED (status)); + TEST_COMPARE (WEXITSTATUS (status), EXIT_SUCCESS); + + TEST_COMPARE (xlseek (tempfd, 0, SEEK_CUR), testdatalen2); + + xlseek (tempfd, 0, SEEK_SET); + char buf[testdatalen2]; + TEST_COMPARE (read (tempfd, buf, sizeof (buf)), testdatalen2); + + TEST_COMPARE (memcmp (buf, testdata2, testdatalen2), 0); + + return 0; +} + + +static volatile sig_atomic_t sigusr1_handler_ran; +static pid_t sig_pid = -1; +#define SIG_PID_EXIT_CODE 20 + +static void +sigusr1_handler (int signum) +{ + TEST_COMPARE (signum, SIGUSR1); + + pid_t ppid = getpid (); + + sig_pid = _Fork (); + TEST_VERIFY_EXIT (sig_pid != -1); + if (sig_pid == 0) + { + TEST_VERIFY_EXIT (getpid () != ppid); + TEST_COMPARE (getppid(), ppid); + + _exit (SIG_PID_EXIT_CODE); + } + + sigusr1_handler_ran = 1; +} + +/* _Fork is async-signal-safe, so check if it can successfully issue + a new process in a signal handler. */ +static int +singlethread_signal_test (void) +{ + xsignal (SIGUSR1, &sigusr1_handler); + /* Assume synchronous signal handling. */ + xraise (SIGUSR1); + TEST_COMPARE (sigusr1_handler_ran, 1); + + int status; + xwaitpid (sig_pid, &status, 0); + TEST_VERIFY (WIFEXITED (status)); + TEST_COMPARE (WEXITSTATUS (status), SIG_PID_EXIT_CODE); + + xsignal (SIGUSR1, SIG_DFL); + + return 0; +} + + +static bool atfork_prepare_var; +static bool atfork_parent_var; +static bool atfork_child_var; + +static void +atfork_prepare (void) +{ + atfork_prepare_var = true; +} + +static void +atfork_parent (void) +{ + atfork_parent_var = true; +} + +static void +atfork_child (void) +{ + atfork_child_var = true; +} + +/* Different than fork, _Fork does not execute any pthread_atfork + handlers. */ +static int +singlethread_atfork_test (void) +{ + pthread_atfork (atfork_prepare, atfork_parent, atfork_child); + singlethread_test (); + TEST_COMPARE (atfork_prepare_var, false); + TEST_COMPARE (atfork_parent_var, false); + TEST_COMPARE (atfork_child_var, false); + + return 0; +} + + +static void * +mt_atfork_test (void *args) +{ + singlethread_atfork_test (); + + return NULL; +} + +static int +multithread_atfork_test (void) +{ + pthread_t thr = xpthread_create (NULL, mt_atfork_test, NULL); + xpthread_join (thr); + + return 0; +} + + +static void * +mt_signal_test (void *args) +{ + singlethread_signal_test (); + + return NULL; +} + +static int +multithread_signal_test (void) +{ + pthread_t thr = xpthread_create (NULL, mt_signal_test, NULL); + xpthread_join (thr); + + return 0; +} + + +static int +do_test (void) +{ + singlethread_atfork_test (); + singlethread_signal_test (); + + multithread_atfork_test (); + multithread_signal_test (); + + return 0; +} + +#include diff --git a/posix/unistd.h b/posix/unistd.h index 3f22763379..670d471ac2 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -776,6 +776,13 @@ extern __pid_t fork (void) __THROWNL; extern __pid_t vfork (void) __THROW; #endif /* Use misc or XPG < 7. */ +#ifdef __USE_GNU +/* This is similar to fork, however it does not run the atfork handlers + neither reinitialize any internal locks in multithread case. + Different than fork, _Fork is async-signal-safe. */ +extern __pid_t _Fork (void) __THROWNL; +#endif + /* Return the pathname of the terminal FD is open on, or NULL on errors. The returned storage is good only until the next call to this function. */ diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index e10a286d2e..f52c578c03 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -2203,6 +2203,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index bac795262d..6dd65a7d88 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -2171,4 +2171,5 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 897f70db22..17280ae21a 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -2253,6 +2253,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 _IO_fprintf F GLIBC_2.4 _IO_printf F diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist index 604d259ad6..5717e6c5ab 100644 --- a/sysdeps/unix/sysv/linux/arc/libc.abilist +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -1931,4 +1931,5 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist index 094236f713..1040046984 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist @@ -155,6 +155,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 _Exit F GLIBC_2.4 _IO_2_1_stderr_ D 0xa0 diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist index 2bb4d31e81..a779b7a81a 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist @@ -152,6 +152,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 _Exit F GLIBC_2.4 _IO_2_1_stderr_ D 0xa0 diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist index d4291fecfb..ed5a835b53 100644 --- a/sysdeps/unix/sysv/linux/csky/libc.abilist +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist @@ -2115,4 +2115,5 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist index 1fd2a862f6..24a311725b 100644 --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist @@ -2074,6 +2074,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist index 943331f01e..6632522eea 100644 --- a/sysdeps/unix/sysv/linux/i386/libc.abilist +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist @@ -2241,6 +2241,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist index f530151bde..a123433250 100644 --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist @@ -2106,6 +2106,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist index 6e76b6dcaa..d382bdfad0 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist @@ -156,6 +156,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 _Exit F GLIBC_2.4 _IO_2_1_stderr_ D 0x98 diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist index 7541b8289f..0a0cbeb5be 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist @@ -2186,6 +2186,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist index 6cf1936c42..f43b603f75 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist @@ -2166,4 +2166,5 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist index 98730ebcda..da75ecfdc5 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist @@ -2163,4 +2163,5 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist index 92fa6cbc73..488985fcba 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist @@ -2157,6 +2157,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist index 265a49e74e..13247177af 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist @@ -2155,6 +2155,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist index cfa5e1111b..4001cb5cec 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist @@ -2163,6 +2163,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist index 8c03ac52cd..8954bbd7c9 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist @@ -2157,6 +2157,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist index 17f5609e06..fad90d0198 100644 --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist @@ -2204,4 +2204,5 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist index 76a16e2a6d..fa59d7eb0e 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist @@ -2213,6 +2213,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 _IO_fprintf F GLIBC_2.4 _IO_printf F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist index 697f072fd4..e17ce44ad9 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist @@ -2246,6 +2246,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 _IO_fprintf F GLIBC_2.4 _IO_printf F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist index 2647bb51f1..38986ac7ee 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist @@ -2076,6 +2076,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 _IO_fprintf F GLIBC_2.4 _IO_printf F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist index 036b1c8345..567228bdb6 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist @@ -2366,4 +2366,5 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist index ff3225e16f..d0774e04e1 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist @@ -1933,4 +1933,5 @@ GLIBC_2.33 wprintf F GLIBC_2.33 write F GLIBC_2.33 writev F GLIBC_2.33 wscanf F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist index fb5ad9909f..360b8d3503 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist @@ -2133,4 +2133,5 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist index cead75acc5..db10446666 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist @@ -2211,6 +2211,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 _IO_fprintf F GLIBC_2.4 _IO_printf F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist index 31366dd7e6..6392e77d0b 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist @@ -2112,6 +2112,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 _IO_fprintf F GLIBC_2.4 _IO_printf F diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist index a3a8be8910..e23463f888 100644 --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist @@ -2081,6 +2081,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist index 8f505c5045..3f089405e8 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist @@ -2078,6 +2078,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist index 53ef6304f1..298edc165f 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist @@ -2202,6 +2202,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 _IO_fprintf F GLIBC_2.4 _IO_printf F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist index eba0cb156d..d5b7ffd30b 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist @@ -2129,6 +2129,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index 17ce5dfd58..35f8b75054 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist @@ -2088,6 +2088,7 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F GLIBC_2.4 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist index 17a1c83903..ab8c50d0bf 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist @@ -2185,4 +2185,5 @@ GLIBC_2.33 mknod F GLIBC_2.33 mknodat F GLIBC_2.33 stat F GLIBC_2.33 stat64 F +GLIBC_2.34 _Fork F GLIBC_2.34 __libc_start_main F