Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp3671676ybl; Sun, 1 Sep 2019 18:47:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqzJjkhw9FMBfMDfU045yuoNa8n8tPWWpDUsBVOdq3TWpkF51Cd3WeEzS113bHi2ExxmltYP X-Received: by 2002:a17:90a:9907:: with SMTP id b7mr4299145pjp.101.1567388860757; Sun, 01 Sep 2019 18:47:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567388860; cv=none; d=google.com; s=arc-20160816; b=Sc/7SM10wKtLMn4Un6Gz9biTpPVJz12PyNoPtXtYSjbDembOpx/cVjKYLSiODdgxqF pcWYvOE/GKIBWNO1ekrAQg2ou4sJprtGRlnD+c2uvvvlwnmKRIb0/oSDw5eafgon0wdr dSKe+6/2sih5vGtJX9WZLylarvHBvgmXb1QXCL9VYjIgL7x8umwH5j5AyWtcfLp9slwI zpWyIiV1koAMEuyZTO5L5a3PjMrrcMaGYdabHPWOJMZy0E7czTWDYgpDLk8hCeleVYOZ XXnFXq3hnDwTHmPa+mPNxlQmoOF4RIMEZTuYmUPXf2Owibr7KrFM1+wetDpFDrhzhx1t qLkw== 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; bh=8TACocEv2ofv+YEGUNz13cnH3mmy/aIyqv3g+exN5Fc=; b=vn9+L+YKjYJ6RbVfxrHkE2sGNCIF42xYklS5YmEVV4xGlz8AS14eoR8fdQvwkfHVTo YjwnU4vedQ7qRKq6M1UQC7QWR0G2PGMey4r2Wc75QSf4EBCC4iArVBiS3ocU28T4aXsr zIPVmY7gLK6bHQ82gO45ThtTfwTBtrvAxeLjJBWzXYuR4HF/tol1eE7p2tbiixhgTLcC 0JSTTnXo9fh48p/dZ8Uo299MRMm5BC9tOlKfeel5AX6KRPiGTWu9S0WNo5+kjbcKyHCC b4OMirRsn9z69LOqqPhzCfSJ2lKQhf1kD9pTaz15dqpqIcTSM6PhvWwE0jN2VCbcqFsD GSAA== 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 k33si10110368pgi.563.2019.09.01.18.47.25; Sun, 01 Sep 2019 18:47:40 -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; 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 S1729061AbfIBBpS (ORCPT + 99 others); Sun, 1 Sep 2019 21:45:18 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:6161 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727517AbfIBBpS (ORCPT ); Sun, 1 Sep 2019 21:45:18 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 864B7ED3FCD6426EBA90; Mon, 2 Sep 2019 09:45:16 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.208) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 2 Sep 2019 09:45:11 +0800 Subject: Re: [f2fs-dev] [PATCH] f2fs: convert inline_data in prior to i_size_write To: Jaegeuk Kim CC: , References: <20190830153453.24684-1-jaegeuk@kernel.org> <20190901072529.GB49907@jaegeuk-macbookpro.roam.corp.google.com> From: Chao Yu Message-ID: Date: Mon, 2 Sep 2019 09:45:10 +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: <20190901072529.GB49907@jaegeuk-macbookpro.roam.corp.google.com> 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 2019/9/1 15:25, Jaegeuk Kim wrote: > On 08/31, Chao Yu wrote: >> On 2019/8/30 23:34, Jaegeuk Kim wrote: >>> This can guarantee inline_data has smaller i_size. >> >> So I guess "f2fs: fix to avoid corruption during inline conversion" didn't fix >> such corruption right, I guess checkpoint & SPO before i_size recovery will >> cause this issue? >> >> err = f2fs_convert_inline_inode(inode); >> if (err) { >> >> --> > > Yup, I think so. Oh, we'd better to avoid wrong fixing patch as much as possible, so what about letting me change that patch to just fix error path of f2fs_convert_inline_page() by adding missing f2fs_truncate_data_blocks_range()? Meanwhile I need to add below 'Fixes' tag line: 7735730d39d7 ("f2fs: fix to propagate error from __get_meta_page()") And if possible, could you add: In below call path, if we failed to convert inline inode, inline inode may have wrong i_size which is larger than max inline size. - f2fs_setattr - truncate_setsize - f2fs_convert_inline_inode Fixes: 0cab80ee0c9e ("f2fs: fix to convert inline inode in ->setattr") > >> >> /* recover old i_size */ >> i_size_write(inode, old_size); >> return err; >> >>> >>> Signed-off-by: Jaegeuk Kim >> >> Reviewed-by: Chao Yu >> >>> --- >>> fs/f2fs/file.c | 25 +++++++++---------------- >>> 1 file changed, 9 insertions(+), 16 deletions(-) >>> >>> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c >>> index 08caaead6f16..a43193dd27cb 100644 >>> --- a/fs/f2fs/file.c >>> +++ b/fs/f2fs/file.c >>> @@ -815,14 +815,20 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr) >>> >>> if (attr->ia_valid & ATTR_SIZE) { >>> loff_t old_size = i_size_read(inode); >>> - bool to_smaller = (attr->ia_size <= old_size); >>> + >>> + if (attr->ia_size > MAX_INLINE_DATA(inode)) { >>> + /* should convert inline inode here */ >> >> Would it be better: >> >> /* should convert inline inode here in piror to i_size_write to avoid >> inconsistent status in between inline flag and i_size */ > > Put like this. > > + /* > + * should convert inline inode before i_size_write to > + * keep smaller than inline_data size with inline flag. > + */ Better, :) thanks, > >> >> Thanks, >> >>> + err = f2fs_convert_inline_inode(inode); >>> + if (err) >>> + return err; >>> + } >>> >>> down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); >>> down_write(&F2FS_I(inode)->i_mmap_sem); >>> >>> truncate_setsize(inode, attr->ia_size); >>> >>> - if (to_smaller) >>> + if (attr->ia_size <= old_size) >>> err = f2fs_truncate(inode); >>> /* >>> * do not trim all blocks after i_size if target size is >>> @@ -830,24 +836,11 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr) >>> */ >>> up_write(&F2FS_I(inode)->i_mmap_sem); >>> up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); >>> - >>> if (err) >>> return err; >>> >>> - if (!to_smaller) { >>> - /* should convert inline inode here */ >>> - if (!f2fs_may_inline_data(inode)) { >>> - err = f2fs_convert_inline_inode(inode); >>> - if (err) { >>> - /* recover old i_size */ >>> - i_size_write(inode, old_size); >>> - return err; >>> - } >>> - } >>> - inode->i_mtime = inode->i_ctime = current_time(inode); >>> - } >>> - >>> down_write(&F2FS_I(inode)->i_sem); >>> + inode->i_mtime = inode->i_ctime = current_time(inode); >>> F2FS_I(inode)->last_disk_size = i_size_read(inode); >>> up_write(&F2FS_I(inode)->i_sem); >>> } >>> > . >