From nobody Mon Dec 29 02:59:48 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD382C4167B for ; Fri, 1 Dec 2023 05:43:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377482AbjLAFnl (ORCPT ); Fri, 1 Dec 2023 00:43:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377368AbjLAFnj (ORCPT ); Fri, 1 Dec 2023 00:43:39 -0500 Received: from SHSQR01.spreadtrum.com (mx1.unisoc.com [222.66.158.135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBD9A1703 for ; Thu, 30 Nov 2023 21:43:43 -0800 (PST) Received: from dlp.unisoc.com ([10.29.3.86]) by SHSQR01.spreadtrum.com with ESMTP id 3B15gkxm019678; Fri, 1 Dec 2023 13:42:46 +0800 (+08) (envelope-from Zhiguo.Niu@unisoc.com) Received: from SHDLP.spreadtrum.com (bjmbx02.spreadtrum.com [10.0.64.8]) by dlp.unisoc.com (SkyGuard) with ESMTPS id 4ShMJN0qrvz2K4tL1; Fri, 1 Dec 2023 13:37:08 +0800 (CST) Received: from bj08434pcu.spreadtrum.com (10.0.73.87) by BJMBX02.spreadtrum.com (10.0.64.8) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Fri, 1 Dec 2023 13:42:44 +0800 From: Zhiguo Niu To: , CC: , , , , Subject: [PATCH] f2fs: unify the error handling of f2fs_is_valid_blkaddr Date: Fri, 1 Dec 2023 13:42:11 +0800 Message-ID: <1701409331-1519-1-git-send-email-zhiguo.niu@unisoc.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [10.0.73.87] X-ClientProxiedBy: SHCAS03.spreadtrum.com (10.0.1.207) To BJMBX02.spreadtrum.com (10.0.64.8) X-MAIL: SHSQR01.spreadtrum.com 3B15gkxm019678 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" unify the error handling of f2fs_is_valid_blkaddr and remove some redundant codes in f2fs_cache_compressed_page. Signed-off-by: Zhiguo Niu --- fs/f2fs/checkpoint.c | 6 +++++- fs/f2fs/compress.c | 8 +++----- fs/f2fs/data.c | 3 ++- fs/f2fs/extent_cache.c | 7 ++++--- fs/f2fs/f2fs.h | 6 ++++-- fs/f2fs/file.c | 10 +++++++--- fs/f2fs/node.c | 7 +++++-- fs/f2fs/recovery.c | 15 +++++++++++---- 8 files changed, 41 insertions(+), 21 deletions(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index b0597a5..47a1335 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -158,6 +158,7 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi,= block_t blkaddr, f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d", blkaddr, exist); set_sbi_flag(sbi, SBI_NEED_FSCK); + dump_stack(); return exist; } =20 @@ -256,8 +257,11 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block= _t start, int nrpages, blk_start_plug(&plug); for (; nrpages-- > 0; blkno++) { =20 - if (!f2fs_is_valid_blkaddr(sbi, blkno, type)) + if (!f2fs_is_valid_blkaddr(sbi, blkno, type)) { + err =3D -EFSCORRUPTED; + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); goto out; + } =20 switch (type) { case META_NAT: diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index 36e5dab..15d5035 100644 --- a/fs/f2fs/compress.c +++ b/fs/f2fs/compress.c @@ -1853,8 +1853,10 @@ void f2fs_cache_compressed_page(struct f2fs_sb_info = *sbi, struct page *page, if (!test_opt(sbi, COMPRESS_CACHE)) return; =20 - if (!f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE_READ)) + if (!f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE_READ)) { + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); return; + } =20 if (!f2fs_available_free_memory(sbi, COMPRESS_PAGE)) return; @@ -1878,12 +1880,8 @@ void f2fs_cache_compressed_page(struct f2fs_sb_info = *sbi, struct page *page, =20 set_page_private_data(cpage, ino); =20 - if (!f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE_READ)) - goto out; - memcpy(page_address(cpage), page_address(page), PAGE_SIZE); SetPageUptodate(cpage); -out: f2fs_put_page(cpage, 1); } =20 diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 4e42b5f..e1a37ea 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2309,7 +2309,8 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, st= ruct bio **bio_ret, break; =20 if (!f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC)) { - ret =3D -EFAULT; + ret =3D -EFSCORRUPTED; + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); goto out_put_dnode; } cc->nr_cpages++; diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c index ad8dfac7..33e5632 100644 --- a/fs/f2fs/extent_cache.c +++ b/fs/f2fs/extent_cache.c @@ -43,7 +43,7 @@ bool sanity_check_extent_cache(struct inode *inode) if (!f2fs_is_valid_blkaddr(sbi, ei->blk, DATA_GENERIC_ENHANCE) || !f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1, DATA_GENERIC_ENHANCE)) { - set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); f2fs_warn(sbi, "%s: inode (ino=3D%lx) extent info [%u, %u, %u] is incorr= ect, run fsck to fix", __func__, inode->i_ino, ei->blk, ei->fofs, ei->len); @@ -857,8 +857,9 @@ static int __get_new_block_age(struct inode *inode, str= uct extent_info *ei, =20 if (__is_valid_data_blkaddr(blkaddr) && !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) { - f2fs_bug_on(sbi, 1); - return -EINVAL; + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); + return -EFSCORRUPTED; + } out: /* diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 9043ced..a4b8d86 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3454,13 +3454,16 @@ static inline int get_inline_xattr_addrs(struct ino= de *inode) =20 bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr, int type); +void f2fs_handle_error(struct f2fs_sb_info *sbi, unsigned char error); + static inline void verify_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr, int type) { if (!f2fs_is_valid_blkaddr(sbi, blkaddr, type)) { f2fs_err(sbi, "invalid blkaddr: %u, type: %d, run fsck to fix.", blkaddr, type); - f2fs_bug_on(sbi, 1); + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); + } } =20 @@ -3587,7 +3590,6 @@ static inline int f2fs_add_link(struct dentry *dentry= , struct inode *inode) void f2fs_save_errors(struct f2fs_sb_info *sbi, unsigned char flag); void f2fs_handle_critical_error(struct f2fs_sb_info *sbi, unsigned char re= ason, bool irq_context); -void f2fs_handle_error(struct f2fs_sb_info *sbi, unsigned char error); void f2fs_handle_error_async(struct f2fs_sb_info *sbi, unsigned char error= ); int f2fs_commit_super(struct f2fs_sb_info *sbi, bool recover); int f2fs_sync_fs(struct super_block *sb, int sync); diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index e503635..5a7dd87 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -416,7 +416,7 @@ static loff_t f2fs_seek_block(struct file *file, loff_t= offset, int whence) pgoff_t pgofs, end_offset; loff_t data_ofs =3D offset; loff_t isize; - int err =3D 0; + int err =3D -ENXIO; =20 inode_lock(inode); =20 @@ -466,6 +466,8 @@ static loff_t f2fs_seek_block(struct file *file, loff_t= offset, int whence) !f2fs_is_valid_blkaddr(F2FS_I_SB(inode), blkaddr, DATA_GENERIC_ENHANCE)) { f2fs_put_dnode(&dn); + err =3D -EFSCORRUPTED; + f2fs_handle_error(F2FS_I_SB(inode), ERROR_INVALID_BLKADDR); goto fail; } =20 @@ -487,7 +489,7 @@ static loff_t f2fs_seek_block(struct file *file, loff_t= offset, int whence) return vfs_setpos(file, data_ofs, maxbytes); fail: inode_unlock(inode); - return -ENXIO; + return err; } =20 static loff_t f2fs_llseek(struct file *file, loff_t offset, int whence) @@ -593,8 +595,10 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_d= ata *dn, int count) =20 if (__is_valid_data_blkaddr(blkaddr)) { if (!f2fs_is_valid_blkaddr(sbi, blkaddr, - DATA_GENERIC_ENHANCE)) + DATA_GENERIC_ENHANCE)) { + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); continue; + } if (compressed_cluster) valid_blocks++; } diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 6c7f6a6..e50a093 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -611,8 +611,10 @@ int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t= nid, cache: blkaddr =3D le32_to_cpu(ne.block_addr); if (__is_valid_data_blkaddr(blkaddr) && - !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) - return -EFAULT; + !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) { + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); + return -EFSCORRUPTED; + } =20 /* cache nat entry */ cache_nat_entry(sbi, nid, &ne); @@ -1652,6 +1654,7 @@ static int __write_node_page(struct page *page, bool = atomic, bool *submitted, if (__is_valid_data_blkaddr(ni.blk_addr) && !f2fs_is_valid_blkaddr(sbi, ni.blk_addr, DATA_GENERIC_ENHANCE)) { + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); f2fs_up_read(&sbi->node_write); goto redirty_out; } diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c index b56d0f1..1244b8e 100644 --- a/fs/f2fs/recovery.c +++ b/fs/f2fs/recovery.c @@ -374,7 +374,8 @@ static int sanity_check_node_chain(struct f2fs_sb_info = *sbi, block_t blkaddr, for (i =3D 0; i < 2; i++) { if (!f2fs_is_valid_blkaddr(sbi, *blkaddr_fast, META_POR)) { *is_detecting =3D false; - return 0; + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); + return -EFSCORRUPTED; } =20 page =3D f2fs_get_tmp_page(sbi, *blkaddr_fast); @@ -399,6 +400,7 @@ static int sanity_check_node_chain(struct f2fs_sb_info = *sbi, block_t blkaddr, if (*blkaddr_fast =3D=3D blkaddr) { f2fs_notice(sbi, "%s: Detect looped node chain on blkaddr:%u." " Run fsck to fix it.", __func__, blkaddr); + set_sbi_flag(sbi, SBI_NEED_FSCK); return -EINVAL; } return 0; @@ -421,8 +423,10 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi,= struct list_head *head, while (1) { struct fsync_inode_entry *entry; =20 - if (!f2fs_is_valid_blkaddr(sbi, blkaddr, META_POR)) - return 0; + if (!f2fs_is_valid_blkaddr(sbi, blkaddr, META_POR)) { + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); + return -EFSCORRUPTED; + } =20 page =3D f2fs_get_tmp_page(sbi, blkaddr); if (IS_ERR(page)) { @@ -786,8 +790,11 @@ static int recover_data(struct f2fs_sb_info *sbi, stru= ct list_head *inode_list, while (1) { struct fsync_inode_entry *entry; =20 - if (!f2fs_is_valid_blkaddr(sbi, blkaddr, META_POR)) + if (!f2fs_is_valid_blkaddr(sbi, blkaddr, META_POR)) { + err =3D -EFSCORRUPTED; + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); break; + } =20 page =3D f2fs_get_tmp_page(sbi, blkaddr); if (IS_ERR(page)) { --=20 1.9.1