Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 27F2EC9EC97 for ; Mon, 12 Jan 2026 15:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type:Cc: Reply-To:From:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:MIME-Version:Message-ID:Date:To:Sender: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=Lrnka0d5O323pyQC1LqdHghUOH47KdqXVGyIdZZAzks=; b=IcKrIDqP5jXE761wXtp00LrN9Z C01/qrpsGD6YI1GtL8mKlizL7J9oknNKiwlEBpSz8rtWwGe6khZZQbTlx4tWTFHF1FfKTgSa11xJj 5s46pirOFZ3vyFNqz5ZPFfFYWNs+1pEX2yq24d6hfPMqPC8HrzXJ3nuzNcIIWS0D0hWA=; Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1vfJOt-0000Ja-4G; Mon, 12 Jan 2026 15:00:11 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1vfJOr-0000JU-No for linux-f2fs-devel@lists.sourceforge.net; Mon, 12 Jan 2026 15:00:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Date:Subject:CC:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ENFROg8aAE5YIz/h5wAmhCDcwWwKEeeN982ABIMaqeQ=; b=Mgg2vSZ4LldvW7qglgwgRLZcfW 83uOwwseE2LOn1upE4Sftvg/n6KmmwQksxkqUAysmEcak+AQbe8slvADEcrtzuW/MEt64lymjebWB HZdpgh2fcKiCKLr77JSOBFYaci7GijV331rzSlRwdbISjUO/hFP/MG+jIyyqgdOoHXhY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Date: Subject:CC:To:From:Sender:Reply-To:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=ENFROg8aAE5YIz/h5wAmhCDcwWwKEeeN982ABIMaqeQ=; b=V eltowdvIxKgo9kKVxox1gXUmGP3YB6AL/AO7f4mkUwPrM+kAoF/peVcElpbwWFP/PQqKBHAIrUxDI UPFPTFabTSWSWQdD7mblfIo9uwu5fCKFVt5sLMYNJGTbeN31zcTIItSZc+TZsEAQhOFvbEXK9UYZ7 v+cZkaohnr5fAcvo=; Received: from pdx-out-012.esa.us-west-2.outbound.mail-perimeter.amazon.com ([35.162.73.231]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1vfJOq-0000ly-CC for linux-f2fs-devel@lists.sourceforge.net; Mon, 12 Jan 2026 15:00:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1768230008; x=1799766008; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=ENFROg8aAE5YIz/h5wAmhCDcwWwKEeeN982ABIMaqeQ=; b=dUIL1lzrKUSKC4/7A8VgMkfVRaQgo0bE80kt/+jmwOgSiCTCU9fouLMn jnyTfEfLR0owM3ncjaCw3GP4XuR7Y0fMI2D+DZ7nXAzf0ZJT0iXE90jI3 XDVp6GhIlGmHb73uqNvarDrpIBpszZyXZHBShEmDL6Ro6PjPRO2y6t0bi 0/VYwl2Lsq80sdVU20ggjM2A9Im3kMCHoEFTuIA1ThWA607+U7AGKuVjW ojXx0nB1I5UGgagbksU1XHbaz4/lGHgLI8CSnxXd7R3vTZ8er0OcX5kle QApJppNsq2jckKt2XSIBgM//OmLj1+V3hMNHr7YG1X5HZSuxOuP4Z4xUH w==; X-CSE-ConnectionGUID: 2I8kZ5xeT/i4MGxBL7W3JQ== X-CSE-MsgGUID: mnxQMfnSSEC2am/P9nLp6w== X-IronPort-AV: E=Sophos;i="6.21,221,1763424000"; d="scan'208";a="10486098" Received: from ip-10-5-12-219.us-west-2.compute.internal (HELO smtpout.naws.us-west-2.prod.farcaster.email.amazon.dev) ([10.5.12.219]) by internal-pdx-out-012.esa.us-west-2.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2026 14:44:24 +0000 Received: from EX19MTAUWB002.ant.amazon.com [205.251.233.111:26658] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.5.94:2525] with esmtp (Farcaster) id c094fed7-4896-46b3-aece-51549785fc25; Mon, 12 Jan 2026 14:44:24 +0000 (UTC) X-Farcaster-Flow-ID: c094fed7-4896-46b3-aece-51549785fc25 Received: from EX19D001UWA001.ant.amazon.com (10.13.138.214) by EX19MTAUWB002.ant.amazon.com (10.250.64.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Mon, 12 Jan 2026 14:44:24 +0000 Received: from dev-dsk-wuboo-2c-a25afee0.us-west-2.amazon.com (172.23.177.110) by EX19D001UWA001.ant.amazon.com (10.13.138.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Mon, 12 Jan 2026 14:44:23 +0000 To: , Date: Mon, 12 Jan 2026 14:44:16 +0000 Message-ID: <20260112144416.38583-1-wuboo@amazon.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-Originating-IP: [172.23.177.110] X-ClientProxiedBy: EX19D043UWA004.ant.amazon.com (10.13.139.41) To EX19D001UWA001.ant.amazon.com (10.13.138.214) X-Headers-End: 1vfJOq-0000ly-CC Subject: [f2fs-dev] [PATCH v2] f2fs-tools: optimize the addrs_per_block/inode loop 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: , From: Wu Bo via Linux-f2fs-devel Reply-To: Wu Bo Cc: wubo.oduw@gmail.com, wuboo@amazon.com, 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 ADDRS_PER_INODE and ADDRS_PER_BLOCK are macros of a function, and if the compiler does not optimize the code (-O0 for example), they would be called in every single loop, which could cause significant performance drops in some cases. This scenario has been found before, refer to: Commit: 1bb669e ("fsck.f2fs: avoid unnecessary recalculation") To avoid this performance drop as much as possible, I changed the function to 'inline' definition, which could mitigate such cases in the future. Signed-off-by: Wu Bo --- v2: Only modify when the macro's return value is fixed in 'for' loops. --- fsck/dump.c | 5 +++-- fsck/fsck.c | 12 ++++++++---- fsck/mount.c | 4 +++- include/f2fs_fs.h | 12 +++++++++++- lib/libf2fs.c | 11 ----------- 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/fsck/dump.c b/fsck/dump.c index f5c95de..a5f344b 100644 --- a/fsck/dump.c +++ b/fsck/dump.c @@ -495,7 +495,7 @@ static int dump_inode_blk(struct f2fs_sb_info *sbi, u32 nid, { u32 i = 0; u64 ofs = 0; - u32 addr_per_block; + u32 addr_per_block, addr_per_inode; u16 type = le16_to_cpu(node_blk->i.i_mode); int ret = 0; @@ -543,9 +543,10 @@ static int dump_inode_blk(struct f2fs_sb_info *sbi, u32 nid, } addr_per_block = ADDRS_PER_BLOCK(&node_blk->i); + addr_per_inode = ADDRS_PER_INODE(&node_blk->i); /* check data blocks in inode */ - for (i = 0; i < ADDRS_PER_INODE(&node_blk->i); i++, ofs++) + for (i = 0; i < addr_per_inode; i++, ofs++) dump_data_blk(sbi, ofs * F2FS_BLKSIZE, le32_to_cpu( node_blk->i.i_addr[get_extra_isize(node_blk) + i]), type); diff --git a/fsck/fsck.c b/fsck/fsck.c index db44f9d..1230d7b 100644 --- a/fsck/fsck.c +++ b/fsck/fsck.c @@ -1516,8 +1516,9 @@ int fsck_chk_dnode_blk(struct f2fs_sb_info *sbi, struct f2fs_inode *inode, bool compressed = i_flags & F2FS_COMPR_FL; bool compr_rel = inode->i_inline & F2FS_COMPRESS_RELEASED; u32 cluster_size = 1 << inode->i_log_cluster_size; + u32 addrs = ADDRS_PER_BLOCK(inode); - for (idx = 0; idx < ADDRS_PER_BLOCK(inode); idx++, child->pgofs++) { + for (idx = 0; idx < addrs; idx++, child->pgofs++) { block_t blkaddr = le32_to_cpu(node_blk->dn.addr[idx]); check_extent_info(child, blkaddr, 0); @@ -3173,7 +3174,7 @@ static void fsck_disconnect_file_dnode(struct f2fs_sb_info *sbi, { struct f2fs_node *node; struct node_info ni; - u32 addr; + u32 addr, addr_per_block; int i, err; node = calloc(F2FS_BLKSIZE, 1); @@ -3187,7 +3188,8 @@ static void fsck_disconnect_file_dnode(struct f2fs_sb_info *sbi, release_block_cnt(sbi, dealloc); release_block(sbi, ni.blk_addr, dealloc); - for (i = 0; i < ADDRS_PER_BLOCK(inode); i++) { + addr_per_block = ADDRS_PER_BLOCK(inode); + for (i = 0; i < addr_per_block; i++) { addr = le32_to_cpu(node->dn.addr[i]); if (!addr) continue; @@ -3302,8 +3304,10 @@ static void fsck_disconnect_file(struct f2fs_sb_info *sbi, nid_t ino, /* clear data counters */ if (!(node->i.i_inline & (F2FS_INLINE_DATA | F2FS_INLINE_DENTRY))) { + u32 addrs = ADDRS_PER_INODE(&node->i); + ofs = get_extra_isize(node); - for (i = 0; i < ADDRS_PER_INODE(&node->i); i++) { + for (i = 0; i < addrs; i++) { block_t addr = le32_to_cpu(node->i.i_addr[ofs + i]); if (!addr) continue; diff --git a/fsck/mount.c b/fsck/mount.c index 6f640a0..990f1e0 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -281,6 +281,7 @@ void print_inode_info(struct f2fs_sb_info *sbi, u32 namelen = le32_to_cpu(inode->i_namelen); int enc_name = file_enc_name(inode); int ofs = get_extra_isize(node); + u32 addrs; pretty_print_filename(inode->i_name, namelen, en, enc_name); if (name && en[0]) { @@ -350,7 +351,8 @@ void print_inode_info(struct f2fs_sb_info *sbi, } } - for (i = 0; i < ADDRS_PER_INODE(inode); i++) { + addrs = ADDRS_PER_INODE(inode); + for (i = 0; i < addrs; i++) { block_t blkaddr; char *flag = ""; diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index 3095b59..d0877b9 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -1660,7 +1660,6 @@ struct f2fs_configuration { extern int utf8_to_utf16(char *, const char *, size_t, size_t); extern int utf16_to_utf8(char *, const char *, size_t, size_t); extern int log_base_2(uint32_t); -extern unsigned int addrs_per_page(struct f2fs_inode *, bool); extern u64 f2fs_max_file_offset(struct f2fs_inode *); extern __u32 f2fs_inode_chksum(struct f2fs_node *); extern __u32 f2fs_checkpoint_chksum(struct f2fs_checkpoint *); @@ -2212,4 +2211,15 @@ static inline bool __time_to_inject(int type, const char *func, return false; } +static inline unsigned int addrs_per_page(struct f2fs_inode *i, bool is_inode) +{ + unsigned int addrs = is_inode ? CUR_ADDRS_PER_INODE(i) - + get_inline_xattr_addrs(i) : DEF_ADDRS_PER_BLOCK; + + if (!LINUX_S_ISREG(le16_to_cpu(i->i_mode)) || + !(le32_to_cpu(i->i_flags) & F2FS_COMPR_FL)) + return addrs; + return ALIGN_DOWN(addrs, 1 << i->i_log_cluster_size); +} + #endif /*__F2FS_FS_H */ diff --git a/lib/libf2fs.c b/lib/libf2fs.c index 1a496b7..13e4d0d 100644 --- a/lib/libf2fs.c +++ b/lib/libf2fs.c @@ -516,17 +516,6 @@ opaque_seq: return __f2fs_dentry_hash(name, len); } -unsigned int addrs_per_page(struct f2fs_inode *i, bool is_inode) -{ - unsigned int addrs = is_inode ? CUR_ADDRS_PER_INODE(i) - - get_inline_xattr_addrs(i) : DEF_ADDRS_PER_BLOCK; - - if (!LINUX_S_ISREG(le16_to_cpu(i->i_mode)) || - !(le32_to_cpu(i->i_flags) & F2FS_COMPR_FL)) - return addrs; - return ALIGN_DOWN(addrs, 1 << i->i_log_cluster_size); -} - u64 f2fs_max_file_offset(struct f2fs_inode *i) { if (!LINUX_S_ISREG(le16_to_cpu(i->i_mode)) || -- 2.47.3 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel