From patchwork Tue Apr 26 18:07:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 53237 X-Patchwork-Delegate: arjun.is@lostca.se 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 EBEBE385842E for ; Tue, 26 Apr 2022 18:08:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EBEBE385842E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1650996494; bh=nS0UEmx6pmhtArMC16Q1dBn3rNzlGkeVUrFT3vL8d4o=; 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=Oe0b7F0n8YtJGf5MnOKN+439s3E/cIOv6ycVx4zUHva9NL9mtLYn+fTBNjUYVnzwZ zZ5WRMANv1q08Lw+evkg//oqmV64TQXd7oJxEx7khZ/pSi7pRS5gtx9mqEmUUTfDdF +Eh93qDJ8nxeJtbl8rcYOD4MQWLSa3yP2TLqqw9w= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x2f.google.com (mail-oa1-x2f.google.com [IPv6:2001:4860:4864:20::2f]) by sourceware.org (Postfix) with ESMTPS id 134C53858C54 for ; Tue, 26 Apr 2022 18:07:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 134C53858C54 Received: by mail-oa1-x2f.google.com with SMTP id 586e51a60fabf-e656032735so18957079fac.0 for ; Tue, 26 Apr 2022 11:07:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nS0UEmx6pmhtArMC16Q1dBn3rNzlGkeVUrFT3vL8d4o=; b=zNrHP763ywmYltK/zZN4piZZF9igeNiTTdF1twEpMZHdA0l4KT4JSyeHXJr6ZVnA4f 6jFoj70+5TvGaWWCcpXLXVOFKm1JIROtwFA9ej/GCXq45F+RCxicQ5qQbzkVsfvsmzAr aM20MODKbSyzk2Kg/OkUmDdEoIPSA5L84voKA6fwWhFk2t+d4My2un6+zxg3ByWSSaT7 +MDwLGcMFdS67NOhFNByBhwxDYWyw7MVi+bqCd58ezPlGtZ0DV5lbrRjTMFOO7yOwdU6 2SMpfKoyxNDvCyDghq7xjNrDxzmfVOsRDSlm1PBDghoB6I3FyWjy5MlioS1qkuezE2YM WM6A== X-Gm-Message-State: AOAM532a4CNJFmx/SBzwQ0n7ToTPAhgUQYO5a3P3Anokf5LmbJJRxMA5 KoIFUHDYMqOms8bo/lHx7FOtVYY94X1icg== X-Google-Smtp-Source: ABdhPJz+Okae9//WzRIkHa5hlbwG1a/lS1YeOME7fg8L8CYKIwrn1e3Gj6dCamUiS7PE4L2Dq8HXvQ== X-Received: by 2002:a05:6870:b38d:b0:e9:2082:fe86 with SMTP id w13-20020a056870b38d00b000e92082fe86mr6481540oap.145.1650996431120; Tue, 26 Apr 2022 11:07:11 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:4214:745b:d03c:b667:123b]) by smtp.gmail.com with ESMTPSA id s4-20020a056871050400b000e686d1389esm1045478oal.56.2022.04.26.11.07.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 11:07:10 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 1/2] nptl: Remove unused members from struct pthread Date: Tue, 26 Apr 2022 15:07:04 -0300 Message-Id: <20220426180705.1274657-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220426180705.1274657-1-adhemerval.zanella@linaro.org> References: <20220426180705.1274657-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" It removes both pid_ununsed and cpuclock_offset_ununsed, saving about 12 bytes from struct pthread. Reviewed-by: Arjun Shankar --- nptl/descr.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nptl/descr.h b/nptl/descr.h index bb46b5958e..b5852632e3 100644 --- a/nptl/descr.h +++ b/nptl/descr.h @@ -172,9 +172,6 @@ struct pthread therefore stack) used' flag. */ pid_t tid; - /* Ununsed. */ - pid_t pid_ununsed; - /* List of robust mutexes the thread is holding. */ #if __PTHREAD_MUTEX_HAVE_PREV void *robust_prev; @@ -342,10 +339,6 @@ struct pthread /* Lock for synchronizing setxid calls. */ unsigned int setxid_futex; -#if HP_TIMING_INLINE - hp_timing_t cpuclock_offset_ununsed; -#endif - /* If the thread waits to join another one the ID of the latter is stored here. From patchwork Tue Apr 26 18:07:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 53238 X-Patchwork-Delegate: arjun.is@lostca.se 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 4295A3857C41 for ; Tue, 26 Apr 2022 18:08:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4295A3857C41 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1650996536; bh=VHWc8ZU8f9IUutqYnxQ75Y9ffZ47FAiyv19DAgUC048=; 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=WbnTNILPVg4eqoghaj2kA71pc9Ge+1+eY81wGbDm6kdKngJqCIWvIsPygbNbl1Vdx F2ckIZiT5jp9QA73tgZKijfKxbOG/CkqnAAJBKOVSK755QdXgL4njBUflbseE43OZ+ 6IFZpsmnNeeCp+VDK7WLJF02A0ltAI97bipYjEvU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x29.google.com (mail-oa1-x29.google.com [IPv6:2001:4860:4864:20::29]) by sourceware.org (Postfix) with ESMTPS id 2C7063858430 for ; Tue, 26 Apr 2022 18:07:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2C7063858430 Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-e2fa360f6dso20228993fac.2 for ; Tue, 26 Apr 2022 11:07:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VHWc8ZU8f9IUutqYnxQ75Y9ffZ47FAiyv19DAgUC048=; b=XmFZEu4I0lgZ01sTRTt7iqYcaCvt8CfbXxZ5CEYPui/Axj8puJhHpTxRB/ZsmVcuKA X88XnkNCiFwyn2Fyr0Eg8hsv6FhTNaEdc5Iapsp1r/wmvKqYxrml7fKIYSlJ4gQCa3ij QPJHTl8G2z3lXLgrjb3xLe6JSqsqcs8DAgIZy2WUoJWip2QmJLEzJbv8ZJAX7B9wLWu0 8S/xgAVsyuSz39DrNKQI1MHBjK0nNtOkf4oA350/aNxMhw7tRXn06ysS69f0rBNksjzW 8w2/lzmoUN/ejTQuHTOFaJ+H5nXd3QsIpfjldxGBxZvD2D/zbTzAZriZoMksTZ2x5TSZ cH1Q== X-Gm-Message-State: AOAM533IMJxq2TA/piE5B43WNRLBTuCuVtqH69InrmWtiptAj4xTiBGe h0SQgonRX8pkFV6X8PZNf+j81qq+adPOyw== X-Google-Smtp-Source: ABdhPJztrmCPbv0EjVVuO24vQ1M6N6m16JF1FsNc0Jgm7qUm1YmryQMBBKd4FovMOATvjaHBSmbJag== X-Received: by 2002:a05:6871:85:b0:d9:ac7a:7a5a with SMTP id u5-20020a056871008500b000d9ac7a7a5amr9946959oaa.9.1650996432751; Tue, 26 Apr 2022 11:07:12 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:4214:745b:d03c:b667:123b]) by smtp.gmail.com with ESMTPSA id s4-20020a056871050400b000e686d1389esm1045478oal.56.2022.04.26.11.07.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 11:07:12 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 2/2] Refactor internal-signals.h Date: Tue, 26 Apr 2022 15:07:05 -0300 Message-Id: <20220426180705.1274657-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220426180705.1274657-1-adhemerval.zanella@linaro.org> References: <20220426180705.1274657-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The main drive is to optimize the internal usage and required size when sigset_t in embedded in other data structures. On Linux, the current supported signal set requires up to 8 bytes (16 on mips), wat lower than the user defined sigset_t (128 bytes). A new internal type internal_sigset_t is added, along with the functions to operate on it similar to the ones for sigset_t. The internal-signals.h is also refactores to remove unused functions Besides small stack usage on some functions (posix_spawn, abort) it lower the struct pthread by about 120 bytes (112 on mips). Checked on x86_64-linux-gnu. --- nptl/descr.h | 3 +- nptl/pthread_attr_setsigmask.c | 2 +- nptl/pthread_create.c | 16 +-- nptl/pthread_kill.c | 10 +- nptl/pthread_sigmask.c | 2 +- rt/tst-timer-sigmask.c | 2 +- signal/sigaction.c | 2 +- signal/sigaddset.c | 2 +- signal/sigdelset.c | 2 +- signal/sigfillset.c | 2 +- stdlib/abort.c | 10 +- sysdeps/generic/internal-signals.h | 31 +----- sysdeps/posix/signal.c | 2 +- sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c | 2 +- sysdeps/unix/sysv/linux/internal-signals.h | 53 +++++---- sysdeps/unix/sysv/linux/internal-sigset.h | 105 ++++++++++++++++++ sysdeps/unix/sysv/linux/spawni.c | 14 ++- sysdeps/unix/sysv/linux/timer_routines.c | 2 +- 18 files changed, 178 insertions(+), 84 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/internal-sigset.h diff --git a/nptl/descr.h b/nptl/descr.h index b5852632e3..5cacb286f3 100644 --- a/nptl/descr.h +++ b/nptl/descr.h @@ -35,6 +35,7 @@ #include #include #include +#include #ifndef TCB_ALIGNMENT # define TCB_ALIGNMENT 32 @@ -387,7 +388,7 @@ struct pthread /* Signal mask for the new thread. Used during thread startup to restore the signal mask. (Threads are launched with all signals masked.) */ - sigset_t sigmask; + internal_sigset_t sigmask; /* Indicates whether is a C11 thread created by thrd_creat. */ bool c11; diff --git a/nptl/pthread_attr_setsigmask.c b/nptl/pthread_attr_setsigmask.c index a6e650f4cc..908a0c13ef 100644 --- a/nptl/pthread_attr_setsigmask.c +++ b/nptl/pthread_attr_setsigmask.c @@ -28,7 +28,7 @@ pthread_attr_setsigmask_np (pthread_attr_t *attr, const sigset_t *sigmask) /* Filter out internal signals. */ struct pthread_attr *iattr = (struct pthread_attr *) attr; - __clear_internal_signals (&iattr->extension->sigmask); + clear_internal_signals (&iattr->extension->sigmask); return 0; } diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c index e7a099acb7..360e78eb13 100644 --- a/nptl/pthread_create.c +++ b/nptl/pthread_create.c @@ -423,7 +423,7 @@ start_thread (void *arg) /* Store the new cleanup handler info. */ THREAD_SETMEM (pd, cleanup_jmp_buf, &unwind_buf); - __libc_signal_restore_set (&pd->sigmask); + internal_signal_restore_set (&pd->sigmask); LIBC_PROBE (pthread_start, 3, (pthread_t) pd, pd->start_routine, pd->arg); @@ -501,8 +501,8 @@ start_thread (void *arg) signal to be delivered. (SIGSETXID cannot run application code, nor does it use pthread_kill.) Reuse the pd->sigmask space for computing the signal mask, to save stack space. */ - __sigfillset (&pd->sigmask); - __sigdelset (&pd->sigmask, SIGSETXID); + internal_sigfillset (&pd->sigmask); + internal_sigdelset (&pd->sigmask, SIGSETXID); INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &pd->sigmask, NULL, __NSIG_BYTES); @@ -766,14 +766,14 @@ __pthread_create_2_1 (pthread_t *newthread, const pthread_attr_t *attr, /* Block all signals, so that the new thread starts out with signals disabled. This avoids race conditions in the thread startup. */ - sigset_t original_sigmask; - __libc_signal_block_all (&original_sigmask); + internal_sigset_t original_sigmask; + internal_signal_block_all (&original_sigmask); if (iattr->extension != NULL && iattr->extension->sigmask_set) /* Use the signal mask in the attribute. The internal signals have already been filtered by the public pthread_attr_setsigmask_np interface. */ - pd->sigmask = iattr->extension->sigmask; + internal_sigset_from_sigset (&pd->sigmask, &iattr->extension->sigmask); else { /* Conceptually, the new thread needs to inherit the signal mask @@ -783,7 +783,7 @@ __pthread_create_2_1 (pthread_t *newthread, const pthread_attr_t *attr, pd->sigmask = original_sigmask; /* Reset the cancellation signal mask in case this thread is running cancellation. */ - __sigdelset (&pd->sigmask, SIGCANCEL); + internal_sigdelset (&pd->sigmask, SIGCANCEL); } /* Start the thread. */ @@ -830,7 +830,7 @@ __pthread_create_2_1 (pthread_t *newthread, const pthread_attr_t *attr, /* Return to the previous signal mask, after creating the new thread. */ - __libc_signal_restore_set (&original_sigmask); + internal_signal_restore_set (&original_sigmask); if (__glibc_unlikely (retval != 0)) { diff --git a/nptl/pthread_kill.c b/nptl/pthread_kill.c index 8015e10b70..178d38d3bd 100644 --- a/nptl/pthread_kill.c +++ b/nptl/pthread_kill.c @@ -45,8 +45,8 @@ __pthread_kill_implementation (pthread_t threadid, int signo, int no_tid) } /* Block all signals, as required by pd->exit_lock. */ - sigset_t old_mask; - __libc_signal_block_all (&old_mask); + internal_sigset_t old_mask; + internal_signal_block_all (&old_mask); __libc_lock_lock (pd->exit_lock); int ret; @@ -64,7 +64,7 @@ __pthread_kill_implementation (pthread_t threadid, int signo, int no_tid) } __libc_lock_unlock (pd->exit_lock); - __libc_signal_restore_set (&old_mask); + internal_signal_restore_set (&old_mask); return ret; } @@ -83,7 +83,7 @@ __pthread_kill (pthread_t threadid, int signo) { /* Disallow sending the signal we use for cancellation, timers, for the setxid implementation. */ - if (__is_internal_signal (signo)) + if (is_internal_signal (signo)) return EINVAL; return __pthread_kill_internal (threadid, signo); @@ -102,7 +102,7 @@ int attribute_compat_text_section __pthread_kill_esrch (pthread_t threadid, int signo) { - if (__is_internal_signal (signo)) + if (is_internal_signal (signo)) return EINVAL; return __pthread_kill_implementation (threadid, signo, ESRCH); diff --git a/nptl/pthread_sigmask.c b/nptl/pthread_sigmask.c index 20f811cc6b..977740b97e 100644 --- a/nptl/pthread_sigmask.c +++ b/nptl/pthread_sigmask.c @@ -32,7 +32,7 @@ __pthread_sigmask (int how, const sigset_t *newmask, sigset_t *oldmask) || __glibc_unlikely (__sigismember (newmask, SIGSETXID)))) { local_newmask = *newmask; - __clear_internal_signals (&local_newmask); + clear_internal_signals (&local_newmask); newmask = &local_newmask; } diff --git a/rt/tst-timer-sigmask.c b/rt/tst-timer-sigmask.c index 11acb670ab..4d088a691d 100644 --- a/rt/tst-timer-sigmask.c +++ b/rt/tst-timer-sigmask.c @@ -43,7 +43,7 @@ thread_handler (union sigval sv) if (sigismember (&ss, sig)) { TEST_VERIFY (sig != SIGKILL && sig != SIGSTOP); - TEST_VERIFY (!__is_internal_signal (sig)); + TEST_VERIFY (!is_internal_signal (sig)); } if (test_verbose && sigismember (&ss, sig)) printf ("%d, ", sig); diff --git a/signal/sigaction.c b/signal/sigaction.c index 8e94b9a10b..d56b3196ca 100644 --- a/signal/sigaction.c +++ b/signal/sigaction.c @@ -24,7 +24,7 @@ int __sigaction (int sig, const struct sigaction *act, struct sigaction *oact) { - if (sig <= 0 || sig >= NSIG || __is_internal_signal (sig)) + if (sig <= 0 || sig >= NSIG || is_internal_signal (sig)) { __set_errno (EINVAL); return -1; diff --git a/signal/sigaddset.c b/signal/sigaddset.c index c6ef0a953a..f0fed84dd7 100644 --- a/signal/sigaddset.c +++ b/signal/sigaddset.c @@ -25,7 +25,7 @@ int sigaddset (sigset_t *set, int signo) { if (set == NULL || signo <= 0 || signo >= NSIG - || __is_internal_signal (signo)) + || is_internal_signal (signo)) { __set_errno (EINVAL); return -1; diff --git a/signal/sigdelset.c b/signal/sigdelset.c index 81bb9a908a..2c973c9b84 100644 --- a/signal/sigdelset.c +++ b/signal/sigdelset.c @@ -25,7 +25,7 @@ int sigdelset (sigset_t *set, int signo) { if (set == NULL || signo <= 0 || signo >= NSIG - || __is_internal_signal (signo)) + || is_internal_signal (signo)) { __set_errno (EINVAL); return -1; diff --git a/signal/sigfillset.c b/signal/sigfillset.c index b52ef06aa0..1d11ae4fec 100644 --- a/signal/sigfillset.c +++ b/signal/sigfillset.c @@ -31,7 +31,7 @@ sigfillset (sigset_t *set) } __sigfillset (set); - __clear_internal_signals (set); + clear_internal_signals (set); return 0; } libc_hidden_def (sigfillset) diff --git a/stdlib/abort.c b/stdlib/abort.c index bcf72f9356..9c1065af0e 100644 --- a/stdlib/abort.c +++ b/stdlib/abort.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include /* Try to get a machine dependent instruction which will make the program crash. This is used in case everything else fails. */ @@ -48,7 +48,6 @@ void abort (void) { struct sigaction act; - sigset_t sigs; /* First acquire the lock. */ __libc_lock_lock_recursive (lock); @@ -59,9 +58,10 @@ abort (void) if (stage == 0) { ++stage; - __sigemptyset (&sigs); - __sigaddset (&sigs, SIGABRT); - __sigprocmask (SIG_UNBLOCK, &sigs, 0); + internal_sigset_t sigs; + internal_sigemptyset (&sigs); + internal_sigaddset (&sigs, SIGABRT); + internal_sigprocmask (SIG_UNBLOCK, &sigs, NULL); } /* Send signal which possibly calls a user handler. */ diff --git a/sysdeps/generic/internal-signals.h b/sysdeps/generic/internal-signals.h index 6121c117ab..0c8f67f1a2 100644 --- a/sysdeps/generic/internal-signals.h +++ b/sysdeps/generic/internal-signals.h @@ -29,39 +29,20 @@ #define RESERVED_SIGRT 0 static inline bool -__is_internal_signal (int sig) +is_internal_signal (int sig) { return false; } static inline void -__clear_internal_signals (sigset_t *set) +clear_internal_signals (sigset_t *set) { } -static inline void -__libc_signal_block_all (sigset_t *set) -{ - sigset_t allset; - __sigfillset (&allset); - __sigprocmask (SIG_BLOCK, &allset, set); -} - -static inline void -__libc_signal_block_app (sigset_t *set) -{ - sigset_t allset; - __sigfillset (&allset); - __clear_internal_signals (&allset); - __sigprocmask (SIG_BLOCK, &allset, set); -} - -/* Restore current process signal mask. */ -static inline void -__libc_signal_restore_set (const sigset_t *set) -{ - __sigprocmask (SIG_SETMASK, set, NULL); -} +typedef sigset_t internal_sigset_t; +#define internal_sigemptyset(__s) sigemptyset (__s) +#define internal_sigaddset(__s, __i) sigaddset (__s, __i) +#define internal_sigprocmask(__h, __s, __o) sigprocmask (__h, __s, __o) #endif /* __INTERNAL_SIGNALS_H */ diff --git a/sysdeps/posix/signal.c b/sysdeps/posix/signal.c index 8f17b4278d..88c3757126 100644 --- a/sysdeps/posix/signal.c +++ b/sysdeps/posix/signal.c @@ -32,7 +32,7 @@ __bsd_signal (int sig, __sighandler_t handler) /* Check signal extents to protect __sigismember. */ if (handler == SIG_ERR || sig < 1 || sig >= NSIG - || __is_internal_signal (sig)) + || is_internal_signal (sig)) { __set_errno (EINVAL); return SIG_ERR; diff --git a/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c b/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c index a59ad78036..a53ae79965 100644 --- a/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c +++ b/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c @@ -34,7 +34,7 @@ __libc_unwind_longjmp (sigjmp_buf env, int val) if (env[0].__mask_was_saved) /* Restore the saved signal mask. */ - __libc_signal_restore_set (&env[0].__saved_mask); + __sigprocmask (SIG_SETMASK, &env[0].__saved_mask, NULL); /* Call the machine-dependent function to restore machine state. */ __sigstack_longjmp (env[0].__jmpbuf, val ?: 1); diff --git a/sysdeps/unix/sysv/linux/internal-signals.h b/sysdeps/unix/sysv/linux/internal-signals.h index f9efb6a159..96cfa0a962 100644 --- a/sysdeps/unix/sysv/linux/internal-signals.h +++ b/sysdeps/unix/sysv/linux/internal-signals.h @@ -19,10 +19,11 @@ #ifndef __INTERNAL_SIGNALS_H # define __INTERNAL_SIGNALS_H +#include +#include #include #include #include -#include #include #include @@ -47,49 +48,60 @@ /* Return is sig is used internally. */ static inline bool -__is_internal_signal (int sig) +is_internal_signal (int sig) { return (sig == SIGCANCEL) || (sig == SIGSETXID); } /* Remove internal glibc signal from the mask. */ static inline void -__clear_internal_signals (sigset_t *set) +clear_internal_signals (sigset_t *set) { __sigdelset (set, SIGCANCEL); __sigdelset (set, SIGSETXID); } -static const sigset_t sigall_set = { - .__val = {[0 ... _SIGSET_NWORDS-1 ] = -1 } +static const internal_sigset_t sigall_set = { + .__val = {[0 ... __NSIG_WORDS-1 ] = -1 } }; -static const sigset_t sigtimer_set = { - .__val = { [0] = __sigmask (SIGTIMER), - [1 ... _SIGSET_NWORDS-1] = 0 } -}; +/* Obtain and changed blocked signals, including internal glibc ones. */ +static inline int +internal_sigprocmask (int how, const internal_sigset_t *set, + internal_sigset_t *oldset) +{ + return INTERNAL_SYSCALL_CALL (rt_sigprocmask, how, set, oldset, + __NSIG_BYTES); +} /* Block all signals, including internal glibc ones. */ static inline void -__libc_signal_block_all (sigset_t *set) +internal_signal_block_all (internal_sigset_t *set) { INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &sigall_set, set, __NSIG_BYTES); } -/* Block all application signals (excluding internal glibc ones). */ +/* Restore current process signal mask. */ static inline void -__libc_signal_block_app (sigset_t *set) +internal_signal_restore_set (const internal_sigset_t *set) { - sigset_t allset = sigall_set; - __clear_internal_signals (&allset); - INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &allset, set, + INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_SETMASK, set, NULL, __NSIG_BYTES); } + +/* It is used on timer_create code directly on sigwaitinfo call, so it can not + use the internal_sigset_t definitions. */ +static const sigset_t sigtimer_set = { + .__val = { [0] = __sigmask (SIGTIMER), + [1 ... _SIGSET_NWORDS-1] = 0 + } +}; + /* Block only SIGTIMER and return the previous set on SET. */ static inline void -__libc_signal_block_sigtimer (sigset_t *set) +signal_block_sigtimer (sigset_t *set) { INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &sigtimer_set, set, __NSIG_BYTES); @@ -97,17 +109,10 @@ __libc_signal_block_sigtimer (sigset_t *set) /* Unblock only SIGTIMER and return the previous set on SET. */ static inline void -__libc_signal_unblock_sigtimer (sigset_t *set) +signal_unblock_sigtimer (sigset_t *set) { INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_UNBLOCK, &sigtimer_set, set, __NSIG_BYTES); } -/* Restore current process signal mask. */ -static inline void -__libc_signal_restore_set (const sigset_t *set) -{ - INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_SETMASK, set, NULL, - __NSIG_BYTES); -} #endif diff --git a/sysdeps/unix/sysv/linux/internal-sigset.h b/sysdeps/unix/sysv/linux/internal-sigset.h new file mode 100644 index 0000000000..cdd7260b1c --- /dev/null +++ b/sysdeps/unix/sysv/linux/internal-sigset.h @@ -0,0 +1,105 @@ +/* Internal sigset_t definition. + Copyright (C) 2022 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 + . */ + +#ifndef _INTERNAL_SIGSET_H +#define _INTERNAL_SIGSET_H + +#include + +typedef struct +{ + unsigned long int __val[__NSIG_WORDS]; +} internal_sigset_t; + +static inline void +internal_sigset_from_sigset (internal_sigset_t *iset, const sigset_t *set) +{ + int cnt = __NSIG_WORDS; + while (--cnt >= 0) + iset->__val[cnt] = set->__val[cnt]; +} + +static inline void +internal_sigemptyset (internal_sigset_t *set) +{ + int cnt = __NSIG_WORDS; + while (--cnt >= 0) + set->__val[cnt] = 0; +} + +static inline void +internal_sigfillset (internal_sigset_t *set) +{ + int cnt = __NSIG_WORDS; + while (--cnt >= 0) + set->__val[cnt] = ~0UL; +} + +static inline int +internal_sigisemptyset (const internal_sigset_t *set) +{ + int cnt = __NSIG_WORDS; + int ret = set->__val[--cnt]; + while (ret == 0 && --cnt >= 0) + ret = set->__val[cnt]; + return ret == 0; +} + +static inline void +internal_sigandset (internal_sigset_t *dest, const internal_sigset_t *left, + const internal_sigset_t *right) +{ + int cnt = __NSIG_WORDS; + while (--cnt >= 0) + dest->__val[cnt] = left->__val[cnt] & right->__val[cnt]; +} + +static inline void +internal_sigorset (internal_sigset_t *dest, const internal_sigset_t *left, + const internal_sigset_t *right) +{ + int cnt = __NSIG_WORDS; + while (--cnt >= 0) + dest->__val[cnt] = left->__val[cnt] | right->__val[cnt]; +} + +static inline int +internal_sigismember (const internal_sigset_t *set, int sig) +{ + unsigned long int mask = __sigmask (sig); + unsigned long int word = __sigword (sig); + return set->__val[word] & mask ? 1 : 0; +} + +static inline void +internal_sigaddset (internal_sigset_t *set, int sig) +{ + unsigned long int mask = __sigmask (sig); + unsigned long int word = __sigword (sig); + set->__val[word] |= mask; +} + +static inline void +internal_sigdelset (internal_sigset_t *set, int sig) +{ + unsigned long int mask = __sigmask (sig); + unsigned long int word = __sigword (sig); + set->__val[word] &= ~mask; +} + +#endif diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c index d703485e3f..75f5c06e32 100644 --- a/sysdeps/unix/sysv/linux/spawni.c +++ b/sysdeps/unix/sysv/linux/spawni.c @@ -57,7 +57,7 @@ struct posix_spawn_args { - sigset_t oldmask; + internal_sigset_t oldmask; const char *file; int (*exec) (const char *, char *const *, char *const *); const posix_spawn_file_actions_t *fa; @@ -124,7 +124,7 @@ __spawni_child (void *arguments) } else if (__sigismember (&hset, sig)) { - if (__is_internal_signal (sig)) + if (is_internal_signal (sig)) sa.sa_handler = SIG_IGN; else { @@ -284,8 +284,10 @@ __spawni_child (void *arguments) /* Set the initial signal mask of the child if POSIX_SPAWN_SETSIGMASK is set, otherwise restore the previous one. */ - __sigprocmask (SIG_SETMASK, (attr->__flags & POSIX_SPAWN_SETSIGMASK) - ? &attr->__ss : &args->oldmask, 0); + if (attr->__flags & POSIX_SPAWN_SETSIGMASK) + __sigprocmask (SIG_SETMASK, &attr->__ss, NULL); + else + internal_sigprocmask (SIG_SETMASK, &args->oldmask, NULL); args->exec (args->file, args->argv, args->envp); @@ -368,7 +370,7 @@ __spawnix (pid_t * pid, const char *file, args.envp = envp; args.xflags = xflags; - __libc_signal_block_all (&args.oldmask); + internal_signal_block_all (&args.oldmask); /* The clone flags used will create a new child that will run in the same memory space (CLONE_VM) and the execution of calling thread will be @@ -416,7 +418,7 @@ __spawnix (pid_t * pid, const char *file, if ((ec == 0) && (pid != NULL)) *pid = new_pid; - __libc_signal_restore_set (&args.oldmask); + internal_signal_restore_set (&args.oldmask); __pthread_setcancelstate (state, NULL); diff --git a/sysdeps/unix/sysv/linux/timer_routines.c b/sysdeps/unix/sysv/linux/timer_routines.c index 8f0a2f635d..fc3deb6823 100644 --- a/sysdeps/unix/sysv/linux/timer_routines.c +++ b/sysdeps/unix/sysv/linux/timer_routines.c @@ -41,7 +41,7 @@ struct thread_start_data static void * timer_sigev_thread (void *arg) { - __libc_signal_unblock_sigtimer (NULL); + signal_unblock_sigtimer (NULL); struct thread_start_data *td = (struct thread_start_data *) arg; void (*thrfunc) (sigval_t) = td->thrfunc;