From patchwork Wed May 17 08:26:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 13244428 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 44734C7EE2D for ; Wed, 17 May 2023 08:27:09 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pzCV0-00020x-OH; Wed, 17 May 2023 08:27:07 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pzCUx-00020e-BW for linux-f2fs-devel@lists.sourceforge.net; Wed, 17 May 2023 08:27:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=QiEqxu+U+zs5KYyUem8m9Q0AcsyhZfMxTaIWzSDhxus=; b=LoUrwNDoEJJDYIbLRODtjJcG2F 2jYfAJPQzYBYJoQrrkCVysjg/q1N7gqddWYKAitbG8mnUEll0UsamT5YKwrlJP0XV5YhOitoavyhP 1wHrkFTwPYRwvvulZplOWxjmuKotNEgLgF+XDixfDen1cbuG4B+xoQG3Wq5kxVMPAwW0=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=QiEqxu+U+zs5KYyUem8m9Q0AcsyhZfMxTaIWzSDhxus=; b=Wo11r0mj4a+ttnRZ9jrYaEP4SC BFqp4pky7alIzEDJVzvK/ERaGO4Uhik5EfLntiPa+qtf9VCbjFuUNr50WMyqfNMibC5TwpkPnFGXJ MnaCoFRF+s04aCTI5yBjS/7iTyhX2wFohjW6QFjoa8tLf1FVsBK1tqHXlitMuYzR99J0=; Received: from dfw.source.kernel.org ([139.178.84.217]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pzCUx-00AqVN-9q for linux-f2fs-devel@lists.sourceforge.net; Wed, 17 May 2023 08:27:04 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E5BBB64394 for ; Wed, 17 May 2023 08:26:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0C9FC433A0; Wed, 17 May 2023 08:26:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684312017; bh=hkgMJMR/lHv986RdJLov+04Q8SMCXUsU1MifqdynOyA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tOTLSCuCwWQ5ra+K+fCZyeGYnhyO0bElEg8WGNhadyPrianO76SNpQ4V1fM5EVLty /t+UKXyFbT8J39IdvJnqlm19ddJ7vX3T/simH3FX/+hsxYmFlA4PxhjrSJbO70X1z8 4SS6rmrdL/drMGt6qhxkQUfBbFjpas30kpplRD+Ks2fR9lcG4lKo4WG/ap1+VIWUaY v2eYZ1+S86MpcG+j2G/EcFDcOEPnwXOGiQaI5BwUIb2g0oUL8hk7Hgh3b0hJJ+Fh2h qsjzBgmRb9vOuH/6BW1mM+yyiV+TBBGAENw5ZmPuFMMufcPKVxyrsWdD35yeJowgRQ oA2zKCB/CyDKA== From: Chao Yu To: jaegeuk@kernel.org Date: Wed, 17 May 2023 16:26:31 +0800 Message-Id: <20230517082632.748914-3-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230517082632.748914-1-chao@kernel.org> References: <20230517082632.748914-1-chao@kernel.org> MIME-Version: 1.0 X-Headers-End: 1pzCUx-00AqVN-9q Subject: [f2fs-dev] [PATCH 3/4] mkfs.f2fs: cleanup w/ alloc_next_free_block() 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: , Cc: linux-f2fs-devel@lists.sourceforge.net Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net Introduce alloc_next_free_block() to wrap below openned codes: blkaddr = get_sb(main_blkaddr) + c.cur_seg[curseg_type] * c.blks_per_seg + c.curseg_offset[curseg_type]; Meanwhile add curseg_offset field in f2fs_configuration to record last blkaddr in each log. Signed-off-by: Chao Yu --- include/f2fs_fs.h | 2 + mkfs/f2fs_format.c | 101 +++++++++++++++++++-------------------------- 2 files changed, 45 insertions(+), 58 deletions(-) diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index 8475645..05d27ba 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -603,6 +603,8 @@ struct f2fs_configuration { /* compression support for sload.f2fs */ compress_config_t compress; + + block_t curseg_offset[6]; }; #ifdef CONFIG_64BIT diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c index 620f779..2ca5f48 100644 --- a/mkfs/f2fs_format.c +++ b/mkfs/f2fs_format.c @@ -1230,11 +1230,24 @@ static int f2fs_discard_obsolete_dnode(void) } #endif +static block_t alloc_next_free_block(int curseg_type, int blkcnt) +{ + block_t blkaddr; + + blkaddr = get_sb(main_blkaddr) + + c.cur_seg[curseg_type] * c.blks_per_seg + + c.curseg_offset[curseg_type]; + + c.curseg_offset[curseg_type] += blkcnt; + + return blkaddr; +} + static int f2fs_write_root_inode(void) { struct f2fs_node *raw_node = NULL; - uint64_t data_blk_nor; - uint64_t main_area_node_seg_blk_offset = 0; + block_t data_blkaddr; + block_t node_blkaddr; raw_node = calloc(F2FS_BLKSIZE, 1); if (raw_node == NULL) { @@ -1248,24 +1261,15 @@ static int f2fs_write_root_inode(void) if (c.lpf_ino) raw_node->i.i_links = cpu_to_le32(3); - raw_node->footer.next_blkaddr = cpu_to_le32( - get_sb(main_blkaddr) + - c.cur_seg[CURSEG_HOT_NODE] * - c.blks_per_seg + 1); - - data_blk_nor = get_sb(main_blkaddr) + - c.cur_seg[CURSEG_HOT_DATA] * c.blks_per_seg; - raw_node->i.i_addr[get_extra_isize(raw_node)] = cpu_to_le32(data_blk_nor); - - main_area_node_seg_blk_offset = get_sb(main_blkaddr); - main_area_node_seg_blk_offset += c.cur_seg[CURSEG_HOT_NODE] * - c.blks_per_seg; - - DBG(1, "\tWriting root inode (hot node), %x %x %x at offset 0x%08"PRIu64"\n", - get_sb(main_blkaddr), - c.cur_seg[CURSEG_HOT_NODE], - c.blks_per_seg, main_area_node_seg_blk_offset); - if (write_inode(raw_node, main_area_node_seg_blk_offset) < 0) { + data_blkaddr = alloc_next_free_block(CURSEG_HOT_DATA, 1); + raw_node->i.i_addr[get_extra_isize(raw_node)] = + cpu_to_le32(data_blkaddr); + + node_blkaddr = alloc_next_free_block(CURSEG_HOT_NODE, 1); + raw_node->footer.next_blkaddr = cpu_to_le32(node_blkaddr + 1); + + DBG(1, "\tWriting root inode (hot node), offset 0x%x\n", node_blkaddr); + if (write_inode(raw_node, node_blkaddr) < 0) { MSG(1, "\tError: While writing the raw_node to disk!!!\n"); free(raw_node); return -1; @@ -1349,8 +1353,8 @@ static int f2fs_write_default_quota(int qtype, unsigned int blkaddr, static int f2fs_write_qf_inode(int qtype, int offset) { struct f2fs_node *raw_node = NULL; - uint64_t data_blk_nor; - uint64_t main_area_node_seg_blk_offset = 0; + block_t data_blkaddr; + block_t node_blkaddr; __le32 raw_id; int i; @@ -1366,14 +1370,10 @@ static int f2fs_write_qf_inode(int qtype, int offset) raw_node->i.i_blocks = cpu_to_le64(1 + QUOTA_DATA(qtype)); raw_node->i.i_flags = F2FS_NOATIME_FL | F2FS_IMMUTABLE_FL; - raw_node->footer.next_blkaddr = cpu_to_le32( - get_sb(main_blkaddr) + - c.cur_seg[CURSEG_HOT_NODE] * - c.blks_per_seg + 1 + qtype + 1); + node_blkaddr = alloc_next_free_block(CURSEG_HOT_NODE, 1); + raw_node->footer.next_blkaddr = cpu_to_le32(node_blkaddr + 1); - data_blk_nor = get_sb(main_blkaddr) + - c.cur_seg[CURSEG_HOT_DATA] * c.blks_per_seg + 1 - + offset * QUOTA_DATA(i); + data_blkaddr = alloc_next_free_block(CURSEG_HOT_DATA, QUOTA_DATA(i)); if (qtype == 0) raw_id = raw_node->i.i_uid; @@ -1385,24 +1385,17 @@ static int f2fs_write_qf_inode(int qtype, int offset) ASSERT(0); /* write two blocks */ - if (f2fs_write_default_quota(qtype, data_blk_nor, raw_id)) { + if (f2fs_write_default_quota(qtype, data_blkaddr, raw_id)) { free(raw_node); return -1; } for (i = 0; i < QUOTA_DATA(qtype); i++) raw_node->i.i_addr[get_extra_isize(raw_node) + i] = - cpu_to_le32(data_blk_nor + i); + cpu_to_le32(data_blkaddr + i); - main_area_node_seg_blk_offset = get_sb(main_blkaddr); - main_area_node_seg_blk_offset += c.cur_seg[CURSEG_HOT_NODE] * - c.blks_per_seg + offset + 1; - - DBG(1, "\tWriting quota inode (hot node), %x %x %x at offset 0x%08"PRIu64"\n", - get_sb(main_blkaddr), - c.cur_seg[CURSEG_HOT_NODE], - c.blks_per_seg, main_area_node_seg_blk_offset); - if (write_inode(raw_node, main_area_node_seg_blk_offset) < 0) { + DBG(1, "\tWriting quota inode (hot node), offset 0x%x\n", node_blkaddr); + if (write_inode(raw_node, node_blkaddr) < 0) { MSG(1, "\tError: While writing the raw_node to disk!!!\n"); free(raw_node); return -1; @@ -1492,8 +1485,8 @@ static block_t f2fs_add_default_dentry_lpf(void) static int f2fs_write_lpf_inode(void) { struct f2fs_node *raw_node; - uint64_t main_area_node_seg_blk_offset; - block_t data_blk_nor; + block_t data_blkaddr; + block_t node_blkaddr; int err = 0; ASSERT(c.lpf_ino); @@ -1510,28 +1503,20 @@ static int f2fs_write_lpf_inode(void) raw_node->i.i_namelen = le32_to_cpu(strlen(LPF)); memcpy(raw_node->i.i_name, LPF, strlen(LPF)); - raw_node->footer.next_blkaddr = cpu_to_le32( - get_sb(main_blkaddr) + - c.cur_seg[CURSEG_HOT_NODE] * c.blks_per_seg + - 1 + c.quota_inum + 1); + node_blkaddr = alloc_next_free_block(CURSEG_HOT_NODE, 1); + raw_node->footer.next_blkaddr = cpu_to_le32(node_blkaddr + 1); - data_blk_nor = f2fs_add_default_dentry_lpf(); - if (data_blk_nor == 0) { + data_blkaddr = f2fs_add_default_dentry_lpf(); + if (data_blkaddr == 0) { MSG(1, "\tError: Failed to add default dentries for lost+found!!!\n"); err = -1; goto exit; } - raw_node->i.i_addr[get_extra_isize(raw_node)] = cpu_to_le32(data_blk_nor); - - main_area_node_seg_blk_offset = get_sb(main_blkaddr); - main_area_node_seg_blk_offset += c.cur_seg[CURSEG_HOT_NODE] * - c.blks_per_seg + c.quota_inum + 1; + raw_node->i.i_addr[get_extra_isize(raw_node)] = cpu_to_le32(data_blkaddr); - DBG(1, "\tWriting lost+found inode (hot node), %x %x %x at offset 0x%08"PRIu64"\n", - get_sb(main_blkaddr), - c.cur_seg[CURSEG_HOT_NODE], - c.blks_per_seg, main_area_node_seg_blk_offset); - if (write_inode(raw_node, main_area_node_seg_blk_offset) < 0) { + DBG(1, "\tWriting lost+found inode (hot node), offset 0x%x\n", + node_blkaddr); + if (write_inode(raw_node, node_blkaddr) < 0) { MSG(1, "\tError: While writing the raw_node to disk!!!\n"); err = -1; goto exit;