ldiskfs/kernel_patches/patches/rhel8.3/ext4-corrupted-inode-block-bitmaps-handling-patches.patch

   1 commit 2963f3d09eb3a0817f87386c0bd7be7ce086809d
   2 Author:     Wang Shilong <wshilong@whamcloud.com>
   3 AuthorDate: Tue Sep 8 21:54:29 2015 +0800
   4 LU-7114 ldiskfs: corrupted bitmaps handling patches
   5
   6 This patch backported following patches from upstream:
   7
   8 163a203ddb36c36d4a1c942aececda0cc8d06aa7
   9 ext4: mark block group as corrupt on block bitmap error
  10
  11 87a39389be3e3b007d341be510a7e4a0542bdf05
  12 ext4: mark block group as corrupt on inode bitmap error
  13
  14 bdfb6ff4a255dcebeb09a901250e13a97eff75af
  15 ext4: mark group corrupt on group descriptor checksum
  16
  17 Also use ext4_warning() instead of ext4_error() so that
  18 filesystem don't become RO in default, and together
  19 with these patches,FS wil still be usable even such
  20 bad things happen.
  21
  22 Signed-off-by: Wang Shilong <wshilong@ddn.com>
  23 Change-Id: Ib4075aba7df6f7f59e89a90475405080acd43dd0
  24 Reviewed-on: http://review.whamcloud.com/16312
  25 Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
  26 Reviewed-by: Yang Sheng <yang.sheng@intel.com>
  27
  28 NOTE: Ported to rhel8.3 keeps the ext4_warning() updates.
  29
  30 Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/balloc.c
  31 ===================================================================
  32 --- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/balloc.c
  33 +++ linux-4.18.0-80.1.2.el8_0/fs/ext4/balloc.c
  34 @@ -373,7 +373,7 @@ static int ext4_validate_block_bitmap(st
  35         if (unlikely(!ext4_block_bitmap_csum_verify(sb, block_group,
  36                         desc, bh))) {
  37                 ext4_unlock_group(sb, block_group);
  38 -               ext4_error(sb, "bg %u: bad block bitmap checksum", block_group);
  39 +               ext4_warning(sb, "bg %u: bad block bitmap checksum", block_group);
  40                 ext4_mark_group_bitmap_corrupted(sb, block_group,
  41                                         EXT4_GROUP_INFO_BBITMAP_CORRUPT);
  42                 return -EFSBADCRC;
  43 @@ -381,8 +381,8 @@ static int ext4_validate_block_bitmap(st
  44         blk = ext4_valid_block_bitmap(sb, desc, block_group, bh);
  45         if (unlikely(blk != 0)) {
  46                 ext4_unlock_group(sb, block_group);
  47 -               ext4_error(sb, "bg %u: block %llu: invalid block bitmap",
  48 -                          block_group, blk);
  49 +               ext4_warning(sb, "bg %u: block %llu: invalid block bitmap",
  50 +                            block_group, blk);
  51                 ext4_mark_group_bitmap_corrupted(sb, block_group,
  52                                         EXT4_GROUP_INFO_BBITMAP_CORRUPT);
  53                 return -EFSCORRUPTED;
  54 @@ -458,8 +458,8 @@ ext4_read_block_bitmap_nowait(struct sup
  55                 ext4_unlock_group(sb, block_group);
  56                 unlock_buffer(bh);
  57                 if (err) {
  58 -                       ext4_error(sb, "Failed to init block bitmap for group "
  59 -                                  "%u: %d", block_group, err);
  60 +                       ext4_warning(sb, "Failed to init block bitmap for group "
  61 +                                    "%u: %d", block_group, err);
  62                         goto out;
  63                 }
  64                 goto verify;
  65 Index: linux-4.18.0-80.1.2.el8_0/fs/ext4/ialloc.c
  66 ===================================================================
  67 --- linux-4.18.0-80.1.2.el8_0.orig/fs/ext4/ialloc.c
  68 +++ linux-4.18.0-80.1.2.el8_0/fs/ext4/ialloc.c
  69 @@ -96,8 +96,8 @@ static int ext4_validate_inode_bitmap(st
  70         if (!ext4_inode_bitmap_csum_verify(sb, block_group, desc, bh,
  71                                            EXT4_INODES_PER_GROUP(sb) / 8)) {
  72                 ext4_unlock_group(sb, block_group);
  73 -               ext4_error(sb, "Corrupt inode bitmap - block_group = %u, "
  74 -                          "inode_bitmap = %llu", block_group, blk);
  75 +               ext4_warning(sb, "Corrupt inode bitmap - block_group = %u, "
  76 +                            "inode_bitmap = %llu", block_group, blk);
  77                 ext4_mark_group_bitmap_corrupted(sb, block_group,
  78                                         EXT4_GROUP_INFO_IBITMAP_CORRUPT);
  79                 return -EFSBADCRC;
  80 @@ -346,7 +346,7 @@ out:
  81                 if (!fatal)
  82                         fatal = err;
  83         } else {
  84 -               ext4_error(sb, "bit already cleared for inode %lu", ino);
  85 +               ext4_warning(sb, "bit already cleared for inode %lu", ino);
  86                 ext4_mark_group_bitmap_corrupted(sb, block_group,
  87                                         EXT4_GROUP_INFO_IBITMAP_CORRUPT);
  88         }
  89 Index: linux-4.18.0-240.1.1.el8/fs/ext4/mballoc.c
  90 ===================================================================
  91 --- linux-4.18.0-240.1.1.el8.orig/fs/ext4/mballoc.c
  92 +++ linux-4.18.0-240.1.1.el8/fs/ext4/mballoc.c
  93 @@ -741,10 +741,14 @@ int ext4_mb_generate_buddy(struct super_
  94         grp->bb_fragments = fragments;
  95
  96         if (free != grp->bb_free) {
  97 -               ext4_grp_locked_error(sb, group, 0, 0,
  98 -                                     "block bitmap and bg descriptor "
  99 -                                     "inconsistent: %u vs %u free clusters",
 100 -                                     free, grp->bb_free);
 101 +               struct ext4_group_desc *gdp;
 102 +               gdp = ext4_get_group_desc(sb, group, NULL);
 103 +               ext4_warning(sb, "group %lu: block bitmap and bg descriptor "
 104 +                            "inconsistent: %u vs %u free clusters "
 105 +                            "%u in gd, %lu pa's",
 106 +                            (long unsigned int)group, free, grp->bb_free,
 107 +                            ext4_free_group_clusters(sb, gdp),
 108 +                            grp->bb_prealloc_nr);
 109                 /*
 110                  * If we intend to continue, we consider group descriptor
 111                  * corrupt and update bb_free using bitmap value
 112 @@ -1107,7 +1111,7 @@ ext4_mb_load_buddy_gfp(struct super_bloc
 113         int block;
 114         int pnum;
 115         int poff;
 116 -       struct page *page;
 117 +       struct page *page = NULL;
 118         int ret;
 119         struct ext4_group_info *grp;
 120         struct ext4_sb_info *sbi = EXT4_SB(sb);
 121 @@ -1133,7 +1137,7 @@ ext4_mb_load_buddy_gfp(struct super_bloc
 122                  */
 123                 ret = ext4_mb_init_group(sb, group, gfp);
 124                 if (ret)
 125 -                       return ret;
 126 +                       goto err;
 127         }
 128
 129         /*
 130 @@ -1236,6 +1240,7 @@ err:
 131                 put_page(e4b->bd_buddy_page);
 132         e4b->bd_buddy = NULL;
 133         e4b->bd_bitmap = NULL;
 134 +       ext4_warning(sb, "Error loading buddy information for %u", group);
 135         return ret;
 136  }
 137
 138 @@ -3675,9 +3680,11 @@ int ext4_mb_check_ondisk_bitmap(struct s
 139         }
 140
 141         if (free != free_in_gdp) {
 142 -               ext4_error(sb, "on-disk bitmap for group %d"
 143 +               ext4_warning(sb, "on-disk bitmap for group %d"
 144                         "corrupted: %u blocks free in bitmap, %u - in gd\n",
 145                         group, free, free_in_gdp);
 146 +               ext4_mark_group_bitmap_corrupted(sb, group,
 147 +                                       EXT4_GROUP_INFO_BBITMAP_CORRUPT);
 148                 return -EIO;
 149         }
 150         return 0;
 151 @@ -4037,16 +4044,8 @@ ext4_mb_release_inode_pa(struct ext4_bud
 152          * otherwise maybe leave some free blocks unavailable, no need to BUG.*/
 153         if (((free > pa->pa_free && !pa->pa_error) || (free < pa->pa_free)) &&
 154             atomic_read(&sb->s_active) > 0) {
 155 -               ext4_error(sb, "pa free mismatch: [pa %p] "
 156 -                               "[phy %lu] [logic %lu] [len %u] [free %u] "
 157 -                               "[error %u] [inode %lu] [freed %u]", pa,
 158 -                               (unsigned long)pa->pa_pstart,
 159 -                               (unsigned long)pa->pa_lstart,
 160 -                               (unsigned)pa->pa_len, (unsigned)pa->pa_free,
 161 -                               (unsigned)pa->pa_error, pa->pa_inode->i_ino,
 162 -                               free);
 163                 ext4_grp_locked_error(sb, group, 0, 0, "free %u, pa_free %u",
 164 -                                       free, pa->pa_free);
 165 +                                     free, pa->pa_free);
 166                 /*
 167                  * pa is already deleted so we use the value obtained
 168                  * from the bitmap and continue.
 169 @@ -4108,16 +4107,11 @@ ext4_mb_discard_group_preallocations(str
 170         bitmap_bh = ext4_read_block_bitmap(sb, group);
 171         if (IS_ERR(bitmap_bh)) {
 172                 err = PTR_ERR(bitmap_bh);
 173 -               ext4_error_err(sb, -err,
 174 -                              "Error %d reading block bitmap for %u",
 175 -                              err, group);
 176                 return 0;
 177         }
 178
 179         err = ext4_mb_load_buddy(sb, group, &e4b);
 180         if (err) {
 181 -               ext4_warning(sb, "Error %d loading buddy information for %u",
 182 -                            err, group);
 183                 put_bh(bitmap_bh);
 184                 return 0;
 185         }
 186 @@ -4278,17 +4272,12 @@ repeat:
 187
 188                 err = ext4_mb_load_buddy_gfp(sb, group, &e4b,
 189                                              GFP_NOFS|__GFP_NOFAIL);
 190 -               if (err) {
 191 -                       ext4_error_err(sb, -err, "Error %d loading buddy information for %u",
 192 -                                      err, group);
 193 +               if (err)
 194                         return;
 195 -               }
 196
 197                 bitmap_bh = ext4_read_block_bitmap(sb, group);
 198                 if (IS_ERR(bitmap_bh)) {
 199                         err = PTR_ERR(bitmap_bh);
 200 -                       ext4_error_err(sb, -err, "Error %d reading block bitmap for %u",
 201 -                                      err, group);
 202                         ext4_mb_unload_buddy(&e4b);
 203                         continue;
 204                 }
 205 @@ -4550,11 +4539,8 @@ ext4_mb_discard_lg_preallocations(struct
 206                 group = ext4_get_group_number(sb, pa->pa_pstart);
 207                 err = ext4_mb_load_buddy_gfp(sb, group, &e4b,
 208                                              GFP_NOFS|__GFP_NOFAIL);
 209 -               if (err) {
 210 -                       ext4_error_err(sb, -err, "Error %d loading buddy information for %u",
 211 -                                      err, group);
 212 +               if (err)
 213                         continue;
 214 -               }
 215                 ext4_lock_group(sb, group);
 216                 list_del(&pa->pa_group_list);
 217                 ext4_get_group_info(sb, group)->bb_prealloc_nr--;
 218 @@ -4807,7 +4793,7 @@ errout:
 219                          * been updated or not when fail case. So can
 220                          * not revert pa_free back, just mark pa_error*/
 221                         pa->pa_error++;
 222 -                       ext4_error(sb,
 223 +                       ext4_warning(sb,
 224                                 "Updating bitmap error: [err %d] "
 225                                 "[pa %p] [phy %lu] [logic %lu] "
 226                                 "[len %u] [free %u] [error %u] "
 227 @@ -4818,6 +4804,7 @@ errout:
 228                                 (unsigned)pa->pa_free,
 229                                 (unsigned)pa->pa_error,
 230                                 pa->pa_inode ? pa->pa_inode->i_ino : 0);
 231 +                       ext4_mark_group_bitmap_corrupted(sb, 0, 0);
 232                 }
 233         }
 234         ext4_mb_release_context(ac);
 235 @@ -5103,7 +5090,7 @@ do_more:
 236         err = ext4_mb_load_buddy_gfp(sb, block_group, &e4b,
 237                                      GFP_NOFS|__GFP_NOFAIL);
 238         if (err)
 239 -               goto error_return;
 240 +               goto error_brelse;
 241
 242         /*
 243          * We need to make sure we don't reuse the freed block until after the
 244 @@ -5194,8 +5181,9 @@ do_more:
 245                 goto do_more;
 246         }
 247  error_return:
 248 -       brelse(bitmap_bh);
 249         ext4_std_error(sb, err);
 250 +error_brelse:
 251 +       brelse(bitmap_bh);
 252         return;
 253  }
 254
 255 @@ -5295,7 +5283,7 @@ int ext4_group_add_blocks(handle_t *hand
 256
 257         err = ext4_mb_load_buddy(sb, block_group, &e4b);
 258         if (err)
 259 -               goto error_return;
 260 +               goto error_brelse;
 261
 262         /*
 263          * need to update group_info->bb_free and bitmap
 264 @@ -5334,8 +5322,9 @@ int ext4_group_add_blocks(handle_t *hand
 265                 err = ret;
 266
 267  error_return:
 268 -       brelse(bitmap_bh);
 269         ext4_std_error(sb, err);
 270 +error_brelse:
 271 +       brelse(bitmap_bh);
 272         return err;
 273  }
 274
 275 @@ -5410,11 +5399,8 @@ ext4_trim_all_free(struct super_block *s
 276         trace_ext4_trim_all_free(sb, group, start, max);
 277
 278         ret = ext4_mb_load_buddy(sb, group, &e4b);
 279 -       if (ret) {
 280 -               ext4_warning(sb, "Error %d loading buddy information for %u",
 281 -                            ret, group);
 282 +       if (ret)
 283                 return ret;
 284 -       }
 285         bitmap = e4b.bd_bitmap;
 286
 287         ext4_lock_group(sb, group);