From: Matthew Bobrowski <mbobrowski@mbobrowski.org>
To: linux-ext4@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, jack@suse.cz, tytso@mit.edu,
riteshh@linux.ibm.com
Subject: [PATCH 1/5] ext4: introduce direct IO read code path using iomap infrastructure
Date: Mon, 12 Aug 2019 22:52:35 +1000 [thread overview]
Message-ID: <3e83a70c4442c6aeb15b7913c39f853e7386a3c3.1565609891.git.mbobrowski@mbobrowski.org> (raw)
In-Reply-To: <cover.1565609891.git.mbobrowski@mbobrowski.org>
This patch introduces a new direct IO read code path implementation
that makes use of the iomap infrastructure.
The new function ext4_dio_read_iter() is responsible for calling into the
iomap infrastructure via iomap_dio_rw(). If the inode in question does not
pass preliminary checks in ext4_dio_checks(), then we simply fallback to
buffered IO and try to take that path. Prior to doing so, we drop the
IOCB_DIRECT flag from iocb->ki_flags to prevent generic_file_read_iter() from
taking the direct IO code path once again.
Signed-off-by: Matthew Bobrowski <mbobrowski@mbobrowski.org>
---
fs/ext4/file.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 53 insertions(+), 2 deletions(-)
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 70b0438dbc94..360eff7b6aa2 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -34,6 +34,53 @@
#include "xattr.h"
#include "acl.h"
+static bool ext4_dio_checks(struct inode *inode)
+{
+#ifdef CONFIG_FS_ENCRYPTION
+ if (IS_ENCRYPTED(inode))
+ return false;
+#endif
+ if (ext4_should_journal_data(inode))
+ return false;
+ if (ext4_has_inline_data(inode))
+ return false;
+ return true;
+}
+
+static ssize_t ext4_dio_read_iter(struct kiocb *iocb, struct iov_iter *to)
+{
+ ssize_t ret;
+ struct inode *inode = file_inode(iocb->ki_filp);
+
+ /*
+ * Get exclusion from truncate and other inode operations.
+ */
+ if (!inode_trylock_shared(inode)) {
+ if (iocb->ki_flags & IOCB_NOWAIT)
+ return -EAGAIN;
+ inode_lock_shared(inode);
+ }
+
+ if (!ext4_dio_checks(inode)) {
+ inode_unlock_shared(inode);
+ /*
+ * Fallback to buffered IO if the operation being
+ * performed on the inode is not supported by direct
+ * IO. The IOCB_DIRECT flag from iocb->ki_flags needs
+ * to be cleared here to ensure that the direct IO
+ * code path in generic_file_read_iter() is not taken.
+ */
+ iocb->ki_flags &= ~IOCB_DIRECT;
+ return generic_file_read_iter(iocb, to);
+ }
+
+ ret = iomap_dio_rw(iocb, to, &ext4_iomap_ops, NULL);
+ inode_unlock_shared(inode);
+
+ file_accessed(iocb->ki_filp);
+ return ret;
+}
+
#ifdef CONFIG_FS_DAX
static ssize_t ext4_dax_read_iter(struct kiocb *iocb, struct iov_iter *to)
{
@@ -64,16 +111,20 @@ static ssize_t ext4_dax_read_iter(struct kiocb *iocb, struct iov_iter *to)
static ssize_t ext4_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
{
- if (unlikely(ext4_forced_shutdown(EXT4_SB(file_inode(iocb->ki_filp)->i_sb))))
+ struct inode *inode = file_inode(iocb->ki_filp);
+
+ if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))
return -EIO;
if (!iov_iter_count(to))
return 0; /* skip atime */
#ifdef CONFIG_FS_DAX
- if (IS_DAX(file_inode(iocb->ki_filp)))
+ if (IS_DAX(inode))
return ext4_dax_read_iter(iocb, to);
#endif
+ if (iocb->ki_flags & IOCB_DIRECT)
+ return ext4_dio_read_iter(iocb, to);
return generic_file_read_iter(iocb, to);
}
--
2.16.4
--
Matthew Bobrowski
next prev parent reply other threads:[~2019-08-12 12:52 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 12:52 [PATCH 0/5] ext4: direct IO via iomap infrastructure Matthew Bobrowski
2019-08-12 12:52 ` Matthew Bobrowski [this message]
2019-08-12 17:18 ` [PATCH 1/5] ext4: introduce direct IO read code path using " Christoph Hellwig
2019-08-12 20:17 ` Matthew Wilcox
2019-08-13 10:45 ` Matthew Bobrowski
2019-08-12 12:52 ` [PATCH 2/5] ext4: move inode extension/truncate code out from ext4_iomap_end() Matthew Bobrowski
2019-08-12 17:18 ` Christoph Hellwig
2019-08-13 10:46 ` Matthew Bobrowski
2019-08-28 19:59 ` Jan Kara
2019-08-28 21:54 ` Matthew Bobrowski
2019-08-29 8:18 ` Jan Kara
2019-08-12 12:53 ` [PATCH 3/5] iomap: modify ->end_io() calling convention Matthew Bobrowski
2019-08-12 17:18 ` Christoph Hellwig
2019-08-13 10:43 ` Matthew Bobrowski
2019-08-12 12:53 ` [PATCH 4/5] ext4: introduce direct IO write code path using iomap infrastructure Matthew Bobrowski
2019-08-12 17:04 ` RITESH HARJANI
2019-08-13 12:58 ` Matthew Bobrowski
2019-08-13 14:35 ` Darrick J. Wong
2019-08-14 9:51 ` Matthew Bobrowski
2019-08-12 17:34 ` Christoph Hellwig
2019-08-13 10:45 ` Matthew Bobrowski
2019-08-28 20:26 ` Jan Kara
2019-08-28 22:32 ` Dave Chinner
2019-08-29 8:03 ` Jan Kara
2019-08-29 11:47 ` Matthew Bobrowski
2019-08-29 11:45 ` Matthew Bobrowski
2019-08-29 12:38 ` Jan Kara
2019-08-12 12:53 ` [PATCH 5/5] ext4: clean up redundant buffer_head direct IO code Matthew Bobrowski
2019-08-12 17:31 ` [PATCH 0/5] ext4: direct IO via iomap infrastructure RITESH HARJANI
2019-08-13 11:10 ` Matthew Bobrowski
2019-08-13 12:27 ` RITESH HARJANI
2019-08-14 9:48 ` Matthew Bobrowski
2019-08-14 11:58 ` RITESH HARJANI
2019-08-21 13:14 ` Matthew Bobrowski
2019-08-22 12:00 ` Matthew Bobrowski
2019-08-22 14:11 ` Ritesh Harjani
2019-08-24 3:18 ` Matthew Bobrowski
2019-08-24 3:55 ` Darrick J. Wong
2019-08-24 23:04 ` Christoph Hellwig
2019-08-27 9:52 ` Matthew Bobrowski
2019-08-28 12:05 ` Matthew Bobrowski
2019-08-28 14:27 ` Theodore Y. Ts'o
2019-08-28 18:02 ` Jan Kara
2019-08-29 6:36 ` Christoph Hellwig
2019-08-29 11:20 ` Matthew Bobrowski
2019-08-29 14:41 ` Christoph Hellwig
2019-08-23 13:43 ` [RFC 1/1] ext4: PoC implementation of option-1 Ritesh Harjani
2019-08-23 13:49 ` Ritesh Harjani
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=3e83a70c4442c6aeb15b7913c39f853e7386a3c3.1565609891.git.mbobrowski@mbobrowski.org \
--to=mbobrowski@mbobrowski.org \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=riteshh@linux.ibm.com \
--cc=tytso@mit.edu \
/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).