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=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 B37ACC4338F for ; Wed, 4 Aug 2021 02:04:10 +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 6D02360F58 for ; Wed, 4 Aug 2021 02:04:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6D02360F58 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=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 1mB6GN-0005Hj-FO; Wed, 04 Aug 2021 02:04:07 +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 1mB6GM-0005HX-70 for linux-f2fs-devel@lists.sourceforge.net; Wed, 04 Aug 2021 02:04:06 +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=9p452FgSMV1NoJZioLRYRpOf5tefJCnh+7pW+LpJANM=; b=Y940/lmYyV1+hWtcd7zO1Ls09h 3XbHRN7g/MtPeNXX/AZBARU3aJ4L0Ci/GYnXMwNN1FV2E8rEY6465kg69UO9aweF4QKqdIbb6/+CJ G1fH+jBcwVSZy4TTDepv1IvaTiB02BXvzfV0Db+N1YcRh6Ak3JWS7jsaSiwfhgzY3Sks=; 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=9p452FgSMV1NoJZioLRYRpOf5tefJCnh+7pW+LpJANM=; b=KbXr/bDIAzG6beKgRx8nfT/87j 9QzO61qu9+/tw3Csm/azmr6UIpMjJhGu93QWjXDKi3fteUCZsuB+VgY+Bxg6LsGGHnMNr+r1FpL/r kl9foQ9/Y4d/E6FCQI3c07Uh3WqC+skOh1Y3pFQtBLQlLm5k0VdZcAufEIe+gg99weX8=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1mB6GA-00BcUp-Km for linux-f2fs-devel@lists.sourceforge.net; Wed, 04 Aug 2021 02:04:06 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id AF4C760F70; Wed, 4 Aug 2021 02:03:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628042622; bh=Q8eZPDaLV1ol8DdRIjz+PapA4l7YPLXHaVAtMQG8fcQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=rk7x9d+D1beYS1le8B6CDGiBvszMGbxCKpwaeM6AUECSPSENheXrnO8Z//3j0OpvR 8BfqxbkpOld9PP95dIWFqHQsUf2ab3EYBaMRBiph1ccbxUu8ENsKuTFzz6HHxOYQm5 5YsFOJ3YO0aXPacziCSbs/OoyiPiw4wVVji6TA2wi7tipWAtZfKYH/1uzG47H0kLMV tIktj9eRcCKJ/6KMOZmk1tnTSfIIBQRvAq2Y7xq/A26krSSfkIj0+kV0n7hw4JHt3U WzquPDhCx3mp0uAMHqXdgMj4jZ/+kWSIgOors+YmdzX8ZxqMHYP7/AF9RXmNypuGcN CVYqGxAp7frmA== Date: Tue, 3 Aug 2021 19:03:41 -0700 From: Jaegeuk Kim To: Chao Yu Message-ID: References: <20210803103952.737222-1-chao@kernel.org> <275b4ec7-d7fd-b169-ff43-3ceec37b47b9@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <275b4ec7-d7fd-b169-ff43-3ceec37b47b9@kernel.org> X-Headers-End: 1mB6GA-00BcUp-Km Subject: Re: [f2fs-dev] [PATCH] f2fs: compress: do sanity check on cluster 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: Chao Yu , 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 08/04, Chao Yu wrote: > On 2021/8/4 2:26, Jaegeuk Kim wrote: > > On 08/03, Chao Yu wrote: > > > This patch adds f2fs_sanity_check_cluster() to support doing > > > sanity check on cluster of compressed file, it will be triggered > > > from below two paths: > > > > > > - __f2fs_cluster_blocks() > > > - f2fs_map_blocks(F2FS_GET_BLOCK_FIEMAP) > > > > > > And it can detect below three kind of cluster insanity status. > > > > > > C: COMPRESS_ADDR > > > N: NULL_ADDR or NEW_ADDR > > > V: valid blkaddr > > > *: any value > > > > > > 1. [*|C|*|*] > > > 2. [C|*|C|*] > > > 3. [C|N|N|V] > > > > > > Signed-off-by: Chao Yu > > > --- > > > fs/f2fs/compress.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ > > > fs/f2fs/data.c | 21 ++++++++++++------ > > > fs/f2fs/f2fs.h | 1 + > > > 3 files changed, 68 insertions(+), 7 deletions(-) > > > > > > diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c > > > index 455561826c7d..4aa166d3d9bf 100644 > > > --- a/fs/f2fs/compress.c > > > +++ b/fs/f2fs/compress.c > > > @@ -898,6 +898,54 @@ static bool cluster_has_invalid_data(struct compress_ctx *cc) > > > return false; > > > } > > > +bool f2fs_sanity_check_cluster(struct dnode_of_data *dn) > > > +{ > > > + struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode); > > > + unsigned int cluster_size = F2FS_I(dn->inode)->i_cluster_size; > > > + bool compressed = dn->data_blkaddr == COMPRESS_ADDR; > > > + int cluster_end = 0; > > > + int i; > > > + char *reason = ""; > > > + > > > + if (!compressed) > > > + return false; > > > + > > > + /* [..., COMPR_ADDR, ...] */ > > > + if (dn->ofs_in_node % cluster_size) { > > > + reason = "[*|C|*|*]"; > > > + goto out; > > > + } > > > + > > > + for (i = 1; i < cluster_size; i++) { > > > + block_t blkaddr = data_blkaddr(dn->inode, dn->node_page, > > > + dn->ofs_in_node + i); > > > + > > > + /* [COMPR_ADDR, ..., COMPR_ADDR] */ > > > + if (blkaddr == COMPRESS_ADDR) { > > > + reason = "[C|*|C|*]"; > > > + goto out; > > > + } > > > + if (compressed) { > > > + if (!__is_valid_data_blkaddr(blkaddr)) { > > > + if (!cluster_end) > > > + cluster_end = i; > > > + continue; > > > + } > > > + /* [COMPR_ADDR, NULL_ADDR or NEW_ADDR, valid_blkaddr] */ > > > + if (cluster_end) { > > > + reason = "[C|N|N|V]"; > > > + goto out; > > > + } > > > + } > > > + } > > > + return false; > > > +out: > > > + f2fs_warn(sbi, "access invalid cluster, ino:%lu, nid:%u, ofs_in_node:%u, reason:%s", > > > + dn->inode->i_ino, dn->nid, dn->ofs_in_node, reason); > > > + set_sbi_flag(sbi, SBI_NEED_FSCK); > > > + return true; > > > +} > > > + > > > static int __f2fs_cluster_blocks(struct inode *inode, > > > unsigned int cluster_idx, bool compr) > > > { > > > @@ -915,6 +963,11 @@ static int __f2fs_cluster_blocks(struct inode *inode, > > > goto fail; > > > } > > > + if (f2fs_sanity_check_cluster(&dn)) { > > > + ret = -EFSCORRUPTED; > > > + goto fail; > > > + } > > > + > > > if (dn.data_blkaddr == COMPRESS_ADDR) { > > > int i; > > > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > > > index 948083c88d17..75dda2035f68 100644 > > > --- a/fs/f2fs/data.c > > > +++ b/fs/f2fs/data.c > > > @@ -1558,13 +1558,20 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, > > > } > > > if (flag == F2FS_GET_BLOCK_PRECACHE) > > > goto sync_out; > > > - if (flag == F2FS_GET_BLOCK_FIEMAP && > > > - blkaddr == NULL_ADDR) { > > > - if (map->m_next_pgofs) > > > - *map->m_next_pgofs = pgofs + 1; > > > - goto sync_out; > > > - } > > > - if (flag != F2FS_GET_BLOCK_FIEMAP) { > > > + if (flag == ) { > > > + if (blkaddr == NULL_ADDR) { > > > + if (map->m_next_pgofs) > > > + *map->m_next_pgofs = pgofs + 1; > > > + goto sync_out; > > > + } > > > +#ifdef CONFIG_F2FS_FS_COMPRESSION > > > + if (f2fs_compressed_file(inode) && > > > + f2fs_sanity_check_cluster(&dn)) { > > > + err = -EFSCORRUPTED; > > > > I prefer to give the block map as is instead of giving an error, since this\ > > It looks the policy is not consistent with the one we did in > f2fs_is_valid_blkaddr(). Why FIEMAP only? Do we need to check in other cases likewise f2fs_is_valid_blkaddr()? > > > takes away to debug the problem from user-land. > > We can debug through "dump.f2fs -i" command? also once f2fs_sanity_check_cluster() > fails, it will print kernel message for further debuging. My concern here is how to debug and get out of this endless fiemap error before recovered. > > Thanks, > > > > > > + goto sync_out; > > > + } > > > +#endif > > > + } else { > > > /* for defragment case */ > > > if (map->m_next_pgofs) > > > *map->m_next_pgofs = pgofs + 1; > > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > > > index 20389b9b3eac..86d416ffad61 100644 > > > --- a/fs/f2fs/f2fs.h > > > +++ b/fs/f2fs/f2fs.h > > > @@ -4060,6 +4060,7 @@ void f2fs_end_read_compressed_page(struct page *page, bool failed, > > > block_t blkaddr); > > > bool f2fs_cluster_is_empty(struct compress_ctx *cc); > > > bool f2fs_cluster_can_merge_page(struct compress_ctx *cc, pgoff_t index); > > > +bool f2fs_sanity_check_cluster(struct dnode_of_data *dn); > > > void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct page *page); > > > int f2fs_write_multi_pages(struct compress_ctx *cc, > > > int *submitted, > > > -- > > > 2.22.1 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel 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=-16.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 71378C432BE for ; Wed, 4 Aug 2021 02:03:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 523A560243 for ; Wed, 4 Aug 2021 02:03:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234301AbhHDCDz (ORCPT ); Tue, 3 Aug 2021 22:03:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:48420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234024AbhHDCDy (ORCPT ); Tue, 3 Aug 2021 22:03:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AF4C760F70; Wed, 4 Aug 2021 02:03:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628042622; bh=Q8eZPDaLV1ol8DdRIjz+PapA4l7YPLXHaVAtMQG8fcQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=rk7x9d+D1beYS1le8B6CDGiBvszMGbxCKpwaeM6AUECSPSENheXrnO8Z//3j0OpvR 8BfqxbkpOld9PP95dIWFqHQsUf2ab3EYBaMRBiph1ccbxUu8ENsKuTFzz6HHxOYQm5 5YsFOJ3YO0aXPacziCSbs/OoyiPiw4wVVji6TA2wi7tipWAtZfKYH/1uzG47H0kLMV tIktj9eRcCKJ/6KMOZmk1tnTSfIIBQRvAq2Y7xq/A26krSSfkIj0+kV0n7hw4JHt3U WzquPDhCx3mp0uAMHqXdgMj4jZ/+kWSIgOors+YmdzX8ZxqMHYP7/AF9RXmNypuGcN CVYqGxAp7frmA== Date: Tue, 3 Aug 2021 19:03:41 -0700 From: Jaegeuk Kim To: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: Re: [PATCH] f2fs: compress: do sanity check on cluster Message-ID: References: <20210803103952.737222-1-chao@kernel.org> <275b4ec7-d7fd-b169-ff43-3ceec37b47b9@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <275b4ec7-d7fd-b169-ff43-3ceec37b47b9@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08/04, Chao Yu wrote: > On 2021/8/4 2:26, Jaegeuk Kim wrote: > > On 08/03, Chao Yu wrote: > > > This patch adds f2fs_sanity_check_cluster() to support doing > > > sanity check on cluster of compressed file, it will be triggered > > > from below two paths: > > > > > > - __f2fs_cluster_blocks() > > > - f2fs_map_blocks(F2FS_GET_BLOCK_FIEMAP) > > > > > > And it can detect below three kind of cluster insanity status. > > > > > > C: COMPRESS_ADDR > > > N: NULL_ADDR or NEW_ADDR > > > V: valid blkaddr > > > *: any value > > > > > > 1. [*|C|*|*] > > > 2. [C|*|C|*] > > > 3. [C|N|N|V] > > > > > > Signed-off-by: Chao Yu > > > --- > > > fs/f2fs/compress.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ > > > fs/f2fs/data.c | 21 ++++++++++++------ > > > fs/f2fs/f2fs.h | 1 + > > > 3 files changed, 68 insertions(+), 7 deletions(-) > > > > > > diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c > > > index 455561826c7d..4aa166d3d9bf 100644 > > > --- a/fs/f2fs/compress.c > > > +++ b/fs/f2fs/compress.c > > > @@ -898,6 +898,54 @@ static bool cluster_has_invalid_data(struct compress_ctx *cc) > > > return false; > > > } > > > +bool f2fs_sanity_check_cluster(struct dnode_of_data *dn) > > > +{ > > > + struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode); > > > + unsigned int cluster_size = F2FS_I(dn->inode)->i_cluster_size; > > > + bool compressed = dn->data_blkaddr == COMPRESS_ADDR; > > > + int cluster_end = 0; > > > + int i; > > > + char *reason = ""; > > > + > > > + if (!compressed) > > > + return false; > > > + > > > + /* [..., COMPR_ADDR, ...] */ > > > + if (dn->ofs_in_node % cluster_size) { > > > + reason = "[*|C|*|*]"; > > > + goto out; > > > + } > > > + > > > + for (i = 1; i < cluster_size; i++) { > > > + block_t blkaddr = data_blkaddr(dn->inode, dn->node_page, > > > + dn->ofs_in_node + i); > > > + > > > + /* [COMPR_ADDR, ..., COMPR_ADDR] */ > > > + if (blkaddr == COMPRESS_ADDR) { > > > + reason = "[C|*|C|*]"; > > > + goto out; > > > + } > > > + if (compressed) { > > > + if (!__is_valid_data_blkaddr(blkaddr)) { > > > + if (!cluster_end) > > > + cluster_end = i; > > > + continue; > > > + } > > > + /* [COMPR_ADDR, NULL_ADDR or NEW_ADDR, valid_blkaddr] */ > > > + if (cluster_end) { > > > + reason = "[C|N|N|V]"; > > > + goto out; > > > + } > > > + } > > > + } > > > + return false; > > > +out: > > > + f2fs_warn(sbi, "access invalid cluster, ino:%lu, nid:%u, ofs_in_node:%u, reason:%s", > > > + dn->inode->i_ino, dn->nid, dn->ofs_in_node, reason); > > > + set_sbi_flag(sbi, SBI_NEED_FSCK); > > > + return true; > > > +} > > > + > > > static int __f2fs_cluster_blocks(struct inode *inode, > > > unsigned int cluster_idx, bool compr) > > > { > > > @@ -915,6 +963,11 @@ static int __f2fs_cluster_blocks(struct inode *inode, > > > goto fail; > > > } > > > + if (f2fs_sanity_check_cluster(&dn)) { > > > + ret = -EFSCORRUPTED; > > > + goto fail; > > > + } > > > + > > > if (dn.data_blkaddr == COMPRESS_ADDR) { > > > int i; > > > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > > > index 948083c88d17..75dda2035f68 100644 > > > --- a/fs/f2fs/data.c > > > +++ b/fs/f2fs/data.c > > > @@ -1558,13 +1558,20 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, > > > } > > > if (flag == F2FS_GET_BLOCK_PRECACHE) > > > goto sync_out; > > > - if (flag == F2FS_GET_BLOCK_FIEMAP && > > > - blkaddr == NULL_ADDR) { > > > - if (map->m_next_pgofs) > > > - *map->m_next_pgofs = pgofs + 1; > > > - goto sync_out; > > > - } > > > - if (flag != F2FS_GET_BLOCK_FIEMAP) { > > > + if (flag == ) { > > > + if (blkaddr == NULL_ADDR) { > > > + if (map->m_next_pgofs) > > > + *map->m_next_pgofs = pgofs + 1; > > > + goto sync_out; > > > + } > > > +#ifdef CONFIG_F2FS_FS_COMPRESSION > > > + if (f2fs_compressed_file(inode) && > > > + f2fs_sanity_check_cluster(&dn)) { > > > + err = -EFSCORRUPTED; > > > > I prefer to give the block map as is instead of giving an error, since this\ > > It looks the policy is not consistent with the one we did in > f2fs_is_valid_blkaddr(). Why FIEMAP only? Do we need to check in other cases likewise f2fs_is_valid_blkaddr()? > > > takes away to debug the problem from user-land. > > We can debug through "dump.f2fs -i" command? also once f2fs_sanity_check_cluster() > fails, it will print kernel message for further debuging. My concern here is how to debug and get out of this endless fiemap error before recovered. > > Thanks, > > > > > > + goto sync_out; > > > + } > > > +#endif > > > + } else { > > > /* for defragment case */ > > > if (map->m_next_pgofs) > > > *map->m_next_pgofs = pgofs + 1; > > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > > > index 20389b9b3eac..86d416ffad61 100644 > > > --- a/fs/f2fs/f2fs.h > > > +++ b/fs/f2fs/f2fs.h > > > @@ -4060,6 +4060,7 @@ void f2fs_end_read_compressed_page(struct page *page, bool failed, > > > block_t blkaddr); > > > bool f2fs_cluster_is_empty(struct compress_ctx *cc); > > > bool f2fs_cluster_can_merge_page(struct compress_ctx *cc, pgoff_t index); > > > +bool f2fs_sanity_check_cluster(struct dnode_of_data *dn); > > > void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct page *page); > > > int f2fs_write_multi_pages(struct compress_ctx *cc, > > > int *submitted, > > > -- > > > 2.22.1