| Message ID | 20240111064208.2969599-6-chao@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [f2fs-dev,v4,1/6] f2fs: compress: fix to guarantee persisting compressed blocks by CP | expand |
Reviewed-by: Daeho Jeong <daehojeong@google.com> On Wed, Jan 10, 2024 at 10:43 PM Chao Yu <chao@kernel.org> wrote: > > We will encounter below inconsistent status when FAULT_BLKADDR type > fault injection is on. > > Info: checkpoint state = d6 : nat_bits crc fsck compacted_summary orphan_inodes sudden-power-off > [ASSERT] (fsck_chk_inode_blk:1254) --> ino: 0x1c100 has i_blocks: 000000c0, but has 191 blocks > [FIX] (fsck_chk_inode_blk:1260) --> [0x1c100] i_blocks=0x000000c0 -> 0xbf > [FIX] (fsck_chk_inode_blk:1269) --> [0x1c100] i_compr_blocks=0x00000026 -> 0x27 > [ASSERT] (fsck_chk_inode_blk:1254) --> ino: 0x1cadb has i_blocks: 0000002f, but has 46 blocks > [FIX] (fsck_chk_inode_blk:1260) --> [0x1cadb] i_blocks=0x0000002f -> 0x2e > [FIX] (fsck_chk_inode_blk:1269) --> [0x1cadb] i_compr_blocks=0x00000011 -> 0x12 > [ASSERT] (fsck_chk_inode_blk:1254) --> ino: 0x1c62c has i_blocks: 00000002, but has 1 blocks > [FIX] (fsck_chk_inode_blk:1260) --> [0x1c62c] i_blocks=0x00000002 -> 0x1 > > After we inject fault into f2fs_is_valid_blkaddr() during truncation, > a) it missed to increase @nr_free or @valid_blocks > b) it can cause in blkaddr leak in truncated dnode > Which may cause inconsistent status. > > This patch separates FAULT_BLKADDR_CONSISTENCE from FAULT_BLKADDR, > and rename FAULT_BLKADDR to FAULT_BLKADDR_VALIDITY > so that we can: > a) use FAULT_BLKADDR_CONSISTENCE in f2fs_truncate_data_blocks_range() > to simulate inconsistent issue independently, then it can verify fsck > repair flow. > b) FAULT_BLKADDR_VALIDITY fault will not cause any inconsistent status, > we can just use it to check error path handling in kernel side. > > Signed-off-by: Chao Yu <chao@kernel.org> > --- > v4: > - rename macro to FAULT_BLKADDR_CONSISTENCE and FAULT_BLKADDR_VALIDITY > suggested by Jaegeuk. > Documentation/ABI/testing/sysfs-fs-f2fs | 47 +++++++++++++------------ > Documentation/filesystems/f2fs.rst | 47 +++++++++++++------------ > fs/f2fs/checkpoint.c | 19 +++++++--- > fs/f2fs/f2fs.h | 5 ++- > fs/f2fs/file.c | 8 +++-- > fs/f2fs/super.c | 37 +++++++++---------- > 6 files changed, 92 insertions(+), 71 deletions(-) > > diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs > index 99fa87a43926..48c135e24eb5 100644 > --- a/Documentation/ABI/testing/sysfs-fs-f2fs > +++ b/Documentation/ABI/testing/sysfs-fs-f2fs > @@ -701,29 +701,30 @@ Description: Support configuring fault injection type, should be > enabled with fault_injection option, fault type value > is shown below, it supports single or combined type. > > - =================== =========== > - Type_Name Type_Value > - =================== =========== > - FAULT_KMALLOC 0x000000001 > - FAULT_KVMALLOC 0x000000002 > - FAULT_PAGE_ALLOC 0x000000004 > - FAULT_PAGE_GET 0x000000008 > - FAULT_ALLOC_BIO 0x000000010 (obsolete) > - FAULT_ALLOC_NID 0x000000020 > - FAULT_ORPHAN 0x000000040 > - FAULT_BLOCK 0x000000080 > - FAULT_DIR_DEPTH 0x000000100 > - FAULT_EVICT_INODE 0x000000200 > - FAULT_TRUNCATE 0x000000400 > - FAULT_READ_IO 0x000000800 > - FAULT_CHECKPOINT 0x000001000 > - FAULT_DISCARD 0x000002000 > - FAULT_WRITE_IO 0x000004000 > - FAULT_SLAB_ALLOC 0x000008000 > - FAULT_DQUOT_INIT 0x000010000 > - FAULT_LOCK_OP 0x000020000 > - FAULT_BLKADDR 0x000040000 > - =================== =========== > + =========================== =========== > + Type_Name Type_Value > + =========================== =========== > + FAULT_KMALLOC 0x000000001 > + FAULT_KVMALLOC 0x000000002 > + FAULT_PAGE_ALLOC 0x000000004 > + FAULT_PAGE_GET 0x000000008 > + FAULT_ALLOC_BIO 0x000000010 (obsolete) > + FAULT_ALLOC_NID 0x000000020 > + FAULT_ORPHAN 0x000000040 > + FAULT_BLOCK 0x000000080 > + FAULT_DIR_DEPTH 0x000000100 > + FAULT_EVICT_INODE 0x000000200 > + FAULT_TRUNCATE 0x000000400 > + FAULT_READ_IO 0x000000800 > + FAULT_CHECKPOINT 0x000001000 > + FAULT_DISCARD 0x000002000 > + FAULT_WRITE_IO 0x000004000 > + FAULT_SLAB_ALLOC 0x000008000 > + FAULT_DQUOT_INIT 0x000010000 > + FAULT_LOCK_OP 0x000020000 > + FAULT_BLKADDR_VALIDITY 0x000040000 > + FAULT_BLKADDR_CONSISTENCE 0x000080000 > + =========================== =========== > > What: /sys/fs/f2fs/<disk>/discard_io_aware_gran > Date: January 2023 > diff --git a/Documentation/filesystems/f2fs.rst b/Documentation/filesystems/f2fs.rst > index d32c6209685d..32cbfa864f38 100644 > --- a/Documentation/filesystems/f2fs.rst > +++ b/Documentation/filesystems/f2fs.rst > @@ -184,29 +184,30 @@ fault_type=%d Support configuring fault injection type, should be > enabled with fault_injection option, fault type value > is shown below, it supports single or combined type. > > - =================== =========== > - Type_Name Type_Value > - =================== =========== > - FAULT_KMALLOC 0x000000001 > - FAULT_KVMALLOC 0x000000002 > - FAULT_PAGE_ALLOC 0x000000004 > - FAULT_PAGE_GET 0x000000008 > - FAULT_ALLOC_BIO 0x000000010 (obsolete) > - FAULT_ALLOC_NID 0x000000020 > - FAULT_ORPHAN 0x000000040 > - FAULT_BLOCK 0x000000080 > - FAULT_DIR_DEPTH 0x000000100 > - FAULT_EVICT_INODE 0x000000200 > - FAULT_TRUNCATE 0x000000400 > - FAULT_READ_IO 0x000000800 > - FAULT_CHECKPOINT 0x000001000 > - FAULT_DISCARD 0x000002000 > - FAULT_WRITE_IO 0x000004000 > - FAULT_SLAB_ALLOC 0x000008000 > - FAULT_DQUOT_INIT 0x000010000 > - FAULT_LOCK_OP 0x000020000 > - FAULT_BLKADDR 0x000040000 > - =================== =========== > + =========================== =========== > + Type_Name Type_Value > + =========================== =========== > + FAULT_KMALLOC 0x000000001 > + FAULT_KVMALLOC 0x000000002 > + FAULT_PAGE_ALLOC 0x000000004 > + FAULT_PAGE_GET 0x000000008 > + FAULT_ALLOC_BIO 0x000000010 (obsolete) > + FAULT_ALLOC_NID 0x000000020 > + FAULT_ORPHAN 0x000000040 > + FAULT_BLOCK 0x000000080 > + FAULT_DIR_DEPTH 0x000000100 > + FAULT_EVICT_INODE 0x000000200 > + FAULT_TRUNCATE 0x000000400 > + FAULT_READ_IO 0x000000800 > + FAULT_CHECKPOINT 0x000001000 > + FAULT_DISCARD 0x000002000 > + FAULT_WRITE_IO 0x000004000 > + FAULT_SLAB_ALLOC 0x000008000 > + FAULT_DQUOT_INIT 0x000010000 > + FAULT_LOCK_OP 0x000020000 > + FAULT_BLKADDR_VALIDITY 0x000040000 > + FAULT_BLKADDR_CONSISTENCE 0x000080000 > + =========================== =========== > mode=%s Control block allocation mode which supports "adaptive" > and "lfs". In "lfs" mode, there should be no random > writes towards main area. > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c > index b0597a539fc5..b85820e70f5e 100644 > --- a/fs/f2fs/checkpoint.c > +++ b/fs/f2fs/checkpoint.c > @@ -170,12 +170,9 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr, > return exist; > } > > -bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, > +static bool __f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, > block_t blkaddr, int type) > { > - if (time_to_inject(sbi, FAULT_BLKADDR)) > - return false; > - > switch (type) { > case META_NAT: > break; > @@ -230,6 +227,20 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, > return true; > } > > +bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, > + block_t blkaddr, int type) > +{ > + if (time_to_inject(sbi, FAULT_BLKADDR_VALIDITY)) > + return false; > + return __f2fs_is_valid_blkaddr(sbi, blkaddr, type); > +} > + > +bool f2fs_is_valid_blkaddr_raw(struct f2fs_sb_info *sbi, > + block_t blkaddr, int type) > +{ > + return __f2fs_is_valid_blkaddr(sbi, blkaddr, type); > +} > + > /* > * Readahead CP/NAT/SIT/SSA/POR pages > */ > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index ab710bb6d8b3..4481f68d6418 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -60,7 +60,8 @@ enum { > FAULT_SLAB_ALLOC, > FAULT_DQUOT_INIT, > FAULT_LOCK_OP, > - FAULT_BLKADDR, > + FAULT_BLKADDR_VALIDITY, > + FAULT_BLKADDR_CONSISTENCE, > FAULT_MAX, > }; > > @@ -3768,6 +3769,8 @@ struct page *f2fs_get_meta_page_retry(struct f2fs_sb_info *sbi, pgoff_t index); > struct page *f2fs_get_tmp_page(struct f2fs_sb_info *sbi, pgoff_t index); > bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, > block_t blkaddr, int type); > +bool f2fs_is_valid_blkaddr_raw(struct f2fs_sb_info *sbi, > + block_t blkaddr, int type); > int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, > int type, bool sync); > void f2fs_ra_meta_pages_cond(struct f2fs_sb_info *sbi, pgoff_t index, > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index 53c495651789..0e4c871d6aed 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -590,9 +590,13 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count) > f2fs_set_data_blkaddr(dn, NULL_ADDR); > > if (__is_valid_data_blkaddr(blkaddr)) { > - if (!f2fs_is_valid_blkaddr(sbi, blkaddr, > - DATA_GENERIC_ENHANCE)) > + if (time_to_inject(sbi, FAULT_BLKADDR_CONSISTENCE)) > + continue; > + if (!f2fs_is_valid_blkaddr_raw(sbi, blkaddr, > + DATA_GENERIC_ENHANCE)) { > + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); > continue; > + } > if (compressed_cluster) > valid_blocks++; > } > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index 206d03c82d96..4de5478972b2 100644 > --- a/fs/f2fs/super.c > +++ b/fs/f2fs/super.c > @@ -44,24 +44,25 @@ static struct kmem_cache *f2fs_inode_cachep; > #ifdef CONFIG_F2FS_FAULT_INJECTION > > const char *f2fs_fault_name[FAULT_MAX] = { > - [FAULT_KMALLOC] = "kmalloc", > - [FAULT_KVMALLOC] = "kvmalloc", > - [FAULT_PAGE_ALLOC] = "page alloc", > - [FAULT_PAGE_GET] = "page get", > - [FAULT_ALLOC_NID] = "alloc nid", > - [FAULT_ORPHAN] = "orphan", > - [FAULT_BLOCK] = "no more block", > - [FAULT_DIR_DEPTH] = "too big dir depth", > - [FAULT_EVICT_INODE] = "evict_inode fail", > - [FAULT_TRUNCATE] = "truncate fail", > - [FAULT_READ_IO] = "read IO error", > - [FAULT_CHECKPOINT] = "checkpoint error", > - [FAULT_DISCARD] = "discard error", > - [FAULT_WRITE_IO] = "write IO error", > - [FAULT_SLAB_ALLOC] = "slab alloc", > - [FAULT_DQUOT_INIT] = "dquot initialize", > - [FAULT_LOCK_OP] = "lock_op", > - [FAULT_BLKADDR] = "invalid blkaddr", > + [FAULT_KMALLOC] = "kmalloc", > + [FAULT_KVMALLOC] = "kvmalloc", > + [FAULT_PAGE_ALLOC] = "page alloc", > + [FAULT_PAGE_GET] = "page get", > + [FAULT_ALLOC_NID] = "alloc nid", > + [FAULT_ORPHAN] = "orphan", > + [FAULT_BLOCK] = "no more block", > + [FAULT_DIR_DEPTH] = "too big dir depth", > + [FAULT_EVICT_INODE] = "evict_inode fail", > + [FAULT_TRUNCATE] = "truncate fail", > + [FAULT_READ_IO] = "read IO error", > + [FAULT_CHECKPOINT] = "checkpoint error", > + [FAULT_DISCARD] = "discard error", > + [FAULT_WRITE_IO] = "write IO error", > + [FAULT_SLAB_ALLOC] = "slab alloc", > + [FAULT_DQUOT_INIT] = "dquot initialize", > + [FAULT_LOCK_OP] = "lock_op", > + [FAULT_BLKADDR_VALIDITY] = "invalid blkaddr", > + [FAULT_BLKADDR_CONSISTENCE] = "inconsistent blkaddr", > }; > > void f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned int rate, > -- > 2.40.1 > > > > _______________________________________________ > Linux-f2fs-devel mailing list > Linux-f2fs-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs index 99fa87a43926..48c135e24eb5 100644 --- a/Documentation/ABI/testing/sysfs-fs-f2fs +++ b/Documentation/ABI/testing/sysfs-fs-f2fs @@ -701,29 +701,30 @@ Description: Support configuring fault injection type, should be enabled with fault_injection option, fault type value is shown below, it supports single or combined type. - =================== =========== - Type_Name Type_Value - =================== =========== - FAULT_KMALLOC 0x000000001 - FAULT_KVMALLOC 0x000000002 - FAULT_PAGE_ALLOC 0x000000004 - FAULT_PAGE_GET 0x000000008 - FAULT_ALLOC_BIO 0x000000010 (obsolete) - FAULT_ALLOC_NID 0x000000020 - FAULT_ORPHAN 0x000000040 - FAULT_BLOCK 0x000000080 - FAULT_DIR_DEPTH 0x000000100 - FAULT_EVICT_INODE 0x000000200 - FAULT_TRUNCATE 0x000000400 - FAULT_READ_IO 0x000000800 - FAULT_CHECKPOINT 0x000001000 - FAULT_DISCARD 0x000002000 - FAULT_WRITE_IO 0x000004000 - FAULT_SLAB_ALLOC 0x000008000 - FAULT_DQUOT_INIT 0x000010000 - FAULT_LOCK_OP 0x000020000 - FAULT_BLKADDR 0x000040000 - =================== =========== + =========================== =========== + Type_Name Type_Value + =========================== =========== + FAULT_KMALLOC 0x000000001 + FAULT_KVMALLOC 0x000000002 + FAULT_PAGE_ALLOC 0x000000004 + FAULT_PAGE_GET 0x000000008 + FAULT_ALLOC_BIO 0x000000010 (obsolete) + FAULT_ALLOC_NID 0x000000020 + FAULT_ORPHAN 0x000000040 + FAULT_BLOCK 0x000000080 + FAULT_DIR_DEPTH 0x000000100 + FAULT_EVICT_INODE 0x000000200 + FAULT_TRUNCATE 0x000000400 + FAULT_READ_IO 0x000000800 + FAULT_CHECKPOINT 0x000001000 + FAULT_DISCARD 0x000002000 + FAULT_WRITE_IO 0x000004000 + FAULT_SLAB_ALLOC 0x000008000 + FAULT_DQUOT_INIT 0x000010000 + FAULT_LOCK_OP 0x000020000 + FAULT_BLKADDR_VALIDITY 0x000040000 + FAULT_BLKADDR_CONSISTENCE 0x000080000 + =========================== =========== What: /sys/fs/f2fs/<disk>/discard_io_aware_gran Date: January 2023 diff --git a/Documentation/filesystems/f2fs.rst b/Documentation/filesystems/f2fs.rst index d32c6209685d..32cbfa864f38 100644 --- a/Documentation/filesystems/f2fs.rst +++ b/Documentation/filesystems/f2fs.rst @@ -184,29 +184,30 @@ fault_type=%d Support configuring fault injection type, should be enabled with fault_injection option, fault type value is shown below, it supports single or combined type. - =================== =========== - Type_Name Type_Value - =================== =========== - FAULT_KMALLOC 0x000000001 - FAULT_KVMALLOC 0x000000002 - FAULT_PAGE_ALLOC 0x000000004 - FAULT_PAGE_GET 0x000000008 - FAULT_ALLOC_BIO 0x000000010 (obsolete) - FAULT_ALLOC_NID 0x000000020 - FAULT_ORPHAN 0x000000040 - FAULT_BLOCK 0x000000080 - FAULT_DIR_DEPTH 0x000000100 - FAULT_EVICT_INODE 0x000000200 - FAULT_TRUNCATE 0x000000400 - FAULT_READ_IO 0x000000800 - FAULT_CHECKPOINT 0x000001000 - FAULT_DISCARD 0x000002000 - FAULT_WRITE_IO 0x000004000 - FAULT_SLAB_ALLOC 0x000008000 - FAULT_DQUOT_INIT 0x000010000 - FAULT_LOCK_OP 0x000020000 - FAULT_BLKADDR 0x000040000 - =================== =========== + =========================== =========== + Type_Name Type_Value + =========================== =========== + FAULT_KMALLOC 0x000000001 + FAULT_KVMALLOC 0x000000002 + FAULT_PAGE_ALLOC 0x000000004 + FAULT_PAGE_GET 0x000000008 + FAULT_ALLOC_BIO 0x000000010 (obsolete) + FAULT_ALLOC_NID 0x000000020 + FAULT_ORPHAN 0x000000040 + FAULT_BLOCK 0x000000080 + FAULT_DIR_DEPTH 0x000000100 + FAULT_EVICT_INODE 0x000000200 + FAULT_TRUNCATE 0x000000400 + FAULT_READ_IO 0x000000800 + FAULT_CHECKPOINT 0x000001000 + FAULT_DISCARD 0x000002000 + FAULT_WRITE_IO 0x000004000 + FAULT_SLAB_ALLOC 0x000008000 + FAULT_DQUOT_INIT 0x000010000 + FAULT_LOCK_OP 0x000020000 + FAULT_BLKADDR_VALIDITY 0x000040000 + FAULT_BLKADDR_CONSISTENCE 0x000080000 + =========================== =========== mode=%s Control block allocation mode which supports "adaptive" and "lfs". In "lfs" mode, there should be no random writes towards main area. diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index b0597a539fc5..b85820e70f5e 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -170,12 +170,9 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr, return exist; } -bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, +static bool __f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr, int type) { - if (time_to_inject(sbi, FAULT_BLKADDR)) - return false; - switch (type) { case META_NAT: break; @@ -230,6 +227,20 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, return true; } +bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, + block_t blkaddr, int type) +{ + if (time_to_inject(sbi, FAULT_BLKADDR_VALIDITY)) + return false; + return __f2fs_is_valid_blkaddr(sbi, blkaddr, type); +} + +bool f2fs_is_valid_blkaddr_raw(struct f2fs_sb_info *sbi, + block_t blkaddr, int type) +{ + return __f2fs_is_valid_blkaddr(sbi, blkaddr, type); +} + /* * Readahead CP/NAT/SIT/SSA/POR pages */ diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index ab710bb6d8b3..4481f68d6418 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -60,7 +60,8 @@ enum { FAULT_SLAB_ALLOC, FAULT_DQUOT_INIT, FAULT_LOCK_OP, - FAULT_BLKADDR, + FAULT_BLKADDR_VALIDITY, + FAULT_BLKADDR_CONSISTENCE, FAULT_MAX, }; @@ -3768,6 +3769,8 @@ struct page *f2fs_get_meta_page_retry(struct f2fs_sb_info *sbi, pgoff_t index); struct page *f2fs_get_tmp_page(struct f2fs_sb_info *sbi, pgoff_t index); bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr, int type); +bool f2fs_is_valid_blkaddr_raw(struct f2fs_sb_info *sbi, + block_t blkaddr, int type); int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, int type, bool sync); void f2fs_ra_meta_pages_cond(struct f2fs_sb_info *sbi, pgoff_t index, diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 53c495651789..0e4c871d6aed 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -590,9 +590,13 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count) f2fs_set_data_blkaddr(dn, NULL_ADDR); if (__is_valid_data_blkaddr(blkaddr)) { - if (!f2fs_is_valid_blkaddr(sbi, blkaddr, - DATA_GENERIC_ENHANCE)) + if (time_to_inject(sbi, FAULT_BLKADDR_CONSISTENCE)) + continue; + if (!f2fs_is_valid_blkaddr_raw(sbi, blkaddr, + DATA_GENERIC_ENHANCE)) { + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); continue; + } if (compressed_cluster) valid_blocks++; } diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 206d03c82d96..4de5478972b2 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -44,24 +44,25 @@ static struct kmem_cache *f2fs_inode_cachep; #ifdef CONFIG_F2FS_FAULT_INJECTION const char *f2fs_fault_name[FAULT_MAX] = { - [FAULT_KMALLOC] = "kmalloc", - [FAULT_KVMALLOC] = "kvmalloc", - [FAULT_PAGE_ALLOC] = "page alloc", - [FAULT_PAGE_GET] = "page get", - [FAULT_ALLOC_NID] = "alloc nid", - [FAULT_ORPHAN] = "orphan", - [FAULT_BLOCK] = "no more block", - [FAULT_DIR_DEPTH] = "too big dir depth", - [FAULT_EVICT_INODE] = "evict_inode fail", - [FAULT_TRUNCATE] = "truncate fail", - [FAULT_READ_IO] = "read IO error", - [FAULT_CHECKPOINT] = "checkpoint error", - [FAULT_DISCARD] = "discard error", - [FAULT_WRITE_IO] = "write IO error", - [FAULT_SLAB_ALLOC] = "slab alloc", - [FAULT_DQUOT_INIT] = "dquot initialize", - [FAULT_LOCK_OP] = "lock_op", - [FAULT_BLKADDR] = "invalid blkaddr", + [FAULT_KMALLOC] = "kmalloc", + [FAULT_KVMALLOC] = "kvmalloc", + [FAULT_PAGE_ALLOC] = "page alloc", + [FAULT_PAGE_GET] = "page get", + [FAULT_ALLOC_NID] = "alloc nid", + [FAULT_ORPHAN] = "orphan", + [FAULT_BLOCK] = "no more block", + [FAULT_DIR_DEPTH] = "too big dir depth", + [FAULT_EVICT_INODE] = "evict_inode fail", + [FAULT_TRUNCATE] = "truncate fail", + [FAULT_READ_IO] = "read IO error", + [FAULT_CHECKPOINT] = "checkpoint error", + [FAULT_DISCARD] = "discard error", + [FAULT_WRITE_IO] = "write IO error", + [FAULT_SLAB_ALLOC] = "slab alloc", + [FAULT_DQUOT_INIT] = "dquot initialize", + [FAULT_LOCK_OP] = "lock_op", + [FAULT_BLKADDR_VALIDITY] = "invalid blkaddr", + [FAULT_BLKADDR_CONSISTENCE] = "inconsistent blkaddr", }; void f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned int rate,
We will encounter below inconsistent status when FAULT_BLKADDR type fault injection is on. Info: checkpoint state = d6 : nat_bits crc fsck compacted_summary orphan_inodes sudden-power-off [ASSERT] (fsck_chk_inode_blk:1254) --> ino: 0x1c100 has i_blocks: 000000c0, but has 191 blocks [FIX] (fsck_chk_inode_blk:1260) --> [0x1c100] i_blocks=0x000000c0 -> 0xbf [FIX] (fsck_chk_inode_blk:1269) --> [0x1c100] i_compr_blocks=0x00000026 -> 0x27 [ASSERT] (fsck_chk_inode_blk:1254) --> ino: 0x1cadb has i_blocks: 0000002f, but has 46 blocks [FIX] (fsck_chk_inode_blk:1260) --> [0x1cadb] i_blocks=0x0000002f -> 0x2e [FIX] (fsck_chk_inode_blk:1269) --> [0x1cadb] i_compr_blocks=0x00000011 -> 0x12 [ASSERT] (fsck_chk_inode_blk:1254) --> ino: 0x1c62c has i_blocks: 00000002, but has 1 blocks [FIX] (fsck_chk_inode_blk:1260) --> [0x1c62c] i_blocks=0x00000002 -> 0x1 After we inject fault into f2fs_is_valid_blkaddr() during truncation, a) it missed to increase @nr_free or @valid_blocks b) it can cause in blkaddr leak in truncated dnode Which may cause inconsistent status. This patch separates FAULT_BLKADDR_CONSISTENCE from FAULT_BLKADDR, and rename FAULT_BLKADDR to FAULT_BLKADDR_VALIDITY so that we can: a) use FAULT_BLKADDR_CONSISTENCE in f2fs_truncate_data_blocks_range() to simulate inconsistent issue independently, then it can verify fsck repair flow. b) FAULT_BLKADDR_VALIDITY fault will not cause any inconsistent status, we can just use it to check error path handling in kernel side. Signed-off-by: Chao Yu <chao@kernel.org> --- v4: - rename macro to FAULT_BLKADDR_CONSISTENCE and FAULT_BLKADDR_VALIDITY suggested by Jaegeuk. Documentation/ABI/testing/sysfs-fs-f2fs | 47 +++++++++++++------------ Documentation/filesystems/f2fs.rst | 47 +++++++++++++------------ fs/f2fs/checkpoint.c | 19 +++++++--- fs/f2fs/f2fs.h | 5 ++- fs/f2fs/file.c | 8 +++-- fs/f2fs/super.c | 37 +++++++++---------- 6 files changed, 92 insertions(+), 71 deletions(-)