Skip to content

Commit 071bbc5

Browse files
chaseyugregkh
authored andcommitted
f2fs: compress: fix deadloop in f2fs_write_cache_pages()
[ Upstream commit c5d3f9b ] With below mount option and testcase, it hangs kernel. 1. mount -t f2fs -o compress_log_size=5 /dev/vdb /mnt/f2fs 2. touch /mnt/f2fs/file 3. chattr +c /mnt/f2fs/file 4. dd if=/dev/zero of=/mnt/f2fs/file bs=1MB count=1 5. sync 6. dd if=/dev/zero of=/mnt/f2fs/file bs=111 count=11 conv=notrunc 7. sync INFO: task sync:4788 blocked for more than 120 seconds. Not tainted 6.5.0-rc1+ #322 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. task:sync state:D stack:0 pid:4788 ppid:509 flags:0x00000002 Call Trace: <TASK> __schedule+0x335/0xf80 schedule+0x6f/0xf0 wb_wait_for_completion+0x5e/0x90 sync_inodes_sb+0xd8/0x2a0 sync_inodes_one_sb+0x1d/0x30 iterate_supers+0x99/0xf0 ksys_sync+0x46/0xb0 __do_sys_sync+0x12/0x20 do_syscall_64+0x3f/0x90 entry_SYSCALL_64_after_hwframe+0x6e/0xd8 The reason is f2fs_all_cluster_page_ready() assumes that pages array should cover at least one cluster, otherwise, it will always return false, result in deadloop. By default, pages array size is 16, and it can cover the case cluster_size is equal or less than 16, for the case cluster_size is larger than 16, let's allocate memory of pages array dynamically. Fixes: 4c8ff70 ("f2fs: support data compression") Signed-off-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent ec67c83 commit 071bbc5

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

fs/f2fs/data.c

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2950,7 +2950,8 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
29502950
{
29512951
int ret = 0;
29522952
int done = 0, retry = 0;
2953-
struct page *pages[F2FS_ONSTACK_PAGES];
2953+
struct page *pages_local[F2FS_ONSTACK_PAGES];
2954+
struct page **pages = pages_local;
29542955
struct folio_batch fbatch;
29552956
struct f2fs_sb_info *sbi = F2FS_M_SB(mapping);
29562957
struct bio *bio = NULL;
@@ -2974,6 +2975,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
29742975
#endif
29752976
int nr_folios, p, idx;
29762977
int nr_pages;
2978+
unsigned int max_pages = F2FS_ONSTACK_PAGES;
29772979
pgoff_t index;
29782980
pgoff_t end; /* Inclusive */
29792981
pgoff_t done_index;
@@ -2983,6 +2985,15 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
29832985
int submitted = 0;
29842986
int i;
29852987

2988+
#ifdef CONFIG_F2FS_FS_COMPRESSION
2989+
if (f2fs_compressed_file(inode) &&
2990+
1 << cc.log_cluster_size > F2FS_ONSTACK_PAGES) {
2991+
pages = f2fs_kzalloc(sbi, sizeof(struct page *) <<
2992+
cc.log_cluster_size, GFP_NOFS | __GFP_NOFAIL);
2993+
max_pages = 1 << cc.log_cluster_size;
2994+
}
2995+
#endif
2996+
29862997
folio_batch_init(&fbatch);
29872998

29882999
if (get_dirty_pages(mapping->host) <=
@@ -3028,7 +3039,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
30283039
add_more:
30293040
pages[nr_pages] = folio_page(folio, idx);
30303041
folio_get(folio);
3031-
if (++nr_pages == F2FS_ONSTACK_PAGES) {
3042+
if (++nr_pages == max_pages) {
30323043
index = folio->index + idx + 1;
30333044
folio_batch_release(&fbatch);
30343045
goto write;
@@ -3214,6 +3225,11 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
32143225
if (bio)
32153226
f2fs_submit_merged_ipu_write(sbi, &bio, NULL);
32163227

3228+
#ifdef CONFIG_F2FS_FS_COMPRESSION
3229+
if (pages != pages_local)
3230+
kfree(pages);
3231+
#endif
3232+
32173233
return ret;
32183234
}
32193235

0 commit comments

Comments
 (0)