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 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 85AF3C197A0 for ; Fri, 17 Nov 2023 17:25:01 +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 1r42aQ-0007jg-0X; Fri, 17 Nov 2023 17:24:58 +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 1r42aO-0007ja-Rp for linux-f2fs-devel@lists.sourceforge.net; Fri, 17 Nov 2023 17:24:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: 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=hZ0dernX1mjzZEua7dpzISsijAUC+xDiOXveKYozVjY=; b=DG+qDCcbpgLgaez8HuX4AnYVzJ 2gYNERUghdH0RGiihZjj1zXDOaOb55Ah1nG1rqw8Y1UPNRrANV2pEim8/UWosM8eR0wAUpPBN7mho yqheUgiJjiEg+/G3wyJP+GYymBpu1PjqDnU5NzwQPwPYkt8naMB1SnArOm+c9StcsgR8=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding: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=hZ0dernX1mjzZEua7dpzISsijAUC+xDiOXveKYozVjY=; b=BpKRlECv3d4uyfPliXz1SCWWSE I3v0+bjjmapT/6M4A8BjIIkyyYoVpyP8ZS5cj5ZPUFbytpI4KU9rJKhN+5akHbVy7odTpsk/gU4Y0 ixM1M5WG0N4/aub6TWpTtW8kSlHVi39TeUst3fF4auJevNH6I5GtBj9+ApsVdV2MNIpE=; 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 1r42aO-008i0t-5v for linux-f2fs-devel@lists.sourceforge.net; Fri, 17 Nov 2023 17:24:57 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 7A10A61D7D; Fri, 17 Nov 2023 17:24:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 242D3C433C8; Fri, 17 Nov 2023 17:24:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700241884; bh=26MRHWylt0nXrukBmgnOlVNwwDicHj9Fjs4MTZhPT1o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ItTF4IXxx5vwEDN29iFnozgfWUQ6cWEkSzmh2g4PNwK+wIdgfgS40KI9xbcPSPzMi MzRl1t5U9WaMKNaEssVcNkrmlixJGB22SN2GdoGRlKvSbWbQ/dSqpiuGryrjxrUEh8 oVWZoga/00jwqqHFguQR2P/0r1W0vVYXz6cgpwJhviJl/ijzxVVQ5zB6jZt88aQ0De jvWhQYpBDl5pTGoXgvNRvqHbo12RKOXU5B8k75A0qVsipFzkNkte/Ytgk6Tl7kw8l5 IDslvubfAm+CcmnOgcmmYeSyfnwoiRq075ylCUNAoxClXEuyR5eHBLFkXFUVPta7YA 68O1gUYkmaTOw== Date: Fri, 17 Nov 2023 09:24:42 -0800 From: Jaegeuk Kim To: Chao Yu Message-ID: References: <20231027002123.1195780-1-daeho43@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Headers-End: 1r42aO-008i0t-5v Subject: Re: [f2fs-dev] [PATCH v2] f2fs-tools: do not reuse corrupted quota inodes 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: Daeho Jeong , kernel-team@android.com, linux-kernel@vger.kernel.org, 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 On 11/15, Chao Yu wrote: > On 2023/10/27 8:21, Daeho Jeong wrote: > > From: Daeho Jeong > > > > When we detect quota inode corruption, we better deallocate the current > > space and allocate new ones for a clean start. > > > > Signed-off-by: Daeho Jeong > > > > --- > > v2: change node count check when creating a new node block > > --- > > fsck/fsck.c | 148 +++++++++++++++++++++++++++++++++++-------------- > > fsck/segment.c | 5 +- > > 2 files changed, 109 insertions(+), 44 deletions(-) > > > > diff --git a/fsck/fsck.c b/fsck/fsck.c > > index 99cface..dc8e282 100644 > > --- a/fsck/fsck.c > > +++ b/fsck/fsck.c > > @@ -67,6 +67,14 @@ int f2fs_set_sit_bitmap(struct f2fs_sb_info *sbi, u32 blk) > > return f2fs_set_bit(BLKOFF_FROM_MAIN(sbi, blk), fsck->sit_area_bitmap); > > } > > +static inline int f2fs_clear_sit_bitmap(struct f2fs_sb_info *sbi, u32 blk) > > +{ > > + struct f2fs_fsck *fsck = F2FS_FSCK(sbi); > > + > > + return f2fs_clear_bit(BLKOFF_FROM_MAIN(sbi, blk), > > + fsck->sit_area_bitmap); > > +} > > + > > static int add_into_hard_link_list(struct f2fs_sb_info *sbi, > > u32 nid, u32 link_cnt) > > { > > @@ -2150,6 +2158,9 @@ int fsck_chk_quota_node(struct f2fs_sb_info *sbi) > > return ret; > > } > > +static void fsck_disconnect_file(struct f2fs_sb_info *sbi, nid_t ino, > > + bool dealloc); > > + > > int fsck_chk_quota_files(struct f2fs_sb_info *sbi) > > { > > struct f2fs_fsck *fsck = F2FS_FSCK(sbi); > > @@ -2181,6 +2192,8 @@ int fsck_chk_quota_files(struct f2fs_sb_info *sbi) > > if (c.fix_on) { > > DBG(0, "Fixing Quota file ([%3d] ino [0x%x])\n", > > qtype, ino); > > + fsck_disconnect_file(sbi, ino, true); > > + f2fs_rebuild_qf_inode(sbi, qtype); > > f2fs_filesize_update(sbi, ino, 0); > > ret = quota_write_inode(sbi, qtype); > > if (!ret) { > > @@ -2874,10 +2887,53 @@ static int fsck_do_reconnect_file(struct f2fs_sb_info *sbi, > > return 0; > > } > > -static void fsck_failed_reconnect_file_dnode(struct f2fs_sb_info *sbi, > > - struct f2fs_inode *inode, nid_t nid) > > +static inline void release_inode_cnt(struct f2fs_sb_info *sbi, bool dealloc) > > +{ > > + F2FS_FSCK(sbi)->chk.valid_inode_cnt--; > > + if (dealloc) > > + sbi->total_valid_inode_count--; > > +} > > + > > +static inline void release_node_cnt(struct f2fs_sb_info *sbi, bool dealloc) > > +{ > > + F2FS_FSCK(sbi)->chk.valid_node_cnt--; > > + if (dealloc) > > + sbi->total_valid_node_count--; > > +} > > + > > +static inline void release_block_cnt(struct f2fs_sb_info *sbi, bool dealloc) > > +{ > > + F2FS_FSCK(sbi)->chk.valid_blk_cnt--; > > + if (dealloc) > > + sbi->total_valid_block_count--; > > +} > > + > > +static inline void release_block(struct f2fs_sb_info *sbi, u64 blkaddr, > > + bool dealloc) > > +{ > > + f2fs_clear_main_bitmap(sbi, blkaddr); > > + if (dealloc) { > > + struct seg_entry *se; > > + u64 offset; > > + > > + se = get_seg_entry(sbi, GET_SEGNO(sbi, blkaddr)); > > + offset = OFFSET_IN_SEG(sbi, blkaddr); > > + se->valid_blocks--; > > + f2fs_clear_bit(offset, (char *)se->cur_valid_map); > > + se->dirty = 1; > > + f2fs_clear_sit_bitmap(sbi, blkaddr); > > + } > > +} > > + > > +static inline void release_nat_entry(struct f2fs_sb_info *sbi, u32 nid) > > +{ > > + nullify_nat_entry(sbi, nid); > > + F2FS_FSCK(sbi)->chk.valid_nat_entry_cnt--; > > +} > > + > > +static void fsck_disconnect_file_dnode(struct f2fs_sb_info *sbi, > > + struct f2fs_inode *inode, nid_t nid, bool dealloc) > > { > > - struct f2fs_fsck *fsck = F2FS_FSCK(sbi); > > struct f2fs_node *node; > > struct node_info ni; > > u32 addr; > > @@ -2890,27 +2946,29 @@ static void fsck_failed_reconnect_file_dnode(struct f2fs_sb_info *sbi, > > err = dev_read_block(node, ni.blk_addr); > > ASSERT(err >= 0); > > - fsck->chk.valid_node_cnt--; > > - fsck->chk.valid_blk_cnt--; > > - f2fs_clear_main_bitmap(sbi, ni.blk_addr); > > + release_node_cnt(sbi, dealloc); > > + release_block_cnt(sbi, dealloc); > > + release_block(sbi, ni.blk_addr, dealloc); > > for (i = 0; i < ADDRS_PER_BLOCK(inode); i++) { > > addr = le32_to_cpu(node->dn.addr[i]); > > if (!addr) > > continue; > > - fsck->chk.valid_blk_cnt--; > > + release_block_cnt(sbi, dealloc); > > if (addr == NEW_ADDR || addr == COMPRESS_ADDR) > > continue; > > - f2fs_clear_main_bitmap(sbi, addr); > > + release_block(sbi, addr, dealloc); > > } > > + if (dealloc) > > + release_nat_entry(sbi, nid); > > + > > free(node); > > } > > -static void fsck_failed_reconnect_file_idnode(struct f2fs_sb_info *sbi, > > - struct f2fs_inode *inode, nid_t nid) > > +static void fsck_disconnect_file_idnode(struct f2fs_sb_info *sbi, > > + struct f2fs_inode *inode, nid_t nid, bool dealloc) > > { > > - struct f2fs_fsck *fsck = F2FS_FSCK(sbi); > > struct f2fs_node *node; > > struct node_info ni; > > nid_t tmp; > > @@ -2923,24 +2981,26 @@ static void fsck_failed_reconnect_file_idnode(struct f2fs_sb_info *sbi, > > err = dev_read_block(node, ni.blk_addr); > > ASSERT(err >= 0); > > - fsck->chk.valid_node_cnt--; > > - fsck->chk.valid_blk_cnt--; > > - f2fs_clear_main_bitmap(sbi, ni.blk_addr); > > + release_node_cnt(sbi, dealloc); > > + release_block_cnt(sbi, dealloc); > > + release_block(sbi, ni.blk_addr, dealloc); > > for (i = 0; i < NIDS_PER_BLOCK; i++) { > > tmp = le32_to_cpu(node->in.nid[i]); > > if (!tmp) > > continue; > > - fsck_failed_reconnect_file_dnode(sbi, inode, tmp); > > + fsck_disconnect_file_dnode(sbi, inode, tmp, dealloc); > > } > > + if (dealloc) > > + release_nat_entry(sbi, nid); > > + > > free(node); > > } > > -static void fsck_failed_reconnect_file_didnode(struct f2fs_sb_info *sbi, > > - struct f2fs_inode *inode, nid_t nid) > > +static void fsck_disconnect_file_didnode(struct f2fs_sb_info *sbi, > > + struct f2fs_inode *inode, nid_t nid, bool dealloc) > > { > > - struct f2fs_fsck *fsck = F2FS_FSCK(sbi); > > struct f2fs_node *node; > > struct node_info ni; > > nid_t tmp; > > @@ -2953,28 +3013,26 @@ static void fsck_failed_reconnect_file_didnode(struct f2fs_sb_info *sbi, > > err = dev_read_block(node, ni.blk_addr); > > ASSERT(err >= 0); > > - fsck->chk.valid_node_cnt--; > > - fsck->chk.valid_blk_cnt--; > > - f2fs_clear_main_bitmap(sbi, ni.blk_addr); > > + release_node_cnt(sbi, dealloc); > > + release_block_cnt(sbi, dealloc); > > + release_block(sbi, ni.blk_addr, dealloc); > > for (i = 0; i < NIDS_PER_BLOCK; i++) { > > tmp = le32_to_cpu(node->in.nid[i]); > > if (!tmp) > > continue; > > - fsck_failed_reconnect_file_idnode(sbi, inode, tmp); > > + fsck_disconnect_file_idnode(sbi, inode, tmp, dealloc); > > } > > + if (dealloc) > > + release_nat_entry(sbi, nid); > > + > > free(node); > > } > > -/* > > - * Counters and main_area_bitmap are already changed during checking > > - * inode block, so clear them. There is no need to clear new blocks > > - * allocted to lost+found. > > - */ > > -static void fsck_failed_reconnect_file(struct f2fs_sb_info *sbi, nid_t ino) > > +static void fsck_disconnect_file(struct f2fs_sb_info *sbi, nid_t ino, > > + bool dealloc) > > { > > - struct f2fs_fsck *fsck = F2FS_FSCK(sbi); > > struct f2fs_node *node; > > struct node_info ni; > > nid_t nid; > > @@ -2988,18 +3046,18 @@ static void fsck_failed_reconnect_file(struct f2fs_sb_info *sbi, nid_t ino) > > ASSERT(err >= 0); > > /* clear inode counters */ > > - fsck->chk.valid_inode_cnt--; > > - fsck->chk.valid_node_cnt--; > > - fsck->chk.valid_blk_cnt--; > > - f2fs_clear_main_bitmap(sbi, ni.blk_addr); > > + release_inode_cnt(sbi, dealloc); > > + release_node_cnt(sbi, dealloc); > > + release_block_cnt(sbi, dealloc); > > + release_block(sbi, ni.blk_addr, dealloc); > > /* clear xnid counters */ > > if (node->i.i_xattr_nid) { > > nid = le32_to_cpu(node->i.i_xattr_nid); > > - fsck->chk.valid_node_cnt--; > > - fsck->chk.valid_blk_cnt--; > > + release_node_cnt(sbi, dealloc); > > + release_block_cnt(sbi, dealloc); > > get_node_info(sbi, nid, &ni); > > - f2fs_clear_main_bitmap(sbi, ni.blk_addr); > > + release_block(sbi, ni.blk_addr, dealloc); > > Needs to release xattr node's nat entry, right? > > if (dealloc) > release_nat_entry(sbi, nid); Daeho? > > Thanks, > > > } > > /* clear data counters */ > > @@ -3009,10 +3067,10 @@ static void fsck_failed_reconnect_file(struct f2fs_sb_info *sbi, nid_t ino) > > block_t addr = le32_to_cpu(node->i.i_addr[ofs + i]); > > if (!addr) > > continue; > > - fsck->chk.valid_blk_cnt--; > > + release_block_cnt(sbi, dealloc); > > if (addr == NEW_ADDR || addr == COMPRESS_ADDR) > > continue; > > - f2fs_clear_main_bitmap(sbi, addr); > > + release_block(sbi, addr, dealloc); > > } > > } > > @@ -3024,18 +3082,24 @@ static void fsck_failed_reconnect_file(struct f2fs_sb_info *sbi, nid_t ino) > > switch (i) { > > case 0: /* direct node */ > > case 1: > > - fsck_failed_reconnect_file_dnode(sbi, &node->i, nid); > > + fsck_disconnect_file_dnode(sbi, &node->i, nid, > > + dealloc); > > break; > > case 2: /* indirect node */ > > case 3: > > - fsck_failed_reconnect_file_idnode(sbi, &node->i, nid); > > + fsck_disconnect_file_idnode(sbi, &node->i, nid, > > + dealloc); > > break; > > case 4: /* double indirect node */ > > - fsck_failed_reconnect_file_didnode(sbi, &node->i, nid); > > + fsck_disconnect_file_didnode(sbi, &node->i, nid, > > + dealloc); > > break; > > } > > } > > + if (dealloc) > > + release_nat_entry(sbi, ino); > > + > > free(node); > > } > > @@ -3121,7 +3185,7 @@ static int fsck_reconnect_file(struct f2fs_sb_info *sbi) > > if (fsck_do_reconnect_file(sbi, lpf_node, node)) { > > DBG(1, "Failed to reconnect inode [0x%x]\n", > > nid); > > - fsck_failed_reconnect_file(sbi, nid); > > + fsck_disconnect_file(sbi, nid, false); > > continue; > > } > > diff --git a/fsck/segment.c b/fsck/segment.c > > index 3a9500f..4e326c4 100644 > > --- a/fsck/segment.c > > +++ b/fsck/segment.c > > @@ -37,7 +37,7 @@ int reserve_new_block(struct f2fs_sb_info *sbi, block_t *to, > > return -ENOSPC; > > } > > if (is_node && fsck->chk.valid_node_cnt >= > > - sbi->total_valid_node_count) { > > + sbi->total_node_count) { > > ERR_MSG("Not enough space for node block\n"); > > return -ENOSPC; > > } > > @@ -76,7 +76,7 @@ int reserve_new_block(struct f2fs_sb_info *sbi, block_t *to, > > se = get_seg_entry(sbi, GET_SEGNO(sbi, blkaddr)); > > offset = OFFSET_IN_SEG(sbi, blkaddr); > > - se->type = type; > > + se->type = se->orig_type = type; > > if (se->valid_blocks == 0) > > SM_I(sbi)->free_segments--; > > se->valid_blocks++; > > @@ -101,6 +101,7 @@ int reserve_new_block(struct f2fs_sb_info *sbi, block_t *to, > > if (c.func == FSCK) { > > fsck->chk.valid_blk_cnt++; > > if (is_node) { > > + fsck->chk.valid_nat_entry_cnt++; > > fsck->chk.valid_node_cnt++; > > if (is_inode) > > fsck->chk.valid_inode_cnt++; _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel