Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

flag parameters: NONBLOCK in eventfd

This patch adds support for the EFD_NONBLOCK flag to eventfd2. 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 <stdio.h>
#include <unistd.h>
#include <sys/syscall.h>

#ifndef __NR_eventfd2
# ifdef __x86_64__
# define __NR_eventfd2 290
# elif defined __i386__
# define __NR_eventfd2 328
# else
# error "need __NR_eventfd2"
# endif
#endif

#define EFD_NONBLOCK O_NONBLOCK

int
main (void)
{
int fd = syscall (__NR_eventfd2, 1, 0);
if (fd == -1)
{
puts ("eventfd2(0) failed");
return 1;
}
int fl = fcntl (fd, F_GETFL);
if (fl == -1)
{
puts ("fcntl failed");
return 1;
}
if (fl & O_NONBLOCK)
{
puts ("eventfd2(0) sets non-blocking mode");
return 1;
}
close (fd);

fd = syscall (__NR_eventfd2, 1, EFD_NONBLOCK);
if (fd == -1)
{
puts ("eventfd2(EFD_NONBLOCK) failed");
return 1;
}
fl = fcntl (fd, F_GETFL);
if (fl == -1)
{
puts ("fcntl failed");
return 1;
}
if ((fl & O_NONBLOCK) == 0)
{
puts ("eventfd2(EFD_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>

authored by

Ulrich Drepper and committed by
Linus Torvalds
e7d476df 5fb5e049

+4 -3
+2 -2
fs/eventfd.c
··· 203 203 int fd; 204 204 struct eventfd_ctx *ctx; 205 205 206 - if (flags & ~EFD_CLOEXEC) 206 + if (flags & ~(EFD_CLOEXEC | EFD_NONBLOCK)) 207 207 return -EINVAL; 208 208 209 209 ctx = kmalloc(sizeof(*ctx), GFP_KERNEL); ··· 218 218 * anon_inode_getfd() will install the fd. 219 219 */ 220 220 fd = anon_inode_getfd("[eventfd]", &eventfd_fops, ctx, 221 - flags & O_CLOEXEC); 221 + flags & (O_CLOEXEC | O_NONBLOCK)); 222 222 if (fd < 0) 223 223 kfree(ctx); 224 224 return fd;
+2 -1
include/linux/eventfd.h
··· 10 10 11 11 #ifdef CONFIG_EVENTFD 12 12 13 - /* For O_CLOEXEC */ 13 + /* For O_CLOEXEC and O_NONBLOCK */ 14 14 #include <linux/fcntl.h> 15 15 16 16 /* Flags for eventfd2. */ 17 17 #define EFD_CLOEXEC O_CLOEXEC 18 + #define EFD_NONBLOCK O_NONBLOCK 18 19 19 20 struct file *eventfd_fget(int fd); 20 21 int eventfd_signal(struct file *file, int n);