Skip to content

Commit 8deca17

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 dfc4cb3 commit 8deca17

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
@@ -3023,7 +3023,8 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
30233023
{
30243024
int ret = 0;
30253025
int done = 0, retry = 0;
3026-
struct page *pages[F2FS_ONSTACK_PAGES];
3026+
struct page *pages_local[F2FS_ONSTACK_PAGES];
3027+
struct page **pages = pages_local;
30273028
struct folio_batch fbatch;
30283029
struct f2fs_sb_info *sbi = F2FS_M_SB(mapping);
30293030
struct bio *bio = NULL;
@@ -3047,6 +3048,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
30473048
#endif
30483049
int nr_folios, p, idx;
30493050
int nr_pages;
3051+
unsigned int max_pages = F2FS_ONSTACK_PAGES;
30503052
pgoff_t index;
30513053
pgoff_t end; /* Inclusive */
30523054
pgoff_t done_index;
@@ -3056,6 +3058,15 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
30563058
int submitted = 0;
30573059
int i;
30583060

3061+
#ifdef CONFIG_F2FS_FS_COMPRESSION
3062+
if (f2fs_compressed_file(inode) &&
3063+
1 << cc.log_cluster_size > F2FS_ONSTACK_PAGES) {
3064+
pages = f2fs_kzalloc(sbi, sizeof(struct page *) <<
3065+
cc.log_cluster_size, GFP_NOFS | __GFP_NOFAIL);
3066+
max_pages = 1 << cc.log_cluster_size;
3067+
}
3068+
#endif
3069+
30593070
folio_batch_init(&fbatch);
30603071

30613072
if (get_dirty_pages(mapping->host) <=
@@ -3101,7 +3112,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
31013112
add_more:
31023113
pages[nr_pages] = folio_page(folio, idx);
31033114
folio_get(folio);
3104-
if (++nr_pages == F2FS_ONSTACK_PAGES) {
3115+
if (++nr_pages == max_pages) {
31053116
index = folio->index + idx + 1;
31063117
folio_batch_release(&fbatch);
31073118
goto write;
@@ -3283,6 +3294,11 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
32833294
if (bio)
32843295
f2fs_submit_merged_ipu_write(sbi, &bio, NULL);
32853296

3297+
#ifdef CONFIG_F2FS_FS_COMPRESSION
3298+
if (pages != pages_local)
3299+
kfree(pages);
3300+
#endif
3301+
32863302
return ret;
32873303
}
32883304

0 commit comments

Comments
 (0)