| From 5c8a61e524475c9208d5598fe09bcce983c2b0c6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 17 Oct 2021 11:58:16 +0300 |
| Subject: nvme-rdma: fix error code in nvme_rdma_setup_ctrl |
| |
| 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 dcc3d2393605e..08a23bb4b8b57 100644 |
| --- a/drivers/nvme/host/rdma.c |
| +++ b/drivers/nvme/host/rdma.c |
| @@ -1019,11 +1019,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 |
| |
