dcache d_drop() bug fix / __d_drop() use fix
Subsystems (3)
PATCH 1/1 dcache d_drop() bug fix / __d_drop() use fix
This is a re-submission of the patch I sent about a month ago.
While working on my code I realized that d_drop() might race against __d_lookup(). __d_drop() (which is called by d_drop() after acquiring the dcache_lock) is accessing dentry->d_flags to set the DCACHE_UNHASHED flag. This shouldn't be done without holding dentry->d_lock, like stated in dcache.h:
struct dentry {
...
unsigned int d_flags; /* protected by d_lock */
...
};Therefore d_drop() must acquire the dentry->d_lock. Likewise every use of __d_drop() must acquire that lock.
This patch fixes d_drop() and every grep'able __d_drop() use. This patch is against today's http://linux.bkbits.net/linux-2.5.
Comments please,
Jan
fs/autofs4/root.c | 2 ++ fs/dcache.c | 3 +++ fs/namei.c | 14 +++++--------- fs/proc/base.c | 6 +++++- fs/sysfs/inode.c | 6 +++++- include/linux/dcache.h | 2 ++ 6 files changed, 22 insertions(+), 11 deletions(-)
include/linux/dcache.h +2 -0
@@ -186,7 +186,9 @@ static inline void __d_drop(struct dentrstatic inline void d_drop (struct dentry *dentry) {spin_lock (&dcache_lock); +spin_lock (&dentry->d_lock);__d_drop (dentry); +spin_unlock (&dentry->d_lock);spin_unlock (&dcache_lock); }
fs/namei.c +5 -9
@@ -1685,17 +1685,13 @@ out:void dentry_unhash (struct dentry *dentry) {dget (dentry); -spin_lock (&dcache_lock); -switch (atomic_read (&dentry->d_count)) { -default : -spin_unlock (&dcache_lock); +if (atomic_read (&dentry->d_count))shrink_dcache_parent (dentry); -spin_lock (&dcache_lock); -if (atomic_read (&dentry->d_count) !=2 ) -break ; -case 2 : +spin_lock (&dcache_lock); +spin_lock (&dentry->d_lock); +if (atomic_read (&dentry->d_count) ==2 )__d_drop (dentry); - } +spin_unlock (&dentry->d_lock);spin_unlock (&dcache_lock); }
fs/sysfs/inode.c +5 -1
@@ -129,13 +129,17 @@ void sysfs_drop_dentry(struct sysfs_direif (dentry) {spin_lock (&dcache_lock); +spin_lock (&dentry->d_lock);if (!(d_unhashed (dentry) && dentry->d_inode)) {dget_locked (dentry);__d_drop (dentry); +spin_unlock (&dentry->d_lock);spin_unlock (&dcache_lock);simple_unlink (parent->d_inode, dentry); - }else + }else { +spin_unlock (&dentry->d_lock);spin_unlock (&dcache_lock); + } } }
fs/dcache.c +3 -0
@@ -340,13 +340,16 @@ restart: tmp = head;while ((tmp = tmp->next) != head) { struct dentry *dentry = list_entry(tmp, struct dentry, d_alias); +spin_lock (&dentry->d_lock);if (!atomic_read (&dentry->d_count)) {__dget_locked (dentry);__d_drop (dentry); +spin_unlock (&dentry->d_lock);spin_unlock (&dcache_lock);dput (dentry); goto restart; } +spin_unlock (&dentry->d_lock); }spin_unlock (&dcache_lock); }
fs/autofs4/root.c +2 -0
@@ -605,7 +605,9 @@ static int autofs4_dir_rmdir(struct inodspin_unlock (&dcache_lock);return -ENOTEMPTY ; } +spin_lock (&dentry->d_lock);__d_drop (dentry); +spin_unlock (&dentry->d_lock);spin_unlock (&dcache_lock);dput (ino->dentry);
fs/proc/base.c +5 -1
@@ -1630,11 +1630,15 @@ struct dentry *proc_pid_unhash(struct taif (proc_dentry !=NULL ) {spin_lock (&dcache_lock); +spin_lock (&proc_dentry->d_lock);if (!d_unhashed (proc_dentry)) {dget_locked (proc_dentry);__d_drop (proc_dentry); - }else +spin_unlock (&proc_dentry->d_lock); + }else { +spin_unlock (&proc_dentry->d_lock); proc_dentry =NULL ; + }spin_unlock (&dcache_lock); }return proc_dentry;
Quoted 7 lines · Jan Blunck
This is a re-submission of the patch I sent about a month ago.
While working on my code I realized that
d_drop()might race against__d_lookup().__d_drop()(which is called byd_drop()after acquiring thedcache_lock) is accessingdentry->d_flagsto set theDCACHE_UNHASHEDflag. This shouldn't be done without holdingdentry->d_lock, like stated indcache.h:struct dentry {
...
unsigned intd_flags; /* protected byd_lock*/
Quoted 7 lines
... };Therefore
d_drop()must acquire thedentry->d_lock. Likewise every use of__d_drop()must acquire that lock.This patch fixes
d_drop()and every grep'able__d_drop()use. This patch is against today's http://linux.bkbits.net/linux-2.5.
For my part, in autofs4, I would prefer:
fs/autofs4/root.c renamed from fs/autofs4/root.c.d_lock +1 -1
@@ -621,7 +621,7 @@spin_unlock (&dcache_lock);return -ENOTEMPTY ; } -__d_drop (dentry); +d_drop (dentry);spin_unlock (&dcache_lock);dput (ino->dentry);
==> Regarding Re: [PATCH] dcache d_drop() bug fix / __d_drop() use fix; [email protected] adds:
Quoted 14 lines · Jan Blunck
Quoted 14 lines
This is a re-submission of the patch I sent about a month ago.
While working on my code I realized that
d_drop()might race against__d_lookup().__d_drop()(which is called byd_drop()after acquiring thedcache_lock) is accessingdentry->d_flagsto set theDCACHE_UNHASHEDflag. This shouldn't be done without holdingdentry->d_lock, like stated indcache.h:struct dentry {
...
unsigned intd_flags; /* protected byd_lock*/
...
};
Quoted 6 lines
Quoted 6 lines
Therefore
d_drop()must acquire thedentry->d_lock. Likewise every use of__d_drop()must acquire that lock.This patch fixes
d_drop()and every grep'able__d_drop()use. This patch is against today's http://linux.bkbits.net/linux-2.5.
raven> For my part, in autofs4, I would prefer:
fs/autofs4/root.c line 627
Quoted 11 lines
fs/autofs4/root.c renamed from fs/autofs4/root.c.d_lock +1
-1@@ -621,7 +621,7 @@spin_unlock (&dcache_lock);return -ENOTEMPTY ; } -__d_drop (dentry); +d_drop (dentry);spin_unlock (&dcache_lock);dput (ino->dentry);
Ian, this would deadlock. You already hold the dcache lock here, and d_drop takes it:
static inline void d_drop(struct dentry *dentry)
{
spin_lock(&dcache_lock);
__d_drop(dentry);
spin_unlock(&dcache_lock);
}The proposed patch was to take the dentry->d_lock.
-Jeff
Quoted 36 lines · Jeff Moyer
==> Regarding Re: [PATCH] dcache
d_drop()bug fix /__d_drop()use fix; [email protected] adds:Quoted 14 lines · Jan Blunck
Quoted 14 lines
This is a re-submission of the patch I sent about a month ago.
While working on my code I realized that
d_drop()might race against__d_lookup().__d_drop()(which is called byd_drop()after acquiring thedcache_lock) is accessingdentry->d_flagsto set theDCACHE_UNHASHEDflag. This shouldn't be done without holdingdentry->d_lock, like stated indcache.h:struct dentry {
...
unsigned intd_flags; /* protected byd_lock*/
...
};Quoted 6 lines
Quoted 6 lines
Therefore
d_drop()must acquire thedentry->d_lock. Likewise every use of__d_drop()must acquire that lock.This patch fixes
d_drop()and every grep'able__d_drop()use. This patch is against today's http://linux.bkbits.net/linux-2.5.raven> For my part, in autofs4, I would prefer:
Quoted 9 lines
fs/autofs4/root.c renamed from fs/autofs4/root.c.d_lock +1
-1@@ -621,7 +621,7 @@spin_unlock (&dcache_lock);return -ENOTEMPTY ; } -__d_drop (dentry); +d_drop (dentry);spin_unlock (&dcache_lock);
Quoted 4 lines
fs/autofs4/root.c line 627
Quoted 1 line
fs/autofs4/root.c renamed from fs/autofs4/root.c.d_lock +0
-0dput (ino->dentry);Ian, this would deadlock. You already hold the dcache lock here, and
d_droptakes it:
Ha!
Yes. There is a difference between d_lock and dcache_lock. I need glasses!
Please ignore what I said.
Ian