f2fs: fix wrong condition check when failing metapage read
Jaegeuk Kim
maintainerPATCH 1/2 f2fs: fix wrong condition check when failing metapage read
This patch fixes wrong initialization.
--- fs/f2fs/checkpoint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/f2fs/checkpoint.c +3 -3
@@ -98,9 +98,9 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index, }if (unlikely (!PageUptodate (page))) { -if (page->index == sbi->metapage_eio_ofs && - sbi->metapage_eio_cnt++ ==MAX_RETRY_META_PAGE_EIO ) { -set_ckpt_flags (sbi,CP_ERROR_FLAG ); +if (page->index == sbi->metapage_eio_ofs) { +if (sbi->metapage_eio_cnt++ ==MAX_RETRY_META_PAGE_EIO ) +set_ckpt_flags (sbi,CP_ERROR_FLAG ); }else { sbi->metapage_eio_ofs = page->index; sbi->metapage_eio_cnt =0 ;
Signature · 8 lines
2.35.1.1178.g4f1659d476-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerPATCH 2/2 f2fs: avoid infinite loop to flush node pages
xfstests/generic/475 can give EIO all the time which give an infinite loop to flush node page like below. Let's avoid it.
[16418.518551] Call Trace: [16418.518553] ? dm_submit_bio+0x48/0x400 [16418.518574] ? submit_bio_checks+0x1ac/0x5a0 [16418.525207] __submit_bio+0x1a9/0x230 [16418.525210] ? kmem_cache_alloc+0x29e/0x3c0 [16418.525223] submit_bio_noacct+0xa8/0x2b0 [16418.525226] submit_bio+0x4d/0x130 [16418.525238] __submit_bio+0x49/0x310 [f2fs] [16418.525339] ? bio_add_page+0x6a/0x90 [16418.525344] f2fs_submit_page_bio+0x134/0x1f0 [f2fs] [16418.525365] read_node_page+0x125/0x1b0 [f2fs] [16418.525388] __get_node_page.part.0+0x58/0x3f0 [f2fs] [16418.525409] __get_node_page+0x2f/0x60 [f2fs] [16418.525431] f2fs_get_dnode_of_data+0x423/0x860 [f2fs] [16418.525452] ? asm_sysvec_apic_timer_interrupt+0x12/0x20 [16418.525458] ? __mod_memcg_state.part.0+0x2a/0x30 [16418.525465] ? __mod_memcg_lruvec_state+0x27/0x40 [16418.525467] ? __xa_set_mark+0x57/0x70 [16418.525472] f2fs_do_write_data_page+0x10e/0x7b0 [f2fs] [16418.525493] f2fs_write_single_data_page+0x555/0x830 [f2fs] [16418.525514] ? sysvec_apic_timer_interrupt+0x4e/0x90 [16418.525518] ? asm_sysvec_apic_timer_interrupt+0x12/0x20 [16418.525523] f2fs_write_cache_pages+0x303/0x880 [f2fs] [16418.525545] ? blk_flush_plug_list+0x47/0x100 [16418.525548] f2fs_write_data_pages+0xfd/0x320 [f2fs] [16418.525569] do_writepages+0xd5/0x210 [16418.525648] filemap_fdatawrite_wbc+0x7d/0xc0 [16418.525655] filemap_fdatawrite+0x50/0x70 [16418.525658] f2fs_sync_dirty_inodes+0xa4/0x230 [f2fs] [16418.525679] f2fs_write_checkpoint+0x16d/0x1720 [f2fs] [16418.525699] ? ttwu_do_wakeup+0x1c/0x160 [16418.525709] ? ttwu_do_activate+0x6d/0xd0 [16418.525711] ? __wait_for_common+0x11d/0x150 [16418.525715] kill_f2fs_super+0xca/0x100 [f2fs] [16418.525733] deactivate_locked_super+0x3b/0xb0 [16418.525739] deactivate_super+0x40/0x50 [16418.525741] cleanup_mnt+0x139/0x190 [16418.525747] __cleanup_mnt+0x12/0x20 [16418.525749] task_work_run+0x6d/0xa0 [16418.525765] exit_to_user_mode_prepare+0x1ad/0x1b0 [16418.525771] syscall_exit_to_user_mode+0x27/0x50 [16418.525774] do_syscall_64+0x48/0xc0 [16418.525776] entry_SYSCALL_64_after_hwframe+0x44/0xae
--- fs/f2fs/checkpoint.c | 8 +------- fs/f2fs/f2fs.h | 20 ++++++++++++++++---- fs/f2fs/node.c | 1 + 3 files changed, 18 insertions(+), 11 deletions(-)
fs/f2fs/checkpoint.c +1 -7
@@ -98,13 +98,7 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index, }if (unlikely (!PageUptodate (page))) { -if (page->index == sbi->metapage_eio_ofs) { -if (sbi->metapage_eio_cnt++ ==MAX_RETRY_META_PAGE_EIO ) -set_ckpt_flags (sbi,CP_ERROR_FLAG ); - }else { - sbi->metapage_eio_ofs = page->index; - sbi->metapage_eio_cnt =0 ; - } +f2fs_handle_page_eio (sbi, page->index,META );f2fs_put_page (page,1 );return ERR_PTR (-EIO ); }
fs/f2fs/f2fs.h +16 -4
@@ -579,8 +579,8 @@ enum {/* maximum retry quota flush count */ #define DEFAULT_RETRY_QUOTA_FLUSH_COUNT 8 -/* maximum retry of EIO'ed meta page */ -#define MAX_RETRY_META_PAGE_EIO 100 +/* maximum retry of EIO'ed page */ +#define MAX_RETRY_PAGE_EIO 100#define F2FS_LINK_MAX 0xffffffff/* maximum link count per file */
@@ -1621,8 +1621,8 @@ struct f2fs_sb_info {/* keep migration IO order for LFS mode */ struct f2fs_rwsem io_order_lock;mempool_t *write_io_dummy;/* Dummy pages */ -pgoff_t metapage_eio_ofs;/* EIO page offset */ -int metapage_eio_cnt;/* EIO count */ +pgoff_t page_eio_ofs[NR_PAGE_TYPE ];/* EIO page offset */ +int page_eio_cnt[NR_PAGE_TYPE ];/* EIO count */ /* for checkpoint */ struct f2fs_checkpoint *ckpt;/* raw checkpoint pointer */
@@ -4538,6 +4538,18 @@ static inline bool f2fs_block_unit_discard(struct f2fs_sb_info *sbi)return F2FS_OPTION (sbi).discard_unit ==DISCARD_UNIT_BLOCK ; } +static inline void f2fs_handle_page_eio (struct f2fs_sb_info *sbi,pgoff_t ofs, +enum page_type type) +{ +if (ofs == sbi->page_eio_ofs[type]) { +if (sbi->page_eio_cnt[type]++ ==MAX_RETRY_PAGE_EIO ) +set_ckpt_flags (sbi,CP_ERROR_FLAG ); + }else { + sbi->page_eio_ofs[type] = ofs; + sbi->page_eio_cnt[type] =0 ; + } +} +#define EFSBADCRC EBADMSG/* Bad CRC detected */ #define EFSCORRUPTED EUCLEAN/* Filesystem is corrupted */
fs/f2fs/node.c +1 -0
@@ -1416,6 +1416,7 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid, err =read_node_page (page,0 );if (err <0 ) { +f2fs_handle_page_eio (sbi, page->index,NODE );f2fs_put_page (page,1 );return ERR_PTR (err); }else if (err ==LOCKED_PAGE ) {
Signature · 8 lines
2.35.1.1178.g4f1659d476-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerRe: [PATCH 2/2 v2] f2fs: avoid infinite loop to flush node pages
xfstests/generic/475 can give EIO all the time which give an infinite loop to flush node page like below. Let's avoid it.
[16418.518551] Call Trace: [16418.518553] ? dm_submit_bio+0x48/0x400 [16418.518574] ? submit_bio_checks+0x1ac/0x5a0 [16418.525207] __submit_bio+0x1a9/0x230 [16418.525210] ? kmem_cache_alloc+0x29e/0x3c0 [16418.525223] submit_bio_noacct+0xa8/0x2b0 [16418.525226] submit_bio+0x4d/0x130 [16418.525238] __submit_bio+0x49/0x310 [f2fs] [16418.525339] ? bio_add_page+0x6a/0x90 [16418.525344] f2fs_submit_page_bio+0x134/0x1f0 [f2fs] [16418.525365] read_node_page+0x125/0x1b0 [f2fs] [16418.525388] __get_node_page.part.0+0x58/0x3f0 [f2fs] [16418.525409] __get_node_page+0x2f/0x60 [f2fs] [16418.525431] f2fs_get_dnode_of_data+0x423/0x860 [f2fs] [16418.525452] ? asm_sysvec_apic_timer_interrupt+0x12/0x20 [16418.525458] ? __mod_memcg_state.part.0+0x2a/0x30 [16418.525465] ? __mod_memcg_lruvec_state+0x27/0x40 [16418.525467] ? __xa_set_mark+0x57/0x70 [16418.525472] f2fs_do_write_data_page+0x10e/0x7b0 [f2fs] [16418.525493] f2fs_write_single_data_page+0x555/0x830 [f2fs] [16418.525514] ? sysvec_apic_timer_interrupt+0x4e/0x90 [16418.525518] ? asm_sysvec_apic_timer_interrupt+0x12/0x20 [16418.525523] f2fs_write_cache_pages+0x303/0x880 [f2fs] [16418.525545] ? blk_flush_plug_list+0x47/0x100 [16418.525548] f2fs_write_data_pages+0xfd/0x320 [f2fs] [16418.525569] do_writepages+0xd5/0x210 [16418.525648] filemap_fdatawrite_wbc+0x7d/0xc0 [16418.525655] filemap_fdatawrite+0x50/0x70 [16418.525658] f2fs_sync_dirty_inodes+0xa4/0x230 [f2fs] [16418.525679] f2fs_write_checkpoint+0x16d/0x1720 [f2fs] [16418.525699] ? ttwu_do_wakeup+0x1c/0x160 [16418.525709] ? ttwu_do_activate+0x6d/0xd0 [16418.525711] ? __wait_for_common+0x11d/0x150 [16418.525715] kill_f2fs_super+0xca/0x100 [f2fs] [16418.525733] deactivate_locked_super+0x3b/0xb0 [16418.525739] deactivate_super+0x40/0x50 [16418.525741] cleanup_mnt+0x139/0x190 [16418.525747] __cleanup_mnt+0x12/0x20 [16418.525749] task_work_run+0x6d/0xa0 [16418.525765] exit_to_user_mode_prepare+0x1ad/0x1b0 [16418.525771] syscall_exit_to_user_mode+0x27/0x50 [16418.525774] do_syscall_64+0x48/0xc0 [16418.525776] entry_SYSCALL_64_after_hwframe+0x44/0xae
---
Change log from v1:
- cover one more error case
fs/f2fs/checkpoint.c | 8 +------- fs/f2fs/f2fs.h | 20 ++++++++++++++++---- fs/f2fs/node.c | 2 ++ 3 files changed, 19 insertions(+), 11 deletions(-)
fs/f2fs/checkpoint.c +1 -7
@@ -98,13 +98,7 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index, }if (unlikely (!PageUptodate (page))) { -if (page->index == sbi->metapage_eio_ofs) { -if (sbi->metapage_eio_cnt++ ==MAX_RETRY_META_PAGE_EIO ) -set_ckpt_flags (sbi,CP_ERROR_FLAG ); - }else { - sbi->metapage_eio_ofs = page->index; - sbi->metapage_eio_cnt =0 ; - } +f2fs_handle_page_eio (sbi, page->index,META );f2fs_put_page (page,1 );return ERR_PTR (-EIO ); }
fs/f2fs/f2fs.h +16 -4
@@ -579,8 +579,8 @@ enum {/* maximum retry quota flush count */ #define DEFAULT_RETRY_QUOTA_FLUSH_COUNT 8 -/* maximum retry of EIO'ed meta page */ -#define MAX_RETRY_META_PAGE_EIO 100 +/* maximum retry of EIO'ed page */ +#define MAX_RETRY_PAGE_EIO 100#define F2FS_LINK_MAX 0xffffffff/* maximum link count per file */
@@ -1621,8 +1621,8 @@ struct f2fs_sb_info {/* keep migration IO order for LFS mode */ struct f2fs_rwsem io_order_lock;mempool_t *write_io_dummy;/* Dummy pages */ -pgoff_t metapage_eio_ofs;/* EIO page offset */ -int metapage_eio_cnt;/* EIO count */ +pgoff_t page_eio_ofs[NR_PAGE_TYPE ];/* EIO page offset */ +int page_eio_cnt[NR_PAGE_TYPE ];/* EIO count */ /* for checkpoint */ struct f2fs_checkpoint *ckpt;/* raw checkpoint pointer */
@@ -4543,6 +4543,18 @@ static inline void f2fs_io_schedule_timeout(long timeout)io_schedule_timeout (timeout); } +static inline void f2fs_handle_page_eio (struct f2fs_sb_info *sbi,pgoff_t ofs, +enum page_type type) +{ +if (ofs == sbi->page_eio_ofs[type]) { +if (sbi->page_eio_cnt[type]++ ==MAX_RETRY_PAGE_EIO ) +set_ckpt_flags (sbi,CP_ERROR_FLAG ); + }else { + sbi->page_eio_ofs[type] = ofs; + sbi->page_eio_cnt[type] =0 ; + } +} +#define EFSBADCRC EBADMSG/* Bad CRC detected */ #define EFSCORRUPTED EUCLEAN/* Filesystem is corrupted */
fs/f2fs/node.c +2 -0
@@ -1416,6 +1416,7 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid, err =read_node_page (page,0 );if (err <0 ) { +f2fs_handle_page_eio (sbi, page->index,NODE );f2fs_put_page (page,1 );return ERR_PTR (err); }else if (err ==LOCKED_PAGE ) {
@@ -1452,6 +1453,7 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid, err = -EINVAL ; out_err:ClearPageUptodate (page); +f2fs_handle_page_eio (sbi, page->index,NODE );f2fs_put_page (page,1 );return ERR_PTR (err); }
Signature · 1 line
2.36.0.rc0.470.gd361397f0d-goog
Chao Yu
maintainerRe: [f2fs-dev] [PATCH 2/2 v2] f2fs: avoid infinite loop to flush node pages
Quoted 104 lines · Jaegeuk Kim
xfstests/generic/475 can give EIO all the time which give an infinite loop to flush node page like below. Let's avoid it.
[16418.518551] Call Trace: [16418.518553] ? dm_submit_bio+0x48/0x400 [16418.518574] ? submit_bio_checks+0x1ac/0x5a0 [16418.525207] __submit_bio+0x1a9/0x230 [16418.525210] ? kmem_cache_alloc+0x29e/0x3c0 [16418.525223] submit_bio_noacct+0xa8/0x2b0 [16418.525226] submit_bio+0x4d/0x130 [16418.525238] __submit_bio+0x49/0x310 [f2fs] [16418.525339] ? bio_add_page+0x6a/0x90 [16418.525344] f2fs_submit_page_bio+0x134/0x1f0 [f2fs] [16418.525365] read_node_page+0x125/0x1b0 [f2fs] [16418.525388] __get_node_page.part.0+0x58/0x3f0 [f2fs] [16418.525409] __get_node_page+0x2f/0x60 [f2fs] [16418.525431] f2fs_get_dnode_of_data+0x423/0x860 [f2fs] [16418.525452] ? asm_sysvec_apic_timer_interrupt+0x12/0x20 [16418.525458] ? __mod_memcg_state.part.0+0x2a/0x30 [16418.525465] ? __mod_memcg_lruvec_state+0x27/0x40 [16418.525467] ? __xa_set_mark+0x57/0x70 [16418.525472] f2fs_do_write_data_page+0x10e/0x7b0 [f2fs] [16418.525493] f2fs_write_single_data_page+0x555/0x830 [f2fs] [16418.525514] ? sysvec_apic_timer_interrupt+0x4e/0x90 [16418.525518] ? asm_sysvec_apic_timer_interrupt+0x12/0x20 [16418.525523] f2fs_write_cache_pages+0x303/0x880 [f2fs] [16418.525545] ? blk_flush_plug_list+0x47/0x100 [16418.525548] f2fs_write_data_pages+0xfd/0x320 [f2fs] [16418.525569] do_writepages+0xd5/0x210 [16418.525648] filemap_fdatawrite_wbc+0x7d/0xc0 [16418.525655] filemap_fdatawrite+0x50/0x70 [16418.525658] f2fs_sync_dirty_inodes+0xa4/0x230 [f2fs] [16418.525679] f2fs_write_checkpoint+0x16d/0x1720 [f2fs] [16418.525699] ? ttwu_do_wakeup+0x1c/0x160 [16418.525709] ? ttwu_do_activate+0x6d/0xd0 [16418.525711] ? __wait_for_common+0x11d/0x150 [16418.525715] kill_f2fs_super+0xca/0x100 [f2fs] [16418.525733] deactivate_locked_super+0x3b/0xb0 [16418.525739] deactivate_super+0x40/0x50 [16418.525741] cleanup_mnt+0x139/0x190 [16418.525747] __cleanup_mnt+0x12/0x20 [16418.525749] task_work_run+0x6d/0xa0 [16418.525765] exit_to_user_mode_prepare+0x1ad/0x1b0 [16418.525771] syscall_exit_to_user_mode+0x27/0x50 [16418.525774] do_syscall_64+0x48/0xc0 [16418.525776] entry_SYSCALL_64_after_hwframe+0x44/0xaeSigned-off-by Jaegeuk Kim <[email protected]>---
Change log from v1:
- cover one more error casefs/f2fs/checkpoint.c | 8 +------- fs/f2fs/f2fs.h | 20 ++++++++++++++++---- fs/f2fs/node.c | 2 ++ 3 files changed, 19 insertions(+), 11 deletions(-)fs/f2fs/checkpoint.c +1
-7@@ -98,13 +98,7 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index, }if (unlikely (!PageUptodate (page))) { -if (page->index == sbi->metapage_eio_ofs) { -if (sbi->metapage_eio_cnt++ ==MAX_RETRY_META_PAGE_EIO ) -set_ckpt_flags (sbi,CP_ERROR_FLAG ); - }else { - sbi->metapage_eio_ofs = page->index; - sbi->metapage_eio_cnt =0 ; - } +f2fs_handle_page_eio (sbi, page->index,META );f2fs_put_page (page,1 );return ERR_PTR (-EIO ); }fs/f2fs/f2fs.h +4
-4@@ -579,8 +579,8 @@ enum {/* maximum retry quota flush count */ #define DEFAULT_RETRY_QUOTA_FLUSH_COUNT 8 -/* maximum retry of EIO'ed meta page */ -#define MAX_RETRY_META_PAGE_EIO 100 +/* maximum retry of EIO'ed page */ +#define MAX_RETRY_PAGE_EIO 100#define F2FS_LINK_MAX 0xffffffff/* maximum link count per file */ @@ -1621,8 +1621,8 @@ struct f2fs_sb_info {/* keep migration IO order for LFS mode */ struct f2fs_rwsem io_order_lock;mempool_t *write_io_dummy;/* Dummy pages */ -pgoff_t metapage_eio_ofs;/* EIO page offset */ -int metapage_eio_cnt;/* EIO count */ +pgoff_t page_eio_ofs[NR_PAGE_TYPE ];/* EIO page offset */ +int page_eio_cnt[NR_PAGE_TYPE ];/* EIO count */ /* for checkpoint */ struct f2fs_checkpoint *ckpt;/* raw checkpoint pointer */
fs/f2fs/f2fs.h static inline void f2fs_io_schedule_timeout(long timeout) · line 4548
Quoted 6 lines
fs/f2fs/f2fs.h +3
-0@@ -4543,6 +4543,18 @@ static inline void f2fs_io_schedule_timeout(long timeout)io_schedule_timeout (timeout); } +static inline void f2fs_handle_page_eio (struct f2fs_sb_info *sbi,pgoff_t ofs, +enum page_type type) +{
If we have already set cp_error, it doesn't need to process below logic redundantly?
if (f2fs_cp_error())
return;
Quoted 17 lines
fs/f2fs/f2fs.h +9
-0+if (ofs == sbi->page_eio_ofs[type]) { +if (sbi->page_eio_cnt[type]++ ==MAX_RETRY_PAGE_EIO ) +set_ckpt_flags (sbi,CP_ERROR_FLAG ); + }else { + sbi->page_eio_ofs[type] = ofs; + sbi->page_eio_cnt[type] =0 ; + } +} +#define EFSBADCRC EBADMSG/* Bad CRC detected */ #define EFSCORRUPTED EUCLEAN/* Filesystem is corrupted */ fs/f2fs/node.c +0
-0
fs/f2fs/node.c static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid, · line 1419
Quoted 4 lines
fs/f2fs/node.c +1
-0@@ -1416,6 +1416,7 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid, err =read_node_page (page,0 );if (err <0 ) { +f2fs_handle_page_eio (sbi, page->index,NODE );
How about:
goto out_put;
fs/f2fs/node.c static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid, · line 1455
Quoted 7 lines
fs/f2fs/node.c +0
-0f2fs_put_page (page,1 );return ERR_PTR (err); }else if (err ==LOCKED_PAGE ) {@@ -1452,6 +1453,7 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid, err = -EINVAL ; out_err:ClearPageUptodate (page);
out_put:
Thanks,
Quoted 4 lines
fs/f2fs/node.c +1
-0+f2fs_handle_page_eio (sbi, page->index,NODE );f2fs_put_page (page,1 );return ERR_PTR (err); }
Jaegeuk Kim
maintainerRe: [f2fs-dev] [PATCH 2/2 v3] f2fs: avoid infinite loop to flush node pages
In reply to Jaegeuk Kimxfstests/generic/475 can give EIO all the time which give an infinite loop to flush node page like below. Let's avoid it.
[16418.518551] Call Trace: [16418.518553] ? dm_submit_bio+0x48/0x400 [16418.518574] ? submit_bio_checks+0x1ac/0x5a0 [16418.525207] __submit_bio+0x1a9/0x230 [16418.525210] ? kmem_cache_alloc+0x29e/0x3c0 [16418.525223] submit_bio_noacct+0xa8/0x2b0 [16418.525226] submit_bio+0x4d/0x130 [16418.525238] __submit_bio+0x49/0x310 [f2fs] [16418.525339] ? bio_add_page+0x6a/0x90 [16418.525344] f2fs_submit_page_bio+0x134/0x1f0 [f2fs] [16418.525365] read_node_page+0x125/0x1b0 [f2fs] [16418.525388] __get_node_page.part.0+0x58/0x3f0 [f2fs] [16418.525409] __get_node_page+0x2f/0x60 [f2fs] [16418.525431] f2fs_get_dnode_of_data+0x423/0x860 [f2fs] [16418.525452] ? asm_sysvec_apic_timer_interrupt+0x12/0x20 [16418.525458] ? __mod_memcg_state.part.0+0x2a/0x30 [16418.525465] ? __mod_memcg_lruvec_state+0x27/0x40 [16418.525467] ? __xa_set_mark+0x57/0x70 [16418.525472] f2fs_do_write_data_page+0x10e/0x7b0 [f2fs] [16418.525493] f2fs_write_single_data_page+0x555/0x830 [f2fs] [16418.525514] ? sysvec_apic_timer_interrupt+0x4e/0x90 [16418.525518] ? asm_sysvec_apic_timer_interrupt+0x12/0x20 [16418.525523] f2fs_write_cache_pages+0x303/0x880 [f2fs] [16418.525545] ? blk_flush_plug_list+0x47/0x100 [16418.525548] f2fs_write_data_pages+0xfd/0x320 [f2fs] [16418.525569] do_writepages+0xd5/0x210 [16418.525648] filemap_fdatawrite_wbc+0x7d/0xc0 [16418.525655] filemap_fdatawrite+0x50/0x70 [16418.525658] f2fs_sync_dirty_inodes+0xa4/0x230 [f2fs] [16418.525679] f2fs_write_checkpoint+0x16d/0x1720 [f2fs] [16418.525699] ? ttwu_do_wakeup+0x1c/0x160 [16418.525709] ? ttwu_do_activate+0x6d/0xd0 [16418.525711] ? __wait_for_common+0x11d/0x150 [16418.525715] kill_f2fs_super+0xca/0x100 [f2fs] [16418.525733] deactivate_locked_super+0x3b/0xb0 [16418.525739] deactivate_super+0x40/0x50 [16418.525741] cleanup_mnt+0x139/0x190 [16418.525747] __cleanup_mnt+0x12/0x20 [16418.525749] task_work_run+0x6d/0xa0 [16418.525765] exit_to_user_mode_prepare+0x1ad/0x1b0 [16418.525771] syscall_exit_to_user_mode+0x27/0x50 [16418.525774] do_syscall_64+0x48/0xc0 [16418.525776] entry_SYSCALL_64_after_hwframe+0x44/0xae
---
Change log from v2:
- minor code refactoring
fs/f2fs/checkpoint.c | 8 +------- fs/f2fs/f2fs.h | 23 +++++++++++++++++++---- fs/f2fs/node.c | 23 ++++++++++++----------- 3 files changed, 32 insertions(+), 22 deletions(-)
fs/f2fs/checkpoint.c +1 -7
@@ -98,13 +98,7 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index, }if (unlikely (!PageUptodate (page))) { -if (page->index == sbi->metapage_eio_ofs) { -if (sbi->metapage_eio_cnt++ ==MAX_RETRY_META_PAGE_EIO ) -set_ckpt_flags (sbi,CP_ERROR_FLAG ); - }else { - sbi->metapage_eio_ofs = page->index; - sbi->metapage_eio_cnt =0 ; - } +f2fs_handle_page_eio (sbi, page->index,META );f2fs_put_page (page,1 );return ERR_PTR (-EIO ); }
fs/f2fs/f2fs.h +19 -4
@@ -578,8 +578,8 @@ enum {/* maximum retry quota flush count */ #define DEFAULT_RETRY_QUOTA_FLUSH_COUNT 8 -/* maximum retry of EIO'ed meta page */ -#define MAX_RETRY_META_PAGE_EIO 100 +/* maximum retry of EIO'ed page */ +#define MAX_RETRY_PAGE_EIO 100#define F2FS_LINK_MAX 0xffffffff/* maximum link count per file */
@@ -1614,8 +1614,8 @@ struct f2fs_sb_info {/* keep migration IO order for LFS mode */ struct f2fs_rwsem io_order_lock;mempool_t *write_io_dummy;/* Dummy pages */ -pgoff_t metapage_eio_ofs;/* EIO page offset */ -int metapage_eio_cnt;/* EIO count */ +pgoff_t page_eio_ofs[NR_PAGE_TYPE ];/* EIO page offset */ +int page_eio_cnt[NR_PAGE_TYPE ];/* EIO count */ /* for checkpoint */ struct f2fs_checkpoint *ckpt;/* raw checkpoint pointer */
@@ -4534,6 +4534,21 @@ static inline void f2fs_io_schedule_timeout(long timeout)io_schedule_timeout (timeout); } +static inline void f2fs_handle_page_eio (struct f2fs_sb_info *sbi,pgoff_t ofs, +enum page_type type) +{ +if (unlikely (f2fs_cp_error (sbi))) +return ; + +if (ofs == sbi->page_eio_ofs[type]) { +if (sbi->page_eio_cnt[type]++ ==MAX_RETRY_PAGE_EIO ) +set_ckpt_flags (sbi,CP_ERROR_FLAG ); + }else { + sbi->page_eio_ofs[type] = ofs; + sbi->page_eio_cnt[type] =0 ; + } +} +#define EFSBADCRC EBADMSG/* Bad CRC detected */ #define EFSCORRUPTED EUCLEAN/* Filesystem is corrupted */
fs/f2fs/node.c +12 -11
@@ -1416,8 +1416,7 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid, err =read_node_page (page,0 );if (err <0 ) { -f2fs_put_page (page,1 ); -return ERR_PTR (err); + goto out_put_err; }else if (err ==LOCKED_PAGE ) { err =0 ; goto page_hit;
@@ -1443,19 +1442,21 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid, goto out_err; } page_hit: -if (unlikely (nid !=nid_of_node (page))) { -f2fs_warn (sbi,"inconsistent node block, nid:%lu, node_footer[nid:%u,ino:%u,ofs:%u,cpver:%llu,blkaddr:%u]" , +if (likely (nid ==nid_of_node (page))) +return page; + +f2fs_warn (sbi,"inconsistent node block, nid:%lu, node_footer[nid:%u,ino:%u,ofs:%u,cpver:%llu,blkaddr:%u]" , nid,nid_of_node (page),ino_of_node (page),ofs_of_node (page),cpver_of_node (page),next_blkaddr_of_node (page)); -set_sbi_flag (sbi,SBI_NEED_FSCK ); - err = -EINVAL ; +set_sbi_flag (sbi,SBI_NEED_FSCK ); + err = -EINVAL ; out_err: -ClearPageUptodate (page); -f2fs_put_page (page,1 ); -return ERR_PTR (err); - } -return page; +ClearPageUptodate (page); +out_put_err: +f2fs_handle_page_eio (sbi, page->index,NODE ); +f2fs_put_page (page,1 ); +return ERR_PTR (err); }struct page *f2fs_get_node_page (struct f2fs_sb_info *sbi,pgoff_t nid)
Signature · 1 line
2.36.0.rc0.470.gd361397f0d-goog
Quoted 4 lines · Jaegeuk Kim
This patch fixes wrong initialization.
Fixes 50c63009f6ab ("f2fs: avoid an infinite loop in f2fs_sync_dirty_inodes")Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,