From: Eric Dumazet <eric.dumazet@gmail.com>
To: Davide Libenzi <davidel@xmailserver.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [patch] make pipes use event aware wakeups
Date: Thu, 16 Dec 2010 21:45:01 +0100 [thread overview]
Message-ID: <1292532301.2655.10.camel@edumazet-laptop> (raw)
In-Reply-To: <alpine.DEB.2.00.1012161228530.25094@davide-lnx1>
Le jeudi 16 décembre 2010 à 12:32 -0800, Davide Libenzi a écrit :
> I thought this was alreay merged, but this thread brought to my attention
> it wasn't:
>
> https://lkml.org/lkml/2010/12/15/234
>
> This patch sends the events the wakeup refers to, so that epoll, and even
> the new poll code in fs/select.c can avoid wakeups in events are not
> matching the requested set.
>
>
> Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
>
>
> - Davide
>
>
> ---
> fs/pipe.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> Index: linux-2.6.mod/fs/pipe.c
> ===================================================================
> --- linux-2.6.mod.orig/fs/pipe.c 2010-12-15 20:49:48.000000000 -0800
> +++ linux-2.6.mod/fs/pipe.c 2010-12-15 20:51:42.000000000 -0800
> @@ -441,7 +441,7 @@
> break;
> }
> if (do_wakeup) {
> - wake_up_interruptible_sync(&pipe->wait);
> + wake_up_interruptible_sync_poll(&pipe->wait, POLLOUT);
> kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
> }
> pipe_wait(pipe);
> @@ -450,7 +450,7 @@
>
> /* Signal writers asynchronously that there is more room. */
> if (do_wakeup) {
> - wake_up_interruptible_sync(&pipe->wait);
> + wake_up_interruptible_sync_poll(&pipe->wait, POLLOUT);
> kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
> }
> if (ret > 0)
> @@ -612,7 +612,7 @@
> break;
> }
> if (do_wakeup) {
> - wake_up_interruptible_sync(&pipe->wait);
> + wake_up_interruptible_sync_poll(&pipe->wait, POLLIN);
> kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
> do_wakeup = 0;
> }
> @@ -623,7 +623,7 @@
> out:
> mutex_unlock(&inode->i_mutex);
> if (do_wakeup) {
> - wake_up_interruptible_sync(&pipe->wait);
> + wake_up_interruptible_sync_poll(&pipe->wait, POLLIN);
> kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
> }
> if (ret > 0)
> @@ -715,7 +715,7 @@
> if (!pipe->readers && !pipe->writers) {
> free_pipe_info(inode);
> } else {
> - wake_up_interruptible_sync(&pipe->wait);
> + wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT);
> kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
> kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
> }
Indeed ;)
I am not sure the last bit is needed, but it should not matter.
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
prev parent reply other threads:[~2010-12-16 20:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-16 20:32 Davide Libenzi
2010-12-16 20:35 ` David Miller
2010-12-16 20:45 ` Eric Dumazet [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1292532301.2655.10.camel@edumazet-laptop \
--to=eric.dumazet@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=davidel@xmailserver.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®