From nobody Wed Nov 27 00:31:47 2024 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 2AB8B38DE9 for ; Tue, 15 Oct 2024 03:43:46 +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=1728963827; cv=none; b=CBavApT2H5Qa3LjumGZWiQ1NganRMsJDSYv452HEgVzpHc44osdv+YBEcLvIa/uMNLDg2Xy+fqIw7sgSd18tA4NNsuXAStCQLGgrp0FVRU9DMtK+W841JsT7mM9KIRB2RNpwjiAmU9JX1I3WEOI9EM/ReviBh6q8p+X+u9bcKpg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728963827; c=relaxed/simple; bh=MjCUBiWnp9PMS4F87LZ3PySPrHGyFoBvs6QlesZy16M=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Z1ANpY0fKuVEQPyOrhtgXVKBVGopnGfI9nAYTRCHXp5PARn6qjow3Tzt97OouPgIM9XbUA6miPcj5KmDPLKRZjvH4RuuQPfhsS0azA7DH/WpTq8wWvOs5MDrPiEKosmG7AF3OsaxMf6MozYdjab3K+bI90J2gHAasn3VEBWplQU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sM3IzIhw; 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="sM3IzIhw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 358C4C4CEC7; Tue, 15 Oct 2024 03:43:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728963826; bh=MjCUBiWnp9PMS4F87LZ3PySPrHGyFoBvs6QlesZy16M=; h=From:To:Cc:Subject:Date:From; b=sM3IzIhwsVrUavZoQV0F6rbspUDHCJnAElwhgYn0Tbzvg7H8J8YMbKnoDhb2nQwsp t2as3W/T8hMqyF6nMRbe1oiYIHG5eE8diW3snDygg7JlS1u3Md1hppclS4yLX5DIBf i15xfXpOpYi69Rj64hHGFXUymLI4AG+w52Nu+OA/6JX95NI1rQ8xMzTzJb+6lKjfGg I5GcF57mfL2KNFj7N4s9DedmCvdbOF4MCd59N5TLILwpDzdCUrSYp+mWU9Gwjzkux1 yxILwgIbyq1Mit6M44qQQZcfFVEPsRyNizc7Zp5+UeZvivrdAw+Jxj5BPWTuuttQ3h qyhU0OF1SaxuQ== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu , Daniel Rosenberg Subject: [PATCH] f2fs: fix to account dirty data in __get_secs_required() Date: Tue, 15 Oct 2024 11:43:39 +0800 Message-Id: <20241015034339.3244676-1-chao@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It will trigger system panic w/ testcase in [1]: ------------[ cut here ]------------ kernel BUG at fs/f2fs/segment.c:2752! RIP: 0010:new_curseg+0xc81/0x2110 Call Trace: f2fs_allocate_data_block+0x1c91/0x4540 do_write_page+0x163/0xdf0 f2fs_outplace_write_data+0x1aa/0x340 f2fs_do_write_data_page+0x797/0x2280 f2fs_write_single_data_page+0x16cd/0x2190 f2fs_write_cache_pages+0x994/0x1c80 f2fs_write_data_pages+0x9cc/0xea0 do_writepages+0x194/0x7a0 filemap_fdatawrite_wbc+0x12b/0x1a0 __filemap_fdatawrite_range+0xbb/0xf0 file_write_and_wait_range+0xa1/0x110 f2fs_do_sync_file+0x26f/0x1c50 f2fs_sync_file+0x12b/0x1d0 vfs_fsync_range+0xfa/0x230 do_fsync+0x3d/0x80 __x64_sys_fsync+0x37/0x50 x64_sys_call+0x1e88/0x20d0 do_syscall_64+0x4b/0x110 entry_SYSCALL_64_after_hwframe+0x76/0x7e The root cause is if checkpoint_disabling and lfs_mode are both on, it will trigger OPU for all overwritten data, it may cost more free segment than expected, so f2fs must account those data correctly to calculate cosumed free segments later, and return ENOSPC earlier to avoid run out of free segment during block allocation. [1] https://lore.kernel.org/fstests/20241015025106.3203676-1-chao@kernel.or= g/ Fixes: 4354994f097d ("f2fs: checkpoint disabling") Cc: Daniel Rosenberg Signed-off-by: Chao Yu --- fs/f2fs/segment.h | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index e9cc73093417..55a01da6c4be 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -561,18 +561,21 @@ static inline int reserved_sections(struct f2fs_sb_in= fo *sbi) } =20 static inline bool has_curseg_enough_space(struct f2fs_sb_info *sbi, - unsigned int node_blocks, unsigned int dent_blocks) + unsigned int node_blocks, unsigned int data_blocks, + unsigned int dent_blocks) { =20 - unsigned segno, left_blocks; + unsigned int segno, left_blocks, blocks; int i; =20 - /* check current node sections in the worst case. */ - for (i =3D CURSEG_HOT_NODE; i <=3D CURSEG_COLD_NODE; i++) { + /* check current data/node sections in the worst case. */ + for (i =3D CURSEG_HOT_DATA; i < NR_PERSISTENT_LOG; i++) { segno =3D CURSEG_I(sbi, i)->segno; left_blocks =3D CAP_BLKS_PER_SEC(sbi) - get_ckpt_valid_blocks(sbi, segno, true); - if (node_blocks > left_blocks) + + blocks =3D i <=3D CURSEG_COLD_DATA ? data_blocks : node_blocks; + if (blocks > left_blocks) return false; } =20 @@ -586,8 +589,9 @@ static inline bool has_curseg_enough_space(struct f2fs_= sb_info *sbi, } =20 /* - * calculate needed sections for dirty node/dentry - * and call has_curseg_enough_space + * calculate needed sections for dirty node/dentry and call + * has_curseg_enough_space, please note that, it needs to account + * dirty data as well in lfs mode when checkpoint is disabled. */ static inline void __get_secs_required(struct f2fs_sb_info *sbi, unsigned int *lower_p, unsigned int *upper_p, bool *curseg_p) @@ -596,19 +600,30 @@ static inline void __get_secs_required(struct f2fs_sb= _info *sbi, get_pages(sbi, F2FS_DIRTY_DENTS) + get_pages(sbi, F2FS_DIRTY_IMETA); unsigned int total_dent_blocks =3D get_pages(sbi, F2FS_DIRTY_DENTS); + unsigned int total_data_blocks =3D 0; unsigned int node_secs =3D total_node_blocks / CAP_BLKS_PER_SEC(sbi); unsigned int dent_secs =3D total_dent_blocks / CAP_BLKS_PER_SEC(sbi); + unsigned int data_secs =3D 0; unsigned int node_blocks =3D total_node_blocks % CAP_BLKS_PER_SEC(sbi); unsigned int dent_blocks =3D total_dent_blocks % CAP_BLKS_PER_SEC(sbi); + unsigned int data_blocks =3D 0; + + if (f2fs_lfs_mode(sbi) && + unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) { + total_data_blocks =3D get_pages(sbi, F2FS_DIRTY_DATA); + data_secs =3D total_data_blocks / CAP_BLKS_PER_SEC(sbi); + data_blocks =3D total_data_blocks % CAP_BLKS_PER_SEC(sbi); + } =20 if (lower_p) - *lower_p =3D node_secs + dent_secs; + *lower_p =3D node_secs + dent_secs + data_secs; if (upper_p) *upper_p =3D node_secs + dent_secs + - (node_blocks ? 1 : 0) + (dent_blocks ? 1 : 0); + (node_blocks ? 1 : 0) + (dent_blocks ? 1 : 0) + + (data_blocks ? 1 : 0); if (curseg_p) *curseg_p =3D has_curseg_enough_space(sbi, - node_blocks, dent_blocks); + node_blocks, data_blocks, dent_blocks); } =20 static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi, --=20 2.40.1