Commit 6156777b authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

nvme: assert if user tries to delete NULL tcp qpair 



It is invalid to try to delete a NULL qpair, so do
not check for it in nvme_tcp_ctrlr_delete_io_qpair and
return an error when NULL.  Just change it to an
assert instead.  This makes it consistent with pcie
and rdma.

While here, add an assert in rdma as well.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ic2f76deecb21b78749dac85e33fb1fa0d14a1239
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6917


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatar <dongx.yi@intel.com>
parent 56d96835

lib/nvme/nvme_rdma.c

+1 −0
Original line number Diff line number Diff line
@@ -1686,6 +1686,7 @@ nvme_rdma_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ 
{

	struct nvme_rdma_qpair *rqpair;



	assert(qpair != NULL);

	rqpair = nvme_rdma_qpair(qpair);

	nvme_transport_ctrlr_disconnect_qpair(ctrlr, qpair);

	if (rqpair->defer_deletion_to_pg) {

lib/nvme/nvme_tcp.c

+1 −4
Original line number Diff line number Diff line
@@ -327,10 +327,7 @@ nvme_tcp_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_q 
{

	struct nvme_tcp_qpair *tqpair;



	if (!qpair) {

		return -1;

	}



	assert(qpair != NULL);

	nvme_transport_ctrlr_disconnect_qpair(ctrlr, qpair);

	nvme_tcp_qpair_abort_reqs(qpair, 1);

	nvme_qpair_deinit(qpair);