lkml.org 
[lkml]   [2021]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 020/334] nvme-tcp: dont update queue count when failing to set io queues
    Date
    From: Ruozhu Li <liruozhu@huawei.com>

    [ Upstream commit 664227fde63844d69e9ec9e90a8a7801e6ff072d ]

    We update ctrl->queue_count and schedule another reconnect when io queue
    count is zero.But we will never try to create any io queue in next reco-
    nnection, because ctrl->queue_count already set to zero.We will end up
    having an admin-only session in Live state, which is exactly what we try
    to avoid in the original patch.
    Update ctrl->queue_count after queue_count zero checking to fix it.

    Signed-off-by: Ruozhu Li <liruozhu@huawei.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/tcp.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
    index 8cb15ee5b249..18bd68b82d78 100644
    --- a/drivers/nvme/host/tcp.c
    +++ b/drivers/nvme/host/tcp.c
    @@ -1769,13 +1769,13 @@ static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)
    if (ret)
    return ret;

    - ctrl->queue_count = nr_io_queues + 1;
    - if (ctrl->queue_count < 2) {
    + if (nr_io_queues == 0) {
    dev_err(ctrl->device,
    "unable to set any I/O queues\n");
    return -ENOMEM;
    }

    + ctrl->queue_count = nr_io_queues + 1;
    dev_info(ctrl->device,
    "creating %d I/O queues.\n", nr_io_queues);

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-13 16:22    [W:2.154 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site