vfs: make real_lookup do dentry revalidation with i_mutex held
PATCH 7/9 vfs: make real_lookup do dentry revalidation with i_mutex held
From: Sage Weil <[email protected]>
real_lookup() is called by do_lookup() if dentry revalidation fails. If the cache is re-populated while waiting for i_mutex, it may find that a d_lookup() subsequently succeeds (see the "Uhhuh! Nasty case" comment).
Previously, real_lookup() would drop i_mutex and do_revalidate() again. If revalidate failed _again_, however, it would give up with -ENOENT. The problem here that network file systems may be invalidating dentries via server callbacks, e.g. due to concurrent access from another client, and -ENOENT is frequently the wrong answer.
This problem has been seen with both Lustre and Ceph. It seems possible to hit this case with NFS as well if the cache lifetime is very short.
Instead, we should do_revalidate() while i_mutex is still held. If revalidation fails, we can move on to a ->lookup() and ensure a correct result without worrying about any subsequent races.
Note that do_revalidate() is called with i_mutex held elsewhere. For example, do_filp_open(), lookup_create(), do_unlinkat(), do_rmdir(), and possibly others all take the directory i_mutex, and then
-> lookup_hash
-> __lookup_hash
-> cached_lookup
-> do_revalidateso this does not introduce any new locking rules for d_revalidate implementations.
Yes, the goto is ugly. A cleanup patch follows.
---
fs/namei.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/namei.c renamed from fs/namei.c~vfs-make-real_lookup-do-dentry-revalidation-with-i_mutex-held +3 -2
@@ -497,6 +497,7 @@ static struct dentry * real_lookup(strucif (!result) {struct dentry *dentry; +do_the_lookup:/* Don't create child dentry for a dead directory. */ result =ERR_PTR (-ENOENT );if (IS_DEADDIR (dir))
@@ -520,12 +521,12 @@ out_unlock:* Uhhuh! Nasty case: the cache was re-populated while * we waited on the semaphore. Need to revalidate. */ -mutex_unlock (&dir->i_mutex);if (result->d_op && result->d_op->d_revalidate) { result =do_revalidate (result, nd);if (!result) - result =ERR_PTR (-ENOENT ); + goto do_the_lookup; } +mutex_unlock (&dir->i_mutex);return result; }
_
Quoted 33 lines · On Tue, 17 Nov 2009, [email protected] wrote:
From: Sage Weil <[email protected]>
real_lookup()is called bydo_lookup()if dentry revalidation fails. If the cache is re-populated while waiting fori_mutex, it may find that ad_lookup()subsequently succeeds (see the "Uhhuh! Nasty case" comment).Previously,
real_lookup()would dropi_mutexanddo_revalidate()again. If revalidate failed _again_, however, it would give up with-ENOENT. The problem here that network file systems may be invalidating dentries via server callbacks, e.g. due to concurrent access from another client, and-ENOENTis frequently the wrong answer.This problem has been seen with both Lustre and Ceph. It seems possible to hit this case with NFS as well if the cache lifetime is very short.
Instead, we should
do_revalidate()whilei_mutexis still held. If revalidation fails, we can move on to a ->lookup() and ensure a correct result without worrying about any subsequent races.Note that
do_revalidate()is called withi_mutexheld elsewhere. For example,do_filp_open(),lookup_create(),do_unlinkat(),do_rmdir(), and possibly others all take the directoryi_mutex, and then->
lookup_hash-> __lookup_hash -> cached_lookup -> do_revalidateso this does not introduce any new locking rules for
d_revalidateimplementations.Yes, the goto is ugly. A cleanup patch follows.
Quoted 7 lines
Cc Ian Kent <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Al Viro <[email protected]>Cc Andreas Dilger <[email protected]>Signed-off-by Yehuda Sadeh <[email protected]>Signed-off-by Sage Weil <[email protected]>Signed-off-by Andrew Morton <[email protected]>