From: Davide Libenzi Implement the half-closed devices notifiation, by adding a new POLLRDHUP (and its alias EPOLLRDHUP) bit to the existing poll/select sets. Since the existing POLLHUP handling, that does not report correctly half-closed devices, was feared to be changed, this implementation leaves the current POLLHUP reporting unchanged and simply add a new bit that is set in the few places where it makes sense. The same thing was discussed and conceptually agreed quite some time ago: http://lkml.org/lkml/2003/7/12/116 Since this new event bit is added to the existing Linux poll infrastruture, even the existing poll/select system calls will be able to use it. As far as the existing POLLHUP handling, the patch leaves it as is. The pollrdhup-2.6.16.rc5-0.10.diff defines the POLLRDHUP for all the existing archs and sets the bit in the six relevant files. The other attached diff is the simple change required to sys/epoll.h to add the EPOLLRDHUP definition. There is "a stupid program" to test POLLRDHUP delivery here: http://www.xmailserver.org/pollrdhup-test.c It tests poll(2), but since the delivery is same epoll(2) will work equally. Signed-off-by: Davide Libenzi Cc: "David S. Miller" Cc: Michael Kerrisk Signed-off-by: Andrew Morton --- fs/eventpoll.c | 4 ++-- include/asm-alpha/poll.h | 2 ++ include/asm-arm/poll.h | 1 + include/asm-arm26/poll.h | 1 + include/asm-cris/poll.h | 1 + include/asm-frv/poll.h | 1 + include/asm-h8300/poll.h | 1 + include/asm-i386/poll.h | 1 + include/asm-ia64/poll.h | 1 + include/asm-m32r/poll.h | 1 + include/asm-m68k/poll.h | 1 + include/asm-mips/poll.h | 1 + include/asm-parisc/poll.h | 1 + include/asm-powerpc/poll.h | 1 + include/asm-s390/poll.h | 1 + include/asm-sh/poll.h | 1 + include/asm-sh64/poll.h | 1 + include/asm-sparc/poll.h | 1 + include/asm-sparc64/poll.h | 1 + include/asm-v850/poll.h | 1 + include/asm-x86_64/poll.h | 1 + include/asm-xtensa/poll.h | 1 + net/bluetooth/af_bluetooth.c | 3 +++ net/core/datagram.c | 2 ++ net/dccp/proto.c | 2 +- net/ipv4/tcp.c | 2 +- net/sctp/socket.c | 2 ++ net/unix/af_unix.c | 2 ++ 28 files changed, 35 insertions(+), 4 deletions(-) diff -puN fs/eventpoll.c~pollrdhup-epollrdhup-handling-for-half-closed-devices fs/eventpoll.c --- devel/fs/eventpoll.c~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/fs/eventpoll.c 2006-03-11 02:46:58.000000000 -0800 @@ -599,7 +599,7 @@ sys_epoll_ctl(int epfd, int op, int fd, switch (op) { case EPOLL_CTL_ADD: if (!epi) { - epds.events |= POLLERR | POLLHUP; + epds.events |= POLLERR | POLLHUP | POLLRDHUP; error = ep_insert(ep, &epds, tfile, fd); } else @@ -613,7 +613,7 @@ sys_epoll_ctl(int epfd, int op, int fd, break; case EPOLL_CTL_MOD: if (epi) { - epds.events |= POLLERR | POLLHUP; + epds.events |= POLLERR | POLLHUP | POLLRDHUP; error = ep_modify(ep, epi, &epds); } else error = -ENOENT; diff -puN include/asm-alpha/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-alpha/poll.h --- devel/include/asm-alpha/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-alpha/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -13,6 +13,8 @@ #define POLLWRBAND (1 << 9) #define POLLMSG (1 << 10) #define POLLREMOVE (1 << 11) +#define POLLRDHUP (1 << 12) + struct pollfd { int fd; diff -puN include/asm-arm26/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-arm26/poll.h --- devel/include/asm-arm26/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-arm26/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -15,6 +15,7 @@ #define POLLWRNORM 0x0100 #define POLLWRBAND 0x0200 #define POLLMSG 0x0400 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-arm/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-arm/poll.h --- devel/include/asm-arm/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-arm/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -16,6 +16,7 @@ #define POLLWRBAND 0x0200 #define POLLMSG 0x0400 #define POLLREMOVE 0x1000 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-cris/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-cris/poll.h --- devel/include/asm-cris/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-cris/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -15,6 +15,7 @@ #define POLLWRBAND 512 #define POLLMSG 1024 #define POLLREMOVE 4096 +#define POLLRDHUP 8192 struct pollfd { int fd; diff -puN include/asm-frv/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-frv/poll.h --- devel/include/asm-frv/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-frv/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -12,6 +12,7 @@ #define POLLRDBAND 128 #define POLLWRBAND 256 #define POLLMSG 0x0400 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-h8300/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-h8300/poll.h --- devel/include/asm-h8300/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-h8300/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -12,6 +12,7 @@ #define POLLRDBAND 128 #define POLLWRBAND 256 #define POLLMSG 0x0400 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-i386/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-i386/poll.h --- devel/include/asm-i386/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-i386/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -16,6 +16,7 @@ #define POLLWRBAND 0x0200 #define POLLMSG 0x0400 #define POLLREMOVE 0x1000 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-ia64/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-ia64/poll.h --- devel/include/asm-ia64/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-ia64/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -21,6 +21,7 @@ #define POLLWRBAND 0x0200 #define POLLMSG 0x0400 #define POLLREMOVE 0x1000 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-m32r/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-m32r/poll.h --- devel/include/asm-m32r/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-m32r/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -21,6 +21,7 @@ #define POLLWRBAND 0x0200 #define POLLMSG 0x0400 #define POLLREMOVE 0x1000 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-m68k/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-m68k/poll.h --- devel/include/asm-m68k/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-m68k/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -13,6 +13,7 @@ #define POLLWRBAND 256 #define POLLMSG 0x0400 #define POLLREMOVE 0x1000 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-mips/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-mips/poll.h --- devel/include/asm-mips/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-mips/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -17,6 +17,7 @@ /* These seem to be more or less nonstandard ... */ #define POLLMSG 0x0400 #define POLLREMOVE 0x1000 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-parisc/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-parisc/poll.h --- devel/include/asm-parisc/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-parisc/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -16,6 +16,7 @@ #define POLLWRBAND 0x0200 #define POLLMSG 0x0400 #define POLLREMOVE 0x1000 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-powerpc/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-powerpc/poll.h --- devel/include/asm-powerpc/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-powerpc/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -13,6 +13,7 @@ #define POLLWRBAND 0x0200 #define POLLMSG 0x0400 #define POLLREMOVE 0x1000 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-s390/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-s390/poll.h --- devel/include/asm-s390/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-s390/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -24,6 +24,7 @@ #define POLLWRBAND 0x0200 #define POLLMSG 0x0400 #define POLLREMOVE 0x1000 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-sh64/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-sh64/poll.h --- devel/include/asm-sh64/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-sh64/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -26,6 +26,7 @@ #define POLLWRNORM 0x0100 #define POLLWRBAND 0x0200 #define POLLMSG 0x0400 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-sh/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-sh/poll.h --- devel/include/asm-sh/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-sh/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -16,6 +16,7 @@ #define POLLWRBAND 0x0200 #define POLLMSG 0x0400 #define POLLREMOVE 0x1000 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-sparc64/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-sparc64/poll.h --- devel/include/asm-sparc64/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-sparc64/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -13,6 +13,7 @@ #define POLLWRBAND 256 #define POLLMSG 512 #define POLLREMOVE 1024 +#define POLLRDHUP 2048 struct pollfd { int fd; diff -puN include/asm-sparc/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-sparc/poll.h --- devel/include/asm-sparc/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-sparc/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -13,6 +13,7 @@ #define POLLWRBAND 256 #define POLLMSG 512 #define POLLREMOVE 1024 +#define POLLRDHUP 2048 struct pollfd { int fd; diff -puN include/asm-v850/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-v850/poll.h --- devel/include/asm-v850/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-v850/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -13,6 +13,7 @@ #define POLLWRBAND 0x0100 #define POLLMSG 0x0400 #define POLLREMOVE 0x1000 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-x86_64/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-x86_64/poll.h --- devel/include/asm-x86_64/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-x86_64/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -16,6 +16,7 @@ #define POLLWRBAND 0x0200 #define POLLMSG 0x0400 #define POLLREMOVE 0x1000 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN include/asm-xtensa/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices include/asm-xtensa/poll.h --- devel/include/asm-xtensa/poll.h~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/include/asm-xtensa/poll.h 2006-03-11 02:46:58.000000000 -0800 @@ -27,6 +27,7 @@ #define POLLMSG 0x0400 #define POLLREMOVE 0x0800 +#define POLLRDHUP 0x2000 struct pollfd { int fd; diff -puN net/bluetooth/af_bluetooth.c~pollrdhup-epollrdhup-handling-for-half-closed-devices net/bluetooth/af_bluetooth.c --- devel/net/bluetooth/af_bluetooth.c~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/net/bluetooth/af_bluetooth.c 2006-03-11 02:46:58.000000000 -0800 @@ -238,6 +238,9 @@ unsigned int bt_sock_poll(struct file * if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) mask |= POLLERR; + if (sk->sk_shutdown & RCV_SHUTDOWN) + mask |= POLLRDHUP; + if (sk->sk_shutdown == SHUTDOWN_MASK) mask |= POLLHUP; diff -puN net/core/datagram.c~pollrdhup-epollrdhup-handling-for-half-closed-devices net/core/datagram.c --- devel/net/core/datagram.c~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/net/core/datagram.c 2006-03-11 02:46:58.000000000 -0800 @@ -500,6 +500,8 @@ unsigned int datagram_poll(struct file * /* exceptional events? */ if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) mask |= POLLERR; + if (sk->sk_shutdown & RCV_SHUTDOWN) + mask |= POLLRDHUP; if (sk->sk_shutdown == SHUTDOWN_MASK) mask |= POLLHUP; diff -puN net/dccp/proto.c~pollrdhup-epollrdhup-handling-for-half-closed-devices net/dccp/proto.c --- devel/net/dccp/proto.c~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/net/dccp/proto.c 2006-03-11 02:46:58.000000000 -0800 @@ -350,7 +350,7 @@ unsigned int dccp_poll(struct file *file if (sk->sk_shutdown == SHUTDOWN_MASK || sk->sk_state == DCCP_CLOSED) mask |= POLLHUP; if (sk->sk_shutdown & RCV_SHUTDOWN) - mask |= POLLIN | POLLRDNORM; + mask |= POLLIN | POLLRDNORM | POLLRDHUP; /* Connected? */ if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING | DCCPF_RESPOND)) { diff -puN net/ipv4/tcp.c~pollrdhup-epollrdhup-handling-for-half-closed-devices net/ipv4/tcp.c --- devel/net/ipv4/tcp.c~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/net/ipv4/tcp.c 2006-03-11 02:46:58.000000000 -0800 @@ -365,7 +365,7 @@ unsigned int tcp_poll(struct file *file, if (sk->sk_shutdown == SHUTDOWN_MASK || sk->sk_state == TCP_CLOSE) mask |= POLLHUP; if (sk->sk_shutdown & RCV_SHUTDOWN) - mask |= POLLIN | POLLRDNORM; + mask |= POLLIN | POLLRDNORM | POLLRDHUP; /* Connected? */ if ((1 << sk->sk_state) & ~(TCPF_SYN_SENT | TCPF_SYN_RECV)) { diff -puN net/sctp/socket.c~pollrdhup-epollrdhup-handling-for-half-closed-devices net/sctp/socket.c --- devel/net/sctp/socket.c~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/net/sctp/socket.c 2006-03-11 02:46:58.000000000 -0800 @@ -4894,6 +4894,8 @@ unsigned int sctp_poll(struct file *file /* Is there any exceptional events? */ if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) mask |= POLLERR; + if (sk->sk_shutdown & RCV_SHUTDOWN) + mask |= POLLRDHUP; if (sk->sk_shutdown == SHUTDOWN_MASK) mask |= POLLHUP; diff -puN net/unix/af_unix.c~pollrdhup-epollrdhup-handling-for-half-closed-devices net/unix/af_unix.c --- devel/net/unix/af_unix.c~pollrdhup-epollrdhup-handling-for-half-closed-devices 2006-03-11 02:46:58.000000000 -0800 +++ devel-akpm/net/unix/af_unix.c 2006-03-11 02:46:58.000000000 -0800 @@ -1880,6 +1880,8 @@ static unsigned int unix_poll(struct fil mask |= POLLERR; if (sk->sk_shutdown == SHUTDOWN_MASK) mask |= POLLHUP; + if (sk->sk_shutdown & RCV_SHUTDOWN) + mask |= POLLRDHUP; /* readable? */ if (!skb_queue_empty(&sk->sk_receive_queue) || _