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

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

f2fs: show simple call stack in fault injection message 



Previously kernel message can show that in which function we do the
injection, but unfortunately, most of the caller are the same, for
tracking more information of injection path, it needs to show upper
caller's name. This patch supports that ability.

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

fs/f2fs/checkpoint.c

+1 −0
Original line number Diff line number Diff line
@@ -494,6 +494,7 @@ int acquire_orphan_inode(struct f2fs_sb_info *sbi) 
#ifdef CONFIG_F2FS_FAULT_INJECTION

	if (time_to_inject(sbi, FAULT_ORPHAN)) {

		spin_unlock(&im->ino_lock);

		f2fs_show_injection_info(FAULT_ORPHAN);

		return -ENOSPC;

	}

#endif

fs/f2fs/data.c

+3 −1
Original line number Diff line number Diff line
@@ -55,8 +55,10 @@ static void f2fs_read_end_io(struct bio *bio) 
	int i;



#ifdef CONFIG_F2FS_FAULT_INJECTION

	if (time_to_inject(F2FS_P_SB(bio->bi_io_vec->bv_page), FAULT_IO))

	if (time_to_inject(F2FS_P_SB(bio->bi_io_vec->bv_page), FAULT_IO)) {

		f2fs_show_injection_info(FAULT_IO);

		bio->bi_error = -EIO;

	}

#endif



	if (f2fs_bio_encrypted(bio)) {

fs/f2fs/dir.c

+3 −1
Original line number Diff line number Diff line
@@ -549,8 +549,10 @@ int f2fs_add_regular_entry(struct inode *dir, const struct qstr *new_name, 


start:

#ifdef CONFIG_F2FS_FAULT_INJECTION

	if (time_to_inject(F2FS_I_SB(dir), FAULT_DIR_DEPTH))

	if (time_to_inject(F2FS_I_SB(dir), FAULT_DIR_DEPTH)) {

		f2fs_show_injection_info(FAULT_DIR_DEPTH);

		return -ENOSPC;

	}

#endif

	if (unlikely(current_depth == MAX_DIR_HASH_DEPTH))

		return -ENOSPC;

fs/f2fs/f2fs.h

+13 −7
Original line number Diff line number Diff line
@@ -952,6 +952,10 @@ struct f2fs_sb_info { 
};



#ifdef CONFIG_F2FS_FAULT_INJECTION

#define f2fs_show_injection_info(type)				\

	printk("%sF2FS-fs : inject %s in %s of %pF\n",		\

		KERN_INFO, fault_name[type],			\

		__func__, __builtin_return_address(0))

static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type)

{

	struct f2fs_fault_info *ffi = &sbi->fault_info;
@@ -965,10 +969,6 @@ static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type) 
	atomic_inc(&ffi->inject_ops);

	if (atomic_read(&ffi->inject_ops) >= ffi->inject_rate) {

		atomic_set(&ffi->inject_ops, 0);

		printk("%sF2FS-fs : inject %s in %pF\n",

				KERN_INFO,

				fault_name[type],

				__builtin_return_address(0));

		return true;

	}

	return false;
@@ -1277,8 +1277,10 @@ static inline bool inc_valid_block_count(struct f2fs_sb_info *sbi, 
	blkcnt_t diff;



#ifdef CONFIG_F2FS_FAULT_INJECTION

	if (time_to_inject(sbi, FAULT_BLOCK))

	if (time_to_inject(sbi, FAULT_BLOCK)) {

		f2fs_show_injection_info(FAULT_BLOCK);

		return false;

	}

#endif

	/*

	 * let's increase this in prior to actual block count change in order
@@ -1518,8 +1520,10 @@ static inline struct page *f2fs_grab_cache_page(struct address_space *mapping, 
	if (page)

		return page;



	if (time_to_inject(F2FS_M_SB(mapping), FAULT_PAGE_ALLOC))

	if (time_to_inject(F2FS_M_SB(mapping), FAULT_PAGE_ALLOC)) {

		f2fs_show_injection_info(FAULT_PAGE_ALLOC);

		return NULL;

	}

#endif

	if (!for_write)

		return grab_cache_page(mapping, index);
@@ -1995,8 +1999,10 @@ static inline void *f2fs_kmalloc(struct f2fs_sb_info *sbi, 
					size_t size, gfp_t flags)

{

#ifdef CONFIG_F2FS_FAULT_INJECTION

	if (time_to_inject(sbi, FAULT_KMALLOC))

	if (time_to_inject(sbi, FAULT_KMALLOC)) {

		f2fs_show_injection_info(FAULT_KMALLOC);

		return NULL;

	}

#endif

	return kmalloc(size, flags);

}

fs/f2fs/gc.c

+3 −1
Original line number Diff line number Diff line
@@ -48,8 +48,10 @@ static int gc_thread_func(void *data) 
		}



#ifdef CONFIG_F2FS_FAULT_INJECTION

		if (time_to_inject(sbi, FAULT_CHECKPOINT))

		if (time_to_inject(sbi, FAULT_CHECKPOINT)) {

			f2fs_show_injection_info(FAULT_CHECKPOINT);

			f2fs_stop_checkpoint(sbi, false);

		}

#endif



		/*