diff mbox series

[6.6/6.12] ext4: goto right label 'out_mmap_sem' in ext4_setattr()

Message ID 20250429-rcn-20250429-v6-6-backport-v1-1-9a27617e4ba8@igalia.com
State Not Applicable
Headers show
Series [6.6/6.12] ext4: goto right label 'out_mmap_sem' in ext4_setattr() | expand

Commit Message

Ricardo Cañuelo Navarro April 29, 2025, 7:51 a.m. UTC 
From: Baokun Li <libaokun1@huawei.com>

[ Upstream commit 7e91ae31e2d264155dfd102101afc2de7bd74a64 ]

Otherwise, if ext4_inode_attach_jinode() fails, a hung task will
happen because filemap_invalidate_unlock() isn't called to unlock
mapping->invalidate_lock. Like this:

EXT4-fs error (device sda) in ext4_setattr:5557: Out of memory
INFO: task fsstress:374 blocked for more than 122 seconds.
      Not tainted 6.14.0-rc1-next-20250206-xfstests-dirty #726
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:fsstress state:D stack:0     pid:374   tgid:374   ppid:373
                                  task_flags:0x440140 flags:0x00000000
Call Trace:
 <TASK>
 __schedule+0x2c9/0x7f0
 schedule+0x27/0xa0
 schedule_preempt_disabled+0x15/0x30
 rwsem_down_read_slowpath+0x278/0x4c0
 down_read+0x59/0xb0
 page_cache_ra_unbounded+0x65/0x1b0
 filemap_get_pages+0x124/0x3e0
 filemap_read+0x114/0x3d0
 vfs_read+0x297/0x360
 ksys_read+0x6c/0xe0
 do_syscall_64+0x4b/0x110
 entry_SYSCALL_64_after_hwframe+0x76/0x7e

Fixes: c7fc0366c656 ("ext4: partial zero eof block on unaligned inode size extension")
Signed-off-by: Baokun Li <libaokun1@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Link: https://patch.msgid.link/20250213112247.3168709-1-libaokun@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Ricardo Cañuelo Navarro <rcn@igalia.com>
---
Hi,

Requesting this fix to be backported to stable v6.6 and v6.12, which
contain the backport for upstream patch
c7fc0366c656 ("ext4: partial zero eof block on unaligned inode size extension").
That patch was also backported to v6.14 but the fix is there already as
well.

Thanks,
Ricardo
---
 fs/ext4/inode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


---
base-commit: 23ec0b4057294d86cdefafe373b1f03568f75aff
change-id: 20250429-rcn-20250429-v6-6-backport-a299b0c87086
diff mbox series

Patch

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index ddfeaf19bff1ba22cea7e108c0564daceb09e9ee..ebb8097b11397fb3e8c005035a808712ac31ee77 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5478,7 +5478,7 @@  int ext4_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
 			    oldsize & (inode->i_sb->s_blocksize - 1)) {
 				error = ext4_inode_attach_jinode(inode);
 				if (error)
-					goto err_out;
+					goto out_mmap_sem;
 			}
 
 			handle = ext4_journal_start(inode, EXT4_HT_INODE, 3);