fs/ocfs2: fix race in ocfs2_dentry_attach_lock()
Subsystems (2)
PATCH 6/16 fs/ocfs2: fix race in ocfs2_dentry_attach_lock()
From: Wengang Wang <[email protected]>
Subject: fs/ocfs2: fix race in ocfs2_dentry_attach_lock()
ocfs2_dentry_attach_lock() can be executed in parallel threads against the same dentry. Make that race safe. The race is like this:
thread A thread B
(A1) enter ocfs2_dentry_attach_lock,
seeing dentry->d_fsdata is NULL,
and no alias found byocfs2_find_local_alias, so kmalloc
a new ocfs2_dentry_lock structure
to local variable "dl", dl1
.....
(B1) enter ocfs2_dentry_attach_lock, seeing dentry->d_fsdata is NULL, and no alias found by ocfs2_find_local_alias so kmalloc a new ocfs2_dentry_lock structure to local variable "dl", dl2.
......
(A2) set dentry->d_fsdata with dl1,
call ocfs2_dentry_lock() and increasedl1->dl_lockres.l_ro_holders to 1 on
success.
......
(B2) set dentry->d_fsdata with dl2
call ocfs2_dentry_lock() and increase
dl2->dl_lockres.l_ro_holders to 1 on
success.
......(A3) call ocfs2_dentry_unlock()
and decreasedl2->dl_lockres.l_ro_holders to 0
on success.
....
(B3) call ocfs2_dentry_unlock(),
decreasing
dl2->dl_lockres.l_ro_holders, but
see it's zero now, panic---
fs/ocfs2/dcache.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
fs/ocfs2/dcache.c renamed from fs/ocfs2/dcache.c~fs-ocfs2-fix-race-in-ocfs2_dentry_attach_lock +12 -0
@@ -296,6 +296,18 @@ int ocfs2_dentry_attach_lock(struct dent out_attach:spin_lock (&dentry_attach_lock); +if (unlikely (dentry->d_fsdata && !alias)) { +/* d_fsdata is set by a racing thread which is doing +* the same thing as this thread is doing. Leave the racing +* thread going ahead and we return here. +*/ +spin_unlock (&dentry_attach_lock); +iput (dl->dl_inode); +ocfs2_lock_res_free (&dl->dl_lockres); +kfree (dl); +return 0 ; + } + dentry->d_fsdata = dl; dl->dl_count++;spin_unlock (&dentry_attach_lock);
_