Commit 5fb5e04926a54bc1c22bba7ca166840f4476196f
Committed by
Linus Torvalds
1 parent
77d2720059
Exists in
master
and in
39 other branches
flag parameters: NONBLOCK in signalfd
This patch adds support for the SFD_NONBLOCK flag to signalfd4. The additional changes needed are minimal. 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 <signal.h> #include <stdio.h> #include <unistd.h> #include <sys/syscall.h> #ifndef __NR_signalfd4 # ifdef __x86_64__ # define __NR_signalfd4 289 # elif defined __i386__ # define __NR_signalfd4 327 # else # error "need __NR_signalfd4" # endif #endif #define SFD_NONBLOCK O_NONBLOCK int main (void) { sigset_t ss; sigemptyset (&ss); sigaddset (&ss, SIGUSR1); int fd = syscall (__NR_signalfd4, -1, &ss, 8, 0); if (fd == -1) { puts ("signalfd4(0) failed"); return 1; } int fl = fcntl (fd, F_GETFL); if (fl == -1) { puts ("fcntl failed"); return 1; } if (fl & O_NONBLOCK) { puts ("signalfd4(0) set non-blocking mode"); return 1; } close (fd); fd = syscall (__NR_signalfd4, -1, &ss, 8, SFD_NONBLOCK); if (fd == -1) { puts ("signalfd4(SFD_NONBLOCK) failed"); return 1; } fl = fcntl (fd, F_GETFL); if (fl == -1) { puts ("fcntl failed"); return 1; } if ((fl & O_NONBLOCK) == 0) { puts ("signalfd4(SFD_NONBLOCK) does not set non-blocking mode"); return 1; } close (fd); 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> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 2 changed files with 4 additions and 3 deletions Side-by-side Diff
fs/signalfd.c
... | ... | @@ -211,7 +211,7 @@ |
211 | 211 | sigset_t sigmask; |
212 | 212 | struct signalfd_ctx *ctx; |
213 | 213 | |
214 | - if (flags & ~SFD_CLOEXEC) | |
214 | + if (flags & ~(SFD_CLOEXEC | SFD_NONBLOCK)) | |
215 | 215 | return -EINVAL; |
216 | 216 | |
217 | 217 | if (sizemask != sizeof(sigset_t) || |
... | ... | @@ -232,7 +232,7 @@ |
232 | 232 | * anon_inode_getfd() will install the fd. |
233 | 233 | */ |
234 | 234 | ufd = anon_inode_getfd("[signalfd]", &signalfd_fops, ctx, |
235 | - flags & O_CLOEXEC); | |
235 | + flags & (O_CLOEXEC | O_NONBLOCK)); | |
236 | 236 | if (ufd < 0) |
237 | 237 | kfree(ctx); |
238 | 238 | } else { |
include/linux/signalfd.h
... | ... | @@ -8,11 +8,12 @@ |
8 | 8 | #ifndef _LINUX_SIGNALFD_H |
9 | 9 | #define _LINUX_SIGNALFD_H |
10 | 10 | |
11 | -/* For O_CLOEXEC */ | |
11 | +/* For O_CLOEXEC and O_NONBLOCK */ | |
12 | 12 | #include <linux/fcntl.h> |
13 | 13 | |
14 | 14 | /* Flags for signalfd4. */ |
15 | 15 | #define SFD_CLOEXEC O_CLOEXEC |
16 | +#define SFD_NONBLOCK O_NONBLOCK | |
16 | 17 | |
17 | 18 | struct signalfd_siginfo { |
18 | 19 | __u32 ssi_signo; |