commit 2963f3d09eb3a0817f87386c0bd7be7ce086809d Author: Wang Shilong AuthorDate: Tue Sep 8 21:54:29 2015 +0800 LU-7114 ldiskfs: corrupted bitmaps handling patches This patch backported following patches from upstream: 163a203ddb36c36d4a1c942aececda0cc8d06aa7 ext4: mark block group as corrupt on block bitmap error 87a39389be3e3b007d341be510a7e4a0542bdf05 ext4: mark block group as corrupt on inode bitmap error bdfb6ff4a255dcebeb09a901250e13a97eff75af ext4: mark group corrupt on group descriptor checksum Also use ext4_warning() instead of ext4_error() so that filesystem don't become RO in default, and together with these patches,FS wil still be usable even such bad things happen. Signed-off-by: Wang Shilong Change-Id: Ib4075aba7df6f7f59e89a90475405080acd43dd0 Reviewed-on: http://review.whamcloud.com/16312 Reviewed-by: Andreas Dilger Reviewed-by: Yang Sheng NOTE: Ported to rhel8.7 keeps the ext4_warning() updates. Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/balloc.c =================================================================== --- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/balloc.c +++ linux-4.18.0-80.1.2.el8_0/fs/ext4/balloc.c @@ -373,7 +373,7 @@ static int ext4_validate_block_bitmap(st if (unlikely(!ext4_block_bitmap_csum_verify(sb, block_group, desc, bh))) { ext4_unlock_group(sb, block_group); - ext4_error(sb, "bg %u: bad block bitmap checksum", block_group); + ext4_warning(sb, "bg %u: bad block bitmap checksum", block_group); ext4_mark_group_bitmap_corrupted(sb, block_group, EXT4_GROUP_INFO_BBITMAP_CORRUPT); return -EFSBADCRC; @@ -381,8 +381,8 @@ static int ext4_validate_block_bitmap(st blk = ext4_valid_block_bitmap(sb, desc, block_group, bh); if (unlikely(blk != 0)) { ext4_unlock_group(sb, block_group); - ext4_error(sb, "bg %u: block %llu: invalid block bitmap", - block_group, blk); + ext4_warning(sb, "bg %u: block %llu: invalid block bitmap", + block_group, blk); ext4_mark_group_bitmap_corrupted(sb, block_group, EXT4_GROUP_INFO_BBITMAP_CORRUPT); return -EFSCORRUPTED; @@ -458,8 +458,8 @@ ext4_read_block_bitmap_nowait(struct sup ext4_unlock_group(sb, block_group); unlock_buffer(bh); if (err) { - ext4_error(sb, "Failed to init block bitmap for group " - "%u: %d", block_group, err); + ext4_warning(sb, "Failed to init block bitmap for group " + "%u: %d", block_group, err); goto out; } goto verify; Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/ialloc.c =================================================================== --- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/ialloc.c +++ linux-4.18.0-80.1.2.el8_0/fs/ext4/ialloc.c @@ -96,8 +96,8 @@ static int ext4_validate_inode_bitmap(st if (!ext4_inode_bitmap_csum_verify(sb, block_group, desc, bh, EXT4_INODES_PER_GROUP(sb) / 8)) { ext4_unlock_group(sb, block_group); - ext4_error(sb, "Corrupt inode bitmap - block_group = %u, " - "inode_bitmap = %llu", block_group, blk); + ext4_warning(sb, "Corrupt inode bitmap - block_group = %u, " + "inode_bitmap = %llu", block_group, blk); ext4_mark_group_bitmap_corrupted(sb, block_group, EXT4_GROUP_INFO_IBITMAP_CORRUPT); return -EFSBADCRC; @@ -346,7 +346,7 @@ out: if (!fatal) fatal = err; } else { - ext4_error(sb, "bit already cleared for inode %lu", ino); + ext4_warning(sb, "bit already cleared for inode %lu", ino); ext4_mark_group_bitmap_corrupted(sb, block_group, EXT4_GROUP_INFO_IBITMAP_CORRUPT); } Index: kernel-4.18.0-423.el8/fs/ext4/mballoc.c =================================================================== --- kernel-4.18.0-423.el8.orig/fs/ext4/mballoc.c +++ kernel-4.18.0-423.el8/fs/ext4/mballoc.c @@ -802,10 +802,14 @@ int ext4_mb_generate_buddy(struct super_ grp->bb_fragments = fragments; if (free != grp->bb_free) { - ext4_grp_locked_error(sb, group, 0, 0, - "block bitmap and bg descriptor " - "inconsistent: %u vs %u free clusters", - free, grp->bb_free); + struct ext4_group_desc *gdp; + gdp = ext4_get_group_desc(sb, group, NULL); + ext4_warning(sb, "group %lu: block bitmap and bg descriptor " + "inconsistent: %u vs %u free clusters " + "%u in gd, %lu pa's", + (long unsigned int)group, free, grp->bb_free, + ext4_free_group_clusters(sb, gdp), + grp->bb_prealloc_nr); /* * If we intend to continue, we consider group descriptor * corrupt and update bb_free using bitmap value @@ -1168,7 +1172,7 @@ ext4_mb_load_buddy_gfp(struct super_bloc int block; int pnum; int poff; - struct page *page; + struct page *page = NULL; int ret; struct ext4_group_info *grp; struct ext4_sb_info *sbi = EXT4_SB(sb); @@ -1194,7 +1198,7 @@ ext4_mb_load_buddy_gfp(struct super_bloc */ ret = ext4_mb_init_group(sb, group, gfp); if (ret) - return ret; + goto err; } /* @@ -1297,6 +1301,7 @@ err: put_page(e4b->bd_buddy_page); e4b->bd_buddy = NULL; e4b->bd_bitmap = NULL; + ext4_warning(sb, "Error loading buddy information for %u", group); return ret; } @@ -3783,9 +3788,11 @@ int ext4_mb_check_ondisk_bitmap(struct s } if (free != free_in_gdp) { - ext4_error(sb, "on-disk bitmap for group %d" + ext4_warning(sb, "on-disk bitmap for group %d" "corrupted: %u blocks free in bitmap, %u - in gd\n", group, free, free_in_gdp); + ext4_mark_group_bitmap_corrupted(sb, group, + EXT4_GROUP_INFO_BBITMAP_CORRUPT); return -EIO; } return 0; @@ -4131,16 +4138,8 @@ ext4_mb_release_inode_pa(struct ext4_bud * otherwise maybe leave some free blocks unavailable, no need to BUG.*/ if (((free > pa->pa_free && !pa->pa_error) || (free < pa->pa_free)) && atomic_read(&sb->s_active) > 0) { - ext4_error(sb, "pa free mismatch: [pa %p] " - "[phy %lu] [logic %lu] [len %u] [free %u] " - "[error %u] [inode %lu] [freed %u]", pa, - (unsigned long)pa->pa_pstart, - (unsigned long)pa->pa_lstart, - (unsigned)pa->pa_len, (unsigned)pa->pa_free, - (unsigned)pa->pa_error, pa->pa_inode->i_ino, - free); ext4_grp_locked_error(sb, group, 0, 0, "free %u, pa_free %u", - free, pa->pa_free); + free, pa->pa_free); /* * pa is already deleted so we use the value obtained * from the bitmap and continue. @@ -4200,16 +4199,11 @@ ext4_mb_discard_group_preallocations(str bitmap_bh = ext4_read_block_bitmap(sb, group); if (IS_ERR(bitmap_bh)) { err = PTR_ERR(bitmap_bh); - ext4_error_err(sb, -err, - "Error %d reading block bitmap for %u", - err, group); goto out_dbg; } err = ext4_mb_load_buddy(sb, group, &e4b); if (err) { - ext4_warning(sb, "Error %d loading buddy information for %u", - err, group); put_bh(bitmap_bh); goto out_dbg; } @@ -4358,17 +4352,12 @@ repeat: err = ext4_mb_load_buddy_gfp(sb, group, &e4b, GFP_NOFS|__GFP_NOFAIL); - if (err) { - ext4_error_err(sb, -err, "Error %d loading buddy information for %u", - err, group); + if (err) return; - } bitmap_bh = ext4_read_block_bitmap(sb, group); if (IS_ERR(bitmap_bh)) { err = PTR_ERR(bitmap_bh); - ext4_error_err(sb, -err, "Error %d reading block bitmap for %u", - err, group); ext4_mb_unload_buddy(&e4b); continue; } @@ -4662,11 +4651,8 @@ ext4_mb_discard_lg_preallocations(struct group = ext4_get_group_number(sb, pa->pa_pstart); err = ext4_mb_load_buddy_gfp(sb, group, &e4b, GFP_NOFS|__GFP_NOFAIL); - if (err) { - ext4_error_err(sb, -err, "Error %d loading buddy information for %u", - err, group); + if (err) continue; - } ext4_lock_group(sb, group); list_del(&pa->pa_group_list); ext4_get_group_info(sb, group)->bb_prealloc_nr--; @@ -4965,7 +4951,7 @@ errout: * been updated or not when fail case. So can * not revert pa_free back, just mark pa_error*/ pa->pa_error++; - ext4_error(sb, + ext4_warning(sb, "Updating bitmap error: [err %d] " "[pa %p] [phy %lu] [logic %lu] " "[len %u] [free %u] [error %u] " @@ -4976,6 +4962,7 @@ errout: (unsigned)pa->pa_free, (unsigned)pa->pa_error, pa->pa_inode ? pa->pa_inode->i_ino : 0); + ext4_mark_group_bitmap_corrupted(sb, 0, 0); } } ext4_mb_release_context(ac); @@ -5262,7 +5249,7 @@ do_more: err = ext4_mb_load_buddy_gfp(sb, block_group, &e4b, GFP_NOFS|__GFP_NOFAIL); if (err) - goto error_return; + goto error_brelse; /* * We need to make sure we don't reuse the freed block until after the @@ -5353,8 +5340,9 @@ do_more: goto do_more; } error_return: - brelse(bitmap_bh); ext4_std_error(sb, err); +error_brelse: + brelse(bitmap_bh); return; } @@ -5454,7 +5442,7 @@ int ext4_group_add_blocks(handle_t *hand err = ext4_mb_load_buddy(sb, block_group, &e4b); if (err) - goto error_return; + goto error_brelse; /* * need to update group_info->bb_free and bitmap @@ -5493,8 +5481,9 @@ int ext4_group_add_blocks(handle_t *hand err = ret; error_return: - brelse(bitmap_bh); ext4_std_error(sb, err); +error_brelse: + brelse(bitmap_bh); return err; } @@ -5569,11 +5558,8 @@ ext4_trim_all_free(struct super_block *s trace_ext4_trim_all_free(sb, group, start, max); ret = ext4_mb_load_buddy(sb, group, &e4b); - if (ret) { - ext4_warning(sb, "Error %d loading buddy information for %u", - ret, group); + if (ret) return ret; - } bitmap = e4b.bd_bitmap; ext4_lock_group(sb, group);