From: Goldwyn Rodrigues <rgoldwyn@suse.de>
To: linux-fsdevel@vger.kernel.org
Cc: linux-btrfs@vger.kernel.org, darrick.wong@oracle.com, hch@lst.de,
david@fromorbit.com, riteshh@linux.ibm.com,
Goldwyn Rodrigues <rgoldwyn@suse.com>
Subject: [PATCH 09/15] btrfs: basic direct read operation
Date: Sun, 1 Sep 2019 15:08:30 -0500 [thread overview]
Message-ID: <20190901200836.14959-10-rgoldwyn@suse.de> (raw)
In-Reply-To: <20190901200836.14959-1-rgoldwyn@suse.de>
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
Add btrfs_dio_iomap_ops for iomap.begin() function. In order to
accomodate dio reads, add a new function btrfs_file_read_iter()
which would call btrfs_dio_iomap_read() for DIO reads and
fallback to generic_file_buffered_read otherwise.
Changed parameter written in generic_file_buffered_read() to
already_read.
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
fs/btrfs/ctree.h | 2 ++
fs/btrfs/file.c | 13 ++++++++++++-
fs/btrfs/iomap.c | 20 ++++++++++++++++++++
3 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 9c501c7826b4..5ca3a365e639 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3243,7 +3243,9 @@ int btrfs_fdatawrite_range(struct inode *inode, loff_t start, loff_t end);
loff_t btrfs_remap_file_range(struct file *file_in, loff_t pos_in,
struct file *file_out, loff_t pos_out,
loff_t len, unsigned int remap_flags);
+/* iomap.c */
size_t btrfs_buffered_iomap_write(struct kiocb *iocb, struct iov_iter *from);
+ssize_t btrfs_dio_iomap_read(struct kiocb *iocb, struct iov_iter *to);
/* tree-defrag.c */
int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index f7087e28ac08..e7f67d514ba8 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2839,9 +2839,20 @@ static int btrfs_file_open(struct inode *inode, struct file *filp)
return generic_file_open(inode, filp);
}
+static ssize_t btrfs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
+{
+ ssize_t ret = 0;
+ if (iocb->ki_flags & IOCB_DIRECT)
+ ret = btrfs_dio_iomap_read(iocb, to);
+ if (ret < 0)
+ return ret;
+
+ return generic_file_buffered_read(iocb, to, ret);
+}
+
const struct file_operations btrfs_file_operations = {
.llseek = btrfs_file_llseek,
- .read_iter = generic_file_read_iter,
+ .read_iter = btrfs_file_read_iter,
.splice_read = generic_file_splice_read,
.write_iter = btrfs_file_write_iter,
.mmap = btrfs_file_mmap,
diff --git a/fs/btrfs/iomap.c b/fs/btrfs/iomap.c
index 8ed93d427962..ee94c687db1a 100644
--- a/fs/btrfs/iomap.c
+++ b/fs/btrfs/iomap.c
@@ -421,3 +421,23 @@ size_t btrfs_buffered_iomap_write(struct kiocb *iocb, struct iov_iter *from)
return written;
}
+static int btrfs_dio_iomap_begin(struct inode *inode, loff_t pos,
+ loff_t length, unsigned flags, struct iomap *iomap,
+ struct iomap *srcmap)
+{
+ return get_iomap(inode, pos, length, iomap);
+}
+
+static const struct iomap_ops btrfs_dio_iomap_ops = {
+ .iomap_begin = btrfs_dio_iomap_begin,
+};
+
+ssize_t btrfs_dio_iomap_read(struct kiocb *iocb, struct iov_iter *to)
+{
+ struct inode *inode = file_inode(iocb->ki_filp);
+ ssize_t ret;
+ inode_lock_shared(inode);
+ ret = iomap_dio_rw(iocb, to, &btrfs_dio_iomap_ops, NULL);
+ inode_unlock_shared(inode);
+ return ret;
+}
--
2.16.4
next prev parent reply other threads:[~2019-09-01 20:09 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-01 20:08 [PATCH v3 0/15] Btrfs iomap Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 01/15] iomap: Introduce CONFIG_FS_IOMAP_DEBUG Goldwyn Rodrigues
2019-09-01 20:50 ` Darrick J. Wong
2019-09-02 16:29 ` Christoph Hellwig
2019-09-02 17:09 ` Darrick J. Wong
2019-09-02 17:18 ` Christoph Hellwig
2019-09-03 15:06 ` Darrick J. Wong
2019-09-01 20:08 ` [PATCH 02/15] iomap: Use a IOMAP_COW/srcmap for a read-modify-write I/O Goldwyn Rodrigues
2019-09-02 16:31 ` Christoph Hellwig
2019-09-03 3:18 ` Darrick J. Wong
2019-09-03 14:12 ` Goldwyn Rodrigues
2019-09-03 14:05 ` Goldwyn Rodrigues
2019-09-03 14:56 ` Darrick J. Wong
2019-09-01 20:08 ` [PATCH 03/15] iomap: Read page from srcmap for IOMAP_COW Goldwyn Rodrigues
2019-09-02 16:31 ` Christoph Hellwig
2019-09-02 17:01 ` Darrick J. Wong
2019-09-02 17:13 ` Christoph Hellwig
2019-09-01 20:08 ` [PATCH 04/15] btrfs: Eliminate PagePrivate for btrfs data pages Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 05/15] btrfs: Add a simple buffered iomap write Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 06/15] btrfs: Add CoW in iomap based writes Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 07/15] btrfs: remove buffered write code made unnecessary Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 08/15] fs: Export generic_file_buffered_read() Goldwyn Rodrigues
2019-09-01 20:08 ` Goldwyn Rodrigues [this message]
2019-09-01 20:08 ` [PATCH 10/15] btrfs: Carve out btrfs_get_extent_map_write() out of btrfs_get_blocks_write() Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 11/15] btrfs: Rename __endio_write_update_ordered() to btrfs_update_ordered_extent() Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 12/15] iomap: use a function pointer for dio submits Goldwyn Rodrigues
2019-09-02 16:41 ` Christoph Hellwig
2019-09-01 20:08 ` [PATCH 13/15] btrfs: Use iomap_dio_rw for performing direct I/O writes Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 14/15] btrfs: Remove btrfs_dio_data and __btrfs_direct_write Goldwyn Rodrigues
2019-09-01 20:08 ` [PATCH 15/15] btrfs: update inode size during bio completion Goldwyn Rodrigues
2019-09-02 16:43 ` [PATCH v3 0/15] Btrfs iomap Christoph Hellwig
2019-09-03 3:51 ` Shiyang Ruan
2019-09-03 4:29 ` Darrick J. Wong
2019-09-03 5:00 ` Shiyang Ruan
2019-09-03 6:21 ` Christoph Hellwig
2019-09-03 13:44 ` 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=20190901200836.14959-10-rgoldwyn@suse.de \
--to=rgoldwyn@suse.de \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=rgoldwyn@suse.com \
--cc=riteshh@linux.ibm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.