public inbox for [email protected]
 help / color / mirror / Atom feed
From: Jiufei Xue <[email protected]>
To: [email protected]
Cc: [email protected], [email protected]
Subject: [PATCH] io_uring: don't set REQ_F_NOWAIT if the file was opened O_NONBLOCK
Date: Mon, 25 May 2020 18:48:44 +0800	[thread overview]
Message-ID: <[email protected]> (raw)

When read from an ondisk file that was opened O_NONBLOCK, it will always
return EAGAIN to the user if the page is not cached. It is not
compatible with interfaces such as aio_read() and normal sys_read().

Files that care about this flag (eg. pipe, eventfd) will deal with it
on their own. So I don't think we should set REQ_F_NOWAIT in
io_prep_rw() to provent from queueing the async work.

Signed-off-by: Jiufei Xue <[email protected]>
---
 fs/io_uring.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index bb25e39..65ae59b 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2080,8 +2080,7 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe,
 		kiocb->ki_ioprio = get_current_ioprio();
 
 	/* don't allow async punt if RWF_NOWAIT was requested */
-	if ((kiocb->ki_flags & IOCB_NOWAIT) ||
-	    (req->file->f_flags & O_NONBLOCK))
+	if (kiocb->ki_flags & IOCB_NOWAIT)
 		req->flags |= REQ_F_NOWAIT;
 
 	if (force_nonblock)
-- 
1.8.3.1


             reply	other threads:[~2020-05-25 10:48 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-25 10:48 Jiufei Xue [this message]
2020-05-26  1:17 ` [PATCH] io_uring: don't set REQ_F_NOWAIT if the file was opened O_NONBLOCK Jiufei Xue

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=1590403724-57101-1-git-send-email-jiufei.xue@linux.alibaba.com \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    /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