Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp2936281pxy; Tue, 3 Aug 2021 20:39:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzH5FSWJo/arERQPxUwXLi+/QLmGXDadv8CXSIiORdmo5NcpFcQw4x392cias8nPZdLc85R X-Received: by 2002:a5d:8b8b:: with SMTP id p11mr316801iol.77.1628048388545; Tue, 03 Aug 2021 20:39:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628048388; cv=none; d=google.com; s=arc-20160816; b=Z5T2qAI7SA//S3vLgLeZweKY2Vq4DgG+CfKw1CY+SPzmKC+BnpjlT0YWHRgEOEhc92 JRzZy6RHGNRojeT2W7bQD/XyhTyXfHR6RQST4c3nDJvJcGZ8TGmWnefRB695KwVHlN1q svgi4eQ4UFw/sTdggAThYRInz3HyBNPZBaHKiRhiOkoxIS5zqcy7P0hF6NXx2W9TErsp MV23GhNEXRkiiShR9hnDkYjBmPzlne4AGCdFINAItK1dmwJ/C9FNFn3LbquXYUW+9dZo 2IIwAECxVBWVZwHrGCNNCareVX8QnYB7IJUTZalXgjnVvuoOXEDbvNleIQXR5Ss8z1HK dqdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:dkim-signature; bh=b98at5X1EOH8ZQoYyZL2q4o9hbp+bK8d+fLMeCNQwoQ=; b=S7xgglzBXLP4jfhNlxkNvs6MsYzP/YE845fM8NmhRwjq0V6vVpdYdM2d6vaT79kgM2 6E03kMHvj3yGdpSZQmrnocucRUIRfNfJVnSIn7PCr2pgTeNgtfdu69uKSOEhWiH4oFTC 21DBRBwajolC5Xe6NdAU+gmIi8vlMUXoYbup40IPGonwODZD2Y/jDs4jAjMbDHw8o+60 5vvmmtCyFBSxBoffk3VgZORubtvnnceF8E0lPZMHTI9jFpmmXkTgiLdBZjbEiaAYGW5l kvMcWjswFwKOPBJ5eNuOYrstXkGc5bp6US8qorLWxYbQukKuT8s6KouGZoWYCcgXsw/3 4JWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=E9g+Mon8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i20si873791jaj.74.2021.08.03.20.39.35; Tue, 03 Aug 2021 20:39:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=E9g+Mon8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234192AbhHDCjg (ORCPT + 99 others); Tue, 3 Aug 2021 22:39:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:39590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231656AbhHDCjf (ORCPT ); Tue, 3 Aug 2021 22:39:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F16E76056B; Wed, 4 Aug 2021 02:39:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628044763; bh=WscaiBBHthddS3j8OcQd5uvgUqMn+jnosTpOTyg/Pis=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=E9g+Mon8GPJoUOgZnRoBlw1F2wdN7E5vWyJzCMKN9NuaEHCpaadTMwHCClwxQJNQi dF4u1/xGkCL3wzKb0mownasgSyfAYyKx3WKCENjky0LBDJy1vGJ69Z01268tA8Ft/B 423gJviJovf394OLvdYZgK5MrBNk2b0bEmn4GyJUy5fbIEstLJiQV6QNiuAedWRftc SWhFqB0WJuq7zSVraTgAvyCcbjhGpuuNUDOk6cZSbKzHdQT8jpGElFb8661YxpsmwU esM+ZKjNRFUCEGEekUbv9mCxP1wf75nG4pEPBzGKIElWSN+kHrQ8neKX/cBakuq72k SkQnfLZvOXqMQ== Subject: Re: [PATCH] f2fs: compress: do sanity check on cluster To: Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu References: <20210803103952.737222-1-chao@kernel.org> <275b4ec7-d7fd-b169-ff43-3ceec37b47b9@kernel.org> From: Chao Yu Message-ID: <709b3653-372b-e809-d98b-56d18a7544cd@kernel.org> Date: Wed, 4 Aug 2021 10:39:21 +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: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021/8/4 10:03, Jaegeuk Kim wrote: > 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()? Agreed, let me cover all missing pieces. > >> >>> 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. Got your concern. For debug purpose, maybe we can add a new ioctl under CONFIG_F2FS_CHECK_FS to dump original mapping? or support dump.f2fs -f to dump all blkaddrs of target file? Thanks > >> >> 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