* [PATCH] ext4: skip extra isize expansion on inode eviction to avoid deadlock
@ 2026-06-11 12:45 Yun Zhou
2026-06-11 14:00 ` Jan Kara
2026-06-12 9:58 ` [PATCH v2] ext4: defer iput() in ext4_xattr_block_set() to avoid deadlock with writepages Yun Zhou
0 siblings, 2 replies; 4+ messages in thread
From: Yun Zhou @ 2026-06-11 12:45 UTC (permalink / raw)
To: tytso, adilger.kernel, libaokun, jack, ojaswin, ritesh.list,
yi.zhang, ebiggers, yun.zhou
Cc: linux-ext4, linux-kernel
Expanding extra isize on an inode that is being evicted is pointless
since the inode is about to be deleted. Skip it by setting
EXT4_STATE_NO_EXPAND before calling ext4_mark_inode_dirty() in the
eviction path.
This also breaks a circular lock dependency reported by lockdep during
orphan cleanup at mount time:
CPU0 (writeback worker) CPU1 (open)
---- ----
ext4_writepages()
s_writepages_rwsem (read) ext4_create()
ext4_do_writepages() __ext4_new_inode()
ext4_journal_start() [holds jbd2 handle]
wait_transaction_locked() ext4_xattr_set_handle()
[WAIT for jbd2_handle] xattr_sem (write)
CPU2 (mount / orphan cleanup)
----
ext4_evict_inode()
__ext4_mark_inode_dirty()
ext4_try_to_expand_extra_isize()
xattr_sem (write)
ext4_expand_extra_isize_ea()
ext4_xattr_block_set()
iput(ea_inode)
write_inode_now()
ext4_writepages()
s_writepages_rwsem (read)
[WAIT for s_writepages_rwsem -- if blocked by write lock holder]
This forms a circular dependency on lock classes:
s_writepages_rwsem --> jbd2_handle --> xattr_sem --> s_writepages_rwsem
The iput() inside ext4_xattr_block_set() triggers write_inode_now()
because SB_ACTIVE is not yet set during mount, so iput_final() cannot
cache the inode in the LRU and must flush it synchronously.
Setting EXT4_STATE_NO_EXPAND prevents ext4_try_to_expand_extra_isize()
from executing, which eliminates the xattr_sem --> s_writepages_rwsem
edge and breaks the cycle.
Reported-by: syzbot+5d19358d7eb30ffb0cc5@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=5d19358d7eb30ffb0cc5
Fixes: c8585c6fcaf2 ("ext4: fix races between changing inode journal mode and ext4_writepages")
Signed-off-by: Yun Zhou <yun.zhou@windriver.com>
---
fs/ext4/inode.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index cd7588a3fa45..cbfd1d1282e6 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -264,6 +264,12 @@ void ext4_evict_inode(struct inode *inode)
if (ext4_inode_is_fast_symlink(inode))
memset(EXT4_I(inode)->i_data, 0, sizeof(EXT4_I(inode)->i_data));
inode->i_size = 0;
+ /*
+ * Skip extra isize expansion on inodes being deleted -- it is
+ * pointless and can trigger a circular lock dependency:
+ * xattr_sem -> ext4_xattr_block_set -> iput -> s_writepages_rwsem
+ */
+ ext4_set_inode_state(inode, EXT4_STATE_NO_EXPAND);
err = ext4_mark_inode_dirty(handle, inode);
if (err) {
ext4_warning(inode->i_sb,
--
2.43.0
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ext4: skip extra isize expansion on inode eviction to avoid deadlock 2026-06-11 12:45 [PATCH] ext4: skip extra isize expansion on inode eviction to avoid deadlock Yun Zhou @ 2026-06-11 14:00 ` Jan Kara 2026-06-12 9:58 ` [PATCH v2] ext4: defer iput() in ext4_xattr_block_set() to avoid deadlock with writepages Yun Zhou 1 sibling, 0 replies; 4+ messages in thread From: Jan Kara @ 2026-06-11 14:00 UTC (permalink / raw) To: Yun Zhou Cc: tytso, adilger.kernel, libaokun, jack, ojaswin, ritesh.list, yi.zhang, ebiggers, linux-ext4, linux-kernel On Thu 11-06-26 20:45:55, Yun Zhou wrote: > Expanding extra isize on an inode that is being evicted is pointless > since the inode is about to be deleted. Skip it by setting > EXT4_STATE_NO_EXPAND before calling ext4_mark_inode_dirty() in the > eviction path. > > This also breaks a circular lock dependency reported by lockdep during > orphan cleanup at mount time: > > CPU0 (writeback worker) CPU1 (open) > ---- ---- > ext4_writepages() > s_writepages_rwsem (read) ext4_create() > ext4_do_writepages() __ext4_new_inode() > ext4_journal_start() [holds jbd2 handle] > wait_transaction_locked() ext4_xattr_set_handle() > [WAIT for jbd2_handle] xattr_sem (write) > > CPU2 (mount / orphan cleanup) > ---- > ext4_evict_inode() > __ext4_mark_inode_dirty() > ext4_try_to_expand_extra_isize() > xattr_sem (write) > ext4_expand_extra_isize_ea() > ext4_xattr_block_set() > iput(ea_inode) > write_inode_now() > ext4_writepages() > s_writepages_rwsem (read) > [WAIT for s_writepages_rwsem -- if blocked by write lock holder] > > This forms a circular dependency on lock classes: > > s_writepages_rwsem --> jbd2_handle --> xattr_sem --> s_writepages_rwsem > > The iput() inside ext4_xattr_block_set() triggers write_inode_now() > because SB_ACTIVE is not yet set during mount, so iput_final() cannot > cache the inode in the LRU and must flush it synchronously. > > Setting EXT4_STATE_NO_EXPAND prevents ext4_try_to_expand_extra_isize() > from executing, which eliminates the xattr_sem --> s_writepages_rwsem > edge and breaks the cycle. > > Reported-by: syzbot+5d19358d7eb30ffb0cc5@syzkaller.appspotmail.com > Closes: https://syzkaller.appspot.com/bug?extid=5d19358d7eb30ffb0cc5 > Fixes: c8585c6fcaf2 ("ext4: fix races between changing inode journal mode and ext4_writepages") > Signed-off-by: Yun Zhou <yun.zhou@windriver.com> Thanks for the patch! So I have no problem with setting EXT4_STATE_NO_EXPAND in ext4_evict_inode() as you correctly point out expansion is pointless in that case. But your patch actually doesn't fix the real problem, it only deals with the particular syzbot reproducer. The real problem is that ext4_xattr_block_set() which is run inside a transaction can end up acquiring s_writepages_rwsem which violates the lock ordering rules. So this is the problem that really needs to be fixed. Honza -- Jan Kara <jack@suse.com> SUSE Labs, CR ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] ext4: defer iput() in ext4_xattr_block_set() to avoid deadlock with writepages 2026-06-11 12:45 [PATCH] ext4: skip extra isize expansion on inode eviction to avoid deadlock Yun Zhou 2026-06-11 14:00 ` Jan Kara @ 2026-06-12 9:58 ` Yun Zhou 2026-06-12 13:19 ` [PATCH v3] " Yun Zhou 1 sibling, 1 reply; 4+ messages in thread From: Yun Zhou @ 2026-06-12 9:58 UTC (permalink / raw) To: tytso, adilger.kernel, libaokun, jack, ojaswin, ritesh.list, yi.zhang, ebiggers, yun.zhou Cc: linux-ext4, linux-kernel ext4_xattr_block_set() calls iput() on ea_inode while its callers hold xattr_sem. If this iput() drops the last reference, it can trigger write_inode_now() -> ext4_writepages() -> s_writepages_rwsem, which violates the lock ordering since ext4_writepages() already establishes s_writepages_rwsem -> jbd2_handle ordering: CPU0 (writeback worker) CPU1 (file create) ---- ---- ext4_writepages() s_writepages_rwsem (read) ext4_create() ext4_do_writepages() __ext4_new_inode() ext4_journal_start() [holds jbd2 handle] wait_transaction_locked() ext4_xattr_set_handle() [WAIT for jbd2_handle] xattr_sem (write) CPU2 (xattr set or isize expand) ---- ext4_xattr_set_handle() or ext4_try_to_expand_extra_isize() xattr_sem (write) ext4_xattr_block_set() iput(ea_inode) write_inode_now() ext4_writepages() s_writepages_rwsem (read) [DEADLOCK] This forms a circular dependency on lock classes: s_writepages_rwsem --> jbd2_handle --> xattr_sem --> s_writepages_rwsem Fix by deferring iput() calls inside ext4_xattr_block_set() via the existing ext4_xattr_inode_array mechanism. The array is threaded through the call chain and freed by callers after releasing xattr_sem. Reported-by: syzbot+5d19358d7eb30ffb0cc5@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=5d19358d7eb30ffb0cc5 Fixes: c8585c6fcaf2 ("ext4: fix races between changing inode journal mode and ext4_writepages") Signed-off-by: Yun Zhou <yun.zhou@windriver.com> --- v2: Defer iput() in ext4_xattr_block_set() via ea_inode_array, freed after xattr_sem is released. Fixes the root cause. v1: Set EXT4_STATE_NO_EXPAND in ext4_evict_inode() to skip expand on inodes being deleted. Only fixes the syzbot reproducer, not the underlying lock ordering violation. fs/ext4/inode.c | 15 +++++++++++---- fs/ext4/xattr.c | 40 +++++++++++++++++++++++++--------------- fs/ext4/xattr.h | 3 ++- 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index cd7588a3fa45..c6448a9eb1e7 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -6408,7 +6408,8 @@ ext4_reserve_inode_write(handle_t *handle, struct inode *inode, static int __ext4_expand_extra_isize(struct inode *inode, unsigned int new_extra_isize, struct ext4_iloc *iloc, - handle_t *handle, int *no_expand) + handle_t *handle, int *no_expand, + struct ext4_xattr_inode_array **ea_inode_array) { struct ext4_inode *raw_inode; struct ext4_xattr_ibody_header *header; @@ -6453,7 +6454,7 @@ static int __ext4_expand_extra_isize(struct inode *inode, /* try to expand with EAs present */ error = ext4_expand_extra_isize_ea(inode, new_extra_isize, - raw_inode, handle); + raw_inode, handle, ea_inode_array); if (error) { /* * Inode size expansion failed; don't try again @@ -6475,6 +6476,7 @@ static int ext4_try_to_expand_extra_isize(struct inode *inode, { int no_expand; int error; + struct ext4_xattr_inode_array *ea_inode_array = NULL; if (ext4_test_inode_state(inode, EXT4_STATE_NO_EXPAND)) return -EOVERFLOW; @@ -6496,8 +6498,10 @@ static int ext4_try_to_expand_extra_isize(struct inode *inode, return -EBUSY; error = __ext4_expand_extra_isize(inode, new_extra_isize, &iloc, - handle, &no_expand); + handle, &no_expand, + &ea_inode_array); ext4_write_unlock_xattr(inode, &no_expand); + ext4_xattr_inode_array_free(ea_inode_array); return error; } @@ -6509,6 +6513,7 @@ int ext4_expand_extra_isize(struct inode *inode, handle_t *handle; int no_expand; int error, rc; + struct ext4_xattr_inode_array *ea_inode_array = NULL; if (ext4_test_inode_state(inode, EXT4_STATE_NO_EXPAND)) { brelse(iloc->bh); @@ -6534,7 +6539,8 @@ int ext4_expand_extra_isize(struct inode *inode, } error = __ext4_expand_extra_isize(inode, new_extra_isize, iloc, - handle, &no_expand); + handle, &no_expand, + &ea_inode_array); rc = ext4_mark_iloc_dirty(handle, inode, iloc); if (!error) @@ -6542,6 +6548,7 @@ int ext4_expand_extra_isize(struct inode *inode, out_unlock: ext4_write_unlock_xattr(inode, &no_expand); + ext4_xattr_inode_array_free(ea_inode_array); ext4_journal_stop(handle); return error; } diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index e91af66db7a7..bf8424927383 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -1906,7 +1906,8 @@ ext4_xattr_block_find(struct inode *inode, struct ext4_xattr_info *i, static int ext4_xattr_block_set(handle_t *handle, struct inode *inode, struct ext4_xattr_info *i, - struct ext4_xattr_block_find *bs) + struct ext4_xattr_block_find *bs, + struct ext4_xattr_inode_array **ea_inode_array) { struct super_block *sb = inode->i_sb; struct buffer_head *new_bh = NULL; @@ -2158,7 +2159,8 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, ext4_warning_inode(ea_inode, "dec ref error=%d", error); - iput(ea_inode); + ext4_expand_inode_array(ea_inode_array, + ea_inode); ea_inode = NULL; } @@ -2190,12 +2192,12 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, /* Drop the previous xattr block. */ if (bs->bh && bs->bh != new_bh) { - struct ext4_xattr_inode_array *ea_inode_array = NULL; + struct ext4_xattr_inode_array *old_ea_inode_array = NULL; ext4_xattr_release_block(handle, inode, bs->bh, - &ea_inode_array, + &old_ea_inode_array, 0 /* extra_credits */); - ext4_xattr_inode_array_free(ea_inode_array); + ext4_xattr_inode_array_free(old_ea_inode_array); } error = 0; @@ -2211,7 +2213,7 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, ext4_xattr_inode_free_quota(inode, ea_inode, i_size_read(ea_inode)); } - iput(ea_inode); + ext4_expand_inode_array(ea_inode_array, ea_inode); } if (ce) mb_cache_entry_put(ea_block_cache, ce); @@ -2371,6 +2373,7 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, struct ext4_xattr_block_find bs = { .s = { .not_found = -ENODATA, }, }; + struct ext4_xattr_inode_array *ea_inode_array = NULL; int no_expand; int error; @@ -2438,7 +2441,8 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, if (!is.s.not_found) error = ext4_xattr_ibody_set(handle, inode, &i, &is); else if (!bs.s.not_found) - error = ext4_xattr_block_set(handle, inode, &i, &bs); + error = ext4_xattr_block_set(handle, inode, &i, &bs, + &ea_inode_array); } else { error = 0; /* Xattr value did not change? Save us some work and bail out */ @@ -2455,7 +2459,8 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, error = ext4_xattr_ibody_set(handle, inode, &i, &is); if (!error && !bs.s.not_found) { i.value = NULL; - error = ext4_xattr_block_set(handle, inode, &i, &bs); + error = ext4_xattr_block_set(handle, inode, &i, &bs, + &ea_inode_array); } else if (error == -ENOSPC) { if (EXT4_I(inode)->i_file_acl && !bs.s.base) { brelse(bs.bh); @@ -2464,7 +2469,8 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, if (error) goto cleanup; } - error = ext4_xattr_block_set(handle, inode, &i, &bs); + error = ext4_xattr_block_set(handle, inode, &i, &bs, + &ea_inode_array); if (!error && !is.s.not_found) { i.value = NULL; error = ext4_xattr_ibody_set(handle, inode, &i, @@ -2503,6 +2509,7 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, brelse(is.iloc.bh); brelse(bs.bh); ext4_write_unlock_xattr(inode, &no_expand); + ext4_xattr_inode_array_free(ea_inode_array); return error; } @@ -2612,7 +2619,8 @@ static void ext4_xattr_shift_entries(struct ext4_xattr_entry *entry, */ static int ext4_xattr_move_to_block(handle_t *handle, struct inode *inode, struct ext4_inode *raw_inode, - struct ext4_xattr_entry *entry) + struct ext4_xattr_entry *entry, + struct ext4_xattr_inode_array **ea_inode_array) { struct ext4_xattr_ibody_find *is = NULL; struct ext4_xattr_block_find *bs = NULL; @@ -2676,7 +2684,7 @@ static int ext4_xattr_move_to_block(handle_t *handle, struct inode *inode, goto out; /* Move ea entry from the inode into the block */ - error = ext4_xattr_block_set(handle, inode, &i, bs); + error = ext4_xattr_block_set(handle, inode, &i, bs, ea_inode_array); if (error) goto out; @@ -2702,7 +2710,8 @@ static int ext4_xattr_move_to_block(handle_t *handle, struct inode *inode, static int ext4_xattr_make_inode_space(handle_t *handle, struct inode *inode, struct ext4_inode *raw_inode, int isize_diff, size_t ifree, - size_t bfree, int *total_ino) + size_t bfree, int *total_ino, + struct ext4_xattr_inode_array **ea_inode_array) { struct ext4_xattr_ibody_header *header = IHDR(inode, raw_inode); struct ext4_xattr_entry *small_entry; @@ -2752,7 +2761,7 @@ static int ext4_xattr_make_inode_space(handle_t *handle, struct inode *inode, total_size += EXT4_XATTR_SIZE( le32_to_cpu(entry->e_value_size)); error = ext4_xattr_move_to_block(handle, inode, raw_inode, - entry); + entry, ea_inode_array); if (error) return error; @@ -2769,7 +2778,8 @@ static int ext4_xattr_make_inode_space(handle_t *handle, struct inode *inode, * Returns 0 on success or negative error number on failure. */ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, - struct ext4_inode *raw_inode, handle_t *handle) + struct ext4_inode *raw_inode, handle_t *handle, + struct ext4_xattr_inode_array **ea_inode_array) { struct ext4_xattr_ibody_header *header; struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); @@ -2841,7 +2851,7 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, error = ext4_xattr_make_inode_space(handle, inode, raw_inode, isize_diff, ifree, bfree, - &total_ino); + &total_ino, ea_inode_array); if (error) { if (error == -ENOSPC && !tried_min_extra_isize && s_min_extra_isize) { diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h index 1fedf44d4fb6..02a172515193 100644 --- a/fs/ext4/xattr.h +++ b/fs/ext4/xattr.h @@ -192,7 +192,8 @@ extern int ext4_xattr_delete_inode(handle_t *handle, struct inode *inode, extern void ext4_xattr_inode_array_free(struct ext4_xattr_inode_array *array); extern int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, - struct ext4_inode *raw_inode, handle_t *handle); + struct ext4_inode *raw_inode, handle_t *handle, + struct ext4_xattr_inode_array **ea_inode_array); extern void ext4_evict_ea_inode(struct inode *inode); extern const struct xattr_handler * const ext4_xattr_handlers[]; -- 2.43.0 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v3] ext4: defer iput() in ext4_xattr_block_set() to avoid deadlock with writepages 2026-06-12 9:58 ` [PATCH v2] ext4: defer iput() in ext4_xattr_block_set() to avoid deadlock with writepages Yun Zhou @ 2026-06-12 13:19 ` Yun Zhou 0 siblings, 0 replies; 4+ messages in thread From: Yun Zhou @ 2026-06-12 13:19 UTC (permalink / raw) To: tytso, adilger.kernel, libaokun, jack, ojaswin, ritesh.list, yi.zhang, ebiggers, yun.zhou Cc: linux-ext4, linux-kernel ext4_xattr_block_set() calls iput() on ea_inode while its callers hold xattr_sem. If this iput() drops the last reference, it can trigger write_inode_now() -> ext4_writepages() -> s_writepages_rwsem, which violates the lock ordering since ext4_writepages() already establishes s_writepages_rwsem -> jbd2_handle ordering: CPU0 (writeback worker) CPU1 (file create) ---- ---- ext4_writepages() s_writepages_rwsem (read) ext4_create() ext4_do_writepages() __ext4_new_inode() ext4_journal_start() [holds jbd2 handle] wait_transaction_locked() ext4_xattr_set_handle() [WAIT for jbd2_handle] xattr_sem (write) CPU2 (xattr set or isize expand) ---- ext4_xattr_set_handle() or ext4_try_to_expand_extra_isize() xattr_sem (write) ext4_xattr_block_set() iput(ea_inode) write_inode_now() ext4_writepages() s_writepages_rwsem (read) [DEADLOCK] This forms a circular dependency on lock classes: s_writepages_rwsem --> jbd2_handle --> xattr_sem --> s_writepages_rwsem Fix by deferring iput() calls inside ext4_xattr_block_set() via the existing ext4_xattr_inode_array mechanism. The array is threaded through the call chain and freed by callers after releasing xattr_sem. Reported-by: syzbot+5d19358d7eb30ffb0cc5@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=5d19358d7eb30ffb0cc5 Fixes: c8585c6fcaf2 ("ext4: fix races between changing inode journal mode and ext4_writepages") Signed-off-by: Yun Zhou <yun.zhou@windriver.com> --- v3: Address AI review feedback on v2: - Check ext4_expand_inode_array() return value; fallback to direct iput() on ENOMEM to prevent inode leak. - Make ext4_xattr_set_handle() take an optional ea_inode_array output parameter so callers can free after ext4_journal_stop(), avoiding the jbd2_handle vs s_writepages_rwsem AB-BA. - Pass ea_inode_array directly to ext4_xattr_release_block() instead of using a local array freed under xattr_sem. - Move ext4_xattr_inode_array_free() after ext4_journal_stop() v2: Defer iput() in ext4_xattr_block_set() via ea_inode_array, freed after xattr_sem is released. Fixes the root cause. v1: Set EXT4_STATE_NO_EXPAND in ext4_evict_inode() to skip expand on inodes being deleted. Only fixes the syzbot reproducer, not the underlying lock ordering violation. fs/ext4/acl.c | 2 +- fs/ext4/crypto.c | 4 ++-- fs/ext4/inode.c | 13 ++++++---- fs/ext4/xattr.c | 51 ++++++++++++++++++++++++++-------------- fs/ext4/xattr.h | 6 +++-- fs/ext4/xattr_security.c | 3 ++- 6 files changed, 51 insertions(+), 28 deletions(-) diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c index 3bffe862f954..21de8276b558 100644 --- a/fs/ext4/acl.c +++ b/fs/ext4/acl.c @@ -215,7 +215,7 @@ __ext4_set_acl(handle_t *handle, struct inode *inode, int type, } error = ext4_xattr_set_handle(handle, inode, name_index, "", - value, size, xattr_flags); + value, size, xattr_flags, NULL); kfree(value); if (!error) diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c index f41f320f4437..bca760751c1d 100644 --- a/fs/ext4/crypto.c +++ b/fs/ext4/crypto.c @@ -173,7 +173,7 @@ static int ext4_set_context(struct inode *inode, const void *ctx, size_t len, res = ext4_xattr_set_handle(handle, inode, EXT4_XATTR_INDEX_ENCRYPTION, EXT4_XATTR_NAME_ENCRYPTION_CONTEXT, - ctx, len, XATTR_CREATE); + ctx, len, XATTR_CREATE, NULL); if (!res) { ext4_set_inode_flag(inode, EXT4_INODE_ENCRYPT); ext4_clear_inode_state(inode, @@ -202,7 +202,7 @@ static int ext4_set_context(struct inode *inode, const void *ctx, size_t len, res = ext4_xattr_set_handle(handle, inode, EXT4_XATTR_INDEX_ENCRYPTION, EXT4_XATTR_NAME_ENCRYPTION_CONTEXT, - ctx, len, 0); + ctx, len, 0, NULL); if (!res) { ext4_set_inode_flag(inode, EXT4_INODE_ENCRYPT); /* diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index cd7588a3fa45..2cf68d27e896 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -6408,7 +6408,8 @@ ext4_reserve_inode_write(handle_t *handle, struct inode *inode, static int __ext4_expand_extra_isize(struct inode *inode, unsigned int new_extra_isize, struct ext4_iloc *iloc, - handle_t *handle, int *no_expand) + handle_t *handle, int *no_expand, + struct ext4_xattr_inode_array **ea_inode_array) { struct ext4_inode *raw_inode; struct ext4_xattr_ibody_header *header; @@ -6453,7 +6454,7 @@ static int __ext4_expand_extra_isize(struct inode *inode, /* try to expand with EAs present */ error = ext4_expand_extra_isize_ea(inode, new_extra_isize, - raw_inode, handle); + raw_inode, handle, ea_inode_array); if (error) { /* * Inode size expansion failed; don't try again @@ -6475,6 +6476,7 @@ static int ext4_try_to_expand_extra_isize(struct inode *inode, { int no_expand; int error; + struct ext4_xattr_inode_array *ea_inode_array = NULL; if (ext4_test_inode_state(inode, EXT4_STATE_NO_EXPAND)) return -EOVERFLOW; @@ -6496,8 +6498,9 @@ static int ext4_try_to_expand_extra_isize(struct inode *inode, return -EBUSY; error = __ext4_expand_extra_isize(inode, new_extra_isize, &iloc, - handle, &no_expand); + handle, &no_expand, &ea_inode_array); ext4_write_unlock_xattr(inode, &no_expand); + ext4_xattr_inode_array_free(ea_inode_array); return error; } @@ -6509,6 +6512,7 @@ int ext4_expand_extra_isize(struct inode *inode, handle_t *handle; int no_expand; int error, rc; + struct ext4_xattr_inode_array *ea_inode_array = NULL; if (ext4_test_inode_state(inode, EXT4_STATE_NO_EXPAND)) { brelse(iloc->bh); @@ -6534,7 +6538,7 @@ int ext4_expand_extra_isize(struct inode *inode, } error = __ext4_expand_extra_isize(inode, new_extra_isize, iloc, - handle, &no_expand); + handle, &no_expand, &ea_inode_array); rc = ext4_mark_iloc_dirty(handle, inode, iloc); if (!error) @@ -6543,6 +6547,7 @@ int ext4_expand_extra_isize(struct inode *inode, out_unlock: ext4_write_unlock_xattr(inode, &no_expand); ext4_journal_stop(handle); + ext4_xattr_inode_array_free(ea_inode_array); return error; } diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index e91af66db7a7..fa9a16c86fd8 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -1906,7 +1906,8 @@ ext4_xattr_block_find(struct inode *inode, struct ext4_xattr_info *i, static int ext4_xattr_block_set(handle_t *handle, struct inode *inode, struct ext4_xattr_info *i, - struct ext4_xattr_block_find *bs) + struct ext4_xattr_block_find *bs, + struct ext4_xattr_inode_array **ea_inode_array) { struct super_block *sb = inode->i_sb; struct buffer_head *new_bh = NULL; @@ -2158,7 +2159,8 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, ext4_warning_inode(ea_inode, "dec ref error=%d", error); - iput(ea_inode); + if (ext4_expand_inode_array(ea_inode_array, ea_inode)) + iput(ea_inode); ea_inode = NULL; } @@ -2190,12 +2192,9 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, /* Drop the previous xattr block. */ if (bs->bh && bs->bh != new_bh) { - struct ext4_xattr_inode_array *ea_inode_array = NULL; - ext4_xattr_release_block(handle, inode, bs->bh, - &ea_inode_array, + ea_inode_array, 0 /* extra_credits */); - ext4_xattr_inode_array_free(ea_inode_array); } error = 0; @@ -2211,7 +2210,8 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, ext4_xattr_inode_free_quota(inode, ea_inode, i_size_read(ea_inode)); } - iput(ea_inode); + if (ext4_expand_inode_array(ea_inode_array, ea_inode)) + iput(ea_inode); } if (ce) mb_cache_entry_put(ea_block_cache, ce); @@ -2356,7 +2356,7 @@ static struct buffer_head *ext4_xattr_get_block(struct inode *inode) int ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, const char *name, const void *value, size_t value_len, - int flags) + int flags, struct ext4_xattr_inode_array **ea_inode_array) { struct ext4_xattr_info i = { .name_index = name_index, @@ -2371,6 +2371,7 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, struct ext4_xattr_block_find bs = { .s = { .not_found = -ENODATA, }, }; + struct ext4_xattr_inode_array *local_array = NULL; int no_expand; int error; @@ -2379,6 +2380,9 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, if (strlen(name) > 255) return -ERANGE; + if (!ea_inode_array) + ea_inode_array = &local_array; + ext4_write_lock_xattr(inode, &no_expand); /* Check journal credits under write lock. */ @@ -2438,7 +2442,8 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, if (!is.s.not_found) error = ext4_xattr_ibody_set(handle, inode, &i, &is); else if (!bs.s.not_found) - error = ext4_xattr_block_set(handle, inode, &i, &bs); + error = ext4_xattr_block_set(handle, inode, &i, &bs, + ea_inode_array); } else { error = 0; /* Xattr value did not change? Save us some work and bail out */ @@ -2455,7 +2460,8 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, error = ext4_xattr_ibody_set(handle, inode, &i, &is); if (!error && !bs.s.not_found) { i.value = NULL; - error = ext4_xattr_block_set(handle, inode, &i, &bs); + error = ext4_xattr_block_set(handle, inode, &i, &bs, + ea_inode_array); } else if (error == -ENOSPC) { if (EXT4_I(inode)->i_file_acl && !bs.s.base) { brelse(bs.bh); @@ -2464,7 +2470,8 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, if (error) goto cleanup; } - error = ext4_xattr_block_set(handle, inode, &i, &bs); + error = ext4_xattr_block_set(handle, inode, &i, &bs, + ea_inode_array); if (!error && !is.s.not_found) { i.value = NULL; error = ext4_xattr_ibody_set(handle, inode, &i, @@ -2503,6 +2510,7 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, brelse(is.iloc.bh); brelse(bs.bh); ext4_write_unlock_xattr(inode, &no_expand); + ext4_xattr_inode_array_free(local_array); return error; } @@ -2547,6 +2555,7 @@ ext4_xattr_set(struct inode *inode, int name_index, const char *name, { handle_t *handle; struct super_block *sb = inode->i_sb; + struct ext4_xattr_inode_array *ea_inode_array = NULL; int error, retries = 0; int credits; @@ -2567,10 +2576,13 @@ ext4_xattr_set(struct inode *inode, int name_index, const char *name, int error2; error = ext4_xattr_set_handle(handle, inode, name_index, name, - value, value_len, flags); + value, value_len, flags, + &ea_inode_array); ext4_fc_mark_ineligible(inode->i_sb, EXT4_FC_REASON_XATTR, handle); error2 = ext4_journal_stop(handle); + ext4_xattr_inode_array_free(ea_inode_array); + ea_inode_array = NULL; if (error == -ENOSPC && ext4_should_retry_alloc(sb, &retries)) goto retry; @@ -2612,7 +2624,8 @@ static void ext4_xattr_shift_entries(struct ext4_xattr_entry *entry, */ static int ext4_xattr_move_to_block(handle_t *handle, struct inode *inode, struct ext4_inode *raw_inode, - struct ext4_xattr_entry *entry) + struct ext4_xattr_entry *entry, + struct ext4_xattr_inode_array **ea_inode_array) { struct ext4_xattr_ibody_find *is = NULL; struct ext4_xattr_block_find *bs = NULL; @@ -2676,7 +2689,7 @@ static int ext4_xattr_move_to_block(handle_t *handle, struct inode *inode, goto out; /* Move ea entry from the inode into the block */ - error = ext4_xattr_block_set(handle, inode, &i, bs); + error = ext4_xattr_block_set(handle, inode, &i, bs, ea_inode_array); if (error) goto out; @@ -2702,7 +2715,8 @@ static int ext4_xattr_move_to_block(handle_t *handle, struct inode *inode, static int ext4_xattr_make_inode_space(handle_t *handle, struct inode *inode, struct ext4_inode *raw_inode, int isize_diff, size_t ifree, - size_t bfree, int *total_ino) + size_t bfree, int *total_ino, + struct ext4_xattr_inode_array **ea_inode_array) { struct ext4_xattr_ibody_header *header = IHDR(inode, raw_inode); struct ext4_xattr_entry *small_entry; @@ -2752,7 +2766,7 @@ static int ext4_xattr_make_inode_space(handle_t *handle, struct inode *inode, total_size += EXT4_XATTR_SIZE( le32_to_cpu(entry->e_value_size)); error = ext4_xattr_move_to_block(handle, inode, raw_inode, - entry); + entry, ea_inode_array); if (error) return error; @@ -2769,7 +2783,8 @@ static int ext4_xattr_make_inode_space(handle_t *handle, struct inode *inode, * Returns 0 on success or negative error number on failure. */ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, - struct ext4_inode *raw_inode, handle_t *handle) + struct ext4_inode *raw_inode, handle_t *handle, + struct ext4_xattr_inode_array **ea_inode_array) { struct ext4_xattr_ibody_header *header; struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); @@ -2841,7 +2856,7 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, error = ext4_xattr_make_inode_space(handle, inode, raw_inode, isize_diff, ifree, bfree, - &total_ino); + &total_ino, ea_inode_array); if (error) { if (error == -ENOSPC && !tried_min_extra_isize && s_min_extra_isize) { diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h index 1fedf44d4fb6..9c3f1a96895d 100644 --- a/fs/ext4/xattr.h +++ b/fs/ext4/xattr.h @@ -179,7 +179,8 @@ extern ssize_t ext4_listxattr(struct dentry *, char *, size_t); extern int ext4_xattr_get(struct inode *, int, const char *, void *, size_t); extern int ext4_xattr_set(struct inode *, int, const char *, const void *, size_t, int); -extern int ext4_xattr_set_handle(handle_t *, struct inode *, int, const char *, const void *, size_t, int); +extern int ext4_xattr_set_handle(handle_t *, struct inode *, int, const char *, + const void *, size_t, int, struct ext4_xattr_inode_array **); extern int ext4_xattr_set_credits(struct inode *inode, size_t value_len, bool is_create, int *credits); extern int __ext4_xattr_set_credits(struct super_block *sb, struct inode *inode, @@ -192,7 +193,8 @@ extern int ext4_xattr_delete_inode(handle_t *handle, struct inode *inode, extern void ext4_xattr_inode_array_free(struct ext4_xattr_inode_array *array); extern int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, - struct ext4_inode *raw_inode, handle_t *handle); + struct ext4_inode *raw_inode, handle_t *handle, + struct ext4_xattr_inode_array **ea_inode_array); extern void ext4_evict_ea_inode(struct inode *inode); extern const struct xattr_handler * const ext4_xattr_handlers[]; diff --git a/fs/ext4/xattr_security.c b/fs/ext4/xattr_security.c index 776cf11d24ca..6b7ab6e703ad 100644 --- a/fs/ext4/xattr_security.c +++ b/fs/ext4/xattr_security.c @@ -44,7 +44,8 @@ ext4_initxattrs(struct inode *inode, const struct xattr *xattr_array, err = ext4_xattr_set_handle(handle, inode, EXT4_XATTR_INDEX_SECURITY, xattr->name, xattr->value, - xattr->value_len, XATTR_CREATE); + xattr->value_len, XATTR_CREATE, + NULL); if (err < 0) break; } -- 2.43.0 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-06-12 13:19 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2026-06-11 12:45 [PATCH] ext4: skip extra isize expansion on inode eviction to avoid deadlock Yun Zhou 2026-06-11 14:00 ` Jan Kara 2026-06-12 9:58 ` [PATCH v2] ext4: defer iput() in ext4_xattr_block_set() to avoid deadlock with writepages Yun Zhou 2026-06-12 13:19 ` [PATCH v3] " Yun Zhou
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®