OSDN Git Service

nvmet-rdma: add an error flow for post_recv failures
authorMax Gurtovoy <maxg@mellanox.com>
Sun, 1 Jul 2018 09:20:24 +0000 (12:20 +0300)
committerChristoph Hellwig <hch@lst.de>
Mon, 23 Jul 2018 07:35:17 +0000 (09:35 +0200)
Posting receive buffer operation can fail, thus we should make
sure to have an error flow during initialization phase. While
we're here, add a debug print in case of a failure.

Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/target/rdma.c

index 4ca0945..e7f43d1 100644 (file)
@@ -436,14 +436,21 @@ static int nvmet_rdma_post_recv(struct nvmet_rdma_device *ndev,
                struct nvmet_rdma_cmd *cmd)
 {
        struct ib_recv_wr *bad_wr;
+       int ret;
 
        ib_dma_sync_single_for_device(ndev->device,
                cmd->sge[0].addr, cmd->sge[0].length,
                DMA_FROM_DEVICE);
 
        if (ndev->srq)
-               return ib_post_srq_recv(ndev->srq, &cmd->wr, &bad_wr);
-       return ib_post_recv(cmd->queue->cm_id->qp, &cmd->wr, &bad_wr);
+               ret = ib_post_srq_recv(ndev->srq, &cmd->wr, &bad_wr);
+       else
+               ret = ib_post_recv(cmd->queue->cm_id->qp, &cmd->wr, &bad_wr);
+
+       if (unlikely(ret))
+               pr_err("post_recv cmd failed\n");
+
+       return ret;
 }
 
 static void nvmet_rdma_process_wr_wait_list(struct nvmet_rdma_queue *queue)
@@ -833,11 +840,16 @@ static int nvmet_rdma_init_srq(struct nvmet_rdma_device *ndev)
        ndev->srq = srq;
        ndev->srq_size = srq_size;
 
-       for (i = 0; i < srq_size; i++)
-               nvmet_rdma_post_recv(ndev, &ndev->srq_cmds[i]);
+       for (i = 0; i < srq_size; i++) {
+               ret = nvmet_rdma_post_recv(ndev, &ndev->srq_cmds[i]);
+               if (ret)
+                       goto out_free_cmds;
+       }
 
        return 0;
 
+out_free_cmds:
+       nvmet_rdma_free_cmds(ndev, ndev->srq_cmds, ndev->srq_size, false);
 out_destroy_srq:
        ib_destroy_srq(srq);
        return ret;
@@ -982,13 +994,17 @@ static int nvmet_rdma_create_queue_ib(struct nvmet_rdma_queue *queue)
        if (!ndev->srq) {
                for (i = 0; i < queue->recv_queue_size; i++) {
                        queue->cmds[i].queue = queue;
-                       nvmet_rdma_post_recv(ndev, &queue->cmds[i]);
+                       ret = nvmet_rdma_post_recv(ndev, &queue->cmds[i]);
+                       if (ret)
+                               goto err_destroy_qp;
                }
        }
 
 out:
        return ret;
 
+err_destroy_qp:
+       rdma_destroy_qp(queue->cm_id);
 err_destroy_cq:
        ib_free_cq(queue->cq);
        goto out;