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.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 85E57C3A59E for ; Tue, 3 Sep 2019 02:09:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 654B721881 for ; Tue, 3 Sep 2019 02:09:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726844AbfICCJs (ORCPT ); Mon, 2 Sep 2019 22:09:48 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:5721 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726521AbfICCJs (ORCPT ); Mon, 2 Sep 2019 22:09:48 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 04709543F0917821EBDC; Tue, 3 Sep 2019 10:09:47 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.211) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 3 Sep 2019 10:09:45 +0800 Subject: Re: [f2fs-dev] [PATCH] f2fs: convert inline_data in prior to i_size_write To: Chao Yu , Jaegeuk Kim CC: , References: <20190830153453.24684-1-jaegeuk@kernel.org> <20190901072529.GB49907@jaegeuk-macbookpro.roam.corp.google.com> <20190902230700.GE71929@jaegeuk-macbookpro.roam.corp.google.com> <65d05f5e-dffc-0b50-1463-b4b30315f014@kernel.org> From: Chao Yu Message-ID: Date: Tue, 3 Sep 2019 10:09:45 +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: <65d05f5e-dffc-0b50-1463-b4b30315f014@kernel.org> Content-Type: text/plain; charset="utf-8" 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/3 7:35, Chao Yu wrote: > On 2019-9-3 7:07, Jaegeuk Kim wrote: >> On 09/02, Chao Yu wrote: >>> 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()? >> >> Could you post another patch? I'm okay to combine them. > > No problem, let merge them in v2. :) Still send as two separated patches which can be easily maintained in those LTS stable kernel. :P Thanks, > > Thanks, > >> >>> >>> 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); >>>>>> } >>>>>> >>>> . >>>> >> >> >> _______________________________________________ >> Linux-f2fs-devel mailing list >> Linux-f2fs-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel >> > . >