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=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 2E1A2C76186 for ; Thu, 18 Jul 2019 03:30:35 +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 04DFC205F4; Thu, 18 Jul 2019 03:30:34 +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="ZBTNSiaJ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="gpSFLtIh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 04DFC205F4 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-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1hnx7q-0006gj-LY; Thu, 18 Jul 2019 03:30:34 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1hnx7p-0006gS-0H for linux-f2fs-devel@lists.sourceforge.net; Thu, 18 Jul 2019 03:30:33 +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=0+fWpcsjqHz2hWgHUO5TBziD83mNXH+4M9yBM3EJ82o=; b=ZBTNSiaJxucXFZMo6drwAvzMA5 vHRCQY/bgJl/eng/O5dB4XCDQc+Xwa4wH4Wy3WdtzUOcikui2vzdZu4V8UIFFqE8+M0epFuClVysz kOHcy/t6AxrHCEh4ANHuztl1GxqQCn7Pv6FnRRM5RSQ1hL6QmsBhmEfGNh4aNxgiII0w=; 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=0+fWpcsjqHz2hWgHUO5TBziD83mNXH+4M9yBM3EJ82o=; b=gpSFLtIh0T+CP+2q3xagSKyB9D KVLfjR6N/sXa1nBJkC85YOjN/6UVPbdhQ5kabhKwKS5RNZukNT8dUz3wtGPolSQ3vCHpbbFsatVcK T+j9HCzLgkjUioCxCfuotHoqzXdH1O6osRdLBqGA3RmZMoB0ANwuMF8DdBbv36wn4JJo=; Received: from szxga07-in.huawei.com ([45.249.212.35] helo=huawei.com) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1hnx7m-005rC8-JH for linux-f2fs-devel@lists.sourceforge.net; Thu, 18 Jul 2019 03:30:32 +0000 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 92BEC43EF11C6CF4ED03; Thu, 18 Jul 2019 11:30:23 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 18 Jul 2019 11:30:19 +0800 To: Jaegeuk Kim , , References: <20190718013718.70335-1-jaegeuk@kernel.org> <20190718031214.GA78336@jaegeuk-macbookpro.roam.corp.google.com> From: Chao Yu Message-ID: <19a25101-da74-de98-6ca4-a9fd9fa09ef2@huawei.com> Date: Thu, 18 Jul 2019 11:30:18 +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: <20190718031214.GA78336@jaegeuk-macbookpro.roam.corp.google.com> Content-Language: en-US X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected X-Headers-End: 1hnx7m-005rC8-JH Subject: Re: [f2fs-dev] [PATCH v2] f2fs: fix to read source block before invalidating it 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 2019/7/18 11:12, Jaegeuk Kim wrote: > f2fs_allocate_data_block() invalidates old block address and enable new block > address. Then, if we try to read old block by f2fs_submit_page_bio(), it will > give WARN due to reading invalid blocks. > > Let's make the order sanely back. Hmm.. to avoid WARM, we may suffer one more memcpy, I suspect this can reduce online resize or foreground gc ioctl performance... Can we just relief to use DATA_GENERIC_ENHANCE_READ for this case...? > > Signed-off-by: Jaegeuk Kim Except performance, I'm okay with this change. Reviewed-by: Chao Yu Thanks, > --- > v2: > I was fixing the comments. :) > > fs/f2fs/gc.c | 70 +++++++++++++++++++++++++--------------------------- > 1 file changed, 34 insertions(+), 36 deletions(-) > > diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c > index 6691f526fa40..8974672db78f 100644 > --- a/fs/f2fs/gc.c > +++ b/fs/f2fs/gc.c > @@ -796,6 +796,29 @@ static int move_data_block(struct inode *inode, block_t bidx, > if (lfs_mode) > down_write(&fio.sbi->io_order_lock); > > + mpage = f2fs_grab_cache_page(META_MAPPING(fio.sbi), > + fio.old_blkaddr, false); > + if (!mpage) > + goto up_out; > + > + fio.encrypted_page = mpage; > + > + /* read source block in mpage */ > + if (!PageUptodate(mpage)) { > + err = f2fs_submit_page_bio(&fio); > + if (err) { > + f2fs_put_page(mpage, 1); > + goto up_out; > + } > + lock_page(mpage); > + if (unlikely(mpage->mapping != META_MAPPING(fio.sbi) || > + !PageUptodate(mpage))) { > + err = -EIO; > + f2fs_put_page(mpage, 1); > + goto up_out; > + } > + } > + > f2fs_allocate_data_block(fio.sbi, NULL, fio.old_blkaddr, &newaddr, > &sum, CURSEG_COLD_DATA, NULL, false); > > @@ -803,44 +826,18 @@ static int move_data_block(struct inode *inode, block_t bidx, > newaddr, FGP_LOCK | FGP_CREAT, GFP_NOFS); > if (!fio.encrypted_page) { > err = -ENOMEM; > - goto recover_block; > - } > - > - mpage = f2fs_pagecache_get_page(META_MAPPING(fio.sbi), > - fio.old_blkaddr, FGP_LOCK, GFP_NOFS); > - if (mpage) { > - bool updated = false; > - > - if (PageUptodate(mpage)) { > - memcpy(page_address(fio.encrypted_page), > - page_address(mpage), PAGE_SIZE); > - updated = true; > - } > f2fs_put_page(mpage, 1); > - invalidate_mapping_pages(META_MAPPING(fio.sbi), > - fio.old_blkaddr, fio.old_blkaddr); > - if (updated) > - goto write_page; > - } > - > - err = f2fs_submit_page_bio(&fio); > - if (err) > - goto put_page_out; > - > - /* write page */ > - lock_page(fio.encrypted_page); > - > - if (unlikely(fio.encrypted_page->mapping != META_MAPPING(fio.sbi))) { > - err = -EIO; > - goto put_page_out; > - } > - if (unlikely(!PageUptodate(fio.encrypted_page))) { > - err = -EIO; > - goto put_page_out; > + goto recover_block; > } > > -write_page: > + /* write target block */ > f2fs_wait_on_page_writeback(fio.encrypted_page, DATA, true, true); > + memcpy(page_address(fio.encrypted_page), > + page_address(mpage), PAGE_SIZE); > + f2fs_put_page(mpage, 1); > + invalidate_mapping_pages(META_MAPPING(fio.sbi), > + fio.old_blkaddr, fio.old_blkaddr); > + > set_page_dirty(fio.encrypted_page); > if (clear_page_dirty_for_io(fio.encrypted_page)) > dec_page_count(fio.sbi, F2FS_DIRTY_META); > @@ -871,11 +868,12 @@ static int move_data_block(struct inode *inode, block_t bidx, > put_page_out: > f2fs_put_page(fio.encrypted_page, 1); > recover_block: > - if (lfs_mode) > - up_write(&fio.sbi->io_order_lock); > if (err) > f2fs_do_replace_block(fio.sbi, &sum, newaddr, fio.old_blkaddr, > true, true); > +up_out: > + if (lfs_mode) > + up_write(&fio.sbi->io_order_lock); > put_out: > f2fs_put_dnode(&dn); > out: > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel