diff options
author | Ulrich Drepper <drepper@redhat.com> | 2008-07-24 00:29:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:47:28 -0400 |
commit | ed8cae8ba01348bfd83333f4648dd807b04d7f08 (patch) | |
tree | c71a1c8e771c1c55728bb7c40612fbdcefbc858a /include | |
parent | 336dd1f70ff62d7dd8655228caed4c5bfc818c56 (diff) |
flag parameters: pipe
This patch introduces the new syscall pipe2 which is like pipe but it also
takes an additional parameter which takes a flag value. This patch implements
the handling of O_CLOEXEC for the flag. I did not add support for the new
syscall for the architectures which have a special sys_pipe implementation. I
think the maintainers of those archs have the chance to go with the unified
implementation but that's up to them.
The implementation introduces do_pipe_flags. I did that instead of changing
all callers of do_pipe because some of the callers are written in assembler.
I would probably screw up changing the assembly code. To avoid breaking code
do_pipe is now a small wrapper around do_pipe_flags. Once all callers are
changed over to do_pipe_flags the old do_pipe function can be removed.
The following test must be adjusted for architectures other than x86 and
x86-64 and in case the syscall numbers changed.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#include <fcntl.h>
#include <stdio.h>
#include <unistd.h>
#include <sys/syscall.h>
#ifndef __NR_pipe2
# ifdef __x86_64__
# define __NR_pipe2 293
# elif defined __i386__
# define __NR_pipe2 331
# else
# error "need __NR_pipe2"
# endif
#endif
int
main (void)
{
int fd[2];
if (syscall (__NR_pipe2, fd, 0) != 0)
{
puts ("pipe2(0) failed");
return 1;
}
for (int i = 0; i < 2; ++i)
{
int coe = fcntl (fd[i], F_GETFD);
if (coe == -1)
{
puts ("fcntl failed");
return 1;
}
if (coe & FD_CLOEXEC)
{
printf ("pipe2(0) set close-on-exit for fd[%d]\n", i);
return 1;
}
}
close (fd[0]);
close (fd[1]);
if (syscall (__NR_pipe2, fd, O_CLOEXEC) != 0)
{
puts ("pipe2(O_CLOEXEC) failed");
return 1;
}
for (int i = 0; i < 2; ++i)
{
int coe = fcntl (fd[i], F_GETFD);
if (coe == -1)
{
puts ("fcntl failed");
return 1;
}
if ((coe & FD_CLOEXEC) == 0)
{
printf ("pipe2(O_CLOEXEC) does not set close-on-exit for fd[%d]\n", i);
return 1;
}
}
close (fd[0]);
close (fd[1]);
puts ("OK");
return 0;
}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Acked-by: Davide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk.manpages@googlemail.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/unistd_32.h | 1 | ||||
-rw-r--r-- | include/asm-x86/unistd_64.h | 2 | ||||
-rw-r--r-- | include/linux/fs.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-x86/unistd_32.h b/include/asm-x86/unistd_32.h index a1f6383bf695..748a05c77da4 100644 --- a/include/asm-x86/unistd_32.h +++ b/include/asm-x86/unistd_32.h | |||
@@ -336,6 +336,7 @@ | |||
336 | #define __NR_eventfd2 328 | 336 | #define __NR_eventfd2 328 |
337 | #define __NR_epoll_create2 329 | 337 | #define __NR_epoll_create2 329 |
338 | #define __NR_dup3 330 | 338 | #define __NR_dup3 330 |
339 | #define __NR_pipe2 331 | ||
339 | 340 | ||
340 | #ifdef __KERNEL__ | 341 | #ifdef __KERNEL__ |
341 | 342 | ||
diff --git a/include/asm-x86/unistd_64.h b/include/asm-x86/unistd_64.h index f0fb2bd40cdb..d2284b43ad58 100644 --- a/include/asm-x86/unistd_64.h +++ b/include/asm-x86/unistd_64.h | |||
@@ -649,6 +649,8 @@ __SYSCALL(__NR_eventfd2, sys_eventfd2) | |||
649 | __SYSCALL(__NR_epoll_create2, sys_epoll_create2) | 649 | __SYSCALL(__NR_epoll_create2, sys_epoll_create2) |
650 | #define __NR_dup3 292 | 650 | #define __NR_dup3 292 |
651 | __SYSCALL(__NR_dup3, sys_dup3) | 651 | __SYSCALL(__NR_dup3, sys_dup3) |
652 | #define __NR_pipe2 293 | ||
653 | __SYSCALL(__NR_pipe2, sys_pipe2) | ||
652 | 654 | ||
653 | 655 | ||
654 | #ifndef __NO_STUBS | 656 | #ifndef __NO_STUBS |
diff --git a/include/linux/fs.h b/include/linux/fs.h index e5e6a244096c..0e80cd717d32 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1777,6 +1777,7 @@ static inline void allow_write_access(struct file *file) | |||
1777 | atomic_inc(&file->f_path.dentry->d_inode->i_writecount); | 1777 | atomic_inc(&file->f_path.dentry->d_inode->i_writecount); |
1778 | } | 1778 | } |
1779 | extern int do_pipe(int *); | 1779 | extern int do_pipe(int *); |
1780 | extern int do_pipe_flags(int *, int); | ||
1780 | extern struct file *create_read_pipe(struct file *f); | 1781 | extern struct file *create_read_pipe(struct file *f); |
1781 | extern struct file *create_write_pipe(void); | 1782 | extern struct file *create_write_pipe(void); |
1782 | extern void free_write_pipe(struct file *); | 1783 | extern void free_write_pipe(struct file *); |