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=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS 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 E866AECDFB3 for ; Mon, 16 Jul 2018 09:40:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A752220B80 for ; Mon, 16 Jul 2018 09:40:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A752220B80 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729818AbeGPKHJ (ORCPT ); Mon, 16 Jul 2018 06:07:09 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:9675 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728061AbeGPKHI (ORCPT ); Mon, 16 Jul 2018 06:07:08 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 98896BD79ED1B; Mon, 16 Jul 2018 17:40:21 +0800 (CST) Received: from [127.0.0.1] (10.134.22.195) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.382.0; Mon, 16 Jul 2018 17:40:23 +0800 Subject: Re: [PATCH 2/3] f2fs: keep meta pages in cp_error state To: Jaegeuk Kim , , References: <20180715011112.11475-1-jaegeuk@kernel.org> <20180715011112.11475-2-jaegeuk@kernel.org> From: Chao Yu Message-ID: <75771f42-d3ab-73d4-8cd8-98ee7d26a49b@huawei.com> Date: Mon, 16 Jul 2018 17:40:24 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <20180715011112.11475-2-jaegeuk@kernel.org> Content-Type: text/plain; charset="windows-1252" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2018/7/15 9:11, Jaegeuk Kim wrote: > It turns out losing meta pages in shutdown period makes f2fs very unstable > so that I could see many unexpected error conditions. > > Let's keep meta pages for fault injection and sudden power-off tests. > > Signed-off-by: Jaegeuk Kim > --- > fs/f2fs/checkpoint.c | 28 +++++++++++++--------------- > 1 file changed, 13 insertions(+), 15 deletions(-) > > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c > index 9f1c96caebda..37ec0f16448e 100644 > --- a/fs/f2fs/checkpoint.c > +++ b/fs/f2fs/checkpoint.c > @@ -242,11 +242,8 @@ static int __f2fs_write_meta_page(struct page *page, > > trace_f2fs_writepage(page, META); > > - if (unlikely(f2fs_cp_error(sbi))) { > - dec_page_count(sbi, F2FS_DIRTY_META); > - unlock_page(page); > - return 0; > - } > + if (unlikely(f2fs_cp_error(sbi))) > + goto redirty_out; > if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING))) > goto redirty_out; > if (wbc->for_reclaim && page->index < GET_SUM_BLOCK(sbi, 0)) > @@ -1129,6 +1126,9 @@ static void wait_on_all_pages_writeback(struct f2fs_sb_info *sbi) > if (!get_pages(sbi, F2FS_WB_CP_DATA)) > break; > > + if (unlikely(f2fs_cp_error(sbi))) > + break; > + > io_schedule_timeout(5*HZ); > } > finish_wait(&sbi->cp_wait, &wait); > @@ -1202,8 +1202,12 @@ static void commit_checkpoint(struct f2fs_sb_info *sbi, > > /* writeout cp pack 2 page */ > err = __f2fs_write_meta_page(page, &wbc, FS_CP_META_IO); > - f2fs_bug_on(sbi, err); > + if (unlikely(err && f2fs_cp_error(sbi))) { > + f2fs_put_page(page, 1); > + return; > + } > > + f2fs_bug_on(sbi, err); > f2fs_put_page(page, 0); > > /* submit checkpoint (with barrier if NOBARRIER is not set) */ > @@ -1229,7 +1233,7 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) > while (get_pages(sbi, F2FS_DIRTY_META)) { > f2fs_sync_meta_pages(sbi, META, LONG_MAX, FS_CP_META_IO); > if (unlikely(f2fs_cp_error(sbi))) > - return -EIO; > + break; > } > > /* > @@ -1309,7 +1313,7 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) > f2fs_sync_meta_pages(sbi, META, LONG_MAX, > FS_CP_META_IO); > if (unlikely(f2fs_cp_error(sbi))) > - return -EIO; > + break; > } > } > > @@ -1350,9 +1354,6 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) > /* wait for previous submitted meta pages writeback */ > wait_on_all_pages_writeback(sbi); > > - if (unlikely(f2fs_cp_error(sbi))) > - return -EIO; > - > /* flush all device cache */ > err = f2fs_flush_device_cache(sbi); > if (err) > @@ -1364,9 +1365,6 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) > > f2fs_release_ino_entry(sbi, false); > > - if (unlikely(f2fs_cp_error(sbi))) > - return -EIO; > - > clear_sbi_flag(sbi, SBI_IS_DIRTY); > clear_sbi_flag(sbi, SBI_NEED_CP); > __set_cp_next_pack(sbi); > @@ -1381,7 +1379,7 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) > > f2fs_bug_on(sbi, get_pages(sbi, F2FS_DIRTY_DENTS)); > > - return 0; > + return unlikely(f2fs_cp_error(sbi)); return unlikely(f2fs_cp_error(sbi)) ? -EIO : 0; > } > > /* >