public inbox for [email protected]
 help / color / mirror / Atom feed
From: Stefan Roesch <[email protected]>
To: <[email protected]>, <[email protected]>,
	<[email protected]>, <[email protected]>,
	<[email protected]>
Cc: <[email protected]>, <[email protected]>, <[email protected]>
Subject: [RFC PATCH v3 11/18] io_uring: Add support for async buffered writes
Date: Wed, 18 May 2022 16:37:02 -0700	[thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>

This enables the async buffered writes for the filesystems that support
async buffered writes in io-uring. Buffered writes are enabled for
blocks that are already in the page cache or can be acquired with noio.

Signed-off-by: Stefan Roesch <[email protected]>
---
 fs/io_uring.c | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 91de361ea9ab..f3aaac286509 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3746,7 +3746,7 @@ static inline int io_iter_do_read(struct io_kiocb *req, struct iov_iter *iter)
 		return -EINVAL;
 }
 
-static bool need_read_all(struct io_kiocb *req)
+static bool need_complete_io(struct io_kiocb *req)
 {
 	return req->flags & REQ_F_ISREG ||
 		S_ISBLK(file_inode(req->file)->i_mode);
@@ -3875,7 +3875,7 @@ static int io_read(struct io_kiocb *req, unsigned int issue_flags)
 	} else if (ret == -EIOCBQUEUED) {
 		goto out_free;
 	} else if (ret == req->result || ret <= 0 || !force_nonblock ||
-		   (req->flags & REQ_F_NOWAIT) || !need_read_all(req)) {
+		   (req->flags & REQ_F_NOWAIT) || !need_complete_io(req)) {
 		/* read all, failed, already did sync or don't want to retry */
 		goto done;
 	}
@@ -3971,9 +3971,10 @@ static int io_write(struct io_kiocb *req, unsigned int issue_flags)
 		if (unlikely(!io_file_supports_nowait(req)))
 			goto copy_iov;
 
-		/* file path doesn't support NOWAIT for non-direct_IO */
-		if (force_nonblock && !(kiocb->ki_flags & IOCB_DIRECT) &&
-		    (req->flags & REQ_F_ISREG))
+		/* File path supports NOWAIT for non-direct_IO only for block devices. */
+		if (!(kiocb->ki_flags & IOCB_DIRECT) &&
+			!(kiocb->ki_filp->f_mode & FMODE_BUF_WASYNC) &&
+			(req->flags & REQ_F_ISREG))
 			goto copy_iov;
 
 		kiocb->ki_flags |= IOCB_NOWAIT;
@@ -4027,6 +4028,24 @@ static int io_write(struct io_kiocb *req, unsigned int issue_flags)
 		/* IOPOLL retry should happen for io-wq threads */
 		if (ret2 == -EAGAIN && (req->ctx->flags & IORING_SETUP_IOPOLL))
 			goto copy_iov;
+
+		if (ret2 != req->result && ret2 >= 0 && need_complete_io(req)) {
+			struct io_async_rw *rw;
+
+			/* This is a partial write. The file pos has already been
+			 * updated, setup the async struct to complete the request
+			 * in the worker. Also update bytes_done to account for
+			 * the bytes already written.
+			 */
+			iov_iter_save_state(&s->iter, &s->iter_state);
+			ret = io_setup_async_rw(req, iovec, s, true);
+
+			rw = req->async_data;
+			if (rw)
+				rw->bytes_done += ret2;
+
+			return ret ? ret : -EAGAIN;
+		}
 done:
 		kiocb_done(req, ret2, issue_flags);
 	} else {
-- 
2.30.2


  parent reply	other threads:[~2022-05-18 23:38 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-18 23:36 [RFC PATCH v3 00/18] io-uring/xfs: support async buffered writes Stefan Roesch
2022-05-18 23:36 ` [RFC PATCH v3 01/18] block: Add check for async buffered writes to generic_write_checks Stefan Roesch
2022-05-19  8:17   ` Christoph Hellwig
2022-05-20 18:23     ` Stefan Roesch
2022-05-18 23:36 ` [RFC PATCH v3 02/18] iomap: Add iomap_page_create_gfp to allocate iomap_pages Stefan Roesch
2022-05-19  8:18   ` Christoph Hellwig
2022-05-20 18:25     ` Stefan Roesch
2022-05-18 23:36 ` [RFC PATCH v3 03/18] iomap: Use iomap_page_create_gfp() in __iomap_write_begin Stefan Roesch
2022-05-19  8:19   ` Christoph Hellwig
2022-05-20 18:26     ` Stefan Roesch
2022-05-18 23:36 ` [RFC PATCH v3 04/18] iomap: Add async buffered write support Stefan Roesch
2022-05-19  8:25   ` Christoph Hellwig
2022-05-20 18:29     ` Stefan Roesch
2022-05-18 23:36 ` [RFC PATCH v3 05/18] xfs: Add iomap " Stefan Roesch
2022-05-18 23:36 ` [RFC PATCH v3 06/18] fs: Split off remove_needs_file_privs() __remove_file_privs() Stefan Roesch
2022-05-18 23:36 ` [RFC PATCH v3 07/18] fs: Split off file_needs_update_time and __file_update_time Stefan Roesch
2022-05-18 23:36 ` [RFC PATCH v3 08/18] xfs: Enable async write file modification handling Stefan Roesch
2022-05-18 23:37 ` [RFC PATCH v3 09/18] fs: Optimization for concurrent file time updates Stefan Roesch
2022-05-18 23:37 ` [RFC PATCH v3 10/18] xfs: Add async buffered write support Stefan Roesch
2022-05-18 23:37 ` Stefan Roesch [this message]
2022-05-18 23:37 ` [RFC PATCH v3 12/18] mm: Move starting of background writeback into the main balancing loop Stefan Roesch
2022-05-18 23:37 ` [RFC PATCH v3 13/18] mm: Move updates of dirty_exceeded into one place Stefan Roesch
2022-05-18 23:37 ` [RFC PATCH v3 14/18] mm: Prepare balance_dirty_pages() for async buffered writes Stefan Roesch
2022-05-18 23:37 ` [RFC PATCH v3 15/18] mm: Add balance_dirty_pages_ratelimited_async() function Stefan Roesch
2022-05-19  8:29   ` Christoph Hellwig
2022-05-19  8:54     ` Jan Kara
2022-05-20 18:32       ` Stefan Roesch
2022-05-20 18:29     ` Stefan Roesch
2022-05-18 23:37 ` [RFC PATCH v3 16/18] iomap: Use balance_dirty_pages_ratelimited_flags in iomap_write_iter Stefan Roesch
2022-05-19  8:32   ` Christoph Hellwig
2022-05-20 18:31     ` Stefan Roesch
2022-05-18 23:37 ` [RFC PATCH v3 17/18] io_uring: Add tracepoint for short writes Stefan Roesch
2022-05-18 23:37 ` [RFC PATCH v3 18/18] xfs: Enable async buffered write support Stefan Roesch
2022-05-19  8:32   ` Christoph Hellwig
2022-05-20 18:32     ` Stefan Roesch

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 \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [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