From: Hugh Dickins <hughd@google.com>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Nick Piggin <npiggin@kernel.dk>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH] vfs: fix race in rcu lookup of pruned dentry
Date: Sun, 17 Jul 2011 14:03:44 -0700 (PDT) [thread overview]
Message-ID: <alpine.LSU.2.00.1107171356480.3175@sister.anvils> (raw)
Since the RCU dcache lookup came in, on five occasions a "cp -a" in my dual
kbuild swapping tests has failed because a source file vanished momentarily
e.g. cp: cannot open `/usr/src/linux/include/linux/cramfs_fs.h' for reading:
No such file or directory
That -ENOENT in walk_component: isn't it assuming we found a negative
dentry, before reaching the read_seqcount_retry which complete_walk
(or nameidata_drop_rcu_last before 3.0) would use to confirm a successful
lookup? And can't memory pressure prune a dentry, coming to dentry_kill
which __d_drops to unhash before dentry_iput resets d_inode to NULL, but
the dentry_rcuwalk_barrier between those is ineffective if the other end
ignores the seqcount?
Move !inode -ENOENT checks from walk_component down into do_lookup,
adding read_seqcount_retry confirmation in the RCU case. And use
path_put_conditional instead of path_to_nameidata (a reverse way of
doing the same) in the non-RCU case, to match the error case just above.
Signed-off-by: Hugh Dickins <hughd@google.com>
Cc: stable@kernel.org
---
I think I now have a faster script (four slightly staggered "cp -a"s of
kernel source, run in limited memory) to reproduce this in hours rather
than weeks; but I'm still calibrating that, cannot yet say whether this
patch fixes it. Sending patch on ahead in case it's obvious to you.
fs/namei.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
--- 3.0-git/fs/namei.c 2011-07-15 19:40:03.269867213 -0700
+++ linux/fs/namei.c 2011-07-17 10:08:17.586475293 -0700
@@ -1173,7 +1173,10 @@ static int do_lookup(struct nameidata *n
goto unlazy;
if (unlikely(path->dentry->d_flags & DCACHE_NEED_AUTOMOUNT))
goto unlazy;
- return 0;
+ if (*inode)
+ return 0;
+ if (!read_seqcount_retry(&dentry->d_seq, nd->seq))
+ return -ENOENT;
unlazy:
if (unlazy_walk(nd, dentry))
return -ECHILD;
@@ -1223,6 +1226,10 @@ retry:
return err;
}
*inode = path->dentry->d_inode;
+ if (!*inode) {
+ path_put_conditional(path, nd);
+ return -ENOENT;
+ }
return 0;
}
@@ -1276,15 +1283,10 @@ static inline int walk_component(struct
if (unlikely(type != LAST_NORM))
return handle_dots(nd, type);
err = do_lookup(nd, name, path, &inode);
- if (unlikely(err)) {
+ if (err) {
terminate_walk(nd);
return err;
}
- if (!inode) {
- path_to_nameidata(path, nd);
- terminate_walk(nd);
- return -ENOENT;
- }
if (unlikely(inode->i_op->follow_link) && follow) {
if (nd->flags & LOOKUP_RCU) {
if (unlikely(unlazy_walk(nd, path->dentry))) {
next reply other threads:[~2011-07-17 21:04 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-17 21:03 Hugh Dickins [this message]
2011-07-17 22:00 ` Linus Torvalds
2011-07-17 22:59 ` Linus Torvalds
2011-07-17 23:26 ` Al Viro
2011-07-17 23:16 ` Al Viro
2011-07-17 23:38 ` Linus Torvalds
2011-07-17 23:47 ` Hugh Dickins
2011-07-18 0:25 ` Al Viro
2011-07-18 1:13 ` Hugh Dickins
2011-07-18 2:08 ` Al Viro
2011-07-18 6:31 ` Linus Torvalds
2011-07-18 14:41 ` Hugh Dickins
2011-07-18 18:11 ` Linus Torvalds
2011-07-18 18:20 ` Al Viro
2011-07-18 19:08 ` Linus Torvalds
2011-07-18 19:20 ` Al Viro
2011-07-18 19:23 ` Al Viro
2011-07-18 19:34 ` Linus Torvalds
2011-07-18 19:04 ` Hugh Dickins
2011-07-18 19:33 ` Linus Torvalds
2011-07-18 19:47 ` Al Viro
2011-07-18 20:24 ` Linus Torvalds
2011-07-18 21:19 ` Hugh Dickins
2011-07-18 21:42 ` Linus Torvalds
2011-07-18 22:43 ` Hugh Dickins
2011-07-18 23:17 ` Al Viro
2011-07-18 23:21 ` Al Viro
2011-07-18 23:27 ` Linus Torvalds
2011-07-18 23:40 ` Al Viro
2011-07-19 2:07 ` Hugh Dickins
2011-07-19 2:14 ` Linus Torvalds
2011-07-19 2:17 ` Linus Torvalds
2011-07-19 2:23 ` Al Viro
2011-07-19 2:37 ` Chris Ball
2011-07-19 4:41 ` Nicolas Pitre
2011-07-19 2:21 ` Al Viro
2011-07-19 23:45 ` Al Viro
2011-07-19 23:52 ` Al Viro
2011-07-19 23:55 ` Al Viro
2011-07-20 0:47 ` NeilBrown
2011-07-20 1:40 ` Al Viro
2011-07-20 4:52 ` Linus Torvalds
2011-07-19 23:56 ` Linus Torvalds
2011-07-20 0:04 ` Al Viro
2011-07-17 23:53 ` Al Viro
2011-07-17 23:31 ` Hugh Dickins
2011-07-17 23:52 ` Linus Torvalds
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=alpine.LSU.2.00.1107171356480.3175@sister.anvils \
--to=hughd@google.com \
--cc=akpm@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=npiggin@kernel.dk \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/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
all inboxes | Powered by JetHome®