Skip to content

Commit a7b8618

Browse files
author
Jaegeuk Kim
committed
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 Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent c550e25 commit a7b8618

3 files changed

Lines changed: 32 additions & 22 deletions

File tree

fs/f2fs/checkpoint.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,7 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index,
9898
}
9999

100100
if (unlikely(!PageUptodate(page))) {
101-
if (page->index == sbi->metapage_eio_ofs) {
102-
if (sbi->metapage_eio_cnt++ == MAX_RETRY_META_PAGE_EIO)
103-
set_ckpt_flags(sbi, CP_ERROR_FLAG);
104-
} else {
105-
sbi->metapage_eio_ofs = page->index;
106-
sbi->metapage_eio_cnt = 0;
107-
}
101+
f2fs_handle_page_eio(sbi, page->index, META);
108102
f2fs_put_page(page, 1);
109103
return ERR_PTR(-EIO);
110104
}

fs/f2fs/f2fs.h

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -578,8 +578,8 @@ enum {
578578
/* maximum retry quota flush count */
579579
#define DEFAULT_RETRY_QUOTA_FLUSH_COUNT 8
580580

581-
/* maximum retry of EIO'ed meta page */
582-
#define MAX_RETRY_META_PAGE_EIO 100
581+
/* maximum retry of EIO'ed page */
582+
#define MAX_RETRY_PAGE_EIO 100
583583

584584
#define F2FS_LINK_MAX 0xffffffff /* maximum link count per file */
585585

@@ -1614,8 +1614,8 @@ struct f2fs_sb_info {
16141614
/* keep migration IO order for LFS mode */
16151615
struct f2fs_rwsem io_order_lock;
16161616
mempool_t *write_io_dummy; /* Dummy pages */
1617-
pgoff_t metapage_eio_ofs; /* EIO page offset */
1618-
int metapage_eio_cnt; /* EIO count */
1617+
pgoff_t page_eio_ofs[NR_PAGE_TYPE]; /* EIO page offset */
1618+
int page_eio_cnt[NR_PAGE_TYPE]; /* EIO count */
16191619

16201620
/* for checkpoint */
16211621
struct f2fs_checkpoint *ckpt; /* raw checkpoint pointer */
@@ -4534,6 +4534,21 @@ static inline void f2fs_io_schedule_timeout(long timeout)
45344534
io_schedule_timeout(timeout);
45354535
}
45364536

4537+
static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi, pgoff_t ofs,
4538+
enum page_type type)
4539+
{
4540+
if (unlikely(f2fs_cp_error(sbi)))
4541+
return;
4542+
4543+
if (ofs == sbi->page_eio_ofs[type]) {
4544+
if (sbi->page_eio_cnt[type]++ == MAX_RETRY_PAGE_EIO)
4545+
set_ckpt_flags(sbi, CP_ERROR_FLAG);
4546+
} else {
4547+
sbi->page_eio_ofs[type] = ofs;
4548+
sbi->page_eio_cnt[type] = 0;
4549+
}
4550+
}
4551+
45374552
#define EFSBADCRC EBADMSG /* Bad CRC detected */
45384553
#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */
45394554

fs/f2fs/node.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,8 +1416,7 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid,
14161416

14171417
err = read_node_page(page, 0);
14181418
if (err < 0) {
1419-
f2fs_put_page(page, 1);
1420-
return ERR_PTR(err);
1419+
goto out_put_err;
14211420
} else if (err == LOCKED_PAGE) {
14221421
err = 0;
14231422
goto page_hit;
@@ -1443,19 +1442,21 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid,
14431442
goto out_err;
14441443
}
14451444
page_hit:
1446-
if (unlikely(nid != nid_of_node(page))) {
1447-
f2fs_warn(sbi, "inconsistent node block, nid:%lu, node_footer[nid:%u,ino:%u,ofs:%u,cpver:%llu,blkaddr:%u]",
1445+
if (likely(nid == nid_of_node(page)))
1446+
return page;
1447+
1448+
f2fs_warn(sbi, "inconsistent node block, nid:%lu, node_footer[nid:%u,ino:%u,ofs:%u,cpver:%llu,blkaddr:%u]",
14481449
nid, nid_of_node(page), ino_of_node(page),
14491450
ofs_of_node(page), cpver_of_node(page),
14501451
next_blkaddr_of_node(page));
1451-
set_sbi_flag(sbi, SBI_NEED_FSCK);
1452-
err = -EINVAL;
1452+
set_sbi_flag(sbi, SBI_NEED_FSCK);
1453+
err = -EINVAL;
14531454
out_err:
1454-
ClearPageUptodate(page);
1455-
f2fs_put_page(page, 1);
1456-
return ERR_PTR(err);
1457-
}
1458-
return page;
1455+
ClearPageUptodate(page);
1456+
out_put_err:
1457+
f2fs_handle_page_eio(sbi, page->index, NODE);
1458+
f2fs_put_page(page, 1);
1459+
return ERR_PTR(err);
14591460
}
14601461

14611462
struct page *f2fs_get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid)

0 commit comments

Comments
 (0)