From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BACD913B586 for ; Mon, 2 Sep 2024 10:08:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725271705; cv=none; b=tXsYBkA9wVwrkNjU+GHxOd43hITosIbBXBJu0ZV92G6ow7Mesf0B+PyJ5wPLfylkt8wMHmonJU0mP5q0lPP1El3zOHuO4l5v0GCSid0ZNDvOIfXWw14KbcEDwV0jEKubgILw5tfqfI86002WJY2CLnyxyXhvBgjfECPPmxv6meA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725271705; c=relaxed/simple; bh=sql6vHe/3EO6mdE86526uAu9+kxcquuGrC0M8wPZbnk=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=pKFXh8NDwWXSa3m51ZPmc59IspXz3ZWUGnmato6Y6snJ7rRDTB4GS+s08DMEk05bNkhLpcCSnKmOp177ypHyhFOdLckqsAXQ6Uw7DAG60LWvYFj+fwLKB46qVnj375Uot4H7xcjhAtrSZ2wSHmkXDjntWP2wMgjA1WBap8TMRcM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sU+VeKZn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sU+VeKZn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD7E7C4CEC2; Mon, 2 Sep 2024 10:08:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725271703; bh=sql6vHe/3EO6mdE86526uAu9+kxcquuGrC0M8wPZbnk=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=sU+VeKZnBBYtd/yBU6G54ZSXXdzGoiIcBDXzwsd1UWmT6Kk5N+hFduzYje2NfsKbQ DtyBtuRdCGTMhS6DsOj+38M6OgLXgc4KJaapc/AWLezj77Wtc/e7KSEsUUiEBKkWRi BLrpCwXsd2+F5j+64rSILpw3cCtk3xGomYYU62gG4eMv5YV5CEP71F1z3rczF70NpM 6alvPXOUqKtz6GJIrlRkM9YXwx2rqU1Pm3Oki0SWjltGZKOF8tUeIGZb/kxis21czT digE+ZQbsL61LegK+XAjXmo1XuLfVCehizfQXlMt9sUSvi9Pd4ER6HiSwIqJgWXQRh r4W0qpmTsy86w== Message-ID: <45a8a9f3-27b8-433e-a0ac-e457f4cdf1eb@kernel.org> Date: Mon, 2 Sep 2024 18:08:20 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [f2fs-dev] [PATCH] f2fs: prevent atomic file from being dirtied before commit To: Daeho Jeong , linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com Cc: Daeho Jeong References: <20240826202352.2150294-1-daeho43@gmail.com> Content-Language: en-US From: Chao Yu In-Reply-To: <20240826202352.2150294-1-daeho43@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2024/8/27 4:23, Daeho Jeong wrote: > From: Daeho Jeong > > Keep atomic file clean while updating and make it dirtied during commit > in order to avoid unnecessary and excessive inode updates in the previous > fix. > > Fixes: 4bf78322346f ("f2fs: mark inode dirty for FI_ATOMIC_COMMITTED flag") > Signed-off-by: Daeho Jeong > --- > fs/f2fs/f2fs.h | 3 +-- > fs/f2fs/inode.c | 10 ++++++---- > fs/f2fs/segment.c | 10 ++++++++-- > 3 files changed, 15 insertions(+), 8 deletions(-) > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index 465b2fd50c70..5a7f6fa8b585 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -801,7 +801,7 @@ enum { > FI_COMPRESS_RELEASED, /* compressed blocks were released */ > FI_ALIGNED_WRITE, /* enable aligned write */ > FI_COW_FILE, /* indicate COW file */ > - FI_ATOMIC_COMMITTED, /* indicate atomic commit completed except disk sync */ > + FI_ATOMIC_DIRTIED, /* indicate atomic file is dirtied */ > FI_ATOMIC_REPLACE, /* indicate atomic replace */ > FI_OPENED_FILE, /* indicate file has been opened */ > FI_MAX, /* max flag, never be used */ > @@ -3042,7 +3042,6 @@ static inline void __mark_inode_dirty_flag(struct inode *inode, > case FI_INLINE_DOTS: > case FI_PIN_FILE: > case FI_COMPRESS_RELEASED: > - case FI_ATOMIC_COMMITTED: > f2fs_mark_inode_dirty_sync(inode, true); > } > } > diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c > index 1eb250c6b392..5dd3e55d2be2 100644 > --- a/fs/f2fs/inode.c > +++ b/fs/f2fs/inode.c > @@ -35,6 +35,11 @@ void f2fs_mark_inode_dirty_sync(struct inode *inode, bool sync) > if (f2fs_inode_dirtied(inode, sync)) It will return directly here if inode was dirtied, so it may missed to set FI_ATOMIC_DIRTIED flag? Thanks, > return; > > + if (f2fs_is_atomic_file(inode)) { > + set_inode_flag(inode, FI_ATOMIC_DIRTIED); > + return; > + } > + > mark_inode_dirty_sync(inode); > } > > @@ -653,10 +658,7 @@ void f2fs_update_inode(struct inode *inode, struct page *node_page) > ri->i_gid = cpu_to_le32(i_gid_read(inode)); > ri->i_links = cpu_to_le32(inode->i_nlink); > ri->i_blocks = cpu_to_le64(SECTOR_TO_BLOCK(inode->i_blocks) + 1); > - > - if (!f2fs_is_atomic_file(inode) || > - is_inode_flag_set(inode, FI_ATOMIC_COMMITTED)) > - ri->i_size = cpu_to_le64(i_size_read(inode)); > + ri->i_size = cpu_to_le64(i_size_read(inode)); > > if (et) { > read_lock(&et->lock); > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c > index 78c3198a6308..2b5391b229a8 100644 > --- a/fs/f2fs/segment.c > +++ b/fs/f2fs/segment.c > @@ -196,9 +196,12 @@ void f2fs_abort_atomic_write(struct inode *inode, bool clean) > truncate_inode_pages_final(inode->i_mapping); > > release_atomic_write_cnt(inode); > - clear_inode_flag(inode, FI_ATOMIC_COMMITTED); > clear_inode_flag(inode, FI_ATOMIC_REPLACE); > clear_inode_flag(inode, FI_ATOMIC_FILE); > + if (is_inode_flag_set(inode, FI_ATOMIC_DIRTIED)) { > + clear_inode_flag(inode, FI_ATOMIC_DIRTIED); > + f2fs_mark_inode_dirty_sync(inode, true); > + } > stat_dec_atomic_inode(inode); > > F2FS_I(inode)->atomic_write_task = NULL; > @@ -365,7 +368,10 @@ static int __f2fs_commit_atomic_write(struct inode *inode) > sbi->revoked_atomic_block += fi->atomic_write_cnt; > } else { > sbi->committed_atomic_block += fi->atomic_write_cnt; > - set_inode_flag(inode, FI_ATOMIC_COMMITTED); > + if (is_inode_flag_set(inode, FI_ATOMIC_DIRTIED)) { > + clear_inode_flag(inode, FI_ATOMIC_DIRTIED); > + f2fs_mark_inode_dirty_sync(inode, true); > + } > } > > __complete_revoke_list(inode, &revoke_list, ret ? true : false);