From: maxg@mellanox.com (Max Gurtovoy)
Subject: [PATCH v2 1/1] nvmet-rdma: Add error flow for post_recv failures
Date: Wed, 27 Jun 2018 15:53:38 +0300 [thread overview]
Message-ID: <72462cc3-e1fa-059f-ca2c-52543cbbd7db@mellanox.com> (raw)
In-Reply-To: <1530100713-24247-1-git-send-email-maxg@mellanox.com>
On 6/27/2018 2:58 PM, Max Gurtovoy wrote:
> Posting receive buffer operation can fail, thus we should
> make sure there is no memory leakage in that flow. Also add
> an error log in case of a failure.
>
> Signed-off-by: Max Gurtovoy <maxg at mellanox.com>
> ---
>
> Changes from v1:
> - centrelize the error log to nvmet_rdma_post_recv func
> - don't release response during post_recv failure in nvmet_rdma_queue_response.
> Instead, continue and try sending the response to the initiator.
>
> ---
> drivers/nvme/target/rdma.c | 27 ++++++++++++++++++++++-----
> 1 file changed, 22 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
> index 52e0c5d..88d9f82 100644
> --- a/drivers/nvme/target/rdma.c
> +++ b/drivers/nvme/target/rdma.c
> @@ -383,14 +383,22 @@ 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 for %s 0x%p\n",
> + ndev->srq ? "SRQ" : "QP",
> + ndev->srq ? ndev->srq : cmd->queue->cm_id->qp);
In second thought maybe I'll leave it:
pr_err("post_recv cmd failed\n");
agreed ?
> + return ret;
> }
>
> static void nvmet_rdma_process_wr_wait_list(struct nvmet_rdma_queue *queue)
> @@ -765,11 +773,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;
> @@ -899,13 +912,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;
>
next prev parent reply other threads:[~2018-06-27 12:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-27 11:58 [PATCH v2 1/1] nvmet-rdma: Add error flow for post_recv failures Max Gurtovoy
2018-06-27 12:53 ` Max Gurtovoy [this message]
2018-06-28 14:38 ` Sagi Grimberg
2018-06-28 15:02 ` Max Gurtovoy
2018-06-28 16:15 ` Sagi Grimberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=72462cc3-e1fa-059f-ca2c-52543cbbd7db@mellanox.com \
--to=maxg@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox