lkml.org 
[lkml]   [2018]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 047/156] nvme-fc: check if queue is ready in queue_rq
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sagi Grimberg <sagi@grimberg.me>


    [ 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.

    Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
    Reviewed-by: James Smart <james.smart@broadcom.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/nvme/host/fc.c | 19 ++++++++++++++++++-
    1 file changed, 18 insertions(+), 1 deletion(-)

    --- a/drivers/nvme/host/fc.c
    +++ b/drivers/nvme/host/fc.c
    @@ -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_queue
    if (!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 *h
    u32 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_f
    if (ret)
    goto out_disconnect_admin_queue;

    + set_bit(NVME_FC_Q_LIVE, &ctrl->queues[0].flags);
    +
    /*
    * Check controller capabilities
    *

    \
     
     \ /
      Last update: 2018-02-02 19:03    [W:4.250 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site