Patch "deal with deadlock in d_walk()" has been added to the 3.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
deal with deadlock in d_walk()
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
deal-with-deadlock-in-d_walk.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
ca5358ef75fc69fee5322a38a340f5739d997c10Mon Sep 17 00:00:00 2001
From: Al Viro <[email protected]>
Date: Sun, 26 Oct 2014 19:31:10 -0400
Subject: deal with deadlock in d_walk()
From: Al Viro <[email protected]>
commit ca5358ef75fc69fee5322a38a340f5739d997c10 upstream.
... by not hitting rename_retry for reasons other than rename having happened. In other words, do _not_ restart when finding that between unlocking the child and locking the parent the former got into __dentry_kill(). Skip the killed siblings instead...
[hujianyang: Backported to 3.14 refer to the work of Ben Hutchings in 3.2:
- Adjust context to make __dentry_kill() apply to d_kill()]
--- fs/dcache.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
fs/dcache.c +16 -15
@@ -435,7 +435,7 @@ static struct dentry *d_kill(struct dent __releases(parent->d_lock) __releases(dentry->d_inode->i_lock) { -list_del (&dentry->d_child); +__list_del_entry (&dentry->d_child);/* * Inform d_walk() that we are no longer attached to the * dentry tree
@@ -1123,33 +1123,31 @@ resume:/* * All done at this level ... ascend and resume the search. */ +rcu_read_lock (); +ascend:if (this_parent != parent) {struct dentry *child = this_parent; this_parent = child->d_parent; -rcu_read_lock ();spin_unlock (&child->d_lock);spin_lock (&this_parent->d_lock); -/* -* might go back up the wrong parent if we have had a rename -* or deletion -*/ -if (this_parent != child->d_parent || - (child->d_flags &DCACHE_DENTRY_KILLED ) || -need_seqretry (&rename_lock, seq)) { -spin_unlock (&this_parent->d_lock); -rcu_read_unlock (); +/* might go back up the wrong parent if we have had a rename. */ +if (need_seqretry (&rename_lock, seq)) goto rename_retry; + next = child->d_child.next; +while (unlikely (child->d_flags &DCACHE_DENTRY_KILLED )) { +if (next == &this_parent->d_subdirs) + goto ascend; + child = list_entry(next, struct dentry, d_child); + next = next->next; }rcu_read_unlock (); - next = child->d_child.next; goto resume; } -if (need_seqretry (&rename_lock, seq)) { -spin_unlock (&this_parent->d_lock); +if (need_seqretry (&rename_lock, seq)) goto rename_retry; - } +rcu_read_unlock ();if (finish)finish (data);
@@ -1159,6 +1157,9 @@ out_unlock:return ; rename_retry: +spin_unlock (&this_parent->d_lock); +rcu_read_unlock (); +BUG_ON (seq &1 );if (!retry)return ; seq =1 ;
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/deal-with-deadlock-in-d_walk.patch