All of lore.kernel.org
 help / color / mirror / Atom feed
From: Trond Myklebust <trond.myklebust@primarydata.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 02/12] NFS: Cache access checks more aggressively
Date: Tue, 14 Jun 2016 15:05:05 -0400	[thread overview]
Message-ID: <1465931115-30784-2-git-send-email-trond.myklebust@primarydata.com> (raw)
In-Reply-To: <1465931115-30784-1-git-send-email-trond.myklebust@primarydata.com>

If an attribute revalidation fails, then we already know that we'll
zap the access cache. If, OTOH, the inode isn't changing, there should
be no need to eject access calls just because they are old.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
 fs/nfs/dir.c | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index aaf7bd0cbae2..d76f0b2b3ee2 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -2232,17 +2232,30 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str
 {
 	struct nfs_inode *nfsi = NFS_I(inode);
 	struct nfs_access_entry *cache;
-	int err = -ENOENT;
+	bool retry = true;
+	int err;
 
 	spin_lock(&inode->i_lock);
-	if (nfsi->cache_validity & NFS_INO_INVALID_ACCESS)
-		goto out_zap;
-	cache = nfs_access_search_rbtree(inode, cred);
-	if (cache == NULL)
-		goto out;
-	if (!nfs_have_delegated_attributes(inode) &&
-	    !time_in_range_open(jiffies, cache->jiffies, cache->jiffies + nfsi->attrtimeo))
-		goto out_stale;
+	for(;;) {
+		if (nfsi->cache_validity & NFS_INO_INVALID_ACCESS)
+			goto out_zap;
+		cache = nfs_access_search_rbtree(inode, cred);
+		err = -ENOENT;
+		if (cache == NULL)
+			goto out;
+		/* Found an entry, is our attribute cache valid? */
+		if (!nfs_attribute_cache_expired(inode) &&
+		    !(nfsi->cache_validity & NFS_INO_INVALID_ATTR))
+			break;
+		if (!retry)
+			goto out_zap;
+		spin_unlock(&inode->i_lock);
+		err = __nfs_revalidate_inode(NFS_SERVER(inode), inode);
+		if (err)
+			return err;
+		spin_lock(&inode->i_lock);
+		retry = false;
+	}
 	res->jiffies = cache->jiffies;
 	res->cred = cache->cred;
 	res->mask = cache->mask;
@@ -2251,12 +2264,6 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str
 out:
 	spin_unlock(&inode->i_lock);
 	return err;
-out_stale:
-	rb_erase(&cache->rb_node, &nfsi->access_cache);
-	list_del(&cache->lru);
-	spin_unlock(&inode->i_lock);
-	nfs_access_free_entry(cache);
-	return -ENOENT;
 out_zap:
 	spin_unlock(&inode->i_lock);
 	nfs_access_zap_cache(inode);
@@ -2283,13 +2290,12 @@ static int nfs_access_get_cached_rcu(struct inode *inode, struct rpc_cred *cred,
 		cache = NULL;
 	if (cache == NULL)
 		goto out;
-	if (!nfs_have_delegated_attributes(inode) &&
-	    !time_in_range_open(jiffies, cache->jiffies, cache->jiffies + nfsi->attrtimeo))
+	err = nfs_revalidate_inode_rcu(NFS_SERVER(inode), inode);
+	if (err)
 		goto out;
 	res->jiffies = cache->jiffies;
 	res->cred = cache->cred;
 	res->mask = cache->mask;
-	err = 0;
 out:
 	rcu_read_unlock();
 	return err;
-- 
2.5.5


  reply	other threads:[~2016-06-14 19:05 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-14 19:05 [PATCH 01/12] NFS: Don't flush caches for a getattr that races with writeback Trond Myklebust
2016-06-14 19:05 ` Trond Myklebust [this message]
2016-06-14 19:05   ` [PATCH 03/12] NFS: Cache aggressively when file is open for writing Trond Myklebust
2016-06-14 19:05     ` [PATCH 04/12] NFS: Kill NFS_INO_NFS_INO_FLUSHING: it is a performance killer Trond Myklebust
2016-06-14 19:05       ` [PATCH 05/12] NFS: writepage of a single page should not be synchronous Trond Myklebust
2016-06-14 19:05         ` [PATCH 06/12] NFS: Don't hold the inode lock across fsync() Trond Myklebust
2016-06-14 19:05           ` [PATCH 07/12] NFS: Don't enable deep stack recursion when doing memory reclaim Trond Myklebust
2016-06-14 19:05             ` [PATCH 08/12] NFS: Fix O_DIRECT verifier problems Trond Myklebust
2016-06-14 19:05               ` [PATCH 09/12] NFS: Ensure we reset the write verifier 'committed' value on resend Trond Myklebust
2016-06-14 19:05                 ` [PATCH 10/12] NFS: Do not serialise O_DIRECT reads and writes Trond Myklebust
2016-06-14 19:05                   ` [PATCH 11/12] NFS: Don't count O_DIRECT reads in the inode->i_dio_count Trond Myklebust
2016-06-14 19:05                     ` [PATCH 12/12] NFS: Clean up nfs_direct_complete() Trond Myklebust
2016-06-15  7:16                     ` [PATCH 11/12] NFS: Don't count O_DIRECT reads in the inode->i_dio_count Christoph Hellwig
2016-06-15 14:36                       ` Trond Myklebust
2016-06-15 14:41                         ` Christoph Hellwig
2016-06-15 14:50                           ` Trond Myklebust
2016-06-15 14:53                             ` Christoph Hellwig
2016-06-15  7:13                   ` [PATCH 10/12] NFS: Do not serialise O_DIRECT reads and writes Christoph Hellwig
2016-06-15 14:29                     ` Trond Myklebust
2016-06-15 14:48                       ` Christoph Hellwig
2016-06-15 14:48                         ` Christoph Hellwig
2016-06-15 14:52                         ` Trond Myklebust
2016-06-15 14:52                           ` Trond Myklebust
2016-06-15 14:56                           ` Christoph Hellwig
2016-06-15 14:56                             ` Christoph Hellwig
2016-06-15 15:09                             ` Trond Myklebust
2016-06-15 15:09                               ` Trond Myklebust
2016-06-15 15:14                               ` Christoph Hellwig
2016-06-15 15:14                                 ` Christoph Hellwig
2016-06-15 15:45                                 ` Trond Myklebust
2016-06-15 15:45                                   ` Trond Myklebust
2016-06-16  9:12                                   ` Christoph Hellwig
2016-06-16  9:12                                     ` Christoph Hellwig
2016-06-15  7:09             ` [PATCH 07/12] NFS: Don't enable deep stack recursion when doing memory reclaim Christoph Hellwig
2016-06-15  7:08           ` [PATCH 06/12] NFS: Don't hold the inode lock across fsync() Christoph Hellwig
2016-06-15 14:47             ` Trond Myklebust
2016-06-15 14:54               ` Christoph Hellwig
2016-06-17  1:11     ` [PATCH 03/12] NFS: Cache aggressively when file is open for writing Oleg Drokin
2016-06-17 14:01       ` Trond Myklebust

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=1465931115-30784-2-git-send-email-trond.myklebust@primarydata.com \
    --to=trond.myklebust@primarydata.com \
    --cc=linux-nfs@vger.kernel.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.