From nobody Sat Dec 27 14:52:38 2025 Received: from SHSQR01.spreadtrum.com (mx1.unisoc.com [222.66.158.135]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E47579EA for ; Tue, 19 Dec 2023 03:58:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unisoc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=unisoc.com Received: from dlp.unisoc.com ([10.29.3.86]) by SHSQR01.spreadtrum.com with ESMTP id 3BJ3vI5j060198; Tue, 19 Dec 2023 11:57:18 +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 4SvN5j45jKz2PmfTZ; Tue, 19 Dec 2023 11:51:05 +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; Tue, 19 Dec 2023 11:57:16 +0800 From: Zhiguo Niu To: , CC: , , , , Subject: [PATCH V3] f2fs: unify the error handling of f2fs_is_valid_blkaddr Date: Tue, 19 Dec 2023 11:56:51 +0800 Message-ID: <1702958211-23176-1-git-send-email-zhiguo.niu@unisoc.com> X-Mailer: git-send-email 1.9.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SHCAS03.spreadtrum.com (10.0.1.207) To BJMBX02.spreadtrum.com (10.0.64.8) X-MAIL: SHSQR01.spreadtrum.com 3BJ3vI5j060198 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" unify the error handling of ERROR_INVALID_BLKADDR in f2fs_is_valid_blkaddr and remove some redundant codes in f2fs_cache_compressed_page. Signed-off-by: Zhiguo Niu --- changes of v2: improve patch according Chao's suggestions. changes of v3: -rebase patch to dev-test -correct return value for some f2fs_is_valid_blkaddr error case --- --- fs/f2fs/checkpoint.c | 39 ++++++++++++++++++++------------------- fs/f2fs/compress.c | 4 ---- fs/f2fs/data.c | 24 ++++-------------------- fs/f2fs/extent_cache.c | 7 ++----- fs/f2fs/file.c | 12 ++---------- fs/f2fs/gc.c | 2 -- fs/f2fs/node.c | 2 +- fs/f2fs/recovery.c | 4 ---- fs/f2fs/segment.c | 2 -- 9 files changed, 29 insertions(+), 67 deletions(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index b0597a5..83119aa 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -154,19 +154,17 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sb= i, block_t blkaddr, if (unlikely(f2fs_cp_error(sbi))) return exist; =20 - if (exist && type =3D=3D DATA_GENERIC_ENHANCE_UPDATE) { - f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d", - blkaddr, exist); - set_sbi_flag(sbi, SBI_NEED_FSCK); - return exist; - } + if ((exist && type =3D=3D DATA_GENERIC_ENHANCE_UPDATE) || + (!exist && type =3D=3D DATA_GENERIC_ENHANCE)) + goto err; =20 - if (!exist && type =3D=3D DATA_GENERIC_ENHANCE) { - f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d", - blkaddr, exist); - set_sbi_flag(sbi, SBI_NEED_FSCK); - dump_stack(); - } + return exist; +err: + f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d", + blkaddr, exist); + set_sbi_flag(sbi, SBI_NEED_FSCK); + dump_stack(); + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); return exist; } =20 @@ -174,29 +172,29 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr, int type) { if (time_to_inject(sbi, FAULT_BLKADDR)) - return false; + goto err; =20 switch (type) { case META_NAT: break; case META_SIT: if (unlikely(blkaddr >=3D SIT_BLK_CNT(sbi))) - return false; + goto err; break; case META_SSA: if (unlikely(blkaddr >=3D MAIN_BLKADDR(sbi) || blkaddr < SM_I(sbi)->ssa_blkaddr)) - return false; + goto err; break; case META_CP: if (unlikely(blkaddr >=3D SIT_I(sbi)->sit_base_addr || blkaddr < __start_cp_addr(sbi))) - return false; + goto err; break; case META_POR: if (unlikely(blkaddr >=3D MAX_BLKADDR(sbi) || blkaddr < MAIN_BLKADDR(sbi))) - return false; + goto err; break; case DATA_GENERIC: case DATA_GENERIC_ENHANCE: @@ -213,7 +211,7 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, blkaddr); set_sbi_flag(sbi, SBI_NEED_FSCK); dump_stack(); - return false; + goto err; } else { return __is_bitmap_valid(sbi, blkaddr, type); } @@ -221,13 +219,16 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, case META_GENERIC: if (unlikely(blkaddr < SEG0_BLKADDR(sbi) || blkaddr >=3D MAIN_BLKADDR(sbi))) - return false; + goto err; break; default: BUG(); } =20 return true; +err: + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); + return false; } =20 /* diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index c5a4364..cf075ca 100644 --- a/fs/f2fs/compress.c +++ b/fs/f2fs/compress.c @@ -1878,12 +1878,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 dce8def..61be01f 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -740,10 +740,8 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio) =20 if (!f2fs_is_valid_blkaddr(fio->sbi, fio->new_blkaddr, fio->is_por ? META_POR : (__is_meta_io(fio) ? - META_GENERIC : DATA_GENERIC_ENHANCE))) { - f2fs_handle_error(fio->sbi, ERROR_INVALID_BLKADDR); + META_GENERIC : DATA_GENERIC_ENHANCE))) return -EFSCORRUPTED; - } =20 trace_f2fs_submit_page_bio(page, fio); =20 @@ -948,10 +946,8 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio) fio->encrypted_page : fio->page; =20 if (!f2fs_is_valid_blkaddr(fio->sbi, fio->new_blkaddr, - __is_meta_io(fio) ? META_GENERIC : DATA_GENERIC)) { - f2fs_handle_error(fio->sbi, ERROR_INVALID_BLKADDR); + __is_meta_io(fio) ? META_GENERIC : DATA_GENERIC)) return -EFSCORRUPTED; - } =20 trace_f2fs_submit_page_bio(page, fio); =20 @@ -1285,8 +1281,6 @@ struct page *f2fs_get_read_data_page(struct inode *in= ode, pgoff_t index, if (!f2fs_is_valid_blkaddr(F2FS_I_SB(inode), dn.data_blkaddr, DATA_GENERIC_ENHANCE_READ)) { err =3D -EFSCORRUPTED; - f2fs_handle_error(F2FS_I_SB(inode), - ERROR_INVALID_BLKADDR); goto put_err; } goto got_it; @@ -1312,8 +1306,6 @@ struct page *f2fs_get_read_data_page(struct inode *in= ode, pgoff_t index, dn.data_blkaddr, DATA_GENERIC_ENHANCE)) { err =3D -EFSCORRUPTED; - f2fs_handle_error(F2FS_I_SB(inode), - ERROR_INVALID_BLKADDR); goto put_err; } got_it: @@ -1641,7 +1633,6 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_= map_blocks *map, int flag) if (!is_hole && !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) { err =3D -EFSCORRUPTED; - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); goto sync_out; } =20 @@ -2165,8 +2156,6 @@ static int f2fs_read_single_page(struct inode *inode,= struct page *page, if (!f2fs_is_valid_blkaddr(F2FS_I_SB(inode), block_nr, DATA_GENERIC_ENHANCE_READ)) { ret =3D -EFSCORRUPTED; - f2fs_handle_error(F2FS_I_SB(inode), - ERROR_INVALID_BLKADDR); goto out; } } else { @@ -2299,7 +2288,7 @@ 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; goto out_put_dnode; } cc->nr_cpages++; @@ -2706,11 +2695,8 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) f2fs_lookup_read_extent_cache_block(inode, page->index, &fio->old_blkaddr)) { if (!f2fs_is_valid_blkaddr(fio->sbi, fio->old_blkaddr, - DATA_GENERIC_ENHANCE)) { - f2fs_handle_error(fio->sbi, - ERROR_INVALID_BLKADDR); + DATA_GENERIC_ENHANCE)) return -EFSCORRUPTED; - } =20 ipu_force =3D true; fio->need_lock =3D LOCK_DONE; @@ -2738,7 +2724,6 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) !f2fs_is_valid_blkaddr(fio->sbi, fio->old_blkaddr, DATA_GENERIC_ENHANCE)) { err =3D -EFSCORRUPTED; - f2fs_handle_error(fio->sbi, ERROR_INVALID_BLKADDR); goto out_writepage; } =20 @@ -3704,7 +3689,6 @@ static int f2fs_write_begin(struct file *file, struct= address_space *mapping, if (!f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE_READ)) { err =3D -EFSCORRUPTED; - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); goto fail; } err =3D f2fs_submit_page_read(use_cow ? diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c index ad8dfac7..99d0442 100644 --- a/fs/f2fs/extent_cache.c +++ b/fs/f2fs/extent_cache.c @@ -43,7 +43,6 @@ 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_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); @@ -856,10 +855,8 @@ static int __get_new_block_age(struct inode *inode, st= ruct extent_info *ei, goto out; =20 if (__is_valid_data_blkaddr(blkaddr) && - !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) { - f2fs_bug_on(sbi, 1); - return -EINVAL; - } + !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) + return -EFSCORRUPTED; out: /* * init block age with zero, this can happen when the block age extent diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 026d05a7..b3df24c 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1192,7 +1192,6 @@ static int __read_out_blkaddrs(struct inode *inode, b= lock_t *blkaddr, !f2fs_is_valid_blkaddr(sbi, *blkaddr, DATA_GENERIC_ENHANCE)) { f2fs_put_dnode(&dn); - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); return -EFSCORRUPTED; } =20 @@ -1478,7 +1477,6 @@ static int f2fs_do_zero_range(struct dnode_of_data *d= n, pgoff_t start, if (!f2fs_is_valid_blkaddr(sbi, dn->data_blkaddr, DATA_GENERIC_ENHANCE)) { ret =3D -EFSCORRUPTED; - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); break; } =20 @@ -3438,10 +3436,8 @@ static int release_compress_blocks(struct dnode_of_d= ata *dn, pgoff_t count) if (!__is_valid_data_blkaddr(blkaddr)) continue; if (unlikely(!f2fs_is_valid_blkaddr(sbi, blkaddr, - DATA_GENERIC_ENHANCE))) { - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); + DATA_GENERIC_ENHANCE))) return -EFSCORRUPTED; - } } =20 while (count) { @@ -3603,10 +3599,8 @@ static int reserve_compress_blocks(struct dnode_of_d= ata *dn, pgoff_t count) if (!__is_valid_data_blkaddr(blkaddr)) continue; if (unlikely(!f2fs_is_valid_blkaddr(sbi, blkaddr, - DATA_GENERIC_ENHANCE))) { - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); + DATA_GENERIC_ENHANCE))) return -EFSCORRUPTED; - } } =20 while (count) { @@ -3877,8 +3871,6 @@ static int f2fs_sec_trim_file(struct file *filp, unsi= gned long arg) DATA_GENERIC_ENHANCE)) { ret =3D -EFSCORRUPTED; f2fs_put_dnode(&dn); - f2fs_handle_error(sbi, - ERROR_INVALID_BLKADDR); goto out; } =20 diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 405a6077..9161050 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -1197,7 +1197,6 @@ static int ra_data_block(struct inode *inode, pgoff_t= index) if (unlikely(!f2fs_is_valid_blkaddr(sbi, dn.data_blkaddr, DATA_GENERIC_ENHANCE_READ))) { err =3D -EFSCORRUPTED; - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); goto put_page; } goto got_it; @@ -1216,7 +1215,6 @@ static int ra_data_block(struct inode *inode, pgoff_t= index) if (unlikely(!f2fs_is_valid_blkaddr(sbi, dn.data_blkaddr, DATA_GENERIC_ENHANCE))) { err =3D -EFSCORRUPTED; - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); goto put_page; } got_it: diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 9b546fd..541c4ad 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -612,7 +612,7 @@ int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t = nid, 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; + return -EFSCORRUPTED; =20 /* cache nat entry */ cache_nat_entry(sbi, nid, &ne); diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c index d0f24cc..21381b7 100644 --- a/fs/f2fs/recovery.c +++ b/fs/f2fs/recovery.c @@ -680,14 +680,12 @@ static int do_recover_data(struct f2fs_sb_info *sbi, = struct inode *inode, if (__is_valid_data_blkaddr(src) && !f2fs_is_valid_blkaddr(sbi, src, META_POR)) { err =3D -EFSCORRUPTED; - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); goto err; } =20 if (__is_valid_data_blkaddr(dest) && !f2fs_is_valid_blkaddr(sbi, dest, META_POR)) { err =3D -EFSCORRUPTED; - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); goto err; } =20 @@ -756,8 +754,6 @@ static int do_recover_data(struct f2fs_sb_info *sbi, st= ruct inode *inode, f2fs_err(sbi, "Inconsistent dest blkaddr:%u, ino:%lu, ofs:%u", dest, inode->i_ino, dn.ofs_in_node); err =3D -EFSCORRUPTED; - f2fs_handle_error(sbi, - ERROR_INVALID_BLKADDR); goto err; } =20 diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 61da26e..0449498 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -334,8 +334,6 @@ static int __f2fs_commit_atomic_write(struct inode *ino= de) DATA_GENERIC_ENHANCE)) { f2fs_put_dnode(&dn); ret =3D -EFSCORRUPTED; - f2fs_handle_error(sbi, - ERROR_INVALID_BLKADDR); goto out; } =20 --=20 1.9.1