Patch "nvme-fc: check if queue is ready in queue_rq" has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
nvme-fc: check if queue is ready in queue_rq
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nvme-fc-check-if-queue-is-ready-in-queue_rq.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Thu Feb 1 13:45:42 CET 2018
From: Sagi Grimberg <[email protected]>
Date: Tue, 24 Oct 2017 15:25:21 +0300
Subject: nvme-fc: check if queue is ready in queue_rq
From: Sagi Grimberg <[email protected]>
[ Upstream commit 9e0ed16ab9a9aaf670b81c9cd05b5e50defed654 ]
In case the queue is not LIVE (fully functional and connected at the nvmf level), we cannot allow any commands other than connect to pass through.
Add a new queue state flag NVME_FC_Q_LIVE which is set after nvmf connect and cleared in queue teardown.
--- drivers/nvme/host/fc.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/nvme/host/fc.c +18 -1
@@ -41,6 +41,7 @@enum nvme_fc_queue_flags {NVME_FC_Q_CONNECTED = (1 <<0 ), +NVME_FC_Q_LIVE = (1 <<1 ), };#define NVMEFC_QUEUE_DELAY 3/* ms units */
@@ -1654,6 +1655,7 @@ nvme_fc_free_queue(struct nvme_fc_queueif (!test_and_clear_bit (NVME_FC_Q_CONNECTED , &queue->flags))return ; +clear_bit (NVME_FC_Q_LIVE , &queue->flags);/* * Current implementation never disconnects a single queue. * It always terminates a whole association. So there is never
@@ -1661,7 +1663,6 @@ nvme_fc_free_queue(struct nvme_fc_queue*/ queue->connection_id =0 ; -clear_bit (NVME_FC_Q_CONNECTED , &queue->flags); } static void
@@ -1740,6 +1741,8 @@ nvme_fc_connect_io_queues(struct nvme_fc ret =nvmf_connect_io_queue (&ctrl->ctrl, i);if (ret)break ; + +set_bit (NVME_FC_Q_LIVE , &ctrl->queues[i].flags); }return ret;
@@ -2048,6 +2051,14 @@ busy:return BLK_STS_RESOURCE ; } +static inline blk_status_t nvme_fc_is_ready (struct nvme_fc_queue *queue, +struct request *rq) +{ +if (unlikely (!test_bit (NVME_FC_Q_LIVE , &queue->flags))) +return nvmf_check_init_req (&queue->ctrl->ctrl, rq); +return BLK_STS_OK ; +} +static blk_status_t nvme_fc_queue_rq (struct blk_mq_hw_ctx *hctx,const struct blk_mq_queue_data *bd)
@@ -2063,6 +2074,10 @@ nvme_fc_queue_rq(struct blk_mq_hw_ctx *hu32 data_len;blk_status_t ret; + ret =nvme_fc_is_ready (queue, rq); +if (unlikely (ret)) +return ret; + ret =nvme_setup_cmd (ns, rq, sqe);if (ret)return ret;
@@ -2398,6 +2413,8 @@ nvme_fc_create_association(struct nvme_fif (ret) goto out_disconnect_admin_queue; +set_bit (NVME_FC_Q_LIVE , &ctrl->queues[0 ].flags); +/* * Check controller capabilities *
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/nvmet-fc-correct-ref-counting-error-when-deferred-rcv-used.patch queue-4.14/nvme-fabrics-introduce-init-command-check-for-a-queue-that-is-not-alive.patch queue-4.14/nvme-fc-check-if-queue-is-ready-in-queue_rq.patch queue-4.14/nvme-loop-check-if-queue-is-ready-in-queue_rq.patch queue-4.14/nvme-rdma-don-t-complete-requests-before-a-send-work-request-has-completed.patch