lkml.org 
[lkml]   [2021]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 3/5] nvme-rdma: Update number of hardware queues before using them
    Date
    When the number of hardware queues changes during resetting we should
    update the tagset first before using it.

    Signed-off-by: Daniel Wagner <dwagner@suse.de>
    ---
    drivers/nvme/host/rdma.c | 13 ++++++-------
    1 file changed, 6 insertions(+), 7 deletions(-)

    diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
    index 3a296fd34bef..9825112bd9f4 100644
    --- a/drivers/nvme/host/rdma.c
    +++ b/drivers/nvme/host/rdma.c
    @@ -967,6 +967,7 @@ static void nvme_rdma_destroy_io_queues(struct nvme_rdma_ctrl *ctrl,
    static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new)
    {
    int ret;
    + u32 prior_q_cnt = ctrl->ctrl.queue_count;

    ret = nvme_rdma_alloc_io_queues(ctrl);
    if (ret)
    @@ -984,13 +985,7 @@ static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new)
    ret = PTR_ERR(ctrl->ctrl.connect_q);
    goto out_free_tag_set;
    }
    - }
    -
    - ret = nvme_rdma_start_io_queues(ctrl);
    - if (ret)
    - goto out_cleanup_connect_q;
    -
    - if (!new) {
    + } else if (prior_q_cnt != ctrl->ctrl.queue_count) {
    nvme_start_queues(&ctrl->ctrl);
    if (!nvme_wait_freeze_timeout(&ctrl->ctrl, NVME_IO_TIMEOUT)) {
    /*
    @@ -1006,6 +1001,10 @@ static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new)
    nvme_unfreeze(&ctrl->ctrl);
    }

    + ret = nvme_rdma_start_io_queues(ctrl);
    + if (ret)
    + goto out_cleanup_connect_q;
    +
    return 0;

    out_wait_freeze_timed_out:
    --
    2.29.2
    \
     
     \ /
      Last update: 2021-07-08 11:32    [W:2.680 / U:0.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site