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