deal with deadlock in d_walk()
Subsystems (2)
Greg KH
maintainerQuoted 11 lines · hujianyang
From: Al Viro <[email protected]>
commit
ca5358ef75fc69fee5322a38a340f5739d997c10upstream.... by not hitting
rename_retryfor 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...Signed-off-by Al Viro <[email protected]>Cc Ben Hutchings <[email protected]>
Quoted 8 lines
[hujianyang: Backported to 3.10 refer to the work of Ben Hutchings in 3.2:
- As we only havetry_to_ascend()and notd_walk(), apply this change to all callers oftry_to_ascend()
- Adjust context to make__dentry_kill()apply tod_kill()]Signed-off-by hujianyang <[email protected]>--- fs/dcache.c | 102 ++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 62 insertions(+), 40 deletions(-)
Can you provide a version for 3.14-stable as well?
thanks,
greg k-h
Quoted 21 lines · Greg KH
Quoted 11 lines · hujianyang
From: Al Viro <[email protected]>
commit
ca5358ef75fc69fee5322a38a340f5739d997c10upstream.... by not hitting
rename_retryfor 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...Signed-off-by Al Viro <[email protected]>Cc Ben Hutchings <[email protected]>Quoted 8 lines
[hujianyang: Backported to 3.10 refer to the work of Ben Hutchings in 3.2:
- As we only havetry_to_ascend()and notd_walk(), apply this change to all callers oftry_to_ascend()
- Adjust context to make__dentry_kill()apply tod_kill()]Signed-off-by hujianyang <[email protected]>--- fs/dcache.c | 102 ++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 62 insertions(+), 40 deletions(-)
Quoted 8 lines
Can you provide a version for 3.14-stable as well?
thanks,
greg k-h
.
Hi Greg,
Sorry for my delay.
Here is the patch for 3.14-stable. Since we have 'd_walk()' in 3.14-stable, we could just apply changes as same as original patch and do not need to apply Ben's fix, commit 20defcec264c from 3.2.y.
Thanks!
Also thanks for the help from Ben!
Hu
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 files changed, 16 insertions(+), 15 deletions(-)
fs/dcache.c +16 -15
@@ -435,7 +435,7 @@ static struct dentry *d_kill(struct dentry *dentry, struct dentry *parent) __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 ;
Signature · 1 line
1.6.0.2
Greg KH
maintainerQuoted 35 lines · hujianyang
Quoted 21 lines · Greg KH
Quoted 11 lines · hujianyang
From: Al Viro <[email protected]>
commit
ca5358ef75fc69fee5322a38a340f5739d997c10upstream.... by not hitting
rename_retryfor 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...Signed-off-by Al Viro <[email protected]>Cc Ben Hutchings <[email protected]>Quoted 8 lines
[hujianyang: Backported to 3.10 refer to the work of Ben Hutchings in 3.2:
- As we only havetry_to_ascend()and notd_walk(), apply this change to all callers oftry_to_ascend()
- Adjust context to make__dentry_kill()apply tod_kill()]Signed-off-by hujianyang <[email protected]>--- fs/dcache.c | 102 ++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 62 insertions(+), 40 deletions(-)Quoted 8 lines
Can you provide a version for 3.14-stable as well?
thanks,
greg k-h
.
Hi Greg,
Sorry for my delay.
Quoted 8 lines
Here is the patch for 3.14-stable. Since we have '
d_walk()' in 3.14-stable, we could just apply changes as same as original patch and do not need to apply Ben's fix, commit20defcec264cfrom 3.2.y.Thanks!
Also thanks for the help from Ben!Hu
Great, thanks for this, now queued up.
greg k-h