From: Max Kellermann <max@duempel.org>
To: linux-kernel@vger.kernel.org
Cc: eric.dumazet@gmail.com, mk@cm4all.com
Subject: [PATCH] pipe: don't block after data has been written
Date: Thu, 05 Nov 2009 16:31:47 +0100 [thread overview]
Message-ID: <20091105153147.27473.19570.stgit@woodpecker.roonstrasse.net> (raw)
According to the select() / poll() documentation, a write operation on
a file descriptor which is "ready for writing" must not block. Linux
violates this rule: if you pass a very large buffer to write(), the
system call will not return until everything is written, or an error
occurs.
This patch adds a simple check: if at least one byte has already been
written, break from the loop, instead of calling pipe_wait().
Signed-off-by: Max Kellermann <max@duempel.org>
---
fs/pipe.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/pipe.c b/fs/pipe.c
index ae17d02..9d84f0b 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -582,7 +582,7 @@ redo2:
}
if (bufs < PIPE_BUFFERS)
continue;
- if (filp->f_flags & O_NONBLOCK) {
+ if (filp->f_flags & O_NONBLOCK || ret > 0) {
if (!ret)
ret = -EAGAIN;
break;
next reply other threads:[~2009-11-05 15:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-05 15:31 Max Kellermann [this message]
2009-11-05 16:20 ` Américo Wang
2009-11-05 16:25 ` Max Kellermann
2009-11-05 16:27 ` Eric Dumazet
2009-11-05 16:36 ` Max Kellermann
2009-11-05 16:37 ` Eric Dumazet
2009-11-05 17:13 ` Zan Lynx
2009-11-05 18:32 ` Alan Cox
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=20091105153147.27473.19570.stgit@woodpecker.roonstrasse.net \
--to=max@duempel.org \
--cc=eric.dumazet@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mk@cm4all.com \
/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®