f2fs: compress: fix deadloop in f2fs_write_cache_pages()
Chao Yu
maintainerPATCH 1/4 f2fs: compress: fix deadloop in f2fs_write_cache_pages()
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/0xd8The 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.
--- fs/f2fs/data.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
fs/f2fs/data.c +18 -2
@@ -3023,7 +3023,8 @@ static int f2fs_write_cache_pages(struct address_space *mapping, {int ret =0 ;int done =0 , retry =0 ; -struct page *pages[F2FS_ONSTACK_PAGES ]; +struct page *pages_local[F2FS_ONSTACK_PAGES ]; +struct page **pages = pages_local;struct folio_batch fbatch;struct f2fs_sb_info *sbi =F2FS_M_SB (mapping);struct bio *bio =NULL ;
@@ -3047,6 +3048,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,#endif int nr_folios, p, idx;int nr_pages; +unsigned int max_pages =F2FS_ONSTACK_PAGES ;pgoff_t index;pgoff_t end;/* Inclusive */ pgoff_t done_index;
@@ -3056,6 +3058,15 @@ static int f2fs_write_cache_pages(struct address_space *mapping,int submitted =0 ;int i; +#ifdef CONFIG_F2FS_FS_COMPRESSION +if (f2fs_compressed_file (inode) && +1 << cc.log_cluster_size >F2FS_ONSTACK_PAGES ) { + pages =f2fs_kzalloc (sbi,sizeof (struct page *) << + cc.log_cluster_size,GFP_NOFS | __GFP_NOFAIL); + max_pages =1 << cc.log_cluster_size; + } +#endif +folio_batch_init (&fbatch); if (get_dirty_pages(mapping->host) <=
@@ -3101,7 +3112,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping, add_more: pages[nr_pages] =folio_page (folio, idx);folio_get (folio); -if (++nr_pages ==F2FS_ONSTACK_PAGES ) { +if (++nr_pages == max_pages) { index = folio->index + idx +1 ;folio_batch_release (&fbatch); goto write;
@@ -3283,6 +3294,11 @@ static int f2fs_write_cache_pages(struct address_space *mapping,if (bio)f2fs_submit_merged_ipu_write (sbi, &bio,NULL ); +#ifdef CONFIG_F2FS_FS_COMPRESSION +if (pages != pages_local) +kfree (pages); +#endif +return ret; }
Signature · 8 lines
2.40.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Chao Yu
maintainerPATCH 2/4 f2fs: compress: fix to avoid use-after-free on dic
Call trace: __memcpy+0x128/0x250 f2fs_read_multi_pages+0x940/0xf7c f2fs_mpage_readpages+0x5a8/0x624 f2fs_readahead+0x5c/0x110 page_cache_ra_unbounded+0x1b8/0x590 do_sync_mmap_readahead+0x1dc/0x2e4 filemap_fault+0x254/0xa8c f2fs_filemap_fault+0x2c/0x104 __do_fault+0x7c/0x238 do_handle_mm_fault+0x11bc/0x2d14 do_mem_abort+0x3a8/0x1004 el0_da+0x3c/0xa0 el0t_64_sync_handler+0xc4/0xec el0t_64_sync+0x1b4/0x1b8
In f2fs_read_multi_pages(), once f2fs_decompress_cluster() was called if we hit cached page in compress_inode's cache, dic may be released, it needs break the loop rather than continuing it, in order to avoid accessing invalid dic pointer.
--- fs/f2fs/data.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/f2fs/data.c +3 -1
@@ -2344,8 +2344,10 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,f2fs_wait_on_block_writeback (inode, blkaddr);if (f2fs_load_compressed_page (sbi, page, blkaddr)) { -if (atomic_dec_and_test (&dic->remaining_pages)) +if (atomic_dec_and_test (&dic->remaining_pages)) {f2fs_decompress_cluster (dic, true); +break ; + }continue ; }
Signature · 8 lines
2.40.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Chao Yu
maintainerPATCH 3/4 f2fs: compress: do sanity check on cluster when CONFIG_F2FS_CHECK_FS is on
In reply to Chao YuThis patch covers sanity check logic on cluster w/ CONFIG_F2FS_CHECK_FS, otherwise, there will be performance regression while querying cluster mapping info.
Callers of f2fs_is_compressed_cluster() only care about whether cluster is compressed or not, rather than # of valid blocks in compressed cluster, so, let's adjust f2fs_is_compressed_cluster()'s logic according to caller's requirement.
--- fs/f2fs/compress.c | 61 ++++++++++++++++++++++++++-------------------- fs/f2fs/data.c | 4 +-- 2 files changed, 35 insertions(+), 30 deletions(-)
fs/f2fs/compress.c +34 -27
@@ -893,14 +893,15 @@ static bool cluster_has_invalid_data(struct compress_ctx *cc)bool f2fs_sanity_check_cluster (struct dnode_of_data *dn) { +#ifdef CONFIG_F2FS_CHECK_FS struct f2fs_sb_info *sbi =F2FS_I_SB (dn->inode);unsigned int cluster_size =F2FS_I (dn->inode)->i_cluster_size; -bool compressed = dn->data_blkaddr ==COMPRESS_ADDR ;int cluster_end =0 ; +unsigned int count;int i;char *reason ="" ; -if (!compressed) +if (dn->data_blkaddr !=COMPRESS_ADDR )return false;/* [..., COMPR_ADDR, ...] */
@@ -909,7 +910,7 @@ bool f2fs_sanity_check_cluster(struct dnode_of_data *dn) goto out; } -for (i =1 ; i < cluster_size; i++) { +for (i =1 , count =1 ; i < cluster_size; i++, count++) {block_t blkaddr =data_blkaddr (dn->inode, dn->node_page, dn->ofs_in_node + i);
@@ -929,19 +930,42 @@ bool f2fs_sanity_check_cluster(struct dnode_of_data *dn) goto out; } } + +f2fs_bug_on (F2FS_I_SB (dn->inode), count != cluster_size && + !is_inode_flag_set (dn->inode,FI_COMPRESS_RELEASED )); +return false; out:f2fs_warn (sbi,"access invalid cluster, ino:%lu, nid:%u, ofs_in_node:%u, reason:%s" , dn->inode->i_ino, dn->nid, dn->ofs_in_node, reason);set_sbi_flag (sbi,SBI_NEED_FSCK );return true; +#else +return false; +#endif +} + +static int __f2fs_get_cluster_blocks (struct inode *inode, +struct dnode_of_data *dn) +{ +unsigned int cluster_size =F2FS_I (inode)->i_cluster_size; +int count, i; + +for (i =1 , count =1 ; i < cluster_size; i++) { +block_t blkaddr =data_blkaddr (dn->inode, dn->node_page, + dn->ofs_in_node + i); + +if (__is_valid_data_blkaddr (blkaddr)) + count++; + } + +return count; }static int __f2fs_cluster_blocks (struct inode *inode, -unsigned int cluster_idx,bool compr) +unsigned int cluster_idx,bool compr_blks) {struct dnode_of_data dn; -unsigned int cluster_size =F2FS_I (inode)->i_cluster_size;unsigned int start_idx = cluster_idx <<F2FS_I (inode)->i_log_cluster_size;int ret;
@@ -956,31 +980,14 @@ static int __f2fs_cluster_blocks(struct inode *inode,if (f2fs_sanity_check_cluster (&dn)) { ret = -EFSCORRUPTED ; -f2fs_handle_error (F2FS_I_SB (inode),ERROR_CORRUPTED_CLUSTER ); goto fail; }if (dn.data_blkaddr ==COMPRESS_ADDR ) { -int i; - - ret =1 ; -for (i =1 ; i < cluster_size; i++) { -block_t blkaddr; - - blkaddr =data_blkaddr (dn.inode, - dn.node_page, dn.ofs_in_node + i); -if (compr) { -if (__is_valid_data_blkaddr (blkaddr)) - ret++; - }else { -if (blkaddr !=NULL_ADDR ) - ret++; - } - } - -f2fs_bug_on (F2FS_I_SB (inode), - !compr && ret != cluster_size && - !is_inode_flag_set (inode,FI_COMPRESS_RELEASED )); +if (compr_blks) + ret =__f2fs_get_cluster_blocks (inode, &dn); +else + ret =1 ; } fail:f2fs_put_dnode (&dn);
@@ -993,7 +1000,7 @@ static int f2fs_compressed_blocks(struct compress_ctx *cc)return __f2fs_cluster_blocks (cc->inode, cc->cluster_idx, true); } -/* return # of valid blocks in compressed cluster */ +/* return whether cluster is compressed one or not */ int f2fs_is_compressed_cluster (struct inode *inode,pgoff_t index) { return __f2fs_cluster_blocks(inode,
fs/f2fs/data.c +1 -3
@@ -1690,9 +1690,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, int flag) map->m_flags |=F2FS_MAP_NEW ; }else if (is_hole) {if (f2fs_compressed_file (inode) && -f2fs_sanity_check_cluster (&dn) && - (flag !=F2FS_GET_BLOCK_FIEMAP || -IS_ENABLED (CONFIG_F2FS_CHECK_FS ))) { +f2fs_sanity_check_cluster (&dn)) { err = -EFSCORRUPTED ;f2fs_handle_error (sbi,ERROR_CORRUPTED_CLUSTER );
Signature · 8 lines
2.40.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Chao Yu
maintainerPATCH 4/4 f2fs: compress: fix to avoid redundant compress extension
In reply to Chao YuWith below script, redundant compress extension will be parsed and added by parse_options(), because parse_options() doesn't check whether the extension is existed or not, fix it.
1. mount -t f2fs -o compress_extension=so /dev/vdb /mnt/f2fs
2. mount -t f2fs -o remount,compress_extension=so /mnt/f2fs
3. mount|grep f2fs
/dev/vdb on /mnt/f2fs type f2fs (...,compress_extension=so,compress_extension=so,...)
--- fs/f2fs/super.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
fs/f2fs/super.c +33 -0
@@ -547,6 +547,29 @@ static int f2fs_set_test_dummy_encryption(struct super_block *sb, }#ifdef CONFIG_F2FS_FS_COMPRESSION +static bool is_compress_extension_exist (struct f2fs_sb_info *sbi, +const char *new_ext,bool is_ext) +{ +unsigned char (*ext)[F2FS_EXTENSION_LEN ]; +int ext_cnt; +int i; + +if (is_ext) { + ext =F2FS_OPTION (sbi).extensions; + ext_cnt =F2FS_OPTION (sbi).compress_ext_cnt; + }else { + ext =F2FS_OPTION (sbi).noextensions; + ext_cnt =F2FS_OPTION (sbi).nocompress_ext_cnt; + } + +for (i =0 ; i < ext_cnt; i++) { +if (!strcasecmp (new_ext, ext[i])) +return true; + } + +return false; +} +/* * 1. The same extension name cannot not appear in both compress and non-compress extension * at the same time.
@@ -1149,6 +1172,11 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)return -EINVAL ; } +if (is_compress_extension_exist (sbi, name, true)) { +kfree (name); +break ; + } +strcpy (ext[ext_cnt], name);F2FS_OPTION (sbi).compress_ext_cnt++;kfree (name);
@@ -1173,6 +1201,11 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)return -EINVAL ; } +if (is_compress_extension_exist (sbi, name, false)) { +kfree (name); +break ; + } +strcpy (noext[noext_cnt], name);F2FS_OPTION (sbi).nocompress_ext_cnt++;kfree (name);
Signature · 8 lines
2.40.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
This series was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This series was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 11 lines · On Mon, 28 Aug 2023 22:04:14 +0800 you wrote:
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[...]
Here is the summary with links:
- [f2fs-dev,1/4] f2fs: compress: fix deadloop in f2fs_write_cache_pages()
https://git.kernel.org/jaegeuk/f2fs/c/c5d3f9b7649a - [f2fs-dev,2/4] f2fs: compress: fix to avoid use-after-free on dic https://git.kernel.org/jaegeuk/f2fs/c/b0327c84e91a - [f2fs-dev,3/4] f2fs: compress: do sanity check on cluster when CONFIG_F2FS_CHECK_FS is on https://git.kernel.org/jaegeuk/f2fs/c/2aaea533bf06 - [f2fs-dev,4/4] f2fs: compress: fix to avoid redundant compress extension https://git.kernel.org/jaegeuk/f2fs/c/7e1b150fece0
You are awesome, thank you!
Signature · 10 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel