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]>, <[email protected]>
Subject: [RFC PATCH v4 06/17] iomap: Add async buffered write support
Date: Fri, 20 May 2022 11:36:35 -0700	[thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>

This adds async buffered write support to iomap.

Signed-off-by: Stefan Roesch <[email protected]>
---
 fs/iomap/buffered-io.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 27e67bfc64f5..187f4ddd7ba7 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -555,15 +555,21 @@ static int __iomap_write_begin(const struct iomap_iter *iter, loff_t pos,
 	loff_t block_size = i_blocksize(iter->inode);
 	loff_t block_start = round_down(pos, block_size);
 	loff_t block_end = round_up(pos + len, block_size);
+	unsigned int nr_blocks = i_blocks_per_folio(iter->inode, folio);
 	size_t from = offset_in_folio(folio, pos), to = from + len;
 	size_t poff, plen;
 	gfp_t  gfp = GFP_NOFS | __GFP_NOFAIL;
 
+	if (iter->flags & IOMAP_NOWAIT)
+		gfp = GFP_NOWAIT;
+
 	if (folio_test_uptodate(folio))
 		return 0;
 	folio_clear_error(folio);
 
 	iop = iomap_page_create(iter->inode, folio, gfp);
+	if ((iter->flags & IOMAP_NOWAIT) && !iop && nr_blocks > 1)
+		return -EAGAIN;
 
 	do {
 		iomap_adjust_read_range(iter->inode, folio, &block_start,
@@ -581,7 +587,12 @@ static int __iomap_write_begin(const struct iomap_iter *iter, loff_t pos,
 				return -EIO;
 			folio_zero_segments(folio, poff, from, to, poff + plen);
 		} else {
-			int status = iomap_read_folio_sync(block_start, folio,
+			int status;
+
+			if (iter->flags & IOMAP_NOWAIT)
+				return -EAGAIN;
+
+			status = iomap_read_folio_sync(block_start, folio,
 					poff, plen, srcmap);
 			if (status)
 				return status;
@@ -610,6 +621,9 @@ static int iomap_write_begin(const struct iomap_iter *iter, loff_t pos,
 	unsigned fgp = FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE | FGP_NOFS;
 	int status = 0;
 
+	if (iter->flags & IOMAP_NOWAIT)
+		fgp |= FGP_NOWAIT;
+
 	BUG_ON(pos + len > iter->iomap.offset + iter->iomap.length);
 	if (srcmap != &iter->iomap)
 		BUG_ON(pos + len > srcmap->offset + srcmap->length);
@@ -767,6 +781,10 @@ static loff_t iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i)
 		 * Otherwise there's a nasty deadlock on copying from the
 		 * same page as we're writing to, without it being marked
 		 * up-to-date.
+		 *
+		 * For async buffered writes the assumption is that the user
+		 * page has already been faulted in. This can be optimized by
+		 * faulting the user page in the prepare phase of io-uring.
 		 */
 		if (unlikely(fault_in_iov_iter_readable(i, bytes) == bytes)) {
 			status = -EFAULT;
@@ -822,6 +840,9 @@ iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i,
 	};
 	int ret;
 
+	if (iocb->ki_flags & IOCB_NOWAIT)
+		iter.flags |= IOMAP_NOWAIT;
+
 	while ((ret = iomap_iter(&iter, ops)) > 0)
 		iter.processed = iomap_write_iter(&iter, i);
 	if (iter.pos == iocb->ki_pos)
-- 
2.30.2


  parent reply	other threads:[~2022-05-20 18:37 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-20 18:36 [RFC PATCH v4 00/17] io-uring/xfs: support async buffered writes Stefan Roesch
2022-05-20 18:36 ` [RFC PATCH v4 01/17] mm: Move starting of background writeback into the main balancing loop Stefan Roesch
2022-05-20 18:36 ` [RFC PATCH v4 02/17] mm: Move updates of dirty_exceeded into one place Stefan Roesch
2022-05-20 18:36 ` [RFC PATCH v4 03/17] mm: Prepare balance_dirty_pages() for async buffered writes Stefan Roesch
2022-05-22  7:17   ` Christoph Hellwig
2022-05-25 21:30     ` Stefan Roesch
2022-05-20 18:36 ` [RFC PATCH v4 04/17] mm: Add balance_dirty_pages_ratelimited_flags() function Stefan Roesch
2022-05-23 10:40   ` Jan Kara
2022-05-20 18:36 ` [RFC PATCH v4 05/17] iomap: Add gfp parameter to iomap_page_create() Stefan Roesch
2022-05-22  7:21   ` Christoph Hellwig
2022-05-25 21:29     ` Stefan Roesch
2022-05-20 18:36 ` Stefan Roesch [this message]
2022-05-20 18:36 ` [RFC PATCH v4 07/17] iomap: Use balance_dirty_pages_ratelimited_flags in iomap_write_iter Stefan Roesch
2022-05-22  7:19   ` Christoph Hellwig
2022-05-25 21:32     ` Stefan Roesch
2022-05-20 18:36 ` [RFC PATCH v4 08/17] fs: Add check for async buffered writes to generic_write_checks Stefan Roesch
2022-05-20 18:36 ` [RFC PATCH v4 09/17] fs: Split off remove_needs_file_privs() __remove_file_privs() Stefan Roesch
2022-05-22  7:32   ` Christoph Hellwig
2022-05-25 21:34     ` Stefan Roesch
2022-05-20 18:36 ` [RFC PATCH v4 10/17] fs: Split off file_needs_update_time and __file_update_time Stefan Roesch
2022-05-22  7:29   ` Christoph Hellwig
2022-05-25 22:32     ` Stefan Roesch
2022-05-20 18:36 ` [RFC PATCH v4 11/17] fs: Add async write file modification handling Stefan Roesch
2022-05-22  7:24   ` Christoph Hellwig
2022-05-25 21:39     ` Stefan Roesch
2022-05-20 18:36 ` [RFC PATCH v4 12/17] fs: Optimization for concurrent file time updates Stefan Roesch
2022-05-23 10:51   ` Jan Kara
2022-05-25 21:46     ` Stefan Roesch
2022-05-20 18:36 ` [RFC PATCH v4 13/17] io_uring: Add support for async buffered writes Stefan Roesch
2022-05-20 18:36 ` [RFC PATCH v4 14/17] io_uring: Add tracepoint for short writes Stefan Roesch
2022-05-20 18:36 ` [RFC PATCH v4 15/17] xfs: Add iomap async buffered write support Stefan Roesch
2022-05-22  7:33   ` Christoph Hellwig
2022-05-25 21:40     ` Stefan Roesch
2022-05-20 18:36 ` [RFC PATCH v4 16/17] xfs: Add " Stefan Roesch
2022-05-22  7:34   ` Christoph Hellwig
2022-05-25 21:41     ` Stefan Roesch
2022-05-22 15:35   ` Darrick J. Wong
2022-05-25 21:44     ` Stefan Roesch
2022-05-20 18:36 ` [RFC PATCH v4 17/17] xfs: Enable " 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] \
    [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