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