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

Commit 60d44df6 authored by Dolev Raviv's avatar Dolev Raviv Committed by Matt Wagantall
Browse files

scsi: ufs: add support for test specific completion check 



Introduce a new callback 'check_test_completion_fn' to test-iosched
framework. This callback is necessary to determine if a test has
completed or not in situation where the request queue is empty, but the
test was not completed.

Change-Id: I60bd8cccffacab11a5a7cba78caccf53fea3e1d8
Signed-off-by: default avatarDolev Raviv <draviv@codeaurora.org>
parent cd112409

block/test-iosched.c

+4 −0
Original line number Diff line number Diff line
@@ -84,6 +84,10 @@ void check_test_completion(void) 
	if (!ptd)

		goto exit;



	if (ptd->test_info.check_test_completion_fn &&

		!ptd->test_info.check_test_completion_fn())

		goto exit;



	list_for_each_entry(test_rq, &ptd->dispatched_queue, queuelist)

		if (!test_rq->req_completed)

			goto exit;

drivers/scsi/ufs/ufs_test.c

+13 −16
Original line number Diff line number Diff line
@@ -181,20 +181,6 @@ static void ufs_test_pseudo_rnd_size(unsigned int *seed, 
		*num_of_bios = DEFAULT_NUM_OF_BIOS;

}



static void ufs_test_write_read_test_end_io_fn(struct request *rq, int err)

{

	struct test_request *test_rq = (struct test_request *)rq->elv.priv[0];

	BUG_ON(!test_rq);



	test_pr_info("%s: request %d completed, err=%d",

			__func__, test_rq->req_id, err);

	test_rq->req_completed = 1;

	test_rq->req_result = err;



	utd->write_completed = true;

	wake_up(&utd->wait_q);

}



static int ufs_test_show(struct seq_file *file, int test_case)

{

	char *test_description;
@@ -262,6 +248,16 @@ exit: 
	return gd;

}



static bool ufs_write_read_completion(void)

{

	if (!utd->write_completed) {

		utd->write_completed = true;

		wake_up(&utd->wait_q);

		return false;

	}

	return true;

}



static int ufs_test_run_write_read_test(struct test_data *td)

{

	int ret = 0;
@@ -284,8 +280,7 @@ static int ufs_test_run_write_read_test(struct test_data *td) 


	utd->write_completed = false;

	ret = test_iosched_add_wr_rd_test_req(0, WRITE, start_sec, num_bios,

					TEST_PATTERN_5A,

					ufs_test_write_read_test_end_io_fn);

						TEST_PATTERN_5A, NULL);



	if (ret) {

		test_pr_err("%s: failed to add a write request", __func__);
@@ -456,6 +451,8 @@ static ssize_t ufs_test_write(struct file *file, const char __user *buf, 
	switch (test_case) {

	case UFS_TEST_WRITE_READ_TEST:

		utd->test_info.run_test_fn = ufs_test_run_write_read_test;

		utd->test_info.check_test_completion_fn =

				ufs_write_read_completion;

		break;

	case UFS_TEST_LONG_SEQUENTIAL_READ:

	case UFS_TEST_LONG_SEQUENTIAL_WRITE:

include/linux/test-iosched.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ typedef char* (get_test_case_str_fn) (struct test_data *); 
typedef void (blk_dev_test_init_fn) (void);

typedef void (blk_dev_test_exit_fn) (void);

typedef struct gendisk* (get_rq_disk_fn) (void);

typedef bool (check_test_completion_fn) (void);



/**

 * enum test_state - defines the state of the test
@@ -146,6 +147,7 @@ struct test_info { 
	get_test_case_str_fn *get_test_case_str_fn;

	ktime_t test_duration;

	get_rq_disk_fn *get_rq_disk_fn;

	check_test_completion_fn *check_test_completion_fn;

	void *data;

	unsigned long test_byte_count;

};