Commit c19fcb00 authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

test/bdevio: consolidate IO valid check into a function 



Change-Id: Ib99d6a558e74c3cdc2d12da9a6bcf9b4181de250
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2904


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 0aca4d91

test/bdev/bdevio/bdevio.c

+13 −4
Original line number Diff line number Diff line
@@ -415,6 +415,17 @@ blockdev_write_read_data_match(char *rx_buf, char *tx_buf, int data_length) 
	return rc;

}



static bool

blockdev_io_valid_blocks(struct spdk_bdev *bdev, uint64_t data_length)

{

	if (data_length < spdk_bdev_get_block_size(bdev) ||

	    data_length / spdk_bdev_get_block_size(bdev) > spdk_bdev_get_num_blocks(bdev)) {

		return false;

	}



	return true;

}



static void

blockdev_write_read(uint32_t data_length, uint32_t iov_len, int pattern, uint64_t offset,

		    int expected_rc, bool write_zeroes)
@@ -426,8 +437,7 @@ blockdev_write_read(uint32_t data_length, uint32_t iov_len, int pattern, uint64_ 


	target = g_current_io_target;



	if (data_length < spdk_bdev_get_block_size(target->bdev) ||

	    data_length / spdk_bdev_get_block_size(target->bdev) > spdk_bdev_get_num_blocks(target->bdev)) {

	if (!blockdev_io_valid_blocks(target->bdev, data_length)) {

		return;

	}
@@ -476,8 +486,7 @@ blockdev_compare_and_write(uint32_t data_length, uint32_t iov_len, uint64_t offs 


	target = g_current_io_target;



	if (data_length < spdk_bdev_get_block_size(target->bdev) ||

	    data_length / spdk_bdev_get_block_size(target->bdev) > spdk_bdev_get_num_blocks(target->bdev)) {

	if (!blockdev_io_valid_blocks(target->bdev, data_length)) {

		return;

	}