Skip to content

Commit

Permalink
fs/dcache.c: avoid soft-lockup in dput()
Browse files Browse the repository at this point in the history
We triggered soft-lockup under stress test which
open/access/write/close one file concurrently on more than
five different CPUs:

WARN: soft lockup - CPU#0 stuck for 11s! [who:30631]
...
[<ffffffc0003986f8>] dput+0x100/0x298
[<ffffffc00038c2dc>] terminate_walk+0x4c/0x60
[<ffffffc00038f56c>] path_lookupat+0x5cc/0x7a8
[<ffffffc00038f780>] filename_lookup+0x38/0xf0
[<ffffffc000391180>] user_path_at_empty+0x78/0xd0
[<ffffffc0003911f4>] user_path_at+0x1c/0x28
[<ffffffc00037d4fc>] SyS_faccessat+0xb4/0x230

->d_lock trylock may failed many times because of concurrently
operations, and dput() may execute a long time.

Fix this by replacing cpu_relax() with cond_resched().
dput() used to be sleepable, so make it sleepable again
should be safe.

Cc: <[email protected]>
Signed-off-by: Wei Fang <[email protected]>
Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
FWei-HW authored and Al Viro committed Jul 24, 2016
1 parent 285b102 commit 47be618
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions fs/dcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,6 @@ static struct dentry *dentry_kill(struct dentry *dentry)

failed:
spin_unlock(&dentry->d_lock);
cpu_relax();
return dentry; /* try again with same dentry */
}

Expand Down Expand Up @@ -770,6 +769,8 @@ void dput(struct dentry *dentry)
return;

repeat:
might_sleep();

rcu_read_lock();
if (likely(fast_dput(dentry))) {
rcu_read_unlock();
Expand Down Expand Up @@ -803,8 +804,10 @@ void dput(struct dentry *dentry)

kill_it:
dentry = dentry_kill(dentry);
if (dentry)
if (dentry) {
cond_resched();
goto repeat;
}
}
EXPORT_SYMBOL(dput);

Expand Down

0 comments on commit 47be618

Please sign in to comment.