Skip to contentSkip to conversation

ocfs2: fix circular locking dependency in reflink

PATCH In review Joseph Qi 2 participants 4 messages Jul 31 – Aug 4 OCFS2

lore
Share & tools
lore

Joseph Qi

author maintainer
#0 lore raw

PATCH 1/1 ocfs2: fix circular locking dependency in reflink

Lockdep reports a possible deadlock involving ip_alloc_sem, j_trans_barrier, and ip_xattr_sem:

  Chain exists of:
    &oi->ip_alloc_sem --> &journal->j_trans_barrier --> &oi->ip_xattr_sem

  Possible unsafe locking scenario:
        CPU0                    CPU1
        ----                    ----
   lock(&oi->ip_xattr_sem);
                                lock(&journal->j_trans_barrier);
                                lock(&oi->ip_xattr_sem);

lock(&oi->ip_alloc_sem);

*** DEADLOCK ***

ocfs2_reflink() and ocfs2_try_remove_refcount_tree() acquire ip_xattr_sem before ip_alloc_sem. This is the reverse of the established system-wide ordering where ip_alloc_sem is outer:

- Write paths (e.g. ocfs2_write_begin_nolock) hold ip_alloc_sem and call ocfs2_start_trans(), which takes j_trans_barrier.

- ocfs2_mknod() calls ocfs2_start_trans() (j_trans_barrier) then ocfs2_init_acl(), which takes ip_xattr_sem on the parent dir.

Fix by swapping the lock order in both functions to acquire ip_alloc_sem before ip_xattr_sem, consistent with the rest of the codebase.

Fixes 09bf27a00020 ("ocfs2: Implement ocfs2_reflink.")
Fixes 8b2c0dba5159 ("ocfs2: Call refcount tree remove process properly.")
Reported-by [email protected]
---
 fs/ocfs2/refcounttree.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
fs/ocfs2/refcounttree.c +4 -4
index d9f22b4a2654..c734ce295bf0 100644
@@ -955,8 +955,8 @@ int ocfs2_try_remove_refcount_tree(struct inode *inode,
 	struct ocfs2_inode_info *oi = OCFS2_I(inode);
 	struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
 
-	down_write(&oi->ip_xattr_sem);
 	down_write(&oi->ip_alloc_sem);
+	down_write(&oi->ip_xattr_sem);
 
 	if (oi->ip_clusters)
 		goto out;
@@ -972,8 +972,8 @@ int ocfs2_try_remove_refcount_tree(struct inode *inode,
 	if (ret)
 		mlog_errno(ret);
 out:
-	up_write(&oi->ip_alloc_sem);
 	up_write(&oi->ip_xattr_sem);
+	up_write(&oi->ip_alloc_sem);
 	return 0;
 }
 
@@ -4292,12 +4292,12 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,
 		goto out;
 	}
 
-	down_write(&OCFS2_I(inode)->ip_xattr_sem);
 	down_write(&OCFS2_I(inode)->ip_alloc_sem);
+	down_write(&OCFS2_I(inode)->ip_xattr_sem);
 	error = __ocfs2_reflink(old_dentry, old_bh,
 				new_orphan_inode, preserve);
-	up_write(&OCFS2_I(inode)->ip_alloc_sem);
 	up_write(&OCFS2_I(inode)->ip_xattr_sem);
+	up_write(&OCFS2_I(inode)->ip_alloc_sem);
 
 	ocfs2_inode_unlock(inode, 1);
 	ocfs2_rw_unlock(inode, 1);
Signature · 1 line
2.39.3
#1 lore raw
Quoted 3 lines · On Fri, 31 Jul 2026 19:34:25 +0800 Joseph Qi <[email protected]>…

Lockdep reports a possible deadlock involving ip_alloc_sem, j_trans_barrier, and ip_xattr_sem:

Cool.

Sashiko said a couple of things:

	https://sashiko.dev/#/patchset/[email protected]
Quoted 6 lines

Fix by swapping the lock order in both functions to acquire ip_alloc_sem before ip_xattr_sem, consistent with the rest of the codebase.

Fixes 09bf27a00020 ("ocfs2: Implement ocfs2_reflink.")
Fixes 8b2c0dba5159 ("ocfs2: Call refcount tree remove process properly.")

Should we backport this into -stable kernels?

author maintainer
#2 lore raw
Quoted 11 lines · Andrew Morton
Quoted 3 lines · On Fri, 31 Jul 2026 19:34:25 +0800 Joseph Qi <[email protected]>…

Lockdep reports a possible deadlock involving ip_alloc_sem, j_trans_barrier, and ip_xattr_sem:

Cool.

Sashiko said a couple of things:

	https://sashiko.dev/#/patchset/[email protected]

Thanks, I'll take a deep look for the sashiko review comments.

Quoted 9 lines
Quoted 6 lines

Fix by swapping the lock order in both functions to acquire ip_alloc_sem before ip_xattr_sem, consistent with the rest of the codebase.

Fixes 09bf27a00020 ("ocfs2: Implement ocfs2_reflink.")
Fixes 8b2c0dba5159 ("ocfs2: Call refcount tree remove process properly.")

Should we backport this into -stable kernels?

Yes, I think it deserves.
Sorry for missing the cc stable tag.

Thanks,
Joseph

author maintainer
#3 lore raw
In reply to Andrew Morton
Quoted 11 lines · Andrew Morton
Quoted 3 lines · On Fri, 31 Jul 2026 19:34:25 +0800 Joseph Qi <[email protected]>…

Lockdep reports a possible deadlock involving ip_alloc_sem, j_trans_barrier, and ip_xattr_sem:

Cool.

Sashiko said a couple of things:

	https://sashiko.dev/#/patchset/[email protected]

The issue sashiko has found is real.

After a deep look, I think it can be fixed by breaking j_trans_barrier -> ip_xattr_sem instread of ip_xattr_sem -> ip_alloc_sem, which is actually posted by Krystian Kaniewski in thread (I've ACKed):
https://lore.kernel.org/ocfs2-devel/[email protected]/T/#t

So please drop this patch and let's keep the existing order for ip_xattr_sem -> ip_alloc_sem.

Thanks,
Joseph

Quoted 9 lines
Quoted 6 lines

Fix by swapping the lock order in both functions to acquire ip_alloc_sem before ip_xattr_sem, consistent with the rest of the codebase.

Fixes 09bf27a00020 ("ocfs2: Implement ocfs2_reflink.")
Fixes 8b2c0dba5159 ("ocfs2: Call refcount tree remove process properly.")

Should we backport this into -stable kernels?