diff mbox series

[1/6] nptl: Move Linux pthread_kill to nptl

Message ID 20201204180944.3774769-1-adhemerval.zanella@linaro.org
State New
Headers show
Series [1/6] nptl: Move Linux pthread_kill to nptl | expand

Commit Message

Adhemerval Zanella Dec. 4, 2020, 6:09 p.m. UTC 
The nptl already expects a Linux syscall internak.  Also
__is_internal_signal and the DEBUGGING_P check is removed.

Checked on x86_64-linux-gnu.
---
 nptl/pthread_kill.c                    | 28 ++++++++-----
 sysdeps/unix/sysv/linux/pthread_kill.c | 57 --------------------------
 2 files changed, 18 insertions(+), 67 deletions(-)
 delete mode 100644 sysdeps/unix/sysv/linux/pthread_kill.c

Comments

Florian Weimer Dec. 4, 2020, 6:12 p.m. UTC | #1 
* Adhemerval Zanella via Libc-alpha:

> The nptl already expects a Linux syscall internak.  Also
> __is_internal_signal and the DEBUGGING_P check is removed.

Typo: internak

And __is_internal_signal is still there?
Adhemerval Zanella Dec. 4, 2020, 7:08 p.m. UTC | #2 
On 04/12/2020 15:12, Florian Weimer wrote:
> * Adhemerval Zanella via Libc-alpha:
> 
>> The nptl already expects a Linux syscall internak.  Also
>> __is_internal_signal and the DEBUGGING_P check is removed.
> 
> Typo: internak
> 
> And __is_internal_signal is still there?
> 
I meant '__is_internal_signal is used', I will fix both in the
commit message.
Florian Weimer Dec. 4, 2020, 7:32 p.m. UTC | #3 
* Adhemerval Zanella:

> On 04/12/2020 15:12, Florian Weimer wrote:
>> * Adhemerval Zanella via Libc-alpha:
>> 
>>> The nptl already expects a Linux syscall internak.  Also
>>> __is_internal_signal and the DEBUGGING_P check is removed.
>> 
>> Typo: internak
>> 
>> And __is_internal_signal is still there?
>> 
> I meant '__is_internal_signal is used', I will fix both in the
> commit message.

Okay, then it looks good.  Thanks.
diff mbox series

Patch

diff --git a/nptl/pthread_kill.c b/nptl/pthread_kill.c
index 73144a07ec..7ef68d1572 100644
--- a/nptl/pthread_kill.c
+++ b/nptl/pthread_kill.c
@@ -1,4 +1,4 @@ 
-/* Send a signal to a specific pthread.  Stub version.
+/* Send a signal to a specific pthread.  Linux version.
    Copyright (C) 2014-2020 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -16,23 +16,31 @@ 
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <errno.h>
-#include <signal.h>
+#include <unistd.h>
 #include <pthreadP.h>
 
-
 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;
+
+  /* Force load of pd->tid into local variable or register.  Otherwise
+     if a thread exits between ESRCH test and tgkill, we might return
+     EINVAL, because pd->tid would be cleared by the kernel.  */
   struct pthread *pd = (struct pthread *) threadid;
-
-  /* Make sure the descriptor is valid.  */
-  if (DEBUGGING_P && INVALID_TD_P (pd))
+  pid_t tid = atomic_forced_read (pd->tid);
+  if (__glibc_unlikely (tid <= 0))
     /* Not a valid thread handle.  */
     return ESRCH;
 
-  return ENOSYS;
+  /* We have a special syscall to do the work.  */
+  pid_t pid = __getpid ();
+
+  int val = INTERNAL_SYSCALL_CALL (tgkill, pid, tid, signo);
+  return (INTERNAL_SYSCALL_ERROR_P (val)
+	  ? INTERNAL_SYSCALL_ERRNO (val) : 0);
 }
 strong_alias (__pthread_kill, pthread_kill)
-
-stub_warning (pthread_kill)
diff --git a/sysdeps/unix/sysv/linux/pthread_kill.c b/sysdeps/unix/sysv/linux/pthread_kill.c
deleted file mode 100644
index 4dfe08ffcd..0000000000
--- a/sysdeps/unix/sysv/linux/pthread_kill.c
+++ /dev/null
@@ -1,57 +0,0 @@ 
-/* Copyright (C) 2002-2020 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <signal.h>
-#include <pthreadP.h>
-#include <tls.h>
-#include <sysdep.h>
-#include <unistd.h>
-
-
-int
-__pthread_kill (pthread_t threadid, int signo)
-{
-  struct pthread *pd = (struct pthread *) threadid;
-
-  /* Make sure the descriptor is valid.  */
-  if (DEBUGGING_P && INVALID_TD_P (pd))
-    /* Not a valid thread handle.  */
-    return ESRCH;
-
-  /* Force load of pd->tid into local variable or register.  Otherwise
-     if a thread exits between ESRCH test and tgkill, we might return
-     EINVAL, because pd->tid would be cleared by the kernel.  */
-  pid_t tid = atomic_forced_read (pd->tid);
-  if (__glibc_unlikely (tid <= 0))
-    /* Not a valid thread handle.  */
-    return ESRCH;
-
-  /* Disallow sending the signal we use for cancellation, timers,
-     for the setxid implementation.  */
-  if (signo == SIGCANCEL || signo == SIGTIMER || signo == SIGSETXID)
-    return EINVAL;
-
-  /* We have a special syscall to do the work.  */
-  pid_t pid = __getpid ();
-
-  int val = INTERNAL_SYSCALL_CALL (tgkill, pid, tid, signo);
-  return (INTERNAL_SYSCALL_ERROR_P (val)
-	  ? INTERNAL_SYSCALL_ERRNO (val) : 0);
-}
-strong_alias (__pthread_kill, pthread_kill)