Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp1203004ybe; Mon, 2 Sep 2019 16:37:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqxjrarBnl/gvwUl1PtSymgLZnA567lYW2NTBu4x3kyEdtkZeanU2wjXKClUSxrvMmu4QQ+b X-Received: by 2002:a62:e10f:: with SMTP id q15mr9577329pfh.34.1567467431960; Mon, 02 Sep 2019 16:37:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567467431; cv=none; d=google.com; s=arc-20160816; b=vSCkbI9BV8kH+mSPRJkewE+VDGK8PksgVbLN2bhmrm7FllrpLeFvVq/NNfLU1D1B+9 aYSFYiTyw42Ru0m4HCjAxZNrC+CgR7rKrDpXMToX9FZ0Yo/AEcC+2KVL7CuGDAUQe5Bq Xqi6aUn0S+q/LaQVHZvQsGGXjhdXK+q83PNuMrq/F18H7oWbTJongtvreYQ3j0MqROyB W93Oquuo3485W/b17F+3+Y2aTuPKY4GJVSw7tX2eu/P+z+JSlloUvTADKlSY1LgWqB+r PMRlxiOFVHUvjg1sZuXlpwV1BMFEPOsUSlYpIZ1ASnXFrMU3+QB+fbIMlERBeX5fZv+4 MhXg== 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:dkim-signature; bh=idjQeAQ+JuVXml4ijJi5kHXXA3lP4ZQ+g5u5KohXUJ4=; b=JZmHjtghAdvCkyg3tIqXzSEzOFIwSn4S+JzCLoFYRcQIFhkZN9CA7ln8icKM9JKuKQ q9vHcmlSixkmjKNwV8anvq0j/WnddVmC0jkRsS3DpRcJcK9JNWz1ByUgRWc18KdnV41K TvQ6RoyLdSAD8Z4IUHPqP9yf3xUdLsMsTTNTXhf6BPPrfKipQ6qJBLUXJLLQkh2+9BPg jJyQwGEzry2KQSNVCCxNL0cVr8Ih1Alkn8DnDv3ynUvq529G93td/hgzTJ8onQnTr1/S F3zSqS6E0yMakFGy31eVJl0D9JVDAq0tp3KmQyWXxx0FQphzcqX3siN4VOghKz+Qa5gO Tshg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=a3LIfORQ; 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 o4si12958531pgv.157.2019.09.02.16.36.56; Mon, 02 Sep 2019 16:37:11 -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=a3LIfORQ; 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 S1726945AbfIBXfm (ORCPT + 99 others); Mon, 2 Sep 2019 19:35:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:33274 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726697AbfIBXfm (ORCPT ); Mon, 2 Sep 2019 19:35:42 -0400 Received: from [192.168.0.102] (unknown [180.111.100.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 23642204EC; Mon, 2 Sep 2019 23:35:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567467341; bh=X4p78bk4rX3A3ZfcqzYO9O0uFPOSYZLmWhRZ8sFloU8=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=a3LIfORQ/heO80Bj8LPo8MOVp1VZ/fLibAGyH2m9lebIAFSlvuAFuFWhd2BfV2dqM A7r1bvrttuCPsH+/JU/dOACyg55fU+OvLyKgV/mug2onAjUSufog/u9NEx3oak8MDX T0KG9X6uf9juBRcuW/btkvrMd5hz3IIn1uuUV7w8= Subject: Re: [f2fs-dev] [PATCH] f2fs: convert inline_data in prior to i_size_write To: Jaegeuk Kim , Chao Yu Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net References: <20190830153453.24684-1-jaegeuk@kernel.org> <20190901072529.GB49907@jaegeuk-macbookpro.roam.corp.google.com> <20190902230700.GE71929@jaegeuk-macbookpro.roam.corp.google.com> From: Chao Yu Message-ID: <65d05f5e-dffc-0b50-1463-b4b30315f014@kernel.org> Date: Tue, 3 Sep 2019 07:35:37 +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: <20190902230700.GE71929@jaegeuk-macbookpro.roam.corp.google.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. :) 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 >