From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F9EEC636C9 for ; Sat, 17 Jul 2021 08:16:51 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D37B6613C0; Sat, 17 Jul 2021 08:16:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D37B6613C0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net 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.90_1) (envelope-from ) id 1m4fVC-0007BZ-EN; Sat, 17 Jul 2021 08:16:50 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4fVA-0007BL-RY for linux-f2fs-devel@lists.sourceforge.net; Sat, 17 Jul 2021 08:16:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: MIME-Version:Date:Message-ID:From:References:Cc:To:Subject:Sender:Reply-To: 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=TOD41Rl34l5GWW3KWZUbiihDoVzJbp4Bmmp9wxvMzw0=; b=Hf6j+MfgqXQyoAITSIAEOGTNtO XlMw4bXGF4C0BK41RFVSA1UwIvbn7MPs6Etr+OFX972XNvey4TP5PhhYFV7v23N1n3hVF/8fyN5L0 IuyWedsksGbzNNZmSjPQpeTlIeeQWSxY8wHGS1wEGl4EwjKpKDzNrF3T7hOdDpTNds0g=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date: Message-ID:From:References:Cc:To:Subject:Sender:Reply-To: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=TOD41Rl34l5GWW3KWZUbiihDoVzJbp4Bmmp9wxvMzw0=; b=dPJ8ci82GkIWpiN0rXujX+vK9T 1ONc/YbnXFCwERMgWmwiEw3Lyxdjvh1V8Rx7OMofjpZs7gPO2Fcw04lEWQ9dcbEo4gzEYQRus7v71 bLyiW/NmCGkXXzglt0Rt2/UzQntDxC9GvcrJcRkueAA2PCzqhErITEbTpo+VaQd5wt/E=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1m4fV2-0005y6-Vp for linux-f2fs-devel@lists.sourceforge.net; Sat, 17 Jul 2021 08:16:48 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D39C16128A; Sat, 17 Jul 2021 08:16:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626509794; bh=ExyHDU6qn6oNZ3HSJyI4+esjd1tcAwdbRgELAnBjFaE=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=aczLuRVhIghG+hWSd3vdVrgQizTTv3kxWdyU8FlqbbRi/SjQRer1U9pksco3Voj9K OshV6H+kirM1Lq3MgEvnom3reWgGrhd1j/6VxNRHI0YhO+Sc4rvmcd7FH9mqllk7nE zl4QwBCp2bZFk6Lwn9d6oyOuze9/SxMnEznLRfmm8ccAQuxM0a1dRrBepJRgJ/LPMw RTAFmU7LxpLv313d5ZgmP2sp8lapvsuHmLoAsuRBNaXtufsyKNtsXtjVYI4ea6Ye0S Z4rHg2UjFNDJ5032arxeUP6eOs4hsu3MMrCI8adJuoxnubaAgqF4yPTmW7OTQ2dXbB 3+QmzJP2RtOKg== To: Wang Xiaojun , jaegeuk@kernel.org References: <20210714020020.208502-1-wangxiaojun11@huawei.com> From: Chao Yu Message-ID: <776a5989-3309-3a2e-40fb-6c12fef5d9dc@kernel.org> Date: Sat, 17 Jul 2021 16:16:32 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210714020020.208502-1-wangxiaojun11@huawei.com> Content-Language: en-US X-Headers-End: 1m4fV2-0005y6-Vp Subject: Re: [f2fs-dev] [PATCH] f2fs-tools: rebuild the quota inode if it is corrupted 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 2021/7/14 10:00, Wang Xiaojun wrote: > If the following process returns an error, > the quota inode, not the quota file, is damaged. > (fsck_chk_quota_node-->fsck_chk_node_blk-->sanity_check_nid) > The fsck does not have a process to rebuild the quota inode. > > Because sanity_check_nid is not passed, fsck->nat_area_bitmap > can not be cleared, and then the NAT of quota will be nullify > during fix_nat_entries. > > During the next fsck check, the quota inode check fails > because the address of the quota inode changes to 0. > In addition, in fsck_chk_quota_files-->f2fs_filesize_update, > data is written to address 0. > > Therefore, when the quota inode is corrupted, we need to rebuild it. > > Signed-off-by: Wang Xiaojun > --- > fsck/fsck.c | 2 ++ > fsck/fsck.h | 1 + > fsck/node.c | 38 ++++++++++++++++++++++++++++++++++++++ > include/f2fs_fs.h | 40 ++++++++++++++++++++++++++++++++++++++++ > mkfs/f2fs_format.c | 31 +------------------------------ > 5 files changed, 82 insertions(+), 30 deletions(-) > > diff --git a/fsck/fsck.c b/fsck/fsck.c > index 6ca85f0..af6d332 100644 > --- a/fsck/fsck.c > +++ b/fsck/fsck.c > @@ -1899,6 +1899,8 @@ int fsck_chk_quota_node(struct f2fs_sb_info *sbi) > ASSERT_MSG("wrong quota inode, qtype [%d] ino [0x%x]", > qtype, ino); > qf_szchk_type[qtype] = QF_SZCHK_ERR; > + if (c.fix_on) > + f2fs_rebuild_qf_inode(sbi, qtype); > } > } > cur_qtype = -1; > diff --git a/fsck/fsck.h b/fsck/fsck.h > index d79afef..67390f0 100644 > --- a/fsck/fsck.h > +++ b/fsck/fsck.h > @@ -286,6 +286,7 @@ void f2fs_alloc_nid(struct f2fs_sb_info *, nid_t *); > void set_data_blkaddr(struct dnode_of_data *); > block_t new_node_block(struct f2fs_sb_info *, > struct dnode_of_data *, unsigned int); > +int f2fs_rebuild_qf_inode(struct f2fs_sb_info *sbi, int qtype); > > /* segment.c */ > struct quota_file; > diff --git a/fsck/node.c b/fsck/node.c > index c7988cb..d8d01db 100644 > --- a/fsck/node.c > +++ b/fsck/node.c > @@ -40,6 +40,44 @@ void f2fs_release_nid(struct f2fs_sb_info *sbi, nid_t nid) > f2fs_clear_bit(nid, nm_i->nid_bitmap); > } > > +int f2fs_rebuild_qf_inode(struct f2fs_sb_info *sbi, int qtype) > +{ > + struct f2fs_node *raw_node = NULL; > + struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); > + struct f2fs_summary sum; > + struct node_info ni; > + nid_t ino = QUOTA_INO(sb, qtype); > + block_t blkaddr = NULL_ADDR; > + int ret = 0; > + > + raw_node = calloc(F2FS_BLKSIZE, 1); > + if (raw_node == NULL) { > + MSG(1, "\tError: Calloc Failed for raw_node!!!\n"); > + return -ENOMEM; > + } > + f2fs_init_qf_inode(sb, raw_node, qtype); > + raw_node->footer.cp_ver = F2FS_CKPT(sbi)->checkpoint_ver; footer.cp_ver not simply equal to .checkpoint_ver, it depends on CP_CRC_RECOVERY_FLAG flag. > + > + get_node_info(sbi, ino, &ni); > + set_summary(&sum, ino, 0, ni.version); > + ret = reserve_new_block(sbi, &blkaddr, &sum, CURSEG_HOT_NODE, 1); > + if (ret) > + goto err_out; > + > + ret = write_inode(raw_node, blkaddr); > + if (ret < 0) { > + MSG(1, "\tError: While rebuilding the quota inode to disk!\n"); > + goto err_out; > + } > + update_nat_blkaddr(sbi, ino, ino, blkaddr); > + > + f2fs_clear_bit(ino, F2FS_FSCK(sbi)->nat_area_bitmap); > + f2fs_set_bit(ino, NM_I(sbi)->nid_bitmap); > +err_out: > + free(raw_node); > + return ret; Better to print debug message like we did in f2fs_write_qf_inode()? > +} > + > void set_data_blkaddr(struct dnode_of_data *dn) > { > __le32 *addr_array; > diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h > index 45f7257..87bbd3c 100644 > --- a/include/f2fs_fs.h > +++ b/include/f2fs_fs.h > @@ -20,6 +20,7 @@ > #include > #include > #include > +#include > #ifdef HAVE_CONFIG_H > #include > #endif > @@ -1554,6 +1555,45 @@ static inline void show_version(const char *prog) > #endif > } > > +static inline void f2fs_init_qf_inode(struct f2fs_super_block *sb, > + struct f2fs_node *raw_node, int qtype) > +{ > + raw_node->footer.nid = sb->qf_ino[qtype]; > + raw_node->footer.ino = sb->qf_ino[qtype]; > + raw_node->footer.cp_ver = cpu_to_le64(1); > + raw_node->i.i_mode = cpu_to_le16(0x8180); > + raw_node->i.i_links = cpu_to_le32(1); > + raw_node->i.i_uid = cpu_to_le32(c.root_uid); > + raw_node->i.i_gid = cpu_to_le32(c.root_gid); > + > + raw_node->i.i_size = cpu_to_le64(1024 * 6); /* Hard coded */ > + raw_node->i.i_blocks = cpu_to_le64(1); > + > + raw_node->i.i_atime = cpu_to_le32(time(NULL)); > + raw_node->i.i_atime_nsec = 0; > + raw_node->i.i_ctime = cpu_to_le32(time(NULL)); > + raw_node->i.i_ctime_nsec = 0; > + raw_node->i.i_mtime = cpu_to_le32(time(NULL)); > + raw_node->i.i_mtime_nsec = 0; > + raw_node->i.i_generation = 0; > + raw_node->i.i_xattr_nid = 0; > + raw_node->i.i_flags = FS_IMMUTABLE_FL; > + raw_node->i.i_current_depth = cpu_to_le32(0); > + raw_node->i.i_dir_level = DEF_DIR_LEVEL; > + > + if (c.feature & cpu_to_le32(F2FS_FEATURE_EXTRA_ATTR)) { > + raw_node->i.i_inline = F2FS_EXTRA_ATTR; > + raw_node->i.i_extra_isize = cpu_to_le16(calc_extra_isize()); > + } > + > + if (c.feature & cpu_to_le32(F2FS_FEATURE_PRJQUOTA)) > + raw_node->i.i_projid = cpu_to_le32(F2FS_DEF_PROJID); > + > + raw_node->i.i_ext.fofs = 0; > + raw_node->i.i_ext.blk_addr = 0; > + raw_node->i.i_ext.len = 0; > +} > + > struct feature { > char *name; > u32 mask; > diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c > index 2132852..f8d0bce 100644 > --- a/mkfs/f2fs_format.c > +++ b/mkfs/f2fs_format.c > @@ -1373,42 +1373,16 @@ static int f2fs_write_qf_inode(int qtype) > MSG(1, "\tError: Calloc Failed for raw_node!!!\n"); > return -1; > } > + f2fs_init_qf_inode(sb, raw_node, qtype); > > - raw_node->footer.nid = sb->qf_ino[qtype]; > - raw_node->footer.ino = sb->qf_ino[qtype]; > - raw_node->footer.cp_ver = cpu_to_le64(1); > 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); > - > - raw_node->i.i_mode = cpu_to_le16(0x8180); > - raw_node->i.i_links = cpu_to_le32(1); > - raw_node->i.i_uid = cpu_to_le32(c.root_uid); > - raw_node->i.i_gid = cpu_to_le32(c.root_gid); > - > - raw_node->i.i_size = cpu_to_le64(1024 * 6); /* Hard coded */ > raw_node->i.i_blocks = cpu_to_le64(1 + QUOTA_DATA(qtype)); > - > raw_node->i.i_atime = cpu_to_le32(mkfs_time); mkfs_time or time(NULL) can be a parameter of f2fs_init_qf_inode()? Thanks, > - raw_node->i.i_atime_nsec = 0; > raw_node->i.i_ctime = cpu_to_le32(mkfs_time); > - raw_node->i.i_ctime_nsec = 0; > raw_node->i.i_mtime = cpu_to_le32(mkfs_time); > - raw_node->i.i_mtime_nsec = 0; > - raw_node->i.i_generation = 0; > - raw_node->i.i_xattr_nid = 0; > - raw_node->i.i_flags = FS_IMMUTABLE_FL; > - raw_node->i.i_current_depth = cpu_to_le32(0); > - raw_node->i.i_dir_level = DEF_DIR_LEVEL; > - > - if (c.feature & cpu_to_le32(F2FS_FEATURE_EXTRA_ATTR)) { > - raw_node->i.i_inline = F2FS_EXTRA_ATTR; > - raw_node->i.i_extra_isize = cpu_to_le16(calc_extra_isize()); > - } > - > - if (c.feature & cpu_to_le32(F2FS_FEATURE_PRJQUOTA)) > - raw_node->i.i_projid = cpu_to_le32(F2FS_DEF_PROJID); > > data_blk_nor = get_sb(main_blkaddr) + > c.cur_seg[CURSEG_HOT_DATA] * c.blks_per_seg + 1; > @@ -1434,9 +1408,6 @@ static int f2fs_write_qf_inode(int qtype) > 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); > - raw_node->i.i_ext.fofs = 0; > - raw_node->i.i_ext.blk_addr = 0; > - raw_node->i.i_ext.len = 0; > > main_area_node_seg_blk_offset = get_sb(main_blkaddr); > main_area_node_seg_blk_offset += c.cur_seg[CURSEG_HOT_NODE] * > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel