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

nvme: fail when request is too long

Browse Source 
Fail when number of child requests is >= NVME_MAX_CHILD_REQUESTS.

Signed-off-by: Piotr Pelplinski <piotr.pelplinski@intel.com>
Change-Id: I8c370053847c9f623b861137da8d2387a66fc030

Reviewed-on: https://review.gerrithub.io/408850
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Maciej Szwed <maciej.szwed@intel.com>
Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Piotr Pelplinski 2018-04-24 16:25:13 +02:00 committed by Jim Harris
parent 00a51646d0
commit fbf06aca1a
2 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
lib/nvme/nvme_ns_cmd.c
View File

@ -39,6 +39,24 @@ static struct nvme_request *_nvme_ns_cmd_rw(struct spdk_nvme_ns *ns, struct spdk
void *cb_arg, uint32_t opc, uint32_t io_flags, void *cb_arg, uint32_t opc, uint32_t io_flags,
uint16_t apptag_mask, uint16_t apptag, bool check_sgl); uint16_t apptag_mask, uint16_t apptag, bool check_sgl);
static bool
spdk_nvme_ns_check_request_length(uint32_t lba_count, uint32_t sectors_per_max_io,
uint32_t sectors_per_stripe, uint32_t qdepth)
{
uint32_t child_per_io;
if (sectors_per_stripe > 0) {
child_per_io = (lba_count + sectors_per_stripe - 1) / sectors_per_stripe;
} else {
child_per_io = (lba_count + sectors_per_max_io - 1) / sectors_per_max_io;
}
SPDK_DEBUGLOG(SPDK_LOG_NVME, "checking maximum i/o length %d\n", child_per_io);
return child_per_io >= qdepth;
}
static void static void
nvme_cb_complete_child(void *child_arg, const struct spdk_nvme_cpl *cpl) nvme_cb_complete_child(void *child_arg, const struct spdk_nvme_cpl *cpl)
{ {
@ -499,6 +517,11 @@ spdk_nvme_ns_cmd_compare(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair,
0, true); 0, true);
if (req != NULL) { if (req != NULL) {
return nvme_qpair_submit_request(qpair, req); return nvme_qpair_submit_request(qpair, req);
} else if (spdk_nvme_ns_check_request_length(lba_count,
ns->sectors_per_max_io,
ns->sectors_per_stripe,
qpair->ctrlr->opts.io_queue_requests)) {
return -EINVAL;
} else { } else {
return -ENOMEM; return -ENOMEM;
} }
@ -525,6 +548,11 @@ spdk_nvme_ns_cmd_compare_with_md(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair
apptag_mask, apptag, true); apptag_mask, apptag, true);
if (req != NULL) { if (req != NULL) {
return nvme_qpair_submit_request(qpair, req); return nvme_qpair_submit_request(qpair, req);
} else if (spdk_nvme_ns_check_request_length(lba_count,
ns->sectors_per_max_io,
ns->sectors_per_stripe,
qpair->ctrlr->opts.io_queue_requests)) {
return -EINVAL;
} else { } else {
return -ENOMEM; return -ENOMEM;
} }
@ -555,6 +583,11 @@ spdk_nvme_ns_cmd_comparev(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair
io_flags, 0, 0, true); io_flags, 0, 0, true);
if (req != NULL) { if (req != NULL) {
return nvme_qpair_submit_request(qpair, req); return nvme_qpair_submit_request(qpair, req);
} else if (spdk_nvme_ns_check_request_length(lba_count,
ns->sectors_per_max_io,
ns->sectors_per_stripe,
qpair->ctrlr->opts.io_queue_requests)) {
return -EINVAL;
} else { } else {
return -ENOMEM; return -ENOMEM;
} }
@ -578,6 +611,11 @@ spdk_nvme_ns_cmd_read(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair, vo
0, true); 0, true);
if (req != NULL) { if (req != NULL) {
return nvme_qpair_submit_request(qpair, req); return nvme_qpair_submit_request(qpair, req);
} else if (spdk_nvme_ns_check_request_length(lba_count,
ns->sectors_per_max_io,
ns->sectors_per_stripe,
qpair->ctrlr->opts.io_queue_requests)) {
return -EINVAL;
} else { } else {
return -ENOMEM; return -ENOMEM;
} }
@ -602,6 +640,11 @@ spdk_nvme_ns_cmd_read_with_md(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *q
apptag_mask, apptag, true); apptag_mask, apptag, true);
if (req != NULL) { if (req != NULL) {
return nvme_qpair_submit_request(qpair, req); return nvme_qpair_submit_request(qpair, req);
} else if (spdk_nvme_ns_check_request_length(lba_count,
ns->sectors_per_max_io,
ns->sectors_per_stripe,
qpair->ctrlr->opts.io_queue_requests)) {
return -EINVAL;
} else { } else {
return -ENOMEM; return -ENOMEM;
} }
@ -631,6 +674,11 @@ spdk_nvme_ns_cmd_readv(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair,
io_flags, 0, 0, true); io_flags, 0, 0, true);
if (req != NULL) { if (req != NULL) {
return nvme_qpair_submit_request(qpair, req); return nvme_qpair_submit_request(qpair, req);
} else if (spdk_nvme_ns_check_request_length(lba_count,
ns->sectors_per_max_io,
ns->sectors_per_stripe,
qpair->ctrlr->opts.io_queue_requests)) {
return -EINVAL;
} else { } else {
return -ENOMEM; return -ENOMEM;
} }
@ -653,6 +701,11 @@ spdk_nvme_ns_cmd_write(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair,
io_flags, 0, 0, true); io_flags, 0, 0, true);
if (req != NULL) { if (req != NULL) {
return nvme_qpair_submit_request(qpair, req); return nvme_qpair_submit_request(qpair, req);
} else if (spdk_nvme_ns_check_request_length(lba_count,
ns->sectors_per_max_io,
ns->sectors_per_stripe,
qpair->ctrlr->opts.io_queue_requests)) {
return -EINVAL;
} else { } else {
return -ENOMEM; return -ENOMEM;
} }
@ -675,6 +728,11 @@ spdk_nvme_ns_cmd_write_with_md(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *
io_flags, apptag_mask, apptag, true); io_flags, apptag_mask, apptag, true);
if (req != NULL) { if (req != NULL) {
return nvme_qpair_submit_request(qpair, req); return nvme_qpair_submit_request(qpair, req);
} else if (spdk_nvme_ns_check_request_length(lba_count,
ns->sectors_per_max_io,
ns->sectors_per_stripe,
qpair->ctrlr->opts.io_queue_requests)) {
return -EINVAL;
} else { } else {
return -ENOMEM; return -ENOMEM;
} }
@ -704,6 +762,11 @@ spdk_nvme_ns_cmd_writev(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair,
io_flags, 0, 0, true); io_flags, 0, 0, true);
if (req != NULL) { if (req != NULL) {
return nvme_qpair_submit_request(qpair, req); return nvme_qpair_submit_request(qpair, req);
} else if (spdk_nvme_ns_check_request_length(lba_count,
ns->sectors_per_max_io,
ns->sectors_per_stripe,
qpair->ctrlr->opts.io_queue_requests)) {
return -EINVAL;
} else { } else {
return -ENOMEM; return -ENOMEM;
} }

5
test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c
View File

@ -512,6 +512,11 @@ test_cmd_child_request(void)
SPDK_CU_ASSERT_FATAL(g_request != NULL); SPDK_CU_ASSERT_FATAL(g_request != NULL);
CU_ASSERT(g_request->num_children == 4); CU_ASSERT(g_request->num_children == 4);
rc = spdk_nvme_ns_cmd_read(&ns, &qpair, payload, lba, (DEFAULT_IO_QUEUE_REQUESTS + 1) * sector_size,
NULL,
NULL, 0);
SPDK_CU_ASSERT_FATAL(rc == -EINVAL);
TAILQ_FOREACH_SAFE(child, &g_request->children, child_tailq, tmp) { TAILQ_FOREACH_SAFE(child, &g_request->children, child_tailq, tmp) {
nvme_request_remove_child(g_request, child); nvme_request_remove_child(g_request, child);
CU_ASSERT(child->payload_offset == offset); CU_ASSERT(child->payload_offset == offset);