Commit d80e731e authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

epoll: introduce POLLFREE to flush ->signalfd_wqh before kfree()

This patch is intentionally incomplete to simplify the review.
It ignores ep_unregister_pollwait() which plays with the same wqh.
See the next change.

epoll assumes that the EPOLL_CTL_ADD'ed file controls everything
f_op->poll() needs. In particular it assumes that the wait queue
can't go away until eventpoll_release(). This is not true in case
of signalfd, the task which does EPOLL_CTL_ADD uses its ->sighand
which is not connected to the file.

This patch adds the special event, POLLFREE, currently only for
epoll. It expects that init_poll_funcptr()'ed hook should do the
necessary cleanup. Perhaps it should be defined as EPOLLFREE in

__cleanup_sighand() is changed to do wake_up_poll(POLLFREE) if
->signalfd_wqh is not empty, we add the new signalfd_cleanup()

ep_poll_callback(POLLFREE) simply does list_del_init(task_list).
This make this poll entry inconsistent, but we don't care. If you
share epoll fd which contains our sigfd with another process you
should blame yourself. signalfd is "really special". I simply do
not know how we can define the "right" semantics if it used with

The main problem is, epoll calls signalfd_poll() once to establish
the connection with the wait queue, after that signalfd_poll(NULL)
returns the different/inconsistent results depending on who does
EPOLL_CTL_MOD/signalfd_read/etc. IOW: apart from sigmask, signalfd
has nothing to do with the file, it works with the current thread.

In short: this patch is the hack which tries to fix the symptoms.
It also assumes that nobody can take tasklist_lock under epoll
locks, this seems to be true.


	- we do not have wake_up_all_poll() but wake_up_poll()
	  is fine, poll/epoll doesn't use WQ_FLAG_EXCLUSIVE.

	- signalfd_cleanup() uses POLLHUP along with POLLFREE,
	  we need a couple of simple changes in eventpoll.c to
	  make sure it can't be "lost".
Reported-by: default avatarMaxime Bizon <>
Cc: <>
Signed-off-by: default avatarOleg Nesterov <>
Signed-off-by: default avatarLinus Torvalds <>
parent 855a85f7
......@@ -842,6 +842,10 @@ static int ep_poll_callback(wait_queue_t *wait, unsigned mode, int sync, void *k
struct epitem *epi = ep_item_from_wait(wait);
struct eventpoll *ep = epi->ep;
/* the caller holds eppoll_entry->whead->lock */
if ((unsigned long)key & POLLFREE)
spin_lock_irqsave(&ep->lock, flags);
......@@ -30,6 +30,17 @@
#include <linux/signalfd.h>
#include <linux/syscalls.h>
void signalfd_cleanup(struct sighand_struct *sighand)
wait_queue_head_t *wqh = &sighand->signalfd_wqh;
if (likely(!waitqueue_active(wqh)))
/* wait_queue_t->func(POLLFREE) should do remove_wait_queue() */
wake_up_poll(wqh, POLLHUP | POLLFREE);
struct signalfd_ctx {
sigset_t sigmask;
......@@ -28,6 +28,8 @@
#define POLLRDHUP 0x2000
#define POLLFREE 0x4000 /* currently only for epoll */
struct pollfd {
int fd;
short events;
......@@ -61,13 +61,16 @@ static inline void signalfd_notify(struct task_struct *tsk, int sig)
extern void signalfd_cleanup(struct sighand_struct *sighand);
static inline void signalfd_notify(struct task_struct *tsk, int sig) { }
static inline void signalfd_cleanup(struct sighand_struct *sighand) { }
#endif /* CONFIG_SIGNALFD */
#endif /* __KERNEL__ */
#endif /* _LINUX_SIGNALFD_H */
......@@ -66,6 +66,7 @@
#include <linux/user-return-notifier.h>
#include <linux/oom.h>
#include <linux/khugepaged.h>
#include <linux/signalfd.h>
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
......@@ -935,8 +936,10 @@ static int copy_sighand(unsigned long clone_flags, struct task_struct *tsk)
void __cleanup_sighand(struct sighand_struct *sighand)
if (atomic_dec_and_test(&sighand->count))
if (atomic_dec_and_test(&sighand->count)) {
kmem_cache_free(sighand_cachep, sighand);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment