ldiskfs/kernel_patches/patches/rhel7.6/ext4-corrupted-inode-block-bitmaps-handling-patches.patch

   1 Since we could skip corrupt block groups, this patch
   2 use ext4_warning() intead of ext4_error() to make FS not
   3 emount RO in default, also fix a leftover from upstream
   4 commit 163a203ddb36c36d4a1c942
   5 ---
   6 Index: linux-stage/fs/ext4/balloc.c
   7 ===================================================================
   8 --- linux-stage.orig/fs/ext4/balloc.c
   9 +++ linux-stage/fs/ext4/balloc.c
  10 @@ -184,25 +184,17 @@ static int ext4_init_block_bitmap(struct
  11         unsigned int bit, bit_max;
  12         struct ext4_sb_info *sbi = EXT4_SB(sb);
  13         ext4_fsblk_t start, tmp;
  14 -       struct ext4_group_info *grp;
  15
  16         J_ASSERT_BH(bh, buffer_locked(bh));
  17
  18         /* If checksum is bad mark all blocks used to prevent allocation
  19          * essentially implementing a per-group read-only flag. */
  20         if (!ext4_group_desc_csum_verify(sb, block_group, gdp)) {
  21 -               grp = ext4_get_group_info(sb, block_group);
  22 -               if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp))
  23 -                       percpu_counter_sub(&sbi->s_freeclusters_counter,
  24 -                                          grp->bb_free);
  25 -               set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);
  26 -               if (!EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
  27 -                       int count;
  28 -                       count = ext4_free_inodes_count(sb, gdp);
  29 -                       percpu_counter_sub(&sbi->s_freeinodes_counter,
  30 -                                          count);
  31 -               }
  32 -               set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);
  33 +               ext4_corrupted_block_group(sb, block_group,
  34 +                               EXT4_GROUP_INFO_BBITMAP_CORRUPT |
  35 +                               EXT4_GROUP_INFO_IBITMAP_CORRUPT,
  36 +                               "Checksum bad for group %u",
  37 +                               block_group);
  38                 return -EIO;
  39         }
  40         memset(bh->b_data, 0, sb->s_blocksize);
  41 @@ -371,7 +363,6 @@ static void ext4_validate_block_bitmap(s
  42  {
  43         ext4_fsblk_t    blk;
  44         struct ext4_group_info *grp = ext4_get_group_info(sb, block_group);
  45 -       struct ext4_sb_info *sbi = EXT4_SB(sb);
  46
  47         if (buffer_verified(bh) || EXT4_MB_GRP_BBITMAP_CORRUPT(grp))
  48                 return;
  49 @@ -382,22 +373,19 @@ static void ext4_validate_block_bitmap(s
  50         blk = ext4_valid_block_bitmap(sb, desc, block_group, bh);
  51         if (unlikely(blk != 0)) {
  52                 ext4_unlock_group(sb, block_group);
  53 -               ext4_error(sb, "bg %u: block %llu: invalid block bitmap",
  54 -                          block_group, blk);
  55 -               if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp))
  56 -                       percpu_counter_sub(&sbi->s_freeclusters_counter,
  57 -                                          grp->bb_free);
  58 -               set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);
  59 +               ext4_corrupted_block_group(sb, block_group,
  60 +                               EXT4_GROUP_INFO_BBITMAP_CORRUPT,
  61 +                               "bg %u: block %llu: invalid block bitmap",
  62 +                               block_group, blk);
  63                 return;
  64         }
  65         if (unlikely(!ext4_block_bitmap_csum_verify(sb, block_group,
  66                         desc, bh))) {
  67                 ext4_unlock_group(sb, block_group);
  68 -               ext4_error(sb, "bg %u: bad block bitmap checksum", block_group);
  69 -               if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp))
  70 -                       percpu_counter_sub(&sbi->s_freeclusters_counter,
  71 -                                          grp->bb_free);
  72 -               set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);
  73 +               ext4_corrupted_block_group(sb, block_group,
  74 +                               EXT4_GROUP_INFO_BBITMAP_CORRUPT,
  75 +                               "bg %u: bad block bitmap checksum",
  76 +                               block_group);
  77                 return;
  78         }
  79         set_buffer_verified(bh);
  80 @@ -466,8 +454,6 @@ ext4_read_block_bitmap_nowait(struct sup
  81                 set_buffer_verified(bh);
  82                 ext4_unlock_group(sb, block_group);
  83                 unlock_buffer(bh);
  84 -               if (err)
  85 -                       ext4_error(sb, "Checksum bad for grp %u", block_group);
  86                 goto verify;
  87         }
  88         ext4_unlock_group(sb, block_group);
  89 Index: linux-stage/fs/ext4/ext4.h
  90 ===================================================================
  91 --- linux-stage.orig/fs/ext4/ext4.h
  92 +++ linux-stage/fs/ext4/ext4.h
  93 @@ -91,6 +91,17 @@ typedef __u32 ext4_lblk_t;
  94  /* data type for block group number */
  95  typedef unsigned int ext4_group_t;
  96
  97 +void __ext4_corrupted_block_group(struct super_block *sb,
  98 +                                 ext4_group_t group, unsigned int flags,
  99 +                                 const char *function, unsigned int line);
 100 +
 101 +#define ext4_corrupted_block_group(sb, group, flags, fmt, ...)         \
 102 +       do {                                                            \
 103 +               __ext4_warning(sb, __func__, __LINE__, fmt,             \
 104 +                               ##__VA_ARGS__);                         \
 105 +               __ext4_corrupted_block_group(sb, group, flags,          \
 106 +                                       __func__, __LINE__);            \
 107 +       } while (0)
 108  /*
 109   * Flags used in mballoc's allocation_context flags field.
 110   *
 111 @@ -2676,7 +2687,11 @@ struct ext4_group_info {
 112  #define EXT4_GROUP_INFO_NEED_INIT_BIT          0
 113  #define EXT4_GROUP_INFO_WAS_TRIMMED_BIT                1
 114  #define EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT    2
 115 +#define EXT4_GROUP_INFO_BBITMAP_CORRUPT                \
 116 +       (1 << EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT)
 117  #define EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT    3
 118 +#define EXT4_GROUP_INFO_IBITMAP_CORRUPT                \
 119 +       (1 << EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT)
 120
 121  #define EXT4_MB_GRP_NEED_INIT(grp)     \
 122         (test_bit(EXT4_GROUP_INFO_NEED_INIT_BIT, &((grp)->bb_state)))
 123 Index: linux-stage/fs/ext4/ialloc.c
 124 ===================================================================
 125 --- linux-stage.orig/fs/ext4/ialloc.c
 126 +++ linux-stage/fs/ext4/ialloc.c
 127 @@ -86,7 +86,6 @@ ext4_read_inode_bitmap(struct super_bloc
 128         struct ext4_group_desc *desc;
 129         struct buffer_head *bh = NULL;
 130         ext4_fsblk_t bitmap_blk;
 131 -       struct ext4_group_info *grp;
 132         struct ext4_sb_info *sbi = EXT4_SB(sb);
 133
 134         desc = ext4_get_group_desc(sb, block_group, NULL);
 135 @@ -171,16 +170,10 @@ verify:
 136                                            EXT4_INODES_PER_GROUP(sb) / 8)) {
 137                 ext4_unlock_group(sb, block_group);
 138                 put_bh(bh);
 139 -               ext4_error(sb, "Corrupt inode bitmap - block_group = %u, "
 140 -                          "inode_bitmap = %llu", block_group, bitmap_blk);
 141 -               grp = ext4_get_group_info(sb, block_group);
 142 -               if (!EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
 143 -                       int count;
 144 -                       count = ext4_free_inodes_count(sb, desc);
 145 -                       percpu_counter_sub(&sbi->s_freeinodes_counter,
 146 -                                          count);
 147 -               }
 148 -               set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);
 149 +               ext4_corrupted_block_group(sb, block_group,
 150 +                               EXT4_GROUP_INFO_IBITMAP_CORRUPT,
 151 +                               "Corrupt inode bitmap - block_group = %u, inode_bitmap = %llu",
 152 +                               block_group, bitmap_blk);
 153                 return NULL;
 154         }
 155         ext4_unlock_group(sb, block_group);
 156 @@ -315,14 +308,9 @@ out:
 157                 if (!fatal)
 158                         fatal = err;
 159         } else {
 160 -               ext4_error(sb, "bit already cleared for inode %lu", ino);
 161 -               if (gdp && !EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
 162 -                       int count;
 163 -                       count = ext4_free_inodes_count(sb, gdp);
 164 -                       percpu_counter_sub(&sbi->s_freeinodes_counter,
 165 -                                          count);
 166 -               }
 167 -               set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);
 168 +               ext4_corrupted_block_group(sb, block_group,
 169 +                               EXT4_GROUP_INFO_IBITMAP_CORRUPT,
 170 +                               "bit already cleared for inode %lu", ino);
 171         }
 172
 173  error_return:
 174 Index: linux-stage/fs/ext4/mballoc.c
 175 ===================================================================
 176 --- linux-stage.orig/fs/ext4/mballoc.c
 177 +++ linux-stage/fs/ext4/mballoc.c
 178 @@ -752,10 +752,18 @@ int ext4_mb_generate_buddy(struct super_
 179         if (free != grp->bb_free) {
 180                 struct ext4_group_desc *gdp;
 181                 gdp = ext4_get_group_desc(sb, group, NULL);
 182 -               ext4_error(sb, "group %lu: %u blocks in bitmap, %u in bb, "
 183 -                       "%u in gd, %lu pa's\n", (long unsigned int)group,
 184 -                       free, grp->bb_free, ext4_free_group_clusters(sb, gdp),
 185 -                       grp->bb_prealloc_nr);
 186 +
 187 +               ext4_corrupted_block_group(sb, group,
 188 +                               EXT4_GROUP_INFO_BBITMAP_CORRUPT,
 189 +                               "group %lu: %u blocks in bitmap, %u in bb, %u in gd, %lu pa's block bitmap corrupt",
 190 +                               (unsigned long int)group, free, grp->bb_free,
 191 +                               ext4_free_group_clusters(sb, gdp),
 192 +                               grp->bb_prealloc_nr);
 193 +               /*
 194 +                * If we intend to continue, we consider group descriptor
 195 +                * corrupt and update bb_free using bitmap value
 196 +                */
 197 +               grp->bb_free = free;
 198                 return -EIO;
 199         }
 200         mb_set_largest_free_order(sb, grp);
 201 @@ -1101,7 +1109,7 @@ ext4_mb_load_buddy(struct super_block *s
 202         int block;
 203         int pnum;
 204         int poff;
 205 -       struct page *page;
 206 +       struct page *page = NULL;
 207         int ret;
 208         struct ext4_group_info *grp;
 209         struct ext4_sb_info *sbi = EXT4_SB(sb);
 210 @@ -1127,7 +1135,7 @@ ext4_mb_load_buddy(struct super_block *s
 211                  */
 212                 ret = ext4_mb_init_group(sb, group);
 213                 if (ret)
 214 -                       return ret;
 215 +                       goto err;
 216         }
 217
 218         /*
 219 @@ -1227,6 +1235,7 @@ err:
 220                 page_cache_release(e4b->bd_buddy_page);
 221         e4b->bd_buddy = NULL;
 222         e4b->bd_bitmap = NULL;
 223 +       ext4_warning(sb, "Error loading buddy information for %u", group);
 224         return ret;
 225  }
 226
 227 @@ -3598,9 +3607,11 @@ int ext4_mb_check_ondisk_bitmap(struct s
 228         }
 229
 230         if (free != free_in_gdp) {
 231 -               ext4_error(sb, "on-disk bitmap for group %d"
 232 -                       "corrupted: %u blocks free in bitmap, %u - in gd\n",
 233 -                       group, free, free_in_gdp);
 234 +               ext4_corrupted_block_group(sb, group,
 235 +                               EXT4_GROUP_INFO_BBITMAP_CORRUPT,
 236 +                               "on-disk bitmap for group %d corrupted: %u blocks free in bitmap, %u - in gd\n",
 237 +                               group, free,
 238 +                               free_in_gdp);
 239                 return -EIO;
 240         }
 241         return 0;
 242 @@ -3961,16 +3972,8 @@ ext4_mb_release_inode_pa(struct ext4_bud
 243         /* "free < pa->pa_free" means we maybe double alloc the same blocks,
 244          * otherwise maybe leave some free blocks unavailable, no need to BUG.*/
 245         if ((free > pa->pa_free && !pa->pa_error) || (free < pa->pa_free)) {
 246 -               ext4_error(sb, "pa free mismatch: [pa %p] "
 247 -                               "[phy %lu] [logic %lu] [len %u] [free %u] "
 248 -                               "[error %u] [inode %lu] [freed %u]", pa,
 249 -                               (unsigned long)pa->pa_pstart,
 250 -                               (unsigned long)pa->pa_lstart,
 251 -                               (unsigned)pa->pa_len, (unsigned)pa->pa_free,
 252 -                               (unsigned)pa->pa_error, pa->pa_inode->i_ino,
 253 -                               free);
 254                 ext4_grp_locked_error(sb, group, 0, 0, "free %u, pa_free %u",
 255 -                                       free, pa->pa_free);
 256 +                                     free, pa->pa_free);
 257                 /*
 258                  * pa is already deleted so we use the value obtained
 259                  * from the bitmap and continue.
 260 @@ -4030,14 +4033,11 @@ ext4_mb_discard_group_preallocations(str
 261                 return 0;
 262
 263         bitmap_bh = ext4_read_block_bitmap(sb, group);
 264 -       if (bitmap_bh == NULL) {
 265 -               ext4_error(sb, "Error reading block bitmap for %u", group);
 266 +       if (bitmap_bh == NULL)
 267                 return 0;
 268 -       }
 269
 270         err = ext4_mb_load_buddy(sb, group, &e4b);
 271         if (err) {
 272 -               ext4_error(sb, "Error loading buddy information for %u", group);
 273                 put_bh(bitmap_bh);
 274                 return 0;
 275         }
 276 @@ -4197,16 +4197,11 @@ repeat:
 277                 group = ext4_get_group_number(sb, pa->pa_pstart);
 278
 279                 err = ext4_mb_load_buddy(sb, group, &e4b);
 280 -               if (err) {
 281 -                       ext4_error(sb, "Error loading buddy information for %u",
 282 -                                       group);
 283 +               if (err)
 284                         return;
 285 -               }
 286
 287                 bitmap_bh = ext4_read_block_bitmap(sb, group);
 288                 if (bitmap_bh == NULL) {
 289 -                       ext4_error(sb, "Error reading block bitmap for %u",
 290 -                                       group);
 291                         ext4_mb_unload_buddy(&e4b);
 292                         continue;
 293                 }
 294 @@ -4466,11 +4461,8 @@ ext4_mb_discard_lg_preallocations(struct
 295         list_for_each_entry_safe(pa, tmp, &discard_list, u.pa_tmp_list) {
 296
 297                 group = ext4_get_group_number(sb, pa->pa_pstart);
 298 -               if (ext4_mb_load_buddy(sb, group, &e4b)) {
 299 -                       ext4_error(sb, "Error loading buddy information for %u",
 300 -                                       group);
 301 +               if (ext4_mb_load_buddy(sb, group, &e4b))
 302                         continue;
 303 -               }
 304                 ext4_lock_group(sb, group);
 305                 list_del(&pa->pa_group_list);
 306                 ext4_get_group_info(sb, group)->bb_prealloc_nr--;
 307 @@ -4741,17 +4733,18 @@ errout:
 308                          * been updated or not when fail case. So can
 309                          * not revert pa_free back, just mark pa_error*/
 310                         pa->pa_error++;
 311 -                       ext4_error(sb,
 312 -                               "Updating bitmap error: [err %d] "
 313 -                               "[pa %p] [phy %lu] [logic %lu] "
 314 -                               "[len %u] [free %u] [error %u] "
 315 -                               "[inode %lu]", *errp, pa,
 316 -                               (unsigned long)pa->pa_pstart,
 317 -                               (unsigned long)pa->pa_lstart,
 318 -                               (unsigned)pa->pa_len,
 319 -                               (unsigned)pa->pa_free,
 320 -                               (unsigned)pa->pa_error,
 321 -                               pa->pa_inode ? pa->pa_inode->i_ino : 0);
 322 +                       ext4_corrupted_block_group(sb, 0, 0,
 323 +                                       "Updating bitmap error: [err %d] "
 324 +                                       "[pa %p] [phy %lu] [logic %lu] "
 325 +                                       "[len %u] [free %u] [error %u] "
 326 +                                       "[inode %lu]", *errp, pa,
 327 +                                       (unsigned long)pa->pa_pstart,
 328 +                                       (unsigned long)pa->pa_lstart,
 329 +                                       (unsigned)pa->pa_len,
 330 +                                       (unsigned)pa->pa_free,
 331 +                                       (unsigned)pa->pa_error,
 332 +                                       pa->pa_inode ?
 333 +                                       pa->pa_inode->i_ino : 0);
 334                 }
 335         }
 336         ext4_mb_release_context(ac);
 337 @@ -5036,7 +5029,7 @@ do_more:
 338
 339         err = ext4_mb_load_buddy(sb, block_group, &e4b);
 340         if (err)
 341 -               goto error_return;
 342 +               goto error_brelse;
 343
 344         if ((flags & EXT4_FREE_BLOCKS_METADATA) && ext4_handle_valid(handle)) {
 345                 struct ext4_free_data *new_entry;
 346 @@ -5118,8 +5111,9 @@ do_more:
 347                 goto do_more;
 348         }
 349  error_return:
 350 -       brelse(bitmap_bh);
 351         ext4_std_error(sb, err);
 352 +error_brelse:
 353 +       brelse(bitmap_bh);
 354         return;
 355  }
 356
 357 @@ -5215,7 +5209,7 @@ int ext4_group_add_blocks(handle_t *hand
 358
 359         err = ext4_mb_load_buddy(sb, block_group, &e4b);
 360         if (err)
 361 -               goto error_return;
 362 +               goto error_brelse;
 363
 364         /*
 365          * need to update group_info->bb_free and bitmap
 366 @@ -5252,8 +5246,9 @@ int ext4_group_add_blocks(handle_t *hand
 367                 err = ret;
 368
 369  error_return:
 370 -       brelse(bitmap_bh);
 371         ext4_std_error(sb, err);
 372 +error_brelse:
 373 +       brelse(bitmap_bh);
 374         return err;
 375  }
 376
 377 @@ -5328,11 +5323,9 @@ ext4_trim_all_free(struct super_block *s
 378         trace_ext4_trim_all_free(sb, group, start, max);
 379
 380         ret = ext4_mb_load_buddy(sb, group, &e4b);
 381 -       if (ret) {
 382 -               ext4_error(sb, "Error in loading buddy "
 383 -                               "information for %u", group);
 384 +       if (ret)
 385                 return ret;
 386 -       }
 387 +
 388         bitmap = e4b.bd_bitmap;
 389
 390         ext4_lock_group(sb, group);
 391 Index: linux-stage/fs/ext4/super.c
 392 ===================================================================
 393 --- linux-stage.orig/fs/ext4/super.c
 394 +++ linux-stage/fs/ext4/super.c
 395 @@ -633,6 +633,37 @@ void __ext4_warning(struct super_block *
 396         va_end(args);
 397  }
 398
 399 +void __ext4_corrupted_block_group(struct super_block *sb, ext4_group_t group,
 400 +                                 unsigned int flags, const char *function,
 401 +                                 unsigned int line)
 402 +{
 403 +       struct ext4_sb_info *sbi = EXT4_SB(sb);
 404 +       struct ext4_group_info *grp = ext4_get_group_info(sb, group);
 405 +       struct ext4_group_desc *gdp = ext4_get_group_desc(sb, group, NULL);
 406 +
 407 +       if (flags & EXT4_GROUP_INFO_BBITMAP_CORRUPT &&
 408 +           !EXT4_MB_GRP_BBITMAP_CORRUPT(grp)) {
 409 +               percpu_counter_sub(&sbi->s_freeclusters_counter,
 410 +                                       grp->bb_free);
 411 +               set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT,
 412 +                       &grp->bb_state);
 413 +       }
 414 +
 415 +       if (flags & EXT4_GROUP_INFO_IBITMAP_CORRUPT &&
 416 +           !EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
 417 +               if (gdp) {
 418 +                       int count;
 419 +
 420 +                       count = ext4_free_inodes_count(sb, gdp);
 421 +                       percpu_counter_sub(&sbi->s_freeinodes_counter,
 422 +                                          count);
 423 +               }
 424 +               set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT,
 425 +                       &grp->bb_state);
 426 +       }
 427 +       save_error_info(sb, function, line);
 428 +}
 429 +
 430  void __ext4_grp_locked_error(const char *function, unsigned int line,
 431                              struct super_block *sb, ext4_group_t grp,
 432                              unsigned long ino, ext4_fsblk_t block,