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

raid/concat: update bdev readv/writev to ext API.

Browse Source 
Other parts have changed these since readv and writev
support ext_opts.
And change corresponding unittest.

Signed-off-by: yidong0635 <dongx.yi@intel.com>
Change-Id: I79260a7e6110aa46df2016e579f1da5c241c9844
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13620
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
yidong0635 2022-07-11 16:46:38 +08:00 committed by Tomasz Zawadzki
parent 2c65d55675
commit 256bfe7685
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
module/bdev/raid/concat.c
View File

@ -102,15 +102,15 @@ concat_submit_rw_request(struct raid_bdev_io *raid_io)
assert(raid_ch->base_channel); assert(raid_ch->base_channel);
base_ch = raid_ch->base_channel[pd_idx]; base_ch = raid_ch->base_channel[pd_idx];
if (bdev_io->type == SPDK_BDEV_IO_TYPE_READ) { if (bdev_io->type == SPDK_BDEV_IO_TYPE_READ) {
ret = spdk_bdev_readv_blocks(base_info->desc, base_ch, ret = spdk_bdev_readv_blocks_ext(base_info->desc, base_ch,
bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt, bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt,
pd_lba, pd_blocks, concat_bdev_io_completion, pd_lba, pd_blocks, concat_bdev_io_completion,
raid_io); raid_io, bdev_io->u.bdev.ext_opts);
} else if (bdev_io->type == SPDK_BDEV_IO_TYPE_WRITE) { } else if (bdev_io->type == SPDK_BDEV_IO_TYPE_WRITE) {
ret = spdk_bdev_writev_blocks(base_info->desc, base_ch, ret = spdk_bdev_writev_blocks_ext(base_info->desc, base_ch,
bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt, bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt,
pd_lba, pd_blocks, concat_bdev_io_completion, pd_lba, pd_blocks, concat_bdev_io_completion,
raid_io); raid_io, bdev_io->u.bdev.ext_opts);
} else { } else {
SPDK_ERRLOG("Recvd not supported io type %u\n", bdev_io->type); SPDK_ERRLOG("Recvd not supported io type %u\n", bdev_io->type);
assert(0); assert(0);

26
test/unit/lib/bdev/raid/concat.c/concat_ut.c
View File

@ -33,6 +33,7 @@ struct req_records {
uint64_t num_blocks[MAX_RECORDS]; uint64_t num_blocks[MAX_RECORDS];
enum CONCAT_IO_TYPE io_type[MAX_RECORDS]; enum CONCAT_IO_TYPE io_type[MAX_RECORDS];
int count; int count;
void *md;
} g_req_records; } g_req_records;
/* /*
@ -56,9 +57,9 @@ DEFINE_STUB(raid_bdev_io_complete_part, bool,
true); true);
int int
spdk_bdev_readv_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, spdk_bdev_readv_blocks_ext(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,
struct iovec *iov, int iovcnt, uint64_t offset_blocks, uint64_t num_blocks, struct iovec *iov, int iovcnt, uint64_t offset_blocks, uint64_t num_blocks,
spdk_bdev_io_completion_cb cb, void *cb_arg) spdk_bdev_io_completion_cb cb, void *cb_arg, struct spdk_bdev_ext_io_opts *opts)
{ {
if (g_succeed) { if (g_succeed) {
int i = g_req_records.count; int i = g_req_records.count;
@ -68,6 +69,7 @@ spdk_bdev_readv_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,
g_req_records.io_type[i] = CONCAT_READV; g_req_records.io_type[i] = CONCAT_READV;
g_req_records.count++; g_req_records.count++;
cb(NULL, true, cb_arg); cb(NULL, true, cb_arg);
g_req_records.md = opts->metadata;
return 0; return 0;
} else { } else {
return -ENOMEM; return -ENOMEM;
@ -75,9 +77,9 @@ spdk_bdev_readv_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,
} }
int int
spdk_bdev_writev_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch, spdk_bdev_writev_blocks_ext(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,
struct iovec *iov, int iovcnt, uint64_t offset_blocks, uint64_t num_blocks, struct iovec *iov, int iovcnt, uint64_t offset_blocks, uint64_t num_blocks,
spdk_bdev_io_completion_cb cb, void *cb_arg) spdk_bdev_io_completion_cb cb, void *cb_arg, struct spdk_bdev_ext_io_opts *opts)
{ {
if (g_succeed) { if (g_succeed) {
int i = g_req_records.count; int i = g_req_records.count;
@ -87,6 +89,7 @@ spdk_bdev_writev_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,
g_req_records.io_type[i] = CONCAT_WRITEV; g_req_records.io_type[i] = CONCAT_WRITEV;
g_req_records.count++; g_req_records.count++;
cb(NULL, true, cb_arg); cb(NULL, true, cb_arg);
g_req_records.md = opts->metadata;
return 0; return 0;
} else { } else {
return -ENOMEM; return -ENOMEM;
@ -314,6 +317,13 @@ bdev_io_cleanup(struct spdk_bdev_io *bdev_io)
} }
free(bdev_io->u.bdev.iovs); free(bdev_io->u.bdev.iovs);
} }
if (bdev_io->u.bdev.ext_opts) {
if (bdev_io->u.bdev.ext_opts->metadata) {
bdev_io->u.bdev.ext_opts->metadata = NULL;
}
free(bdev_io->u.bdev.ext_opts);
}
free(bdev_io); free(bdev_io);
} }
@ -339,6 +349,9 @@ bdev_io_initialize(struct spdk_bdev_io *bdev_io, struct spdk_io_channel *ch, str
SPDK_CU_ASSERT_FATAL(bdev_io->u.bdev.iovs->iov_base != NULL); SPDK_CU_ASSERT_FATAL(bdev_io->u.bdev.iovs->iov_base != NULL);
bdev_io->u.bdev.iovs->iov_len = bdev_io->u.bdev.num_blocks * BLOCK_LEN; bdev_io->u.bdev.iovs->iov_len = bdev_io->u.bdev.num_blocks * BLOCK_LEN;
bdev_io->internal.ch = channel; bdev_io->internal.ch = channel;
bdev_io->u.bdev.ext_opts = calloc(1, sizeof(struct spdk_bdev_ext_io_opts));
SPDK_CU_ASSERT_FATAL(bdev_io->u.bdev.ext_opts != NULL);
bdev_io->u.bdev.ext_opts->metadata = (void *)0xAEDFEBAC;
} }
static void static void
@ -399,6 +412,7 @@ submit_and_verify_rw(enum CONCAT_IO_TYPE io_type, struct concat_params *params)
CU_ASSERT(g_req_records.num_blocks[0] == blocks); CU_ASSERT(g_req_records.num_blocks[0] == blocks);
CU_ASSERT(g_req_records.io_type[0] == io_type); CU_ASSERT(g_req_records.io_type[0] == io_type);
CU_ASSERT(g_req_records.count == 1); CU_ASSERT(g_req_records.count == 1);
CU_ASSERT(g_req_records.md == (void *)0xAEDFEBAC);
bdev_io_cleanup(bdev_io); bdev_io_cleanup(bdev_io);
free(ch); free(ch);
free(raid_ch->base_channel); free(raid_ch->base_channel);