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.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 C4B29C76190 for ; Tue, 23 Jul 2019 01:27:37 +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 92D1321BF6; Tue, 23 Jul 2019 01:27:37 +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="doicFPfr"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="bWR1XGHp"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="O1XRN6oz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 92D1321BF6 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-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1hpjaa-0001jj-TO; Tue, 23 Jul 2019 01:27:36 +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 1hpjaZ-0001jV-Kf for linux-f2fs-devel@lists.sourceforge.net; Tue, 23 Jul 2019 01:27:35 +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=S+XdDu+Iq2AXhXwNFNkrD9rNIltgpQewBUJ5fqfF9nE=; b=doicFPfrtrxVObJGLnIdERKFnW HAdcX1JqBXWZtdUgIA71tpAfnQxaaAEh/baaUPDyP3l5ylRoqQaaLpfQ5bjPDxK0F3e88sfmR9qba wUOyEMuOfWhARaijbUsx4bm42RDWQ0C1T0cwGtqP3W2pwwez1EkBGmFXuGUGTkdo1aNI=; 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=S+XdDu+Iq2AXhXwNFNkrD9rNIltgpQewBUJ5fqfF9nE=; b=bWR1XGHp/kyyyJpMJclWAZvKKZ 3yWCLcZa/Q4vCixSHdWxxZWJyRftP8nv5Qure1kMLW7RhhSDKYdn5zH+GiopaiK4fAZlAUEmPnKrb Dvz2JYXq0mTqzr4Js2jUDL0X2utW2PwZaVwjMeyoW8LjoxoqmXRRjUWrovXQl7NWaZsk=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1hpjaT-00BQZa-Sl for linux-f2fs-devel@lists.sourceforge.net; Tue, 23 Jul 2019 01:27:35 +0000 Received: from localhost (unknown [104.132.0.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7D92321BF6; Tue, 23 Jul 2019 01:27:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563845242; bh=BgGXeSedDJgfg5t9SX7vvcS+VkZq7bZ/ummuI4tawSk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=O1XRN6ozdEy1fvJTWYKfWixHEUFc/NCjTuf5UjHxYO5i1Lz1LhS9ZP2LVL+RhA6+F 4wxqyU5zqYDwnjwBWJa9JML50Q6xQp2Zk8WWuP5Brk7Y6jqCQfJ/Lo67mv/Ylvo5AP kJxwxF6Uk8fDncn01YMmLb4cH1rFKYlT3MyN/fMM= Date: Mon, 22 Jul 2019 18:27:21 -0700 From: Jaegeuk Kim To: Chao Yu Message-ID: <20190723012721.GA60134@jaegeuk-macbookpro.roam.corp.google.com> References: <20190718013718.70335-1-jaegeuk@kernel.org> <20190718031214.GA78336@jaegeuk-macbookpro.roam.corp.google.com> <19a25101-da74-de98-6ca4-a9fd9fa09ef2@huawei.com> <20190718040005.GA81995@jaegeuk-macbookpro.roam.corp.google.com> <91dbfa33-cda0-e6e7-d62f-6604939142d4@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <91dbfa33-cda0-e6e7-d62f-6604939142d4@huawei.com> User-Agent: Mutt/1.8.2 (2017-04-18) X-Headers-End: 1hpjaT-00BQZa-Sl 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: , Cc: linux-kernel@vger.kernel.org, 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 07/18, Chao Yu wrote: > On 2019/7/18 12:00, Jaegeuk Kim wrote: > > On 07/18, Chao Yu wrote: > >> 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... > > > > I worried about performance tho, more concern came to me that there may exist a > > chance that other thread can allocate and write something in old block address. > > Me too, however, previous invalid block address should be reused after a > checkpoint, and checkpoint should have invalidated meta cache already, so there > shouldn't be any race here. I think SSR can reuse that before checkpoint. > > /* > * invalidate intermediate page cache borrowed from meta inode > * which are used for migration of encrypted inode's blocks. > */ > if (f2fs_sb_has_encrypt(sbi)) > invalidate_mapping_pages(META_MAPPING(sbi), > MAIN_BLKADDR(sbi), MAX_BLKADDR(sbi) - 1); > > Thanks, > > > > >> > >> Can we just relief to use DATA_GENERIC_ENHANCE_READ for this case...? > > > > We need to keep consistency for this api. > > > > Thanks, > > > >> > >>> > >>> 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 > > . > > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel