Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp8197821ybi; Tue, 23 Jul 2019 04:31:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqye7fTCw1Q8PVeQA1KRgNnhu0OXoDVWMq6pyOuepn7QPSPQjDiSJZiTgn8vz+VQGqO21J8y X-Received: by 2002:a62:7641:: with SMTP id r62mr5290853pfc.35.1563881508888; Tue, 23 Jul 2019 04:31:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563881508; cv=none; d=google.com; s=arc-20160816; b=xE17X6SYSlLwaDhcYavQiWGtAskDvX4oR+KXNnPIUh0svQfeTmh7khzZ4lq86H3iBj wqmDVPlBGFDRN/Tp76hdDesysgm9jdXxxUM0pXXQTL6z9uzNz/+ICDOYAjb4+dUcaXCb 8DVbUrgVBrSDApBmOjQk++Y7TuuLAAHKd85/4MqLmwwRSC1B+cb8Yb+34R8USJ6W0yTF 3O28icN2URCfuj3nWgLB6ODoGYnTvG2Xpcv4sMmtmCGhGqBwfiNtJ037gn5sW/ZUnYCE 3Wm42rH/fQpZghScXLkMcbJYaQnG1muhqBqRvQdf1wScyLBq9bqE62DlNfK1IZN6jsQN rGWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=S+XdDu+Iq2AXhXwNFNkrD9rNIltgpQewBUJ5fqfF9nE=; b=SqGfzX7MWwCPoZMO7QM6VVECfy0w7Y0YKqb/2A84FIwvX8QNDETqfLBBVONwTMs+7J Cx9HvqQMf/L7km3PAasrZ2YgR9NZWZFapRxT+3NRyZBVqfAsF5X3PiQLl6w/8Uahr+w0 jjgBNmYvTm+hGV9be9uvcgpI+eO6kMfgRbtugQsrPiPpXhD/TdHhvx/Mn2LzLllPLURq lSKzxsJZzvwXv2A36/L6yPAvsoVPLvcnqHUzhB1IAv1T0omSioFb4sBojgpd2caSjrT2 A7Pv9iPbBV2r6Y7ysXYoJi+oZWxuKKOcLMu6pDSVsjMHoMtkQPEgdc04tAXqFJaXEJC7 8ytA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=O1XRN6oz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i3si296699pgm.163.2019.07.23.04.31.32; Tue, 23 Jul 2019 04:31:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=O1XRN6oz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729630AbfGWB1X (ORCPT + 99 others); Mon, 22 Jul 2019 21:27:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:39986 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727748AbfGWB1X (ORCPT ); Mon, 22 Jul 2019 21:27:23 -0400 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 Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Subject: Re: [f2fs-dev] [PATCH v2] f2fs: fix to read source block before invalidating it 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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <91dbfa33-cda0-e6e7-d62f-6604939142d4@huawei.com> User-Agent: Mutt/1.8.2 (2017-04-18) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > . > >