From: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>
To: xfs-VZNHf3L845pBDgjK7y7TUQ@public.gmane.org
Cc: linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-nvdimm-y27Ovi1pjclAfugRpC6u6w@public.gmane.org
Subject: [PATCH 5/8] xfs: stop using generic_file_read_iter for direct I/O
Date: Wed, 22 Jun 2016 17:27:13 +0200 [thread overview]
Message-ID: <1466609236-23801-6-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1466609236-23801-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
XFS already implement it's own flushing of the pagecache because it
implements proper synchronization for direct I/O reads. This means
calling generic_file_read_iter for direct I/O is rather useless,
as it doesn't do much but updating the atime and iocb position for
us. This also gets rid of the buffered I/O fallback that isn't used
for XFS.
Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>
---
fs/xfs/xfs_file.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index e584333..f761f49 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -246,12 +246,17 @@ xfs_file_dio_aio_read(
struct address_space *mapping = iocb->ki_filp->f_mapping;
struct inode *inode = mapping->host;
struct xfs_inode *ip = XFS_I(inode);
+ loff_t isize = i_size_read(inode);
size_t count = iov_iter_count(to);
+ struct iov_iter data;
struct xfs_buftarg *target;
ssize_t ret = 0;
trace_xfs_file_direct_read(ip, count, iocb->ki_pos);
+ if (!count)
+ return 0; /* skip atime */
+
if (XFS_IS_REALTIME_INODE(ip))
target = ip->i_mount->m_rtdev_targp;
else
@@ -260,7 +265,7 @@ xfs_file_dio_aio_read(
if (!IS_DAX(inode)) {
/* DIO must be aligned to device logical sector size */
if ((iocb->ki_pos | count) & target->bt_logical_sectormask) {
- if (iocb->ki_pos == i_size_read(inode))
+ if (iocb->ki_pos == isize)
return 0;
return -EINVAL;
}
@@ -311,9 +316,15 @@ xfs_file_dio_aio_read(
xfs_rw_ilock_demote(ip, XFS_IOLOCK_EXCL);
}
- ret = generic_file_read_iter(iocb, to);
+ data = *to;
+ ret = mapping->a_ops->direct_IO(iocb, &data);
+ if (ret > 0) {
+ iocb->ki_pos += ret;
+ iov_iter_advance(to, ret);
+ }
xfs_rw_iunlock(ip, XFS_IOLOCK_SHARED);
+ file_accessed(iocb->ki_filp);
return ret;
}
--
2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: xfs@oss.sgi.com
Cc: linux-nvdimm@ml01.01.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 5/8] xfs: stop using generic_file_read_iter for direct I/O
Date: Wed, 22 Jun 2016 17:27:13 +0200 [thread overview]
Message-ID: <1466609236-23801-6-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1466609236-23801-1-git-send-email-hch@lst.de>
XFS already implement it's own flushing of the pagecache because it
implements proper synchronization for direct I/O reads. This means
calling generic_file_read_iter for direct I/O is rather useless,
as it doesn't do much but updating the atime and iocb position for
us. This also gets rid of the buffered I/O fallback that isn't used
for XFS.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/xfs_file.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index e584333..f761f49 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -246,12 +246,17 @@ xfs_file_dio_aio_read(
struct address_space *mapping = iocb->ki_filp->f_mapping;
struct inode *inode = mapping->host;
struct xfs_inode *ip = XFS_I(inode);
+ loff_t isize = i_size_read(inode);
size_t count = iov_iter_count(to);
+ struct iov_iter data;
struct xfs_buftarg *target;
ssize_t ret = 0;
trace_xfs_file_direct_read(ip, count, iocb->ki_pos);
+ if (!count)
+ return 0; /* skip atime */
+
if (XFS_IS_REALTIME_INODE(ip))
target = ip->i_mount->m_rtdev_targp;
else
@@ -260,7 +265,7 @@ xfs_file_dio_aio_read(
if (!IS_DAX(inode)) {
/* DIO must be aligned to device logical sector size */
if ((iocb->ki_pos | count) & target->bt_logical_sectormask) {
- if (iocb->ki_pos == i_size_read(inode))
+ if (iocb->ki_pos == isize)
return 0;
return -EINVAL;
}
@@ -311,9 +316,15 @@ xfs_file_dio_aio_read(
xfs_rw_ilock_demote(ip, XFS_IOLOCK_EXCL);
}
- ret = generic_file_read_iter(iocb, to);
+ data = *to;
+ ret = mapping->a_ops->direct_IO(iocb, &data);
+ if (ret > 0) {
+ iocb->ki_pos += ret;
+ iov_iter_advance(to, ret);
+ }
xfs_rw_iunlock(ip, XFS_IOLOCK_SHARED);
+ file_accessed(iocb->ki_filp);
return ret;
}
--
2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: xfs@oss.sgi.com
Cc: linux-fsdevel@vger.kernel.org, linux-nvdimm@ml01.01.org
Subject: [PATCH 5/8] xfs: stop using generic_file_read_iter for direct I/O
Date: Wed, 22 Jun 2016 17:27:13 +0200 [thread overview]
Message-ID: <1466609236-23801-6-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1466609236-23801-1-git-send-email-hch@lst.de>
XFS already implement it's own flushing of the pagecache because it
implements proper synchronization for direct I/O reads. This means
calling generic_file_read_iter for direct I/O is rather useless,
as it doesn't do much but updating the atime and iocb position for
us. This also gets rid of the buffered I/O fallback that isn't used
for XFS.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/xfs_file.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index e584333..f761f49 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -246,12 +246,17 @@ xfs_file_dio_aio_read(
struct address_space *mapping = iocb->ki_filp->f_mapping;
struct inode *inode = mapping->host;
struct xfs_inode *ip = XFS_I(inode);
+ loff_t isize = i_size_read(inode);
size_t count = iov_iter_count(to);
+ struct iov_iter data;
struct xfs_buftarg *target;
ssize_t ret = 0;
trace_xfs_file_direct_read(ip, count, iocb->ki_pos);
+ if (!count)
+ return 0; /* skip atime */
+
if (XFS_IS_REALTIME_INODE(ip))
target = ip->i_mount->m_rtdev_targp;
else
@@ -260,7 +265,7 @@ xfs_file_dio_aio_read(
if (!IS_DAX(inode)) {
/* DIO must be aligned to device logical sector size */
if ((iocb->ki_pos | count) & target->bt_logical_sectormask) {
- if (iocb->ki_pos == i_size_read(inode))
+ if (iocb->ki_pos == isize)
return 0;
return -EINVAL;
}
@@ -311,9 +316,15 @@ xfs_file_dio_aio_read(
xfs_rw_ilock_demote(ip, XFS_IOLOCK_EXCL);
}
- ret = generic_file_read_iter(iocb, to);
+ data = *to;
+ ret = mapping->a_ops->direct_IO(iocb, &data);
+ if (ret > 0) {
+ iocb->ki_pos += ret;
+ iov_iter_advance(to, ret);
+ }
xfs_rw_iunlock(ip, XFS_IOLOCK_SHARED);
+ file_accessed(iocb->ki_filp);
return ret;
}
--
2.1.4
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2016-06-22 15:27 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-22 15:27 xfs: untangle the direct I/O and DAX path, fix DAX locking Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
[not found] ` <1466609236-23801-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2016-06-22 15:27 ` [PATCH 1/8] xfs: don't pass ioflags around in the ioctl path Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-22 15:27 ` [PATCH 2/8] xfs: kill ioflags Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-22 15:27 ` [PATCH 3/8] xfs: remove s_maxbytes enforcement in xfs_file_read_iter Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-22 15:27 ` [PATCH 4/8] xfs: split xfs_file_read_iter into buffered and direct I/O helpers Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig [this message]
2016-06-22 15:27 ` [PATCH 5/8] xfs: stop using generic_file_read_iter for direct I/O Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-22 15:27 ` [PATCH 6/8] xfs: direct calls in the direct I/O path Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-22 15:27 ` [PATCH 7/8] xfs: split direct I/O and DAX path Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
[not found] ` <1466609236-23801-8-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2016-09-29 2:53 ` Darrick J. Wong
2016-09-29 2:53 ` Darrick J. Wong
2016-09-29 2:53 ` Darrick J. Wong
2016-09-29 8:38 ` aio completions vs file_accessed race, was: " Christoph Hellwig
2016-09-29 8:38 ` Christoph Hellwig
2016-09-29 20:18 ` Christoph Hellwig
2016-09-29 20:18 ` Christoph Hellwig
2016-09-29 20:18 ` Christoph Hellwig
2016-09-29 20:18 ` Christoph Hellwig
2016-09-29 20:33 ` Darrick J. Wong
2016-09-29 20:33 ` Darrick J. Wong
2016-06-22 15:27 ` [PATCH 8/8] xfs: fix locking for DAX writes Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-22 15:27 ` Christoph Hellwig
2016-06-23 14:22 ` Boaz Harrosh
2016-06-23 14:22 ` Boaz Harrosh
2016-06-23 23:24 ` xfs: untangle the direct I/O and DAX path, fix DAX locking Dave Chinner
2016-06-23 23:24 ` Dave Chinner
2016-06-23 23:24 ` Dave Chinner
2016-06-24 1:14 ` Dan Williams
2016-06-24 1:14 ` Dan Williams
2016-06-24 7:13 ` Dave Chinner
2016-06-24 7:13 ` Dave Chinner
2016-06-24 7:31 ` Christoph Hellwig
2016-06-24 7:31 ` Christoph Hellwig
2016-06-24 7:26 ` Christoph Hellwig
2016-06-24 7:26 ` Christoph Hellwig
2016-06-24 7:26 ` Christoph Hellwig
2016-06-24 23:00 ` Dave Chinner
2016-06-24 23:00 ` Dave Chinner
2016-06-28 13:10 ` Christoph Hellwig
2016-06-28 13:10 ` Christoph Hellwig
2016-06-28 13:10 ` Christoph Hellwig
[not found] ` <20160628131059.GA30475-jcswGhMUV9g@public.gmane.org>
2016-06-28 13:27 ` Boaz Harrosh
2016-06-28 13:27 ` Boaz Harrosh
2016-06-28 13:27 ` Boaz Harrosh
[not found] ` <57727B27.7060104-/8YdC2HfS5554TAoqtyWWQ@public.gmane.org>
2016-06-28 13:39 ` Christoph Hellwig
2016-06-28 13:39 ` Christoph Hellwig
2016-06-28 13:39 ` Christoph Hellwig
[not found] ` <20160628133928.GB31283-jcswGhMUV9g@public.gmane.org>
2016-06-28 13:56 ` Boaz Harrosh
2016-06-28 13:56 ` Boaz Harrosh
2016-06-28 13:56 ` Boaz Harrosh
[not found] ` <5772820E.2080403-/8YdC2HfS5554TAoqtyWWQ@public.gmane.org>
2016-06-28 15:39 ` Christoph Hellwig
2016-06-28 15:39 ` Christoph Hellwig
2016-06-28 15:39 ` Christoph Hellwig
[not found] ` <20160628153925.GA2643-jcswGhMUV9g@public.gmane.org>
2016-06-29 12:23 ` Boaz Harrosh
2016-06-29 12:23 ` Boaz Harrosh
2016-06-29 12:23 ` Boaz Harrosh
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=1466609236-23801-6-git-send-email-hch@lst.de \
--to=hch-jcswghmuv9g@public.gmane.org \
--cc=linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-nvdimm-y27Ovi1pjclAfugRpC6u6w@public.gmane.org \
--cc=xfs-VZNHf3L845pBDgjK7y7TUQ@public.gmane.org \
/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.