mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-21 03:33:59 +08:00
5fb5e04926
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>
72 lines
1.4 KiB
C
72 lines
1.4 KiB
C
/*
|
|
* include/linux/signalfd.h
|
|
*
|
|
* Copyright (C) 2007 Davide Libenzi <davidel@xmailserver.org>
|
|
*
|
|
*/
|
|
|
|
#ifndef _LINUX_SIGNALFD_H
|
|
#define _LINUX_SIGNALFD_H
|
|
|
|
/* For O_CLOEXEC and O_NONBLOCK */
|
|
#include <linux/fcntl.h>
|
|
|
|
/* Flags for signalfd4. */
|
|
#define SFD_CLOEXEC O_CLOEXEC
|
|
#define SFD_NONBLOCK O_NONBLOCK
|
|
|
|
struct signalfd_siginfo {
|
|
__u32 ssi_signo;
|
|
__s32 ssi_errno;
|
|
__s32 ssi_code;
|
|
__u32 ssi_pid;
|
|
__u32 ssi_uid;
|
|
__s32 ssi_fd;
|
|
__u32 ssi_tid;
|
|
__u32 ssi_band;
|
|
__u32 ssi_overrun;
|
|
__u32 ssi_trapno;
|
|
__s32 ssi_status;
|
|
__s32 ssi_int;
|
|
__u64 ssi_ptr;
|
|
__u64 ssi_utime;
|
|
__u64 ssi_stime;
|
|
__u64 ssi_addr;
|
|
|
|
/*
|
|
* Pad strcture to 128 bytes. Remember to update the
|
|
* pad size when you add new members. We use a fixed
|
|
* size structure to avoid compatibility problems with
|
|
* future versions, and we leave extra space for additional
|
|
* members. We use fixed size members because this strcture
|
|
* comes out of a read(2) and we really don't want to have
|
|
* a compat on read(2).
|
|
*/
|
|
__u8 __pad[48];
|
|
};
|
|
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#ifdef CONFIG_SIGNALFD
|
|
|
|
/*
|
|
* Deliver the signal to listening signalfd.
|
|
*/
|
|
static inline void signalfd_notify(struct task_struct *tsk, int sig)
|
|
{
|
|
if (unlikely(waitqueue_active(&tsk->sighand->signalfd_wqh)))
|
|
wake_up(&tsk->sighand->signalfd_wqh);
|
|
}
|
|
|
|
#else /* CONFIG_SIGNALFD */
|
|
|
|
static inline void signalfd_notify(struct task_struct *tsk, int sig) { }
|
|
|
|
#endif /* CONFIG_SIGNALFD */
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _LINUX_SIGNALFD_H */
|
|
|