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 5423CC2FF for ; Tue, 17 Feb 2026 15:45:27 +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=1771343127; cv=none; b=Eh1UvutpXwcxCBhU3+n3WbFPCc/4Zs1FOq/t+0DIeS0QytVKnQ2AMKcyGr9JjNMJ/W1eH1Btx0ADVyxXm0t4goks/RU7QVrjqNmeeVQn9s8q8YO7YIvCoKS869W5UKPW158ptCgfCrBXxS9ABs90dDgGXSQrb/ecKxY08+JeEuM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771343127; c=relaxed/simple; bh=S8aBcxVAV1FiVtbDzYsHKGc0946afaJhnPIsvjZZAOY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ubhQUcCTVGPGfcy+rCJHIZykztRdOfrpgH56xSsxM7zpCQ56KpyuVwApt4YjBSQ/sDFBpQS0jNqHpVXJvLtRidy1hnDDPclpSrTZuiw/EgA16VpOShmhbsWbHGSSiAWC6HZWu88cEpzYro/L6ZcS7mWjhS6PkWdP5Vsnrdk2rj0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BCOyYAv7; 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="BCOyYAv7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 170D5C19421; Tue, 17 Feb 2026 15:45:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771343126; bh=S8aBcxVAV1FiVtbDzYsHKGc0946afaJhnPIsvjZZAOY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BCOyYAv7FNnGHvwDbuUnHmRAebahL5yMDmYUtCMRrTim7tN6dq4GH4AzhVBZwGAqZ PKTdAbpqat+hLRSoq6WM9cSrJeXFDYvqaeEh782JcJBDjdU+NFbmzdzCYJvvBZEmK/ RC5ggXWVwu738W9LxLbpxTxQpJNY2awOQV7owragsgcWFpvNcqdDRCn07AlA0xPouQ HOmqE7BTfj84gYLTsyolEjrzufa2lP4o1XNwBu46lyx/6n6g6bgAoK4umBVgRNL2qX gcZXAhPSN4zLu0KDgzuq4D7dCqh4j0zQDcyx28xs+zKih8APIsdiY7ZhYDvgFb4E0b OPjLORjiJBmLg== From: Sasha Levin To: stable@vger.kernel.org Cc: Yongpeng Yang , stable@kernel.org, Sheng Yong , Jinbao Liu , Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 6.6.y] f2fs: fix IS_CHECKPOINTED flag inconsistency issue caused by concurrent atomic commit and checkpoint writes Date: Tue, 17 Feb 2026 10:45:24 -0500 Message-ID: <20260217154524.3702838-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026021730-secular-unclog-885f@gregkh> References: <2026021730-secular-unclog-885f@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Yongpeng Yang [ Upstream commit 7633a7387eb4d0259d6bea945e1d3469cd135bbc ] During SPO tests, when mounting F2FS, an -EINVAL error was returned from f2fs_recover_inode_page. The issue occurred under the following scenario Thread A Thread B f2fs_ioc_commit_atomic_write - f2fs_do_sync_file // atomic = true - f2fs_fsync_node_pages : last_folio = inode folio : schedule before folio_lock(last_folio) f2fs_write_checkpoint - block_operations// writeback last_folio - schedule before f2fs_flush_nat_entries : set_fsync_mark(last_folio, 1) : set_dentry_mark(last_folio, 1) : folio_mark_dirty(last_folio) - __write_node_folio(last_folio) : f2fs_down_read(&sbi->node_write)//block - f2fs_flush_nat_entries : {struct nat_entry}->flag |= BIT(IS_CHECKPOINTED) - unblock_operations : f2fs_up_write(&sbi->node_write) f2fs_write_checkpoint//return : f2fs_do_write_node_page() f2fs_ioc_commit_atomic_write//return SPO Thread A calls f2fs_need_dentry_mark(sbi, ino), and the last_folio has already been written once. However, the {struct nat_entry}->flag did not have the IS_CHECKPOINTED set, causing set_dentry_mark(last_folio, 1) and write last_folio again after Thread B finishes f2fs_write_checkpoint. After SPO and reboot, it was detected that {struct node_info}->blk_addr was not NULL_ADDR because Thread B successfully write the checkpoint. This issue only occurs in atomic write scenarios. For regular file fsync operations, the folio must be dirty. If block_operations->f2fs_sync_node_pages successfully submit the folio write, this path will not be executed. Otherwise, the f2fs_write_checkpoint will need to wait for the folio write submission to complete, as sbi->nr_pages[F2FS_DIRTY_NODES] > 0. Therefore, the situation where f2fs_need_dentry_mark checks that the {struct nat_entry}->flag /wo the IS_CHECKPOINTED flag, but the folio write has already been submitted, will not occur. Therefore, for atomic file fsync, sbi->node_write should be acquired through __write_node_folio to ensure that the IS_CHECKPOINTED flag correctly indicates that the checkpoint write has been completed. Fixes: 608514deba38 ("f2fs: set fsync mark only for the last dnode") Cc: stable@kernel.org Signed-off-by: Sheng Yong Signed-off-by: Jinbao Liu Signed-off-by: Yongpeng Yang Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim [ folio => page ] Signed-off-by: Sasha Levin --- fs/f2fs/node.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 1b404937743cf..133141f10d94d 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1696,8 +1696,13 @@ static int __write_node_page(struct page *page, bool atomic, bool *submitted, goto redirty_out; } - if (atomic && !test_opt(sbi, NOBARRIER) && !f2fs_sb_has_blkzoned(sbi)) - fio.op_flags |= REQ_PREFLUSH | REQ_FUA; + if (atomic) { + if (!test_opt(sbi, NOBARRIER) && !f2fs_sb_has_blkzoned(sbi)) + fio.op_flags |= REQ_PREFLUSH | REQ_FUA; + if (IS_INODE(page)) + set_dentry_mark(page, + f2fs_need_dentry_mark(sbi, ino_of_node(page))); + } /* should add to global list before clearing PAGECACHE status */ if (f2fs_in_warm_node_list(sbi, page)) { @@ -1852,8 +1857,9 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode, if (is_inode_flag_set(inode, FI_DIRTY_INODE)) f2fs_update_inode(inode, page); - set_dentry_mark(page, - f2fs_need_dentry_mark(sbi, ino)); + if (!atomic) + set_dentry_mark(page, + f2fs_need_dentry_mark(sbi, ino)); } /* may be written by other thread */ if (!PageDirty(page)) -- 2.51.0