lkml.org 
[lkml]   [2018]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 203/293] f2fs: fix to avoid panic when encountering corrupt node
    Date
    From: Chao Yu <yuchao0@huawei.com>

    [ Upstream commit 1f258ec13b82d3d947b515a007a748ffcbe29f9a ]

    With fault_injection option, generic/361 of fstests will complain us
    with below message:

    Call Trace:
    get_node_page+0x12/0x20 [f2fs]
    f2fs_iget+0x92/0x7d0 [f2fs]
    f2fs_fill_super+0x10fb/0x15e0 [f2fs]
    mount_bdev+0x184/0x1c0
    f2fs_mount+0x15/0x20 [f2fs]
    mount_fs+0x39/0x150
    vfs_kern_mount+0x67/0x110
    do_mount+0x1bb/0xc70
    SyS_mount+0x83/0xd0
    do_syscall_64+0x6e/0x160
    entry_SYSCALL64_slow_path+0x25/0x25

    Since mkfs loop device in f2fs partition can be failed silently due to
    checkpoint error injection, so root inode page can be corrupted, in order
    to avoid needless panic, in get_node_page, it's better to leave message
    and return error to caller, and let fsck repaire it later.

    Signed-off-by: Chao Yu <yuchao0@huawei.com>
    Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    fs/f2fs/node.c | 14 +++++++++++---
    1 file changed, 11 insertions(+), 3 deletions(-)

    diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
    index 01177ecdeab8..db787d7a2b9d 100644
    --- a/fs/f2fs/node.c
    +++ b/fs/f2fs/node.c
    @@ -1139,6 +1139,7 @@ repeat:
    f2fs_put_page(page, 1);
    return ERR_PTR(err);
    } else if (err == LOCKED_PAGE) {
    + err = 0;
    goto page_hit;
    }

    @@ -1152,15 +1153,22 @@ repeat:
    goto repeat;
    }

    - if (unlikely(!PageUptodate(page)))
    + if (unlikely(!PageUptodate(page))) {
    + err = -EIO;
    goto out_err;
    + }
    page_hit:
    if(unlikely(nid != nid_of_node(page))) {
    - f2fs_bug_on(sbi, 1);
    + f2fs_msg(sbi->sb, KERN_WARNING, "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));
    ClearPageUptodate(page);
    + err = -EINVAL;
    out_err:
    f2fs_put_page(page, 1);
    - return ERR_PTR(-EIO);
    + return ERR_PTR(err);
    }
    return page;
    }
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 04:01    [W:4.742 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site