From: Goldwyn Rodrigues <rgoldwyn@suse.de>
To: linux-fsdevel@vger.kernel.org
Cc: linux-btrfs@vger.kernel.org, hch@lst.de, darrick.wong@oracle.com,
david@fromorbit.com, dsterba@suse.cz, jthumshirn@suse.de,
fdmanana@gmail.com, Goldwyn Rodrigues <rgoldwyn@suse.com>
Subject: [PATCH 2/6] iomap: IOMAP_DIOF_PGINVALID_FAIL return if page invalidation fails
Date: Mon, 22 Jun 2020 10:24:53 -0500 [thread overview]
Message-ID: <20200622152457.7118-3-rgoldwyn@suse.de> (raw)
In-Reply-To: <20200622152457.7118-1-rgoldwyn@suse.de>
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
The flag indicates that if the page invalidation fails, it should return
back control to the filesystem so it may fallback to buffered mode.
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
fs/iomap/direct-io.c | 8 +++++++-
include/linux/iomap.h | 5 +++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
index 7ed857196a39..20c4370e6b1b 100644
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@ -484,8 +484,14 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
*/
ret = invalidate_inode_pages2_range(mapping,
pos >> PAGE_SHIFT, end >> PAGE_SHIFT);
- if (ret)
+ if (ret) {
+ if (dio_flags & IOMAP_DIOF_PGINVALID_FAIL) {
+ if (ret == -EBUSY)
+ ret = 0;
+ goto out_free_dio;
+ }
dio_warn_stale_pagecache(iocb->ki_filp);
+ }
ret = 0;
if (iov_iter_rw(iter) == WRITE && !wait_for_completion &&
diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index f6230446b08d..95024e28dec5 100644
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -261,6 +261,11 @@ struct iomap_dio_ops {
/* Wait for completion of DIO */
#define IOMAP_DIOF_WAIT_FOR_COMPLETION 0x1
+/*
+ * Return zero if page invalidation fails, so caller filesystem may fallback
+ * to buffered I/O
+ */
+#define IOMAP_DIOF_PGINVALID_FAIL 0x2
ssize_t iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
const struct iomap_ops *ops, const struct iomap_dio_ops *dops,
--
2.25.0
next prev parent reply other threads:[~2020-06-22 15:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-22 15:24 [PATCH 0/6 v9] btrfs direct-io using iomap Goldwyn Rodrigues
2020-06-22 15:24 ` [PATCH 1/6] iomap: Convert wait_for_completion to flags Goldwyn Rodrigues
2020-06-22 15:49 ` Johannes Thumshirn
2020-06-22 17:34 ` Darrick J. Wong
2020-06-23 5:57 ` Dave Chinner
2020-06-25 17:42 ` Goldwyn Rodrigues
2020-06-22 15:24 ` Goldwyn Rodrigues [this message]
2020-06-22 17:33 ` [PATCH 2/6] iomap: IOMAP_DIOF_PGINVALID_FAIL return if page invalidation fails Darrick J. Wong
2020-06-23 6:15 ` Dave Chinner
2020-06-22 15:24 ` [PATCH 3/6] btrfs: switch to iomap_dio_rw() for dio Goldwyn Rodrigues
2020-06-22 15:24 ` [PATCH 4/6] fs: remove dio_end_io() Goldwyn Rodrigues
2020-06-22 15:24 ` [PATCH 5/6] btrfs: remove BTRFS_INODE_READDIO_NEED_LOCK Goldwyn Rodrigues
2020-06-22 15:24 ` [PATCH 6/6] btrfs: split btrfs_direct_IO to read and write part Goldwyn Rodrigues
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=20200622152457.7118-3-rgoldwyn@suse.de \
--to=rgoldwyn@suse.de \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=dsterba@suse.cz \
--cc=fdmanana@gmail.com \
--cc=hch@lst.de \
--cc=jthumshirn@suse.de \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=rgoldwyn@suse.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;
as well as URLs for NNTP newsgroup(s).