Commit 557f022f authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Konrad Sztyber
Browse files

bdev: Change 1st parameter of bdev_bytes_to_blocks from bdev to desc 



The following patches will add option to spdk_bdev_desc and it will
affect block size. As a preparation, change the first parameter of
bdev_bytes_to_blocks from bdev pointer to desc pointer.

Even before this patch, the caller used spdk_bdev_desc_get_bdev()
as a function parameter. Hence, this is a good clean up.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I4b84351bce13b109c17b5477e2711ed632208178
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24628


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent c0b2ac5c

lib/bdev/bdev.c

+10 −16
Original line number Diff line number Diff line
@@ -5286,9 +5286,10 @@ spdk_bdev_notify_blockcnt_change(struct spdk_bdev *bdev, uint64_t size) 
 * Returns zero on success or non-zero if the byte parameters aren't divisible by the block size.

 */

static uint64_t

bdev_bytes_to_blocks(struct spdk_bdev *bdev, uint64_t offset_bytes, uint64_t *offset_blocks,

		     uint64_t num_bytes, uint64_t *num_blocks)

bdev_bytes_to_blocks(struct spdk_bdev_desc *desc, uint64_t offset_bytes,

		     uint64_t *offset_blocks, uint64_t num_bytes, uint64_t *num_blocks)

{

	struct spdk_bdev *bdev = spdk_bdev_desc_get_bdev(desc);

	uint32_t block_size = bdev->blocklen;

	uint8_t shift_cnt;
@@ -5446,8 +5447,7 @@ spdk_bdev_read(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 
{

	uint64_t offset_blocks, num_blocks;



	if (bdev_bytes_to_blocks(spdk_bdev_desc_get_bdev(desc), offset, &offset_blocks,

				 nbytes, &num_blocks) != 0) {

	if (bdev_bytes_to_blocks(desc, offset, &offset_blocks, nbytes, &num_blocks) != 0) {

		return -EINVAL;

	}
@@ -5491,8 +5491,7 @@ spdk_bdev_readv(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 
{

	uint64_t offset_blocks, num_blocks;



	if (bdev_bytes_to_blocks(spdk_bdev_desc_get_bdev(desc), offset, &offset_blocks,

				 nbytes, &num_blocks) != 0) {

	if (bdev_bytes_to_blocks(desc, offset, &offset_blocks, nbytes, &num_blocks) != 0) {

		return -EINVAL;

	}
@@ -5690,8 +5689,7 @@ spdk_bdev_write(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 
{

	uint64_t offset_blocks, num_blocks;



	if (bdev_bytes_to_blocks(spdk_bdev_desc_get_bdev(desc), offset, &offset_blocks,

				 nbytes, &num_blocks) != 0) {

	if (bdev_bytes_to_blocks(desc, offset, &offset_blocks, nbytes, &num_blocks) != 0) {

		return -EINVAL;

	}
@@ -5794,8 +5792,7 @@ spdk_bdev_writev(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 
{

	uint64_t offset_blocks, num_blocks;



	if (bdev_bytes_to_blocks(spdk_bdev_desc_get_bdev(desc), offset, &offset_blocks,

				 len, &num_blocks) != 0) {

	if (bdev_bytes_to_blocks(desc, offset, &offset_blocks, len, &num_blocks) != 0) {

		return -EINVAL;

	}
@@ -6320,8 +6317,7 @@ spdk_bdev_write_zeroes(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 
{

	uint64_t offset_blocks, num_blocks;



	if (bdev_bytes_to_blocks(spdk_bdev_desc_get_bdev(desc), offset, &offset_blocks,

				 len, &num_blocks) != 0) {

	if (bdev_bytes_to_blocks(desc, offset, &offset_blocks, len, &num_blocks) != 0) {

		return -EINVAL;

	}
@@ -6390,8 +6386,7 @@ spdk_bdev_unmap(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 
{

	uint64_t offset_blocks, num_blocks;



	if (bdev_bytes_to_blocks(spdk_bdev_desc_get_bdev(desc), offset, &offset_blocks,

				 nbytes, &num_blocks) != 0) {

	if (bdev_bytes_to_blocks(desc, offset, &offset_blocks, nbytes, &num_blocks) != 0) {

		return -EINVAL;

	}
@@ -6461,8 +6456,7 @@ spdk_bdev_flush(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, 
{

	uint64_t offset_blocks, num_blocks;



	if (bdev_bytes_to_blocks(spdk_bdev_desc_get_bdev(desc), offset, &offset_blocks,

				 length, &num_blocks) != 0) {

	if (bdev_bytes_to_blocks(desc, offset, &offset_blocks, length, &num_blocks) != 0) {

		return -EINVAL;

	}

test/unit/lib/bdev/bdev.c/bdev_ut.c

+9 −6
Original line number Diff line number Diff line
@@ -941,9 +941,12 @@ claim_test(void) 
static void

bytes_to_blocks_test(void)

{

	struct spdk_bdev_desc desc;

	struct spdk_bdev bdev;

	uint64_t offset_blocks, num_blocks;





	desc.bdev = &bdev;

	memset(&bdev, 0, sizeof(bdev));



	bdev.blocklen = 512;
@@ -951,27 +954,27 @@ bytes_to_blocks_test(void) 
	/* All parameters valid */

	offset_blocks = 0;

	num_blocks = 0;

	CU_ASSERT(bdev_bytes_to_blocks(&bdev, 512, &offset_blocks, 1024, &num_blocks) == 0);

	CU_ASSERT(bdev_bytes_to_blocks(&desc, 512, &offset_blocks, 1024, &num_blocks) == 0);

	CU_ASSERT(offset_blocks == 1);

	CU_ASSERT(num_blocks == 2);



	/* Offset not a block multiple */

	CU_ASSERT(bdev_bytes_to_blocks(&bdev, 3, &offset_blocks, 512, &num_blocks) != 0);

	CU_ASSERT(bdev_bytes_to_blocks(&desc, 3, &offset_blocks, 512, &num_blocks) != 0);



	/* Length not a block multiple */

	CU_ASSERT(bdev_bytes_to_blocks(&bdev, 512, &offset_blocks, 3, &num_blocks) != 0);

	CU_ASSERT(bdev_bytes_to_blocks(&desc, 512, &offset_blocks, 3, &num_blocks) != 0);



	/* In case blocklen not the power of two */

	bdev.blocklen = 100;

	CU_ASSERT(bdev_bytes_to_blocks(&bdev, 100, &offset_blocks, 200, &num_blocks) == 0);

	CU_ASSERT(bdev_bytes_to_blocks(&desc, 100, &offset_blocks, 200, &num_blocks) == 0);

	CU_ASSERT(offset_blocks == 1);

	CU_ASSERT(num_blocks == 2);



	/* Offset not a block multiple */

	CU_ASSERT(bdev_bytes_to_blocks(&bdev, 3, &offset_blocks, 100, &num_blocks) != 0);

	CU_ASSERT(bdev_bytes_to_blocks(&desc, 3, &offset_blocks, 100, &num_blocks) != 0);



	/* Length not a block multiple */

	CU_ASSERT(bdev_bytes_to_blocks(&bdev, 100, &offset_blocks, 3, &num_blocks) != 0);

	CU_ASSERT(bdev_bytes_to_blocks(&desc, 100, &offset_blocks, 3, &num_blocks) != 0);

}



static void