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

nvme: change nvme_transport_ctrlr_delete_io_qpair to void

Browse Source 
Returning an error from this function is not useful - there
is nothing the caller can do with that information. So
change the return value to void.  Also add ERRLOG and assert
if a transport actually returns a non-zero status, to
force the transport implementer (which must be an out-of-tree
transport) to make changes as necessary.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I402afec045265db178af821d25b99a6dbe066eab
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8659
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Jim Harris 2021-07-05 17:47:19 +00:00 committed by Tomasz Zawadzki
parent c081a84cd2
commit 4246e79c04
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/spdk/nvme.h
View File

@ -1501,10 +1501,11 @@ spdk_nvme_qp_failure_reason spdk_nvme_ctrlr_get_admin_qp_failure_reason(
/** /**
* Free an I/O queue pair that was allocated by spdk_nvme_ctrlr_alloc_io_qpair(). * Free an I/O queue pair that was allocated by spdk_nvme_ctrlr_alloc_io_qpair().
* *
* The qpair must not be accessed after calling this function.
*
* \param qpair I/O queue pair to free. * \param qpair I/O queue pair to free.
* *
* \return 0 on success, -1 on failure. On failure, the caller should reset * \return 0 on success. This function will never return any value other than 0.
* the controller and try to free the io qpair again after the reset.
*/ */
int spdk_nvme_ctrlr_free_io_qpair(struct spdk_nvme_qpair *qpair); int spdk_nvme_ctrlr_free_io_qpair(struct spdk_nvme_qpair *qpair);

6
lib/nvme/nvme_ctrlr.c
View File

@ -583,11 +583,7 @@ spdk_nvme_ctrlr_free_io_qpair(struct spdk_nvme_qpair *qpair)
TAILQ_REMOVE(&ctrlr->active_io_qpairs, qpair, tailq); TAILQ_REMOVE(&ctrlr->active_io_qpairs, qpair, tailq);
spdk_nvme_ctrlr_free_qid(ctrlr, qpair->id); spdk_nvme_ctrlr_free_qid(ctrlr, qpair->id);
if (nvme_transport_ctrlr_delete_io_qpair(ctrlr, qpair)) { nvme_transport_ctrlr_delete_io_qpair(ctrlr, qpair);
nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
return -1;
}
nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock); nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
return 0; return 0;
} }

2
lib/nvme/nvme_internal.h
View File

@ -1342,7 +1342,7 @@ int nvme_transport_ctrlr_enable_pmr(struct spdk_nvme_ctrlr *ctrlr);
int nvme_transport_ctrlr_disable_pmr(struct spdk_nvme_ctrlr *ctrlr); int nvme_transport_ctrlr_disable_pmr(struct spdk_nvme_ctrlr *ctrlr);
void *nvme_transport_ctrlr_map_pmr(struct spdk_nvme_ctrlr *ctrlr, size_t *size); void *nvme_transport_ctrlr_map_pmr(struct spdk_nvme_ctrlr *ctrlr, size_t *size);
int nvme_transport_ctrlr_unmap_pmr(struct spdk_nvme_ctrlr *ctrlr); int nvme_transport_ctrlr_unmap_pmr(struct spdk_nvme_ctrlr *ctrlr);
int nvme_transport_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, void nvme_transport_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr,
struct spdk_nvme_qpair *qpair); struct spdk_nvme_qpair *qpair);
int nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, int nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr,
struct spdk_nvme_qpair *qpair); struct spdk_nvme_qpair *qpair);

10
lib/nvme/nvme_transport.c
View File

@ -328,10 +328,11 @@ nvme_transport_ctrlr_create_io_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid
return qpair; return qpair;
} }
int void
nvme_transport_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair) nvme_transport_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
{ {
const struct spdk_nvme_transport *transport = nvme_get_transport(ctrlr->trid.trstring); const struct spdk_nvme_transport *transport = nvme_get_transport(ctrlr->trid.trstring);
int rc;
assert(transport != NULL); assert(transport != NULL);
@ -340,7 +341,12 @@ nvme_transport_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_
* own unique transport objects since they contain function pointers). So we look up the * own unique transport objects since they contain function pointers). So we look up the
* transport object in the delete_io_qpair case. * transport object in the delete_io_qpair case.
*/ */
return transport->ops.ctrlr_delete_io_qpair(ctrlr, qpair); rc = transport->ops.ctrlr_delete_io_qpair(ctrlr, qpair);
if (rc != 0) {
SPDK_ERRLOG("transport %s returned non-zero for ctrlr_delete_io_qpair op\n",
transport->ops.name);
assert(false);
}
} }
int int

3
test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c
View File

@ -204,11 +204,10 @@ nvme_transport_ctrlr_create_io_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid
return qpair; return qpair;
} }
int void
nvme_transport_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair) nvme_transport_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
{ {
free(qpair); free(qpair);
return 0;
} }
void void