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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 C8987C6377C for ; Mon, 19 Jul 2021 09:04:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B36E0600CD for ; Mon, 19 Jul 2021 09:04:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235850AbhGSIXt (ORCPT ); Mon, 19 Jul 2021 04:23:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:41442 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235831AbhGSIXr (ORCPT ); Mon, 19 Jul 2021 04:23:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 250FE61220; Mon, 19 Jul 2021 08:54:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626684882; bh=PNDJ3yy1GPRXY9a7Ib41rhUp0LSubtpNKhCmo000WW0=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=Wi22x+SkuOH27vAvSGfrA9zM/OPV2VsSbhqMH1RZBuH6r6mpLmE9Pt/Y4oo9Owpb8 IeQKkqM4xvS/wlUO4yxfF8XdiE+pLv/4Hricg5yMANx2Jh4ewrotwg48XdP2SvnEY8 PulIlWTHFgVWmV/Kp3whindn+ApSH6ol3ivPTKONkXr8SFAMBXugXZ6agtM/UJSGqt 28ScV9MZ9Cn7DGpYht48nQ3mEqHSVf/B3/NFW1Uf2t9PDpqIDjARamFOQhpPaReUpD 5t7o/ytjri2aLr9ojxBjlDClX6IZEedJv0QndKNlFSn9V8K98ebJDHnjerFOAGO9Wv D/qdcm+cYhg3g== Subject: Re: [f2fs-dev] [PATCH] f2fs: reset free segment to prefree status when do_checkpoint() fail To: Yangtao Li , jaegeuk@kernel.org Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net References: <20210427082106.2755-1-frank.li@vivo.com> <12ae52df-bc5e-82c3-4f78-1eafe7723f93@huawei.com> From: Chao Yu Message-ID: <5f37995c-2390-e8ca-d002-3639ad39e0d3@kernel.org> Date: Mon, 19 Jul 2021 16:54:40 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <12ae52df-bc5e-82c3-4f78-1eafe7723f93@huawei.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021/4/27 20:37, Chao Yu wrote: > I think just reverting dirty/free bitmap is not enough if checkpoint fails, > due to we have updated sbi->cur_cp_pack and nat/sit bitmap, next CP tries > to overwrite last valid meta/node/data, then filesystem will be corrupted. > > So I suggest to set cp_error if do_checkpoint() fails until we can handle > all cases, which is not so easy. > > How do you think? Let's add below patch first before you figure out the patch which covers all things. From 3af957c98e9e04259f8bb93ca0b74ba164f3f27e Mon Sep 17 00:00:00 2001 From: Chao Yu Date: Mon, 19 Jul 2021 16:37:44 +0800 Subject: [PATCH] f2fs: fix to stop filesystem update once CP failed During f2fs_write_checkpoint(), once we failed in f2fs_flush_nat_entries() or do_checkpoint(), metadata of filesystem such as prefree bitmap, nat/sit version bitmap won't be recovered, it may cause f2fs image to be inconsistent, let's just set CP error flag to avoid further updates until we figure out a scheme to rollback all metadatas in such condition. Reported-by: Yangtao Li Signed-off-by: Yangtao Li Signed-off-by: Chao Yu --- fs/f2fs/checkpoint.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 6c208108d69c..096c85022f62 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -1639,8 +1639,10 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) /* write cached NAT/SIT entries to NAT/SIT area */ err = f2fs_flush_nat_entries(sbi, cpc); - if (err) + if (err) { + f2fs_stop_checkpoint(sbi, false); goto stop; + } f2fs_flush_sit_entries(sbi, cpc); @@ -1648,10 +1650,12 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) f2fs_save_inmem_curseg(sbi); err = do_checkpoint(sbi, cpc); - if (err) + if (err) { + f2fs_stop_checkpoint(sbi, false); f2fs_release_discard_addrs(sbi); - else + } else { f2fs_clear_prefree_segments(sbi, cpc); + } f2fs_restore_inmem_curseg(sbi); stop: -- 2.22.1 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=-15.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,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 A6522C12002 for ; Mon, 19 Jul 2021 08:55:03 +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 64626611C0; Mon, 19 Jul 2021 08:55:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 64626611C0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.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 1m5P3G-0003Wn-Us; Mon, 19 Jul 2021 08:55:02 +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 1m5P3E-0003WZ-JO for linux-f2fs-devel@lists.sourceforge.net; Mon, 19 Jul 2021 08:55:00 +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:Cc:To:Subject:Sender:Reply-To: 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=LipmBgXHdoM/SKGbryw/YccSnEKyKMjmVyBxb3Xqwnk=; b=SyDmmUct8lLjVZEQKlofarQeZL sgcNO/eDqg4rBlwAxUcSY41hkpqzcYE4ZT4n4yCdRn6YhOXu9RdR+bO3cBfXqHzIk2Qtt95wyehnF W4cJ+lSgnrupnEkM43KbNL5DZrvl6JUWpdauvdoLYObu9bvtrqF8bDXWqPoQRpPt4My0=; 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:Cc:To:Subject:Sender:Reply-To: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=LipmBgXHdoM/SKGbryw/YccSnEKyKMjmVyBxb3Xqwnk=; b=WezQdduN671oq5Wx5DK3b+O8dv YFop37HLh3dSd6J1HkZlWsBeRc4GIMFRHs5aiIwwlgHtoEtw3CBY0asqbqZC60Zzu8Z2JmMLluGcs 84HP7Y2pYAGmlCsEQ36DX/+MdYroL9EaD+jvwCr/iLFTnSkClGCStTt/smIXd+uSzPhU=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1m5P32-0004lb-HM for linux-f2fs-devel@lists.sourceforge.net; Mon, 19 Jul 2021 08:55:00 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 250FE61220; Mon, 19 Jul 2021 08:54:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626684882; bh=PNDJ3yy1GPRXY9a7Ib41rhUp0LSubtpNKhCmo000WW0=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=Wi22x+SkuOH27vAvSGfrA9zM/OPV2VsSbhqMH1RZBuH6r6mpLmE9Pt/Y4oo9Owpb8 IeQKkqM4xvS/wlUO4yxfF8XdiE+pLv/4Hricg5yMANx2Jh4ewrotwg48XdP2SvnEY8 PulIlWTHFgVWmV/Kp3whindn+ApSH6ol3ivPTKONkXr8SFAMBXugXZ6agtM/UJSGqt 28ScV9MZ9Cn7DGpYht48nQ3mEqHSVf/B3/NFW1Uf2t9PDpqIDjARamFOQhpPaReUpD 5t7o/ytjri2aLr9ojxBjlDClX6IZEedJv0QndKNlFSn9V8K98ebJDHnjerFOAGO9Wv D/qdcm+cYhg3g== To: Yangtao Li , jaegeuk@kernel.org References: <20210427082106.2755-1-frank.li@vivo.com> <12ae52df-bc5e-82c3-4f78-1eafe7723f93@huawei.com> From: Chao Yu Message-ID: <5f37995c-2390-e8ca-d002-3639ad39e0d3@kernel.org> Date: Mon, 19 Jul 2021 16:54:40 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <12ae52df-bc5e-82c3-4f78-1eafe7723f93@huawei.com> Content-Language: en-US X-Headers-End: 1m5P32-0004lb-HM Subject: Re: [f2fs-dev] [PATCH] f2fs: reset free segment to prefree status when do_checkpoint() fail 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: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 2021/4/27 20:37, Chao Yu wrote: > I think just reverting dirty/free bitmap is not enough if checkpoint fails, > due to we have updated sbi->cur_cp_pack and nat/sit bitmap, next CP tries > to overwrite last valid meta/node/data, then filesystem will be corrupted. > > So I suggest to set cp_error if do_checkpoint() fails until we can handle > all cases, which is not so easy. > > How do you think? Let's add below patch first before you figure out the patch which covers all things. From 3af957c98e9e04259f8bb93ca0b74ba164f3f27e Mon Sep 17 00:00:00 2001 From: Chao Yu Date: Mon, 19 Jul 2021 16:37:44 +0800 Subject: [PATCH] f2fs: fix to stop filesystem update once CP failed During f2fs_write_checkpoint(), once we failed in f2fs_flush_nat_entries() or do_checkpoint(), metadata of filesystem such as prefree bitmap, nat/sit version bitmap won't be recovered, it may cause f2fs image to be inconsistent, let's just set CP error flag to avoid further updates until we figure out a scheme to rollback all metadatas in such condition. Reported-by: Yangtao Li Signed-off-by: Yangtao Li Signed-off-by: Chao Yu --- fs/f2fs/checkpoint.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 6c208108d69c..096c85022f62 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -1639,8 +1639,10 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) /* write cached NAT/SIT entries to NAT/SIT area */ err = f2fs_flush_nat_entries(sbi, cpc); - if (err) + if (err) { + f2fs_stop_checkpoint(sbi, false); goto stop; + } f2fs_flush_sit_entries(sbi, cpc); @@ -1648,10 +1650,12 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) f2fs_save_inmem_curseg(sbi); err = do_checkpoint(sbi, cpc); - if (err) + if (err) { + f2fs_stop_checkpoint(sbi, false); f2fs_release_discard_addrs(sbi); - else + } else { f2fs_clear_prefree_segments(sbi, cpc); + } f2fs_restore_inmem_curseg(sbi); stop: -- 2.22.1 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel