Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c72d9db authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: inject fault to kvmalloc 



This patch supports to inject fault into kvmalloc/kvzalloc.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent fc42fc2c

fs/f2fs/f2fs.h

+19 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#ifdef CONFIG_F2FS_FAULT_INJECTION

enum {

	FAULT_KMALLOC,

	FAULT_KVMALLOC,

	FAULT_PAGE_ALLOC,

	FAULT_PAGE_GET,

	FAULT_ALLOC_BIO,
@@ -2553,6 +2554,24 @@ static inline void *f2fs_kzalloc(struct f2fs_sb_info *sbi, 
	return f2fs_kmalloc(sbi, size, flags | __GFP_ZERO);

}



static inline void *f2fs_kvmalloc(struct f2fs_sb_info *sbi,

					size_t size, gfp_t flags)

{

#ifdef CONFIG_F2FS_FAULT_INJECTION

	if (time_to_inject(sbi, FAULT_KVMALLOC)) {

		f2fs_show_injection_info(FAULT_KVMALLOC);

		return NULL;

	}

#endif

	return kvmalloc(size, flags);

}



static inline void *f2fs_kvzalloc(struct f2fs_sb_info *sbi,

					size_t size, gfp_t flags)

{

	return f2fs_kvmalloc(sbi, size, flags | __GFP_ZERO);

}



static inline int get_extra_isize(struct inode *inode)

{

	return F2FS_I(inode)->i_extra_isize / sizeof(__le32);

fs/f2fs/file.c

+4 −2
Original line number Diff line number Diff line
@@ -1081,11 +1081,13 @@ static int __exchange_data_block(struct inode *src_inode, 
	while (len) {

		olen = min((pgoff_t)4 * ADDRS_PER_BLOCK, len);



		src_blkaddr = kvzalloc(sizeof(block_t) * olen, GFP_KERNEL);

		src_blkaddr = f2fs_kvzalloc(F2FS_I_SB(src_inode),

					sizeof(block_t) * olen, GFP_KERNEL);

		if (!src_blkaddr)

			return -ENOMEM;



		do_replace = kvzalloc(sizeof(int) * olen, GFP_KERNEL);

		do_replace = f2fs_kvzalloc(F2FS_I_SB(src_inode),

					sizeof(int) * olen, GFP_KERNEL);

		if (!do_replace) {

			kvfree(src_blkaddr);

			return -ENOMEM;

fs/f2fs/node.c

+3 −3
Original line number Diff line number Diff line
@@ -2730,17 +2730,17 @@ static int init_free_nid_cache(struct f2fs_sb_info *sbi) 
{

	struct f2fs_nm_info *nm_i = NM_I(sbi);



	nm_i->free_nid_bitmap = kvzalloc(nm_i->nat_blocks *

	nm_i->free_nid_bitmap = f2fs_kvzalloc(sbi, nm_i->nat_blocks *

					NAT_ENTRY_BITMAP_SIZE, GFP_KERNEL);

	if (!nm_i->free_nid_bitmap)

		return -ENOMEM;



	nm_i->nat_block_bitmap = kvzalloc(nm_i->nat_blocks / 8,

	nm_i->nat_block_bitmap = f2fs_kvzalloc(sbi, nm_i->nat_blocks / 8,

								GFP_KERNEL);

	if (!nm_i->nat_block_bitmap)

		return -ENOMEM;



	nm_i->free_nid_count = kvzalloc(nm_i->nat_blocks *

	nm_i->free_nid_count = f2fs_kvzalloc(sbi, nm_i->nat_blocks *

					sizeof(unsigned short), GFP_KERNEL);

	if (!nm_i->free_nid_count)

		return -ENOMEM;

fs/f2fs/segment.c

+9 −7
Original line number Diff line number Diff line
@@ -3427,13 +3427,14 @@ static int build_sit_info(struct f2fs_sb_info *sbi) 


	SM_I(sbi)->sit_info = sit_i;



	sit_i->sentries = kvzalloc(MAIN_SEGS(sbi) *

	sit_i->sentries = f2fs_kvzalloc(sbi, MAIN_SEGS(sbi) *

					sizeof(struct seg_entry), GFP_KERNEL);

	if (!sit_i->sentries)

		return -ENOMEM;



	bitmap_size = f2fs_bitmap_size(MAIN_SEGS(sbi));

	sit_i->dirty_sentries_bitmap = kvzalloc(bitmap_size, GFP_KERNEL);

	sit_i->dirty_sentries_bitmap = f2fs_kvzalloc(sbi, bitmap_size,

								GFP_KERNEL);

	if (!sit_i->dirty_sentries_bitmap)

		return -ENOMEM;
@@ -3467,7 +3468,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi) 
		return -ENOMEM;



	if (sbi->segs_per_sec > 1) {

		sit_i->sec_entries = kvzalloc(MAIN_SECS(sbi) *

		sit_i->sec_entries = f2fs_kvzalloc(sbi, MAIN_SECS(sbi) *

					sizeof(struct sec_entry), GFP_KERNEL);

		if (!sit_i->sec_entries)

			return -ENOMEM;
@@ -3518,12 +3519,12 @@ static int build_free_segmap(struct f2fs_sb_info *sbi) 
	SM_I(sbi)->free_info = free_i;



	bitmap_size = f2fs_bitmap_size(MAIN_SEGS(sbi));

	free_i->free_segmap = kvmalloc(bitmap_size, GFP_KERNEL);

	free_i->free_segmap = f2fs_kvmalloc(sbi, bitmap_size, GFP_KERNEL);

	if (!free_i->free_segmap)

		return -ENOMEM;



	sec_bitmap_size = f2fs_bitmap_size(MAIN_SECS(sbi));

	free_i->free_secmap = kvmalloc(sec_bitmap_size, GFP_KERNEL);

	free_i->free_secmap = f2fs_kvmalloc(sbi, sec_bitmap_size, GFP_KERNEL);

	if (!free_i->free_secmap)

		return -ENOMEM;
@@ -3703,7 +3704,7 @@ static int init_victim_secmap(struct f2fs_sb_info *sbi) 
	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi);

	unsigned int bitmap_size = f2fs_bitmap_size(MAIN_SECS(sbi));



	dirty_i->victim_secmap = kvzalloc(bitmap_size, GFP_KERNEL);

	dirty_i->victim_secmap = f2fs_kvzalloc(sbi, bitmap_size, GFP_KERNEL);

	if (!dirty_i->victim_secmap)

		return -ENOMEM;

	return 0;
@@ -3726,7 +3727,8 @@ static int build_dirty_segmap(struct f2fs_sb_info *sbi) 
	bitmap_size = f2fs_bitmap_size(MAIN_SEGS(sbi));



	for (i = 0; i < NR_DIRTY_TYPE; i++) {

		dirty_i->dirty_segmap[i] = kvzalloc(bitmap_size, GFP_KERNEL);

		dirty_i->dirty_segmap[i] = f2fs_kvzalloc(sbi, bitmap_size,

								GFP_KERNEL);

		if (!dirty_i->dirty_segmap[i])

			return -ENOMEM;

	}

fs/f2fs/super.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static struct kmem_cache *f2fs_inode_cachep; 


char *fault_name[FAULT_MAX] = {

	[FAULT_KMALLOC]		= "kmalloc",

	[FAULT_KVMALLOC]	= "kvmalloc",

	[FAULT_PAGE_ALLOC]	= "page alloc",

	[FAULT_PAGE_GET]	= "page get",

	[FAULT_ALLOC_BIO]	= "alloc bio",