lkml.org 
[lkml]   [2021]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 158/323] nvme-rdma: fix error code in nvme_rdma_setup_ctrl
    Date
    From: Max Gurtovoy <mgurtovoy@nvidia.com>

    [ Upstream commit 09748122009aed7bfaa7acc33c10c083a4758322 ]

    In case that icdoff is not zero or mandatory keyed sgls are not
    supported by the NVMe/RDMA target, we'll go to error flow but we'll
    return 0 to the caller. Fix it by returning an appropriate error code.

    Fixes: c66e2998c8ca ("nvme-rdma: centralize controller setup sequence")
    Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com>
    Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/rdma.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
    index ffd6a7204509a..1f41cf80f827c 100644
    --- a/drivers/nvme/host/rdma.c
    +++ b/drivers/nvme/host/rdma.c
    @@ -967,11 +967,13 @@ static int nvme_rdma_setup_ctrl(struct nvme_rdma_ctrl *ctrl, bool new)
    return ret;

    if (ctrl->ctrl.icdoff) {
    + ret = -EOPNOTSUPP;
    dev_err(ctrl->ctrl.device, "icdoff is not supported!\n");
    goto destroy_admin;
    }

    if (!(ctrl->ctrl.sgls & (1 << 2))) {
    + ret = -EOPNOTSUPP;
    dev_err(ctrl->ctrl.device,
    "Mandatory keyed sgls are not supported!\n");
    goto destroy_admin;
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-24 14:07    [W:4.179 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site