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

bdev/nvme: Add copy IO type support

Browse Source 
Signed-off-by: Evgeniy Kochetov <evgeniik@nvidia.com>
Change-Id: I6a272161e129b592f535f8671e174e6b20e09fd0
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14347
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Evgeniy Kochetov 2022-08-22 15:47:31 +03:00 committed by Tomasz Zawadzki
parent 1f47bbba51
commit 789f48dec7
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
module/bdev/nvme/bdev_nvme.c
View File

@ -2036,6 +2036,10 @@ static int bdev_nvme_unmap(struct nvme_bdev_io *bio, uint64_t offset_blocks,
static int bdev_nvme_write_zeroes(struct nvme_bdev_io *bio, uint64_t offset_blocks, static int bdev_nvme_write_zeroes(struct nvme_bdev_io *bio, uint64_t offset_blocks,
uint64_t num_blocks); uint64_t num_blocks);
static int bdev_nvme_copy(struct nvme_bdev_io *bio, uint64_t dst_offset_blocks,
uint64_t src_offset_blocks,
uint64_t num_blocks);
static void static void
bdev_nvme_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io, bdev_nvme_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io,
bool success) bool success)
@ -2206,6 +2210,12 @@ bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_i
nbdev_io, nbdev_io,
nbdev_io_to_abort); nbdev_io_to_abort);
break; break;
case SPDK_BDEV_IO_TYPE_COPY:
rc = bdev_nvme_copy(nbdev_io,
bdev_io->u.bdev.offset_blocks,
bdev_io->u.bdev.copy.src_offset_blocks,
bdev_io->u.bdev.num_blocks);
break;
default: default:
rc = -EINVAL; rc = -EINVAL;
break; break;
@ -2270,6 +2280,10 @@ bdev_nvme_io_type_supported(void *ctx, enum spdk_bdev_io_type io_type)
return spdk_nvme_ns_get_csi(ns) == SPDK_NVME_CSI_ZNS && return spdk_nvme_ns_get_csi(ns) == SPDK_NVME_CSI_ZNS &&
spdk_nvme_ctrlr_get_flags(ctrlr) & SPDK_NVME_CTRLR_ZONE_APPEND_SUPPORTED; spdk_nvme_ctrlr_get_flags(ctrlr) & SPDK_NVME_CTRLR_ZONE_APPEND_SUPPORTED;
case SPDK_BDEV_IO_TYPE_COPY:
cdata = spdk_nvme_ctrlr_get_data(ctrlr);
return cdata->oncs.copy;
default: default:
return false; return false;
} }
@ -2981,6 +2995,11 @@ nvme_disk_create(struct spdk_bdev *disk, const char *base_name,
disk->acwu = cdata->acwu + 1; /* 0-based */ disk->acwu = cdata->acwu + 1; /* 0-based */
} }
if (cdata->oncs.copy) {
/* For now bdev interface allows only single segment copy */
disk->max_copy = nsdata->mssrl;
}
disk->ctxt = ctx; disk->ctxt = ctx;
disk->fn_table = &nvmelib_fn_table; disk->fn_table = &nvmelib_fn_table;
disk->module = &nvme_if; disk->module = &nvme_if;
@ -6490,6 +6509,21 @@ bdev_nvme_abort(struct nvme_bdev_channel *nbdev_ch, struct nvme_bdev_io *bio,
} }
} }
static int
bdev_nvme_copy(struct nvme_bdev_io *bio, uint64_t dst_offset_blocks, uint64_t src_offset_blocks,
uint64_t num_blocks)
{
struct spdk_nvme_scc_source_range range = {
.slba = src_offset_blocks,
.nlb = num_blocks - 1
};
return spdk_nvme_ns_cmd_copy(bio->io_path->nvme_ns->ns,
bio->io_path->qpair->qpair,
&range, 1, dst_offset_blocks,
bdev_nvme_queued_done, bio);
}
static void static void
bdev_nvme_opts_config_json(struct spdk_json_write_ctx *w) bdev_nvme_opts_config_json(struct spdk_json_write_ctx *w)
{ {

9
test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c
View File

@ -1046,6 +1046,15 @@ spdk_nvme_ns_cmd_write_zeroes(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *q
return ut_submit_nvme_request(ns, qpair, SPDK_NVME_OPC_WRITE_ZEROES, cb_fn, cb_arg); return ut_submit_nvme_request(ns, qpair, SPDK_NVME_OPC_WRITE_ZEROES, cb_fn, cb_arg);
} }
int
spdk_nvme_ns_cmd_copy(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair,
const struct spdk_nvme_scc_source_range *ranges,
uint16_t num_ranges, uint64_t dest_lba,
spdk_nvme_cmd_cb cb_fn, void *cb_arg)
{
return ut_submit_nvme_request(ns, qpair, SPDK_NVME_OPC_COPY, cb_fn, cb_arg);
}
struct spdk_nvme_poll_group * struct spdk_nvme_poll_group *
spdk_nvme_poll_group_create(void *ctx, struct spdk_nvme_accel_fn_table *table) spdk_nvme_poll_group_create(void *ctx, struct spdk_nvme_accel_fn_table *table)
{ {