ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/bdevio: consolidate IO valid check into a function

Browse Source 
Change-Id: Ib99d6a558e74c3cdc2d12da9a6bcf9b4181de250
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2904
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Changpeng Liu 2020-06-15 20:37:20 -04:00 committed by Tomasz Zawadzki
parent 0aca4d91e8
commit c19fcb00d0
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/bdev/bdevio/bdevio.c
View File

@ -415,6 +415,17 @@ blockdev_write_read_data_match(char *rx_buf, char *tx_buf, int data_length)
return rc; 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 static void
blockdev_write_read(uint32_t data_length, uint32_t iov_len, int pattern, uint64_t offset, blockdev_write_read(uint32_t data_length, uint32_t iov_len, int pattern, uint64_t offset,
int expected_rc, bool write_zeroes) 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; target = g_current_io_target;
if (data_length < spdk_bdev_get_block_size(target->bdev) || if (!blockdev_io_valid_blocks(target->bdev, data_length)) {
data_length / spdk_bdev_get_block_size(target->bdev) > spdk_bdev_get_num_blocks(target->bdev)) {
return; 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; target = g_current_io_target;
if (data_length < spdk_bdev_get_block_size(target->bdev) || if (!blockdev_io_valid_blocks(target->bdev, data_length)) {
data_length / spdk_bdev_get_block_size(target->bdev) > spdk_bdev_get_num_blocks(target->bdev)) {
return; return;
} }