From 447373239849b65b8f9f242256c9be833e78f88e Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Mon, 30 Sep 2019 15:46:03 -0700 Subject: [PATCH] nvme: allow fabrics commands during reconnect. When doing a reset on an NVMe-oF target with active I/O qpairs, we need to be able to submit fabrics commands on them in order to perform a reset. Currently, resetting a fabric controller with any I/O qpairs active will cause the reset to hang indefinitely. Change-Id: Ic972a301390a4dd64adabedfe01aa4e5253e40b0 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/469935 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- lib/nvme/nvme_qpair.c | 6 +++--- lib/nvme/nvme_transport.c | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/nvme/nvme_qpair.c b/lib/nvme/nvme_qpair.c index 605649cf0..e7f2a99bc 100644 --- a/lib/nvme/nvme_qpair.c +++ b/lib/nvme/nvme_qpair.c @@ -637,9 +637,9 @@ _nvme_qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_request *r if (spdk_likely(qpair->is_enabled)) { rc = nvme_transport_qpair_submit_request(qpair, req); - } else if (nvme_qpair_is_admin_queue(qpair) && req->cmd.opc == SPDK_NVME_OPC_FABRIC) { - /* Always allow fabrics commands through on the admin qpair - these get - * the controller out of reset state. + } else if (req->cmd.opc == SPDK_NVME_OPC_FABRIC && qpair->is_connecting) { + /* Always allow fabrics commands through - these get + * the controller out of reset state. */ rc = nvme_transport_qpair_submit_request(qpair, req); } else { diff --git a/lib/nvme/nvme_transport.c b/lib/nvme/nvme_transport.c index 3f7c9be4c..727b1267a 100644 --- a/lib/nvme/nvme_transport.c +++ b/lib/nvme/nvme_transport.c @@ -182,13 +182,9 @@ nvme_transport_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_ int nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair) { - if (nvme_qpair_is_admin_queue(qpair)) { - qpair->is_connecting = 1; - } + qpair->is_connecting = 1; NVME_TRANSPORT_CALL(ctrlr->trid.trtype, ctrlr_connect_qpair, (ctrlr, qpair)); - if (nvme_qpair_is_admin_queue(qpair)) { - qpair->is_connecting = 0; - } + qpair->is_connecting = 0; } volatile struct spdk_nvme_registers *