From: Anna Schumaker <Anna.Schumaker@netapp.com>
To: Trond Myklebust <trond.myklebust@primarydata.com>,
<linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v2 11/12] NFS: Remove inode->i_dio_count from the NFS O_DIRECT code
Date: Wed, 22 Jun 2016 13:58:16 -0400 [thread overview]
Message-ID: <74f8a81e-41c2-b28c-0227-780f3d26db75@Netapp.com> (raw)
In-Reply-To: <1466544893-12058-11-git-send-email-trond.myklebust@primarydata.com>
Hi Trond,
On 06/21/2016 05:34 PM, Trond Myklebust wrote:
> Now that we can serialise O_DIRECT and write/truncate using the
> inode->i_rwsem, we no longer need inode->i_dio_count.
I'm seeing cthon basic tests fail on all NFS versions after applying this patch:
./test5: read and write
./test5: (/nfs/basic) 'bigfile' has size 8192, should be 1048576
basic tests failed
Just thought you should know :)
Anna
>
> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
> ---
> fs/nfs/direct.c | 12 +++---------
> fs/nfs/file.c | 2 --
> fs/nfs/inode.c | 1 -
> 3 files changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
> index 2333e9973802..92267316290a 100644
> --- a/fs/nfs/direct.c
> +++ b/fs/nfs/direct.c
> @@ -385,11 +385,6 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq, bool write)
> spin_unlock(&inode->i_lock);
> }
>
> - if (write)
> - nfs_zap_mapping(inode, inode->i_mapping);
> -
> - inode_dio_end(inode);
> -
> if (dreq->iocb) {
> long res = (long) dreq->error;
> if (!res)
> @@ -488,7 +483,6 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq,
> &nfs_direct_read_completion_ops);
> get_dreq(dreq);
> desc.pg_dreq = dreq;
> - inode_dio_begin(inode);
>
> while (iov_iter_count(iter)) {
> struct page **pagevec;
> @@ -540,7 +534,6 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq,
> * generic layer handle the completion.
> */
> if (requested_bytes == 0) {
> - inode_dio_end(inode);
> nfs_direct_req_release(dreq);
> return result < 0 ? result : -EIO;
> }
> @@ -770,6 +763,7 @@ static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq)
> static void nfs_direct_write_schedule_work(struct work_struct *work)
> {
> struct nfs_direct_req *dreq = container_of(work, struct nfs_direct_req, work);
> + struct inode *inode = dreq->inode;
> int flags = dreq->flags;
>
> dreq->flags = 0;
> @@ -781,6 +775,8 @@ static void nfs_direct_write_schedule_work(struct work_struct *work)
> nfs_direct_write_reschedule(dreq);
> break;
> default:
> + nfs_zap_mapping(inode, inode->i_mapping);
> +
> nfs_direct_complete(dreq, true);
> }
> }
> @@ -903,7 +899,6 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq,
> &nfs_direct_write_completion_ops);
> desc.pg_dreq = dreq;
> get_dreq(dreq);
> - inode_dio_begin(inode);
>
> NFS_I(inode)->write_io += iov_iter_count(iter);
> while (iov_iter_count(iter)) {
> @@ -964,7 +959,6 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq,
> * generic layer handle the completion.
> */
> if (requested_bytes == 0) {
> - inode_dio_end(inode);
> nfs_direct_req_release(dreq);
> return result < 0 ? result : -EIO;
> }
> diff --git a/fs/nfs/file.c b/fs/nfs/file.c
> index b1dd7f2c64f4..fb7a1b0b6a20 100644
> --- a/fs/nfs/file.c
> +++ b/fs/nfs/file.c
> @@ -276,7 +276,6 @@ nfs_file_fsync(struct file *file, loff_t start, loff_t end, int datasync)
>
> trace_nfs_fsync_enter(inode);
>
> - inode_dio_wait(inode);
> do {
> ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
> if (ret != 0)
> @@ -364,7 +363,6 @@ start:
> /*
> * Wait for O_DIRECT to complete
> */
> - inode_dio_wait(mapping->host);
>
> page = grab_cache_page_write_begin(mapping, index, flags);
> if (!page)
> diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
> index bd0390da3344..6bc65ffc3c6c 100644
> --- a/fs/nfs/inode.c
> +++ b/fs/nfs/inode.c
> @@ -141,7 +141,6 @@ void nfs_evict_inode(struct inode *inode)
>
> int nfs_sync_inode(struct inode *inode)
> {
> - inode_dio_wait(inode);
> return nfs_wb_all(inode);
> }
> EXPORT_SYMBOL_GPL(nfs_sync_inode);
>
next prev parent reply other threads:[~2016-06-22 17:58 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-21 21:34 [PATCH v2 01/12] NFS: Don't flush caches for a getattr that races with writeback Trond Myklebust
2016-06-21 21:34 ` [PATCH v2 02/12] NFS: Cache access checks more aggressively Trond Myklebust
2016-06-21 21:34 ` [PATCH v2 03/12] NFS: Cache aggressively when file is open for writing Trond Myklebust
2016-06-21 21:34 ` [PATCH v2 04/12] NFS: Kill NFS_INO_NFS_INO_FLUSHING: it is a performance killer Trond Myklebust
2016-06-21 21:34 ` [PATCH v2 05/12] NFS: writepage of a single page should not be synchronous Trond Myklebust
2016-06-21 21:34 ` [PATCH v2 06/12] NFS: Don't hold the inode lock across fsync() Trond Myklebust
2016-06-21 21:34 ` [PATCH v2 07/12] NFS: Don't call COMMIT in ->releasepage() Trond Myklebust
2016-06-21 21:34 ` [PATCH v2 08/12] NFS: Fix O_DIRECT verifier problems Trond Myklebust
2016-06-21 21:34 ` [PATCH v2 09/12] NFS: Ensure we reset the write verifier 'committed' value on resend Trond Myklebust
2016-06-21 21:34 ` [PATCH v2 10/12] NFS: Do not serialise O_DIRECT reads and writes Trond Myklebust
2016-06-21 21:34 ` [PATCH v2 11/12] NFS: Remove inode->i_dio_count from the NFS O_DIRECT code Trond Myklebust
2016-06-21 21:34 ` [PATCH v2 12/12] NFS: Clean up nfs_direct_complete() Trond Myklebust
2016-06-22 16:43 ` Christoph Hellwig
2016-06-22 16:42 ` [PATCH v2 11/12] NFS: Remove inode->i_dio_count from the NFS O_DIRECT code Christoph Hellwig
2016-06-22 16:58 ` Trond Myklebust
2016-06-23 10:19 ` Christoph Hellwig
2016-06-22 17:58 ` Anna Schumaker [this message]
2016-06-22 18:06 ` Trond Myklebust
2016-06-22 18:08 ` Anna Schumaker
2016-06-22 18:51 ` Anna Schumaker
2016-06-22 19:42 ` Trond Myklebust
2016-06-22 16:47 ` [PATCH v2 10/12] NFS: Do not serialise O_DIRECT reads and writes Christoph Hellwig
2016-06-22 17:24 ` Trond Myklebust
2016-06-23 11:00 ` Christoph Hellwig
2016-06-21 22:25 ` [PATCH v2 03/12] NFS: Cache aggressively when file is open for writing Oleg Drokin
2016-06-22 13:06 ` Trond Myklebust
2016-06-22 16:19 ` Oleg Drokin
2016-06-22 15:48 ` [PATCH v2 01/12] NFS: Don't flush caches for a getattr that races with writeback Christoph Hellwig
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=74f8a81e-41c2-b28c-0227-780f3d26db75@Netapp.com \
--to=anna.schumaker@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.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).