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 D00F0C54FCE for ; Mon, 23 Mar 2020 10:51:15 +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 A07552076A; Mon, 23 Mar 2020 10:51:15 +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="m/uf1oZ5"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="IRUxMfP8"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="EnnYh7k0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A07552076A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org 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 1jGKfo-0001vU-GZ; Mon, 23 Mar 2020 10:51:12 +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 1jGKfm-0001vM-JE for linux-f2fs-devel@lists.sourceforge.net; Mon, 23 Mar 2020 10:51:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: 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=wvSJn3HmvMRQIINhTgTe3cDcD0e7WVK7g1Im47zZ/wk=; b=m/uf1oZ5LImgtsitZvT0p+ar08 oGS4XiNibYZB4E2uf/LPWAcLfd5WtqbXrJJnqyP4uPu3eZuTlE3GOX2Oi13elpiti2Q37Y+i5y5qC c3mEef8XgpUO8bxAcNhfTG5dEFffktGTI/xkRBO2ESCjN3Drr6287pV5PYRkREs7WNhM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding: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=wvSJn3HmvMRQIINhTgTe3cDcD0e7WVK7g1Im47zZ/wk=; b=IRUxMfP8HcUF7QCCxaghEtRBdY xoN8rAza9BXqH17x1NyJ30AzyY9pROIv+1qadRrHlv4HdjJUhXtPctSf6eCZhjH9BujlBE7JZMwkC aPSM+BFDhOqqqKCIyE0xdo0faU35MvcNqqnrk/jJGW9AhbYXls8RR5BuAoWN/fLRTrAI=; Received: from mail26.static.mailgun.info ([104.130.122.26]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1jGKfc-000lo4-Vn for linux-f2fs-devel@lists.sourceforge.net; Mon, 23 Mar 2020 10:51:10 +0000 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1584960660; h=In-Reply-To: Content-Type: MIME-Version: References: Message-ID: Subject: Cc: To: From: Date: Sender; bh=wvSJn3HmvMRQIINhTgTe3cDcD0e7WVK7g1Im47zZ/wk=; b=EnnYh7k0Ovd2X12UdYz5lfSuKGol6eGNE80wlklvIE3wfdz9Gy/tiSOwz9jIlkwbNtn7dNzI SMNxDas0tAt7k9aGzoNK9J4mZ4Q+/d3uqjE2/Cq6kqV3u1tylbYikOWdDGMWn5kuPOF+lvF2 zhTSoYTJOnTgypd/TkglTYzahDU= X-Mailgun-Sending-Ip: 104.130.122.26 X-Mailgun-Sid: WyI2M2Y4ZiIsICJsaW51eC1mMmZzLWRldmVsQGxpc3RzLnNvdXJjZWZvcmdlLm5ldCIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by mxa.mailgun.org with ESMTP id 5e78948a.7fdb17da8768-smtp-out-n04; Mon, 23 Mar 2020 10:50:50 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id B027BC433D2; Mon, 23 Mar 2020 10:50:49 +0000 (UTC) Received: from codeaurora.org (blr-c-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: stummala) by smtp.codeaurora.org (Postfix) with ESMTPSA id 58A84C433CB; Mon, 23 Mar 2020 10:50:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 58A84C433CB Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=stummala@codeaurora.org Date: Mon, 23 Mar 2020 16:20:43 +0530 From: Sahitya Tummala To: Chao Yu Message-ID: <20200323105043.GP20234@codeaurora.org> References: <1584676412-4448-1-git-send-email-stummala@codeaurora.org> <8cdf7aa9-cd86-3b73-c3da-89c281cddd0f@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <8cdf7aa9-cd86-3b73-c3da-89c281cddd0f@huawei.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Headers-End: 1jGKfc-000lo4-Vn Subject: Re: [f2fs-dev] [PATCH v3] 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: , Cc: Jaegeuk Kim , linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On Mon, Mar 23, 2020 at 09:54:20AM +0800, Chao Yu wrote: > On 2020/3/20 11:53, 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. > > > > The 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 > > --- > > v3: > > - allow fsck to fix based on -f option > > > > fsck/mount.c | 34 ++++++++++++++++++++++++++++++---- > > include/f2fs_fs.h | 1 + > > 2 files changed, 31 insertions(+), 4 deletions(-) > > > > diff --git a/fsck/mount.c b/fsck/mount.c > > index e4ba048..1e3731f 100644 > > --- a/fsck/mount.c > > +++ b/fsck/mount.c > > @@ -429,6 +429,8 @@ void print_cp_state(u32 flag) > > MSG(0, "%s", " orphan_inodes"); > > if (flag & CP_DISABLED_FLAG) > > MSG(0, "%s", " disabled"); > > + if (flag & CP_RESIZEFS_FLAG) > > + MSG(0, "%s", " resizefs"); > > if (flag & CP_UMOUNT_FLAG) > > MSG(0, "%s", " unmount"); > > else > > @@ -1128,6 +1130,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,8 +1167,31 @@ 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); > > - return 1; > > + ASSERT_MSG("\tWrong user_block_count(%u)\n", user_block_count); > > + if (!c.fix_on) > > + return 1; > > It looks fix_on will be revised to 1 on several CP status when user uses > -a or -p? we should consider this as well? Sure, let me add it. Thanks, > > if (!c.fix_on && (c.auto_fix || c.preen_mode)) { > u32 flag = get_cp(ckpt_flags); > > if (flag & CP_FSCK_FLAG || > flag & CP_QUOTA_NEED_FSCK_FLAG || > (exist_qf_ino(sb) && (flag & CP_ERROR_FLAG))) { > c.fix_on = 1; > > > + > > + if (flag & (CP_FSCK_FLAG | CP_RESIZEFS_FLAG)) { > > + 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_cnt_main %u in sb\n", > > + segment_count_main << log_blocks_per_seg); > > + 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.bug_on = 1; > > + } > > } > > > > main_segs = get_sb(segment_count_main); > > @@ -3361,6 +3387,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 +3408,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 > > -- -- Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel