ldiskfs/kernel_patches/patches/ubuntu18/ext4-corrupted-inode-block-bitmaps-handling-patches-001.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-4.15.0/fs/ext4/balloc.c
   7 ===================================================================
   8 --- linux-4.15.0.orig/fs/ext4/balloc.c
   9 +++ linux-4.15.0/fs/ext4/balloc.c
  10 @@ -185,25 +185,17 @@ static int ext4_init_block_bitmap(struct
  11         struct ext4_sb_info *sbi = EXT4_SB(sb);
  12         ext4_fsblk_t start, tmp;
  13         int flex_bg = 0;
  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 -EFSBADCRC;
  39         }
  40         memset(bh->b_data, 0, sb->s_blocksize);
  41 @@ -369,7 +361,6 @@ static int ext4_validate_block_bitmap(st
  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))
  48                 return 0;
  49 @@ -380,22 +371,19 @@ static int ext4_validate_block_bitmap(st
  50         if (unlikely(!ext4_block_bitmap_csum_verify(sb, block_group,
  51                         desc, bh))) {
  52                 ext4_unlock_group(sb, block_group);
  53 -               ext4_error(sb, "bg %u: bad block bitmap checksum", block_group);
  54 -               if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp))
  55 -                       percpu_counter_sub(&sbi->s_freeclusters_counter,
  56 -                                          grp->bb_free);
  57 -               set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);
  58 +               ext4_corrupted_block_group(sb, block_group,
  59 +                               EXT4_GROUP_INFO_BBITMAP_CORRUPT,
  60 +                               "bg %u: bad block bitmap checksum",
  61 +                               block_group);
  62                 return -EFSBADCRC;
  63         }
  64         blk = ext4_valid_block_bitmap(sb, desc, block_group, bh);
  65         if (unlikely(blk != 0)) {
  66                 ext4_unlock_group(sb, block_group);
  67 -               ext4_error(sb, "bg %u: block %llu: invalid block bitmap",
  68 -                          block_group, blk);
  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: block %llu: invalid block bitmap",
  76 +                               block_group, blk);
  77                 return -EFSCORRUPTED;
  78         }
  79         set_buffer_verified(bh);
  80 @@ -450,8 +438,6 @@ ext4_read_block_bitmap_nowait(struct sup
  81                 ext4_unlock_group(sb, block_group);
  82                 unlock_buffer(bh);
  83                 if (err) {
  84 -                       ext4_error(sb, "Failed to init block bitmap for group "
  85 -                                  "%u: %d", block_group, err);
  86                         goto out;
  87                 }
  88                 goto verify;
  89 Index: linux-4.15.0/fs/ext4/ext4.h
  90 ===================================================================
  91 --- linux-4.15.0.orig/fs/ext4/ext4.h
  92 +++ linux-4.15.0/fs/ext4/ext4.h
  93 @@ -101,6 +101,18 @@ 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  enum SHIFT_DIRECTION {
 110         SHIFT_LEFT = 0,
 111         SHIFT_RIGHT,
 112 @@ -3032,7 +3044,11 @@ struct ext4_group_info {
 113  #define EXT4_GROUP_INFO_NEED_INIT_BIT          0
 114  #define EXT4_GROUP_INFO_WAS_TRIMMED_BIT                1
 115  #define EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT    2
 116 +#define EXT4_GROUP_INFO_BBITMAP_CORRUPT                \
 117 +       (1 << EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT)
 118  #define EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT    3
 119 +#define EXT4_GROUP_INFO_IBITMAP_CORRUPT                \
 120 +       (1 << EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT)
 121
 122  #define EXT4_MB_GRP_NEED_INIT(grp)     \
 123         (test_bit(EXT4_GROUP_INFO_NEED_INIT_BIT, &((grp)->bb_state)))
 124 Index: linux-4.15.0/fs/ext4/ialloc.c
 125 ===================================================================
 126 --- linux-4.15.0.orig/fs/ext4/ialloc.c
 127 +++ linux-4.15.0/fs/ext4/ialloc.c
 128 @@ -83,7 +83,6 @@ static int ext4_validate_inode_bitmap(st
 129  {
 130         ext4_fsblk_t    blk;
 131         struct ext4_group_info *grp = ext4_get_group_info(sb, block_group);
 132 -       struct ext4_sb_info *sbi = EXT4_SB(sb);
 133
 134         if (buffer_verified(bh))
 135                 return 0;
 136 @@ -95,16 +94,10 @@ static int ext4_validate_inode_bitmap(st
 137         if (!ext4_inode_bitmap_csum_verify(sb, block_group, desc, bh,
 138                                            EXT4_INODES_PER_GROUP(sb) / 8)) {
 139                 ext4_unlock_group(sb, block_group);
 140 -               ext4_error(sb, "Corrupt inode bitmap - block_group = %u, "
 141 -                          "inode_bitmap = %llu", block_group, blk);
 142 -               grp = ext4_get_group_info(sb, block_group);
 143 -               if (!EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
 144 -                       int count;
 145 -                       count = ext4_free_inodes_count(sb, desc);
 146 -                       percpu_counter_sub(&sbi->s_freeinodes_counter,
 147 -                                          count);
 148 -               }
 149 -               set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);
 150 +               ext4_corrupted_block_group(sb, block_group,
 151 +                               EXT4_GROUP_INFO_IBITMAP_CORRUPT,
 152 +                               "Corrupt inode bitmap - block_group = %u, inode_bitmap = %llu",
 153 +                               block_group, blk);
 154                 return -EFSBADCRC;
 155         }
 156         set_buffer_verified(bh);
 157 @@ -330,14 +323,9 @@ out:
 158                 if (!fatal)
 159                         fatal = err;
 160         } else {
 161 -               ext4_error(sb, "bit already cleared for inode %lu", ino);
 162 -               if (gdp && !EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
 163 -                       int count;
 164 -                       count = ext4_free_inodes_count(sb, gdp);
 165 -                       percpu_counter_sub(&sbi->s_freeinodes_counter,
 166 -                                          count);
 167 -               }
 168 -               set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);
 169 +               ext4_corrupted_block_group(sb, block_group,
 170 +                               EXT4_GROUP_INFO_IBITMAP_CORRUPT,
 171 +                               "bit already cleared for inode %lu", ino);
 172         }
 173
 174  error_return:
 175 Index: linux-4.15.0/fs/ext4/mballoc.c
 176 ===================================================================
 177 --- linux-4.15.0.orig/fs/ext4/mballoc.c
 178 +++ linux-4.15.0/fs/ext4/mballoc.c
 179 @@ -751,10 +751,18 @@ int ext4_mb_generate_buddy(struct super_
 180         if (free != grp->bb_free) {
 181                 struct ext4_group_desc *gdp;
 182                 gdp = ext4_get_group_desc(sb, group, NULL);
 183 -               ext4_error(sb, "group %lu: %u blocks in bitmap, %u in bb, "
 184 -                       "%u in gd, %lu pa's\n", (long unsigned int)group,
 185 -                       free, grp->bb_free, ext4_free_group_clusters(sb, gdp),
 186 -                       grp->bb_prealloc_nr);
 187 +
 188 +               ext4_corrupted_block_group(sb, group,
 189 +                               EXT4_GROUP_INFO_BBITMAP_CORRUPT,
 190 +                               "group %lu: %u blocks in bitmap, %u in bb, %u in gd, %lu pa's block bitmap corrupt",
 191 +                               (unsigned long int)group, free, grp->bb_free,
 192 +                               ext4_free_group_clusters(sb, gdp),
 193 +                               grp->bb_prealloc_nr);
 194 +               /*
 195 +                * If we intend to continue, we consider group descriptor
 196 +                * corrupt and update bb_free using bitmap value
 197 +                */
 198 +               grp->bb_free = free;
 199                 return -EIO;
 200         }
 201         mb_set_largest_free_order(sb, grp);
 202 @@ -1110,7 +1118,7 @@ ext4_mb_load_buddy_gfp(struct super_bloc
 203         int block;
 204         int pnum;
 205         int poff;
 206 -       struct page *page;
 207 +       struct page *page = NULL;
 208         int ret;
 209         struct ext4_group_info *grp;
 210         struct ext4_sb_info *sbi = EXT4_SB(sb);
 211 @@ -1136,7 +1144,7 @@ ext4_mb_load_buddy_gfp(struct super_bloc
 212                  */
 213                 ret = ext4_mb_init_group(sb, group, gfp);
 214                 if (ret)
 215 -                       return ret;
 216 +                       goto err;
 217         }
 218
 219         /*
 220 @@ -1239,6 +1247,7 @@ err:
 221                 put_page(e4b->bd_buddy_page);
 222         e4b->bd_buddy = NULL;
 223         e4b->bd_bitmap = NULL;
 224 +       ext4_warning(sb, "Error loading buddy information for %u", group);
 225         return ret;
 226  }
 227
 228 @@ -3689,9 +3698,11 @@ int ext4_mb_check_ondisk_bitmap(struct s
 229         }
 230
 231         if (free != free_in_gdp) {
 232 -               ext4_error(sb, "on-disk bitmap for group %d"
 233 -                       "corrupted: %u blocks free in bitmap, %u - in gd\n",
 234 -                       group, free, free_in_gdp);
 235 +               ext4_corrupted_block_group(sb, group,
 236 +                               EXT4_GROUP_INFO_BBITMAP_CORRUPT,
 237 +                               "on-disk bitmap for group %d corrupted: %u blocks free in bitmap, %u - in gd\n",
 238 +                               group, free,
 239 +                               free_in_gdp);
 240                 return -EIO;
 241         }
 242         return 0;
 243 @@ -4052,16 +4063,8 @@ ext4_mb_release_inode_pa(struct ext4_bud
 244         /* "free < pa->pa_free" means we maybe double alloc the same blocks,
 245          * otherwise maybe leave some free blocks unavailable, no need to BUG.*/
 246         if ((free > pa->pa_free && !pa->pa_error) || (free < pa->pa_free)) {
 247 -               ext4_error(sb, "pa free mismatch: [pa %p] "
 248 -                               "[phy %lu] [logic %lu] [len %u] [free %u] "
 249 -                               "[error %u] [inode %lu] [freed %u]", pa,
 250 -                               (unsigned long)pa->pa_pstart,
 251 -                               (unsigned long)pa->pa_lstart,
 252 -                               (unsigned)pa->pa_len, (unsigned)pa->pa_free,
 253 -                               (unsigned)pa->pa_error, pa->pa_inode->i_ino,
 254 -                               free);
 255                 ext4_grp_locked_error(sb, group, 0, 0, "free %u, pa_free %u",
 256 -                                       free, pa->pa_free);
 257 +                                     free, pa->pa_free);
 258                 /*
 259                  * pa is already deleted so we use the value obtained
 260                  * from the bitmap and continue.
 261 @@ -4123,15 +4126,11 @@ ext4_mb_discard_group_preallocations(str
 262         bitmap_bh = ext4_read_block_bitmap(sb, group);
 263         if (IS_ERR(bitmap_bh)) {
 264                 err = PTR_ERR(bitmap_bh);
 265 -               ext4_error(sb, "Error %d reading block bitmap for %u",
 266 -                          err, group);
 267                 return 0;
 268         }
 269
 270         err = ext4_mb_load_buddy(sb, group, &e4b);
 271         if (err) {
 272 -               ext4_warning(sb, "Error %d loading buddy information for %u",
 273 -                            err, group);
 274                 put_bh(bitmap_bh);
 275                 return 0;
 276         }
 277 @@ -4292,17 +4291,12 @@ repeat:
 278
 279                 err = ext4_mb_load_buddy_gfp(sb, group, &e4b,
 280                                              GFP_NOFS|__GFP_NOFAIL);
 281 -               if (err) {
 282 -                       ext4_error(sb, "Error %d loading buddy information for %u",
 283 -                                  err, group);
 284 +               if (err)
 285                         return;
 286 -               }
 287
 288                 bitmap_bh = ext4_read_block_bitmap(sb, group);
 289                 if (IS_ERR(bitmap_bh)) {
 290                         err = PTR_ERR(bitmap_bh);
 291 -                       ext4_error(sb, "Error %d reading block bitmap for %u",
 292 -                                       err, group);
 293                         ext4_mb_unload_buddy(&e4b);
 294                         continue;
 295                 }
 296 @@ -4565,11 +4559,8 @@ ext4_mb_discard_lg_preallocations(struct
 297                 group = ext4_get_group_number(sb, pa->pa_pstart);
 298                 err = ext4_mb_load_buddy_gfp(sb, group, &e4b,
 299                                              GFP_NOFS|__GFP_NOFAIL);
 300 -               if (err) {
 301 -                       ext4_error(sb, "Error %d loading buddy information for %u",
 302 -                                  err, group);
 303 +               if (err)
 304                         continue;
 305 -               }
 306                 ext4_lock_group(sb, group);
 307                 list_del(&pa->pa_group_list);
 308                 ext4_get_group_info(sb, group)->bb_prealloc_nr--;
 309 @@ -4822,17 +4813,18 @@ errout:
 310                          * been updated or not when fail case. So can
 311                          * not revert pa_free back, just mark pa_error*/
 312                         pa->pa_error++;
 313 -                       ext4_error(sb,
 314 -                               "Updating bitmap error: [err %d] "
 315 -                               "[pa %p] [phy %lu] [logic %lu] "
 316 -                               "[len %u] [free %u] [error %u] "
 317 -                               "[inode %lu]", *errp, pa,
 318 -                               (unsigned long)pa->pa_pstart,
 319 -                               (unsigned long)pa->pa_lstart,
 320 -                               (unsigned)pa->pa_len,
 321 -                               (unsigned)pa->pa_free,
 322 -                               (unsigned)pa->pa_error,
 323 -                               pa->pa_inode ? pa->pa_inode->i_ino : 0);
 324 +                       ext4_corrupted_block_group(sb, 0, 0,
 325 +                                       "Updating bitmap error: [err %d] "
 326 +                                       "[pa %p] [phy %lu] [logic %lu] "
 327 +                                       "[len %u] [free %u] [error %u] "
 328 +                                       "[inode %lu]", *errp, pa,
 329 +                                       (unsigned long)pa->pa_pstart,
 330 +                                       (unsigned long)pa->pa_lstart,
 331 +                                       (unsigned)pa->pa_len,
 332 +                                       (unsigned)pa->pa_free,
 333 +                                       (unsigned)pa->pa_error,
 334 +                                       pa->pa_inode ?
 335 +                                       pa->pa_inode->i_ino : 0);
 336                 }
 337         }
 338         ext4_mb_release_context(ac);
 339 @@ -5118,7 +5110,7 @@ do_more:
 340         err = ext4_mb_load_buddy_gfp(sb, block_group, &e4b,
 341                                      GFP_NOFS|__GFP_NOFAIL);
 342         if (err)
 343 -               goto error_return;
 344 +               goto error_brelse;
 345
 346         /*
 347          * We need to make sure we don't reuse the freed block until after the
 348 @@ -5200,8 +5192,9 @@ do_more:
 349                 goto do_more;
 350         }
 351  error_return:
 352 -       brelse(bitmap_bh);
 353         ext4_std_error(sb, err);
 354 +error_brelse:
 355 +       brelse(bitmap_bh);
 356         return;
 357  }
 358
 359 @@ -5301,7 +5294,7 @@ int ext4_group_add_blocks(handle_t *hand
 360
 361         err = ext4_mb_load_buddy(sb, block_group, &e4b);
 362         if (err)
 363 -               goto error_return;
 364 +               goto error_brelse;
 365
 366         /*
 367          * need to update group_info->bb_free and bitmap
 368 @@ -5339,8 +5332,9 @@ int ext4_group_add_blocks(handle_t *hand
 369                 err = ret;
 370
 371  error_return:
 372 -       brelse(bitmap_bh);
 373         ext4_std_error(sb, err);
 374 +error_brelse:
 375 +       brelse(bitmap_bh);
 376         return err;
 377  }
 378
 379 @@ -5415,11 +5409,9 @@ ext4_trim_all_free(struct super_block *s
 380         trace_ext4_trim_all_free(sb, group, start, max);
 381
 382         ret = ext4_mb_load_buddy(sb, group, &e4b);
 383 -       if (ret) {
 384 -               ext4_warning(sb, "Error %d loading buddy information for %u",
 385 -                            ret, group);
 386 +       if (ret)
 387                 return ret;
 388 -       }
 389 +
 390         bitmap = e4b.bd_bitmap;
 391
 392         ext4_lock_group(sb, group);
 393 Index: linux-4.15.0/fs/ext4/super.c
 394 ===================================================================
 395 --- linux-4.15.0.orig/fs/ext4/super.c
 396 +++ linux-4.15.0/fs/ext4/super.c
 397 @@ -708,6 +708,37 @@ void __ext4_warning_inode(const struct i
 398         va_end(args);
 399  }
 400
 401 +void __ext4_corrupted_block_group(struct super_block *sb, ext4_group_t group,
 402 +                                 unsigned int flags, const char *function,
 403 +                                 unsigned int line)
 404 +{
 405 +       struct ext4_sb_info *sbi = EXT4_SB(sb);
 406 +       struct ext4_group_info *grp = ext4_get_group_info(sb, group);
 407 +       struct ext4_group_desc *gdp = ext4_get_group_desc(sb, group, NULL);
 408 +
 409 +       if (flags & EXT4_GROUP_INFO_BBITMAP_CORRUPT &&
 410 +           !EXT4_MB_GRP_BBITMAP_CORRUPT(grp)) {
 411 +               percpu_counter_sub(&sbi->s_freeclusters_counter,
 412 +                                       grp->bb_free);
 413 +               set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT,
 414 +                       &grp->bb_state);
 415 +       }
 416 +
 417 +       if (flags & EXT4_GROUP_INFO_IBITMAP_CORRUPT &&
 418 +           !EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
 419 +               if (gdp) {
 420 +                       int count;
 421 +
 422 +                       count = ext4_free_inodes_count(sb, gdp);
 423 +                       percpu_counter_sub(&sbi->s_freeinodes_counter,
 424 +                                          count);
 425 +               }
 426 +               set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT,
 427 +                       &grp->bb_state);
 428 +       }
 429 +       save_error_info(sb, function, line);
 430 +}
 431 +
 432  void __ext4_grp_locked_error(const char *function, unsigned int line,
 433                              struct super_block *sb, ext4_group_t grp,
 434                              unsigned long ino, ext4_fsblk_t block,