Commit ffc2cf1c authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdevperf: Three Cleanups for bdevperf_construct_target() 



Firstly, change unmap suppor and I/O size checks to do once per
bdev.  It is enough to check if unmap is supported and check if
I/O size is multiple of data block size once per bdev.  Hence move
these checks from bdevperf_construct_target() to
_bdevperf_construct_targets().

Secondly, use calloc() to remove unnecessary zeroings in
bdevperf_construct_target().

Thirdly, factor out getting next io_target_group from
bdevperf_construct_target().  This is a preparation to make
bdevperf_construct_target() asynchronous by using
spdk_for_each_channel().

These may be better to break-up but these are already included in
the long patch series.   So to reduce the burden of reviewers,
squash these into a single patch.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I2cb94c8aa2b6b1a1b9e9a04da533e1fd093f8f29
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/640


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent ba9ce365

test/bdev/bdevperf/bdevperf.c

+32 −29
Original line number Diff line number Diff line
@@ -990,19 +990,13 @@ bdevperf_target_gone(void *arg) 
}



static int

bdevperf_construct_target(struct spdk_bdev *bdev)

bdevperf_construct_target(struct spdk_bdev *bdev, struct io_target_group *group)

{

	struct io_target_group *group;

	struct io_target *target;

	int block_size, data_block_size;

	int rc;



	if (g_unmap && !spdk_bdev_io_type_supported(bdev, SPDK_BDEV_IO_TYPE_UNMAP)) {

		printf("Skipping %s because it does not support unmap\n", spdk_bdev_get_name(bdev));

		return 0;

	}



	target = malloc(sizeof(struct io_target));

	target = calloc(1, sizeof(struct io_target));

	if (!target) {

		fprintf(stderr, "Unable to allocate memory for new target.\n");

		return -ENOMEM;
@@ -1024,25 +1018,13 @@ bdevperf_construct_target(struct spdk_bdev *bdev) 
	}



	target->bdev = bdev;

	target->io_completed = 0;

	target->current_queue_depth = 0;

	target->offset_in_ios = 0;



	block_size = spdk_bdev_get_block_size(bdev);

	data_block_size = spdk_bdev_get_data_block_size(bdev);

	target->io_size_blocks = g_io_size / data_block_size;

	if ((g_io_size % data_block_size) != 0) {

		SPDK_ERRLOG("IO size (%d) is not multiples of data block size of bdev %s (%"PRIu32")\n",

			    g_io_size, spdk_bdev_get_name(bdev), data_block_size);

		spdk_bdev_close(target->bdev_desc);

		free(target->name);

		free(target);

		return 0;

	}



	target->buf_size = target->io_size_blocks * block_size;



	target->dif_check_flags = 0;

	if (spdk_bdev_is_dif_check_enabled(bdev, SPDK_DIF_CHECK_TYPE_REFTAG)) {

		target->dif_check_flags |= SPDK_DIF_FLAGS_REFTAG_CHECK;

	}
@@ -1052,31 +1034,51 @@ bdevperf_construct_target(struct spdk_bdev *bdev) 


	target->size_in_ios = spdk_bdev_get_num_blocks(bdev) / target->io_size_blocks;



	target->is_draining = false;

	target->run_timer = NULL;

	target->reset_timer = NULL;

	TAILQ_INIT(&target->task_list);



	/* Mapping each created target to target group */

	target->group = group;

	TAILQ_INSERT_TAIL(&group->targets, target, link);

	g_target_count++;



	return 0;

}



static struct io_target_group *

get_next_io_target_group(void)

{

	struct io_target_group *group;



	if (g_next_tg == NULL) {

		g_next_tg = TAILQ_FIRST(&g_bdevperf.groups);

		assert(g_next_tg != NULL);

	}



	group = g_next_tg;

	g_next_tg = TAILQ_NEXT(g_next_tg, link);

	target->group = group;

	TAILQ_INSERT_TAIL(&group->targets, target, link);

	g_target_count++;



	return 0;

	return group;

}



static void

_bdevperf_construct_targets(struct spdk_bdev *bdev)

{

	uint32_t data_block_size;

	uint8_t core_idx, core_count_for_each_bdev;

	struct io_target_group *group;

	int rc;



	if (g_unmap && !spdk_bdev_io_type_supported(bdev, SPDK_BDEV_IO_TYPE_UNMAP)) {

		printf("Skipping %s because it does not support unmap\n", spdk_bdev_get_name(bdev));

		return;

	}



	data_block_size = spdk_bdev_get_data_block_size(bdev);

	if ((g_io_size % data_block_size) != 0) {

		SPDK_ERRLOG("IO size (%d) is not multiples of data block size of bdev %s (%"PRIu32")\n",

			    g_io_size, spdk_bdev_get_name(bdev), data_block_size);

		return;

	}



	if (g_every_core_for_each_bdev == false) {

		core_count_for_each_bdev = 1;

	} else {
@@ -1084,7 +1086,8 @@ _bdevperf_construct_targets(struct spdk_bdev *bdev) 
	}



	for (core_idx = 0; core_idx < core_count_for_each_bdev; core_idx++) {

		rc = bdevperf_construct_target(bdev);

		group = get_next_io_target_group();

		rc = bdevperf_construct_target(bdev, group);

		if (rc != 0) {

			return;

		}