Received: by 10.223.176.5 with SMTP id f5csp1405186wra; Wed, 7 Feb 2018 19:15:21 -0800 (PST) X-Google-Smtp-Source: AH8x227ECovfWjXohN0zGABKG7i9ijPbtC3QpIcbWlsVue2U6546Me/F0lNGqEqjD2MoyAuwUs8c X-Received: by 2002:a17:902:6bca:: with SMTP id m10-v6mr8029583plt.351.1518059721834; Wed, 07 Feb 2018 19:15:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518059721; cv=none; d=google.com; s=arc-20160816; b=dVDipk2SGylchQ8qucD/P36v20sJeNiMHzv+xcymqk2a501Jb55tuZW2Z7oMrnOkxm 33zwurex1dAjFUxmO/8HtX82guL2mL3UjkwXMRZ8GpEoN92hpyxPgI+/NvDq14SkNTie KWfXiA3N0GRm3/0AIkA7C+3EUVmNEUqSmzqjIBdTtq05fJP0Hr37wNYXRKxiT/IljA3J 3S9rn4QwAyq04zBOFcBfaB3iV3udiAPRZV23SRDJbBHvEiyMJKtxJW0iZF8Hk7u+1cnk ILUQAebOU4LJl1ahPAR+nZVmC3zC1N/u2ogJ9K/ywSdSD8BXU3awjt6Mj02SLaZrPcXa FFgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:arc-authentication-results; bh=uNZ71kfMie6ARb/1G5/47HdFw4gL78UnmF7ncq2WGoM=; b=RfLtmaNBq++4DoDmC/ThFdkr2fhIS9/EYDojW5yOqxTo+ZhxY8734s+sjJf0lgWcVl 6daJfyE0agOgRvlwPK4+rmWnW9K36i9jnyJt5LIE4eyl5DVJjtOThwX5LYOnFs8YzT3d bBKMX8WFagvp0YcYldyYaIJw24nQK2jtv0ZC29+BLb/8jwdM4uVywqLgxko9VOQwoLZ6 xBAUBBmQlL536gGCcEAoRtO19oTIfj4RUeMctQljUkf7yYHZBfoeG7VA18xTbFFjKQa9 uF+Ixi3CXddErTCbeXVBM3BvCHnR8bYeqZY+Rr/zT2SBwWrEk4dbySyJ0NvDe6ZKIqVH lsPA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n78si434014pfj.337.2018.02.07.19.15.06; Wed, 07 Feb 2018 19:15:21 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751146AbeBHDOU (ORCPT + 99 others); Wed, 7 Feb 2018 22:14:20 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:52590 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1750736AbeBHDOT (ORCPT ); Wed, 7 Feb 2018 22:14:19 -0500 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 25FB02866073B; Thu, 8 Feb 2018 11:14:07 +0800 (CST) Received: from [127.0.0.1] (10.111.220.140) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.361.1; Thu, 8 Feb 2018 11:13:58 +0800 Subject: Re: [PATCH] f2fs: add fi->commit_lock to protect commit GCed pages To: Chao Yu , , , CC: , , , , , References: <1517626068-49739-1-git-send-email-yunlong.song@huawei.com> <1517888990-96478-1-git-send-email-yunlong.song@huawei.com> <4493cbf2-6f37-6c04-a012-4b2516b3b4e7@kernel.org> From: Yunlong Song Message-ID: <134848f9-2dd6-0efa-3ccf-3c29eeaf5534@huawei.com> Date: Thu, 8 Feb 2018 11:11:13 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <4493cbf2-6f37-6c04-a012-4b2516b3b4e7@kernel.org> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.111.220.140] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Then the GCed data pages are totally mixed with the inmem atomic pages, this will cause the atomic commit ops write the GCed data pages twice (the first write happens in GC). How about using the early two patches to separate the inmem data pages and GCed data pages, and use dio_rwsem instead of this patch to fix the dnode page problem (dnode page commited but data page are not committed for the GCed page)? On 2018/2/7 20:16, Chao Yu wrote: > On 2018/2/6 11:49, Yunlong Song wrote: >> This patch adds fi->commit_lock to avoid the case that GCed node pages >> are committed but GCed data pages are not committed. This can avoid the >> db file run into inconsistent state when sudden-power-off happens if >> data pages of atomic file is allowed to be GCed before. > > do_fsync: GC: > - mutex_lock(&fi->commit_lock); > - lock_page() > - mutex_lock(&fi->commit_lock); > - lock_page() > > > Well, please consider lock dependency & code complexity, IMO, reuse > fi->dio_rwsem[WRITE] will be enough as below: > > --- > fs/f2fs/file.c | 3 +++ > fs/f2fs/gc.c | 5 ----- > 2 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index 672a542e5464..1bdc11feb8d0 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -1711,6 +1711,8 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp) > > inode_lock(inode); > > + down_write(&F2FS_I(inode)->dio_rwsem[WRITE]); > + > if (f2fs_is_volatile_file(inode)) > goto err_out; > > @@ -1729,6 +1731,7 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp) > ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 1, false); > } > err_out: > + up_write(&F2FS_I(inode)->dio_rwsem[WRITE]); > inode_unlock(inode); > mnt_drop_write_file(filp); > return ret; > diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c > index b9d93fd532a9..e49416283563 100644 > --- a/fs/f2fs/gc.c > +++ b/fs/f2fs/gc.c > @@ -622,9 +622,6 @@ static void move_data_block(struct inode *inode, block_t bidx, > if (!check_valid_map(F2FS_I_SB(inode), segno, off)) > goto out; > > - if (f2fs_is_atomic_file(inode)) > - goto out; > - > if (f2fs_is_pinned_file(inode)) { > f2fs_pin_file_control(inode, true); > goto out; > @@ -729,8 +726,6 @@ static void move_data_page(struct inode *inode, block_t bidx, int gc_type, > if (!check_valid_map(F2FS_I_SB(inode), segno, off)) > goto out; > > - if (f2fs_is_atomic_file(inode)) > - goto out; > if (f2fs_is_pinned_file(inode)) { > if (gc_type == FG_GC) > f2fs_pin_file_control(inode, true); > -- Thanks, Yunlong Song