From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH v2 8/9] nptl: Use pthread_kill on pthread_cancel
Date: Thu, 27 May 2021 14:28:22 -0300 [thread overview]
Message-ID: <20210527172823.3461314-9-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20210527172823.3461314-1-adhemerval.zanella@linaro.org>
It consolidates the tgkill call and it is the first step of making
pthread_cancel async-signal-safe. It also fix a possible issue
where the 'struct pthread' tid is not read atomically, which might
send an invalid cancellation signal (similar to what
db988e50a87f613cb6b9e98a2fc66a4848bc3546 fixed for pthread_join).
Checked on x86_64-linux-gnu and aarch64-linux-gnu.
---
nptl/pthreadP.h | 2 ++
nptl/pthread_cancel.c | 6 +-----
nptl/pthread_kill.c | 18 ++++++++++++------
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 618922f47a..675d1de753 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -515,6 +515,8 @@ libc_hidden_proto (__pthread_detach)
extern int __pthread_kill (pthread_t threadid, int signo);
libc_hidden_proto (__pthread_kill)
extern int __pthread_cancel (pthread_t th);
+extern int __pthread_kill_internal (pthread_t threadid, int signo)
+ attribute_hidden;
extern void __pthread_exit (void *value) __attribute__ ((__noreturn__));
libc_hidden_proto (__pthread_exit)
extern int __pthread_join (pthread_t threadid, void **thread_return);
diff --git a/nptl/pthread_cancel.c b/nptl/pthread_cancel.c
index c6086b6c3c..5fae763861 100644
--- a/nptl/pthread_cancel.c
+++ b/nptl/pthread_cancel.c
@@ -109,11 +109,7 @@ __pthread_cancel (pthread_t th)
return 0;
}
- pid_t pid = __getpid ();
- int val = INTERNAL_SYSCALL_CALL (tgkill, pid, pd->tid, SIGCANCEL);
- return INTERNAL_SYSCALL_ERROR_P (val)
- ? INTERNAL_SYSCALL_ERRNO (val)
- : 0;
+ return __pthread_kill_internal (th, SIGCANCEL);
}
versioned_symbol (libc, __pthread_cancel, pthread_cancel, GLIBC_2_34);
diff --git a/nptl/pthread_kill.c b/nptl/pthread_kill.c
index 0392c3f9e5..93387dd60a 100644
--- a/nptl/pthread_kill.c
+++ b/nptl/pthread_kill.c
@@ -21,13 +21,8 @@
#include <shlib-compat.h>
int
-__pthread_kill (pthread_t threadid, int signo)
+__pthread_kill_internal (pthread_t threadid, int signo)
{
- /* Disallow sending the signal we use for cancellation, timers,
- for the setxid implementation. */
- if (__is_internal_signal (signo))
- return EINVAL;
-
pid_t tid;
struct pthread *pd = (struct pthread *) threadid;
@@ -53,6 +48,17 @@ __pthread_kill (pthread_t threadid, int signo)
return val;
}
+
+int
+__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))
+ return EINVAL;
+
+ return __pthread_kill_internal (threadid, signo);
+}
/* Some architectures (for instance arm) might pull raise through libgcc, so
avoid the symbol version if it ends up being used on ld.so. */
#if !IS_IN(rtld)
--
2.30.2
next prev parent reply other threads:[~2021-05-27 17:28 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-27 17:28 [PATCH v2 0/9] nptl: pthread cancellation refactor Adhemerval Zanella
2021-05-27 17:28 ` [PATCH v2 1/9] nptl: Remove exit-thread.h Adhemerval Zanella
2021-06-01 7:51 ` Florian Weimer
2021-06-01 12:55 ` Adhemerval Zanella
2021-05-27 17:28 ` [PATCH v2 2/9] nptl: Deallocate the thread stack on setup failure (BZ #19511) Adhemerval Zanella
2021-06-01 8:32 ` Florian Weimer
2021-06-01 13:08 ` Adhemerval Zanella
2021-06-01 13:55 ` Adhemerval Zanella
2021-06-02 12:56 ` [PATCH v3] " Adhemerval Zanella
2021-06-02 13:08 ` Andreas Schwab
2021-06-02 13:39 ` Adhemerval Zanella
2021-06-02 13:41 ` Andreas Schwab
2021-06-02 14:01 ` Adhemerval Zanella
2021-06-02 14:07 ` Andreas Schwab
2021-06-02 14:15 ` Adhemerval Zanella
2021-06-02 14:30 ` Andreas Schwab
2021-06-02 14:42 ` Adhemerval Zanella
2021-06-02 18:20 ` Joseph Myers
2021-06-02 18:30 ` Florian Weimer
2021-06-02 19:02 ` Adhemerval Zanella
2021-06-02 19:11 ` Florian Weimer
2021-06-08 10:56 ` Florian Weimer
2021-06-08 17:01 ` Adhemerval Zanella
2021-06-09 13:49 ` Florian Weimer
2021-06-09 17:07 ` Adhemerval Zanella
2021-05-27 17:28 ` [PATCH v2 3/9] nptl: Install cancellation handler on pthread_cancel Adhemerval Zanella
2021-05-31 18:18 ` Adhemerval Zanella
2021-06-01 8:38 ` Florian Weimer
2021-06-01 13:10 ` Adhemerval Zanella
2021-06-01 8:39 ` Florian Weimer
2021-05-27 17:28 ` [PATCH v2 4/9] nptl: Remove CANCELING_BITMASK Adhemerval Zanella
2021-06-01 9:03 ` Florian Weimer
2021-06-01 13:50 ` Adhemerval Zanella
2021-06-01 16:36 ` Adhemerval Zanella
2021-05-27 17:28 ` [PATCH v2 5/9] nptl: Move cancel state out of cancelhandling Adhemerval Zanella
2021-06-01 9:58 ` Florian Weimer
2021-06-02 13:09 ` Adhemerval Zanella
2021-05-27 17:28 ` [PATCH v2 6/9] nptl: Move cancel type " Adhemerval Zanella
2021-06-01 12:37 ` Florian Weimer
2021-06-02 13:11 ` Adhemerval Zanella
2021-06-09 17:06 ` Adhemerval Zanella
2021-05-27 17:28 ` [PATCH v2 7/9] nptl: Implement raise in terms of pthread_kill Adhemerval Zanella
2021-06-01 12:40 ` Florian Weimer
2021-06-02 13:14 ` Adhemerval Zanella
2021-05-27 17:28 ` Adhemerval Zanella [this message]
2021-06-01 12:41 ` [PATCH v2 8/9] nptl: Use pthread_kill on pthread_cancel Florian Weimer
2021-05-27 17:28 ` [PATCH v2 9/9] nptl: Avoid async cancellation to wrongly update __nptl_nthreads (BZ #19366) Adhemerval Zanella
2021-06-01 14:29 ` Florian Weimer
2021-06-02 13:15 ` Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210527172823.3461314-9-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).