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

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

f2fs: split IO error injection according to RW 



This patch adds to support injecting error for write IO, this can simulate
IO error like fail_make_request or dm_flakey does.

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

Documentation/filesystems/f2fs.txt

+2 −1
Original line number Diff line number Diff line
@@ -171,9 +171,10 @@ fault_type=%d Support configuring fault injection type, should be 
                       FAULT_DIR_DEPTH		0x000000100

                       FAULT_EVICT_INODE	0x000000200

                       FAULT_TRUNCATE		0x000000400

                       FAULT_IO			0x000000800

                       FAULT_READ_IO		0x000000800

                       FAULT_CHECKPOINT		0x000001000

                       FAULT_DISCARD		0x000002000

                       FAULT_WRITE_IO		0x000004000

mode=%s                Control block allocation mode which supports "adaptive"

                       and "lfs". In "lfs" mode, there should be no random

                       writes towards main area.

fs/f2fs/data.c

+7 −2
Original line number Diff line number Diff line
@@ -122,8 +122,8 @@ static bool f2fs_bio_post_read_required(struct bio *bio) 


static void f2fs_read_end_io(struct bio *bio)

{

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

		f2fs_show_injection_info(FAULT_IO);

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

		f2fs_show_injection_info(FAULT_READ_IO);

		bio->bi_error = -EIO;

	}
@@ -144,6 +144,11 @@ static void f2fs_write_end_io(struct bio *bio) 
	struct bio_vec *bvec;

	int i;



	if (time_to_inject(sbi, FAULT_WRITE_IO)) {

		f2fs_show_injection_info(FAULT_WRITE_IO);

		bio->bi_error = -EIO;

	}



	bio_for_each_segment_all(bvec, bio, i) {

		struct page *page = bvec->bv_page;

		enum count_type type = WB_DATA_TYPE(page);

fs/f2fs/f2fs.h

+2 −1
Original line number Diff line number Diff line
@@ -52,9 +52,10 @@ enum { 
	FAULT_DIR_DEPTH,

	FAULT_EVICT_INODE,

	FAULT_TRUNCATE,

	FAULT_IO,

	FAULT_READ_IO,

	FAULT_CHECKPOINT,

	FAULT_DISCARD,

	FAULT_WRITE_IO,

	FAULT_MAX,

};

fs/f2fs/super.c

+2 −1
Original line number Diff line number Diff line
@@ -50,9 +50,10 @@ char *f2fs_fault_name[FAULT_MAX] = { 
	[FAULT_DIR_DEPTH]	= "too big dir depth",

	[FAULT_EVICT_INODE]	= "evict_inode fail",

	[FAULT_TRUNCATE]	= "truncate fail",

	[FAULT_IO]		= "IO error",

	[FAULT_READ_IO]		= "read IO error",

	[FAULT_CHECKPOINT]	= "checkpoint error",

	[FAULT_DISCARD]		= "discard error",

	[FAULT_WRITE_IO]	= "write IO error",

};



void f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned int rate,