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.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 08A77C3A5A4 for ; Mon, 2 Sep 2019 01:45:30 +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 C9EBC217F4; Mon, 2 Sep 2019 01:45:29 +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="gw0af4Rm"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="mMCQMxxo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9EBC217F4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com 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-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1i4bPN-0005SL-89; Mon, 02 Sep 2019 01:45:29 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1i4bPK-0005S0-Mb for linux-f2fs-devel@lists.sourceforge.net; Mon, 02 Sep 2019 01:45:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: MIME-Version:Date:Message-ID:From:References:CC:To:Subject:Sender:Reply-To: 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=8TACocEv2ofv+YEGUNz13cnH3mmy/aIyqv3g+exN5Fc=; b=gw0af4RmwPhgwIOh1/rC6xyrQC 5VRS297Qemx8Rjr694VGfECHoes8NP/jpieqKA2xodGhXKdfiavwg3BbZLcPFC5cGF5ioSCnnv5r9 p7T5EiUQn6UDbo2PjiX64z2FvbQV8svgprpPOGEatGx4aBW9XZC/ydE6PYJYI3JaKaE4=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date: Message-ID:From:References:CC:To:Subject:Sender:Reply-To: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=8TACocEv2ofv+YEGUNz13cnH3mmy/aIyqv3g+exN5Fc=; b=mMCQMxxo/d80GV2ZHSNOD2pco+ ssTW8RMP0UPrdZhmvooysGMC053c3PkvtCRsg+4WBpk5mXYw3egQxvuw42+ouDkAoBmWuJ7McF/04 gwkKx1Ni2MlJyHWmphM13uYE2Qen7YEmnA6QA0gJQET2pxAqnj8F83XZJyG0RFiCcPEA=; Received: from szxga04-in.huawei.com ([45.249.212.190] helo=huawei.com) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1i4bPH-006GmI-Of for linux-f2fs-devel@lists.sourceforge.net; Mon, 02 Sep 2019 01:45:25 +0000 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 To: Jaegeuk Kim 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-Language: en-US X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected X-Headers-End: 1i4bPH-006GmI-Of Subject: Re: [f2fs-dev] [PATCH] f2fs: convert inline_data in prior to i_size_write 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 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); >>> } >>> > . > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel