make POLLRDNORM/POLLWRNORM working for event/signal/timerfd
Subsystems (2)
cover make POLLRDNORM/POLLWRNORM working for event/signal/timerfd
poll(2) manpage says that POLLRDNORM/POLLWRNORM are equivalent to POLLIN/POLLOUT and they are for other special fds. This makes the event/signal/timerfd consistent.
(A candidate for -stable?)
Michał Mirosław (3):
eventfd: make POLLRDNORM/POLLWRNORM working
signalfd: make POLLRDNORM working
timerfd: make POLLRDNORM working
fs/eventfd.c | 12 ++++++------ fs/signalfd.c | 2 +- fs/timerfd.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
Signature · 1 line
2.10.2
PATCH 1/3 eventfd: make POLLRDNORM/POLLWRNORM working
poll(2) suggests these should be equivalent to POLLIN/POLLOUT.
Signed-off-by Michał Mirosław <[email protected]>
--- fs/eventfd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
fs/eventfd.c +6 -6
@@ -60,7 +60,7 @@ __u64 eventfd_signal(struct eventfd_ctx *ctx, __u64 n) n =ULLONG_MAX - ctx->count; ctx->count += n;if (waitqueue_active (&ctx->wqh)) -wake_up_locked_poll (&ctx->wqh,POLLIN ); +wake_up_locked_poll (&ctx->wqh,POLLIN |POLLRDNORM );spin_unlock_irqrestore (&ctx->wqh.lock, flags);return n;
@@ -163,11 +163,11 @@ static unsigned int eventfd_poll(struct file *file, poll_table *wait) count =READ_ONCE (ctx->count);if (count >0 ) - events |=POLLIN ; + events |=POLLIN |POLLRDNORM ;if (count ==ULLONG_MAX ) events |=POLLERR ;if (ULLONG_MAX -1 > count) - events |=POLLOUT ; + events |=POLLOUT |POLLWRNORM ;return events; }
@@ -200,7 +200,7 @@ int eventfd_ctx_remove_wait_queue(struct eventfd_ctx *ctx, wait_queue_t *wait,eventfd_ctx_do_read (ctx, cnt);__remove_wait_queue (&ctx->wqh, wait);if (*cnt !=0 &&waitqueue_active (&ctx->wqh)) -wake_up_locked_poll (&ctx->wqh,POLLOUT ); +wake_up_locked_poll (&ctx->wqh,POLLOUT |POLLWRNORM );spin_unlock_irqrestore (&ctx->wqh.lock, flags);return *cnt !=0 ?0 : -EAGAIN ;
@@ -253,7 +253,7 @@ ssize_t eventfd_ctx_read(struct eventfd_ctx *ctx, int no_wait, __u64 *cnt)if (likely (res ==0 )) {eventfd_ctx_do_read (ctx, cnt);if (waitqueue_active (&ctx->wqh)) -wake_up_locked_poll (&ctx->wqh,POLLOUT ); +wake_up_locked_poll (&ctx->wqh,POLLOUT |POLLWRNORM ); }spin_unlock_irq (&ctx->wqh.lock);
@@ -317,7 +317,7 @@ static ssize_t eventfd_write(struct file *file, const char __user *buf, size_t cif (likely (res >0 )) { ctx->count += ucnt;if (waitqueue_active (&ctx->wqh)) -wake_up_locked_poll (&ctx->wqh,POLLIN ); +wake_up_locked_poll (&ctx->wqh,POLLIN |POLLRDNORM ); }spin_unlock_irq (&ctx->wqh.lock);
Signature · 1 line
2.10.2
PATCH 2/3 signalfd: make POLLRDNORM working
In reply to Michał Mirosławpoll(2) suggests this should be equivalent to POLLIN.
Signed-off-by Michał Mirosław <[email protected]>
--- fs/signalfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/signalfd.c +1 -1
@@ -68,7 +68,7 @@ static unsigned int signalfd_poll(struct file *file, poll_table *wait)if (next_signal (¤t->pending, &ctx->sigmask) ||next_signal (¤t->signal->shared_pending, &ctx->sigmask)) - events |=POLLIN ; + events |=POLLIN |POLLRDNORM ;spin_unlock_irq (¤t->sighand->siglock);return events;
Signature · 1 line
2.10.2
PATCH 3/3 timerfd: make POLLRDNORM working
In reply to Michał Mirosławpoll(2) suggests this should be equivalent to POLLIN.
Signed-off-by Michał Mirosław <[email protected]>
--- fs/timerfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/timerfd.c +1 -1
@@ -226,7 +226,7 @@ static unsigned int timerfd_poll(struct file *file, poll_table *wait)spin_lock_irqsave (&ctx->wqh.lock, flags);if (ctx->ticks) - events |=POLLIN ; + events |=POLLIN |POLLRDNORM ;spin_unlock_irqrestore (&ctx->wqh.lock, flags);return events;
Signature · 1 line
2.10.2