diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 21 | ||||
| -rw-r--r-- | nptl/Makefile | 5 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S | 21 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/vfork.S | 8 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/raise.c | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/pt-vfork.S | 34 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/vfork.S | 6 | ||||
| -rw-r--r-- | nptl/tst-vfork1.c | 1 | ||||
| -rw-r--r-- | nptl/tst-vfork1x.c | 1 | ||||
| -rw-r--r-- | nptl/tst-vfork2.c | 1 | ||||
| -rw-r--r-- | nptl/tst-vfork2x.c | 1 |
11 files changed, 96 insertions, 10 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 793349126e..1ea68cfcc7 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,24 @@ +2004-02-09 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/unix/sysv/linux/i386/vfork.S (SAVE_PID): Negate PID + if non-zero and set to INT_MIN if zero. + * sysdeps/unix/sysv/linux/x86_64/vfork.S (SAVE_PID): Likewise. + * sysdeps/unix/sysv/linux/i386/pt-vfork.S: Include tcb-offsets.h. + (SAVE_PID, RESTORE_PID): Define. + (__vfork): Use it. + * sysdeps/unix/sysv/linux/x86_64/pt-vfork.S: Include tcb-offsets.h. + Use relative path to avoid including NPTL i386/vfork.S. + (SAVE_PID, RESTORE_PID): Define. + * sysdeps/unix/sysv/linux/raise.c: Include limits.h. + (raise): Handle THREAD_SELF->pid INT_MIN the same as 0. + * Makefile (tests): Add tst-vfork1, tst-vfork2, tst-vfork1x and + tst-vfork2x. + (tests-reverse): Add tst-vfork1x and tst-vfork2x. + * tst-vfork1.c: New test. + * tst-vfork2.c: New test. + * tst-vfork1x.c: New test. + * tst-vfork2x.c: New test. + 2004-03-08 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/tcb-offsets.sym: Add PID. diff --git a/nptl/Makefile b/nptl/Makefile index 885a854156..114d4a3ad8 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -237,7 +237,8 @@ tests = tst-attr1 tst-attr2 tst-attr3 \ tst-context1 \ tst-sched1 \ tst-backtrace1 \ - tst-oddstacklimit + tst-oddstacklimit \ + tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x # Files which must not be linked with libpthread. tests-nolibpthread = tst-unload @@ -337,7 +338,7 @@ ifeq ($(build-static),yes) tests-static += tst-locale1 tst-locale2 endif # These tests are linked with libc before libpthread -tests-reverse += tst-cancel5 tst-cancel23 +tests-reverse += tst-cancel5 tst-cancel23 tst-vfork1x tst-vfork2x include ../Rules diff --git a/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S index 6994c0d7fa..24f5a1d292 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Schwab <schwab@gnu.org>. @@ -21,6 +21,21 @@ #define _ERRNO_H 1 #include <bits/errno.h> #include <kernel-features.h> +#include <tcb-offsets.h> + +/* Save the PID value. */ +#define SAVE_PID \ + movl %gs:PID, %edx; \ + movl %edx, %eax; \ + negl %eax; \ + movl %eax, %gs:PID + +/* Restore the old PID value in the parent. */ +#define RESTORE_PID \ + testl %eax, %eax; \ + je 1f; \ + movl %edx, %gs:PID; \ +1: /* Clone the calling process, but without copying the whole address space. The calling process is suspended until the new process exits or is @@ -31,10 +46,14 @@ ENTRY (__vfork) /* Pop the return PC value into ECX. */ popl %ecx + SAVE_PID + /* Stuff the syscall number in EAX and enter into the kernel. */ movl $SYS_ify (vfork), %eax int $0x80 + RESTORE_PID + /* Jump to the return PC. Don't jump directly since this disturbs the branch target cache. Instead push the return address back on the stack. */ diff --git a/nptl/sysdeps/unix/sysv/linux/i386/vfork.S b/nptl/sysdeps/unix/sysv/linux/i386/vfork.S index 2b60a5ea5e..52336102c7 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/vfork.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/vfork.S @@ -21,9 +21,13 @@ /* Save the PID value. */ #define SAVE_PID \ movl %gs:PID, %edx; \ - movl $-1, %gs:PID + movl %edx, %eax; \ + negl %eax; \ + jne 1f; \ + movl $0x80000000, %eax; \ +1: movl %eax, %gs:PID -/* Restore the old PID value in the parent. In the child store 0. */ +/* Restore the old PID value in the parent. */ #define RESTORE_PID \ testl %eax, %eax; \ je 1f; \ diff --git a/nptl/sysdeps/unix/sysv/linux/raise.c b/nptl/sysdeps/unix/sysv/linux/raise.c index ac54fa217e..28d03c3837 100644 --- a/nptl/sysdeps/unix/sysv/linux/raise.c +++ b/nptl/sysdeps/unix/sysv/linux/raise.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -18,6 +18,7 @@ 02111-1307 USA. */ #include <errno.h> +#include <limits.h> #include <signal.h> #include <sysdep.h> #include <nptl/pthreadP.h> @@ -53,10 +54,10 @@ raise (sig) #if __ASSUME_TGKILL || defined __NR_tgkill else /* raise is an async-safe function. It could be called while the - fork function temporarily invalidated the PID field. Adjust for + fork/vfork function temporarily invalidated the PID field. Adjust for that. */ if (__builtin_expect (pid <= 0, 0)) - pid = pid == 0 ? selftid : -pid; + pid = (pid & INT_MAX) == 0 ? selftid : -pid; #endif #if __ASSUME_TGKILL diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pt-vfork.S index 41ae251333..653b6b12fc 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pt-vfork.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pt-vfork.S @@ -1 +1,33 @@ -#include <sysdeps/unix/sysv/linux/x86_64/vfork.S> +/* Copyright (C) 2004 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, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <tcb-offsets.h> + +#define SAVE_PID \ + movl %fs:PID, %esi; \ + movl %esi, %edx; \ + negl %edx; \ + movl %edx, %fs:PID + +#define RESTORE_PID \ + testq %rax, %rax; \ + je 1f; \ + movl %esi, %fs:PID; \ +1: + +#include <../../../../../../sysdeps/unix/sysv/linux/x86_64/vfork.S> diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/vfork.S b/nptl/sysdeps/unix/sysv/linux/x86_64/vfork.S index 9e348683f3..f68d40439e 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/vfork.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/vfork.S @@ -20,7 +20,11 @@ #define SAVE_PID \ movl %fs:PID, %esi; \ - movl $-1, %fs:PID + movl $0x80000000, %ecx; \ + movl %esi, %edx; \ + negl %edx; \ + cmove %ecx, %edx; \ + movl %edx, %fs:PID #define RESTORE_PID \ testq %rax, %rax; \ diff --git a/nptl/tst-vfork1.c b/nptl/tst-vfork1.c new file mode 100644 index 0000000000..f409ec49b3 --- /dev/null +++ b/nptl/tst-vfork1.c @@ -0,0 +1 @@ +#include <posix/tst-vfork1.c> diff --git a/nptl/tst-vfork1x.c b/nptl/tst-vfork1x.c new file mode 100644 index 0000000000..f409ec49b3 --- /dev/null +++ b/nptl/tst-vfork1x.c @@ -0,0 +1 @@ +#include <posix/tst-vfork1.c> diff --git a/nptl/tst-vfork2.c b/nptl/tst-vfork2.c new file mode 100644 index 0000000000..5356e83115 --- /dev/null +++ b/nptl/tst-vfork2.c @@ -0,0 +1 @@ +#include <posix/tst-vfork2.c> diff --git a/nptl/tst-vfork2x.c b/nptl/tst-vfork2x.c new file mode 100644 index 0000000000..5356e83115 --- /dev/null +++ b/nptl/tst-vfork2x.c @@ -0,0 +1 @@ +#include <posix/tst-vfork2.c> |