From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1C5FC3F2C6 for ; Tue, 3 Mar 2020 12:04:23 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A075C2073B; Tue, 3 Mar 2020 12:04:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="TPGryYMp"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="cdHXUui8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A075C2073B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1j96Hd-0001gB-M9; Tue, 03 Mar 2020 12:04:21 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1j96Hc-0001g4-Az for linux-f2fs-devel@lists.sourceforge.net; Tue, 03 Mar 2020 12:04:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: MIME-Version:Date:Message-ID:From:References:To:Subject:Sender:Reply-To:Cc: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=yOUW+c1N6lBWBiRv3GI2KKjZLsueiEXKY4wPN4/s8Sc=; b=TPGryYMporRBqVSGd1Fq2cCvPJ bHyfuYfCH0DMkYzwFu2PoovF3Dd3cxLKAMcCPgrJsrkGIGq46obUZDFFIrxRorvH7IBrfm5PDvT2J vLlnKlHREQuxr4m1mUAaDyUvgMzd8qms1hVA8yunQdfomVjJSm8nO8Op3at9F3cgS9eQ=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=yOUW+c1N6lBWBiRv3GI2KKjZLsueiEXKY4wPN4/s8Sc=; b=cdHXUui8E1GNgyIxqYH2W0Kljj 79cJcb1FuBrWrunDs3cw7nRMcHuikiMR4CvRbbCp7wHQxgDoE3lkh8D56ywfnRXWWCFvGIkQu4yD6 F2byazhtCNy/JMBERoLVzKnovpsbyLQ1Ckv/1kUNVImVsjJ4g/Cq8N/8kq+H5bQ/QoAo=; Received: from szxga06-in.huawei.com ([45.249.212.32] helo=huawei.com) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1j96HY-00BvLn-9h for linux-f2fs-devel@lists.sourceforge.net; Tue, 03 Mar 2020 12:04:20 +0000 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id DC893D5CF4488879CFDE; Tue, 3 Mar 2020 19:43:03 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 3 Mar 2020 19:43:01 +0800 To: Sahitya Tummala , Jaegeuk Kim , References: <1582800037-22834-1-git-send-email-stummala@codeaurora.org> From: Chao Yu Message-ID: <421ef8cf-f43d-b698-f58c-fb7b09f9c654@huawei.com> Date: Tue, 3 Mar 2020 19:43:00 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <1582800037-22834-1-git-send-email-stummala@codeaurora.org> Content-Language: en-US X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected X-Headers-End: 1j96HY-00BvLn-9h Subject: Re: [f2fs-dev] [PATCH] fsck.f2fs: allow fsck to fix issues with online resize due to SPO X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 2020/2/27 18:40, Sahitya Tummala wrote: > Add support for new CP flag CP_RESIZEFS_FLAG set during online > resize FS. If SPO happens after SB is updated but CP isn't, then > allow fsck to fix it. > > fsck errors without this fix - > Info: CKPT version = 6ed7bccb > Wrong user_block_count(2233856) > [f2fs_do_mount:3365] Checkpoint is polluted > > the subsequent mount failure without this fix - > [ 11.294650] F2FS-fs (sda8): Wrong user_block_count: 2233856 > [ 11.300272] F2FS-fs (sda8): Failed to get valid F2FS checkpoint > > Signed-off-by: Sahitya Tummala > --- > fsck/mount.c | 30 +++++++++++++++++++++++++++--- > include/f2fs_fs.h | 1 + > 2 files changed, 28 insertions(+), 3 deletions(-) > > diff --git a/fsck/mount.c b/fsck/mount.c > index e4ba048..374c9c4 100644 > --- a/fsck/mount.c > +++ b/fsck/mount.c > @@ -1128,6 +1128,7 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi) > unsigned int total, fsmeta; > struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); > struct f2fs_checkpoint *cp = F2FS_CKPT(sbi); > + unsigned int flag = get_cp(ckpt_flags); > unsigned int ovp_segments, reserved_segments; > unsigned int main_segs, blocks_per_seg; > unsigned int sit_segs, nat_segs; > @@ -1164,7 +1165,30 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi) > log_blocks_per_seg = get_sb(log_blocks_per_seg); > if (!user_block_count || user_block_count >= > segment_count_main << log_blocks_per_seg) { > - MSG(0, "\tWrong user_block_count(%u)\n", user_block_count); > + if (flag & CP_RESIZEFS_FLAG) { For old image with old kernel, if image was corrupted, we will only have CP_FSCK_FLAG flag, how about checking and repairing image as well if CP_FSCK_FLAG was set in order to keep backward compatibility. Thanks, > + u32 valid_user_block_cnt; > + u32 seg_cnt_main = get_sb(segment_count) - > + (get_sb(segment_count_ckpt) + > + get_sb(segment_count_sit) + > + get_sb(segment_count_nat) + > + get_sb(segment_count_ssa)); > + > + /* validate segment_count_main in sb first */ > + if (seg_cnt_main != get_sb(segment_count_main)) { > + MSG(0, "inconsistent segment counts found\n"); > + return 1; > + } > + valid_user_block_cnt = ((get_sb(segment_count_main) - > + get_cp(overprov_segment_count)) * c.blks_per_seg); > + MSG(0, "Info: Fix wrong user_block_count in CP: (%u) -> (%u)\n", > + user_block_count, valid_user_block_cnt); > + set_cp(user_block_count, valid_user_block_cnt); > + c.fix_on = 1; > + c.bug_on = 1; > + } else { > + MSG(0, "\tWrong user_block_count(%u)\n", user_block_count); > + return 1; > + } > return 1; > } > > @@ -3361,6 +3385,8 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi) > return -1; > } > > + c.bug_on = 0; > + > if (sanity_check_ckpt(sbi)) { > ERR_MSG("Checkpoint is polluted\n"); > return -1; > @@ -3380,8 +3406,6 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi) > c.fix_on = 1; > } > > - c.bug_on = 0; > - > if (tune_sb_features(sbi)) > return -1; > > diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h > index af31bc5..265f50c 100644 > --- a/include/f2fs_fs.h > +++ b/include/f2fs_fs.h > @@ -678,6 +678,7 @@ struct f2fs_super_block { > /* > * For checkpoint > */ > +#define CP_RESIZEFS_FLAG 0x00004000 > #define CP_DISABLED_FLAG 0x00001000 > #define CP_QUOTA_NEED_FSCK_FLAG 0x00000800 > #define CP_LARGE_NAT_BITMAP_FLAG 0x00000400 > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel