lkml.org 
[lkml]   [2017]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 41/50] rds: ib: add error handle
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Zhu Yanjun <yanjun.zhu@oracle.com>


    [ Upstream commit 3b12f73a5c2977153f28a224392fd4729b50d1dc ]

    In the function rds_ib_setup_qp, the error handle is missing. When some
    error occurs, it is possible that memory leak occurs. As such, error
    handle is added.

    Cc: Joe Jin <joe.jin@oracle.com>
    Reviewed-by: Junxiao Bi <junxiao.bi@oracle.com>
    Reviewed-by: Guanglei Li <guanglei.li@oracle.com>
    Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
    Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/rds/ib_cm.c | 47 ++++++++++++++++++++++++++++++++++++-----------
    1 file changed, 36 insertions(+), 11 deletions(-)

    --- a/net/rds/ib_cm.c
    +++ b/net/rds/ib_cm.c
    @@ -381,7 +381,7 @@ static int rds_ib_setup_qp(struct rds_co
    ret = PTR_ERR(ic->i_send_cq);
    ic->i_send_cq = NULL;
    rdsdebug("ib_create_cq send failed: %d\n", ret);
    - goto out;
    + goto rds_ibdev_out;
    }

    cq_attr.cqe = ic->i_recv_ring.w_nr;
    @@ -392,19 +392,19 @@ static int rds_ib_setup_qp(struct rds_co
    ret = PTR_ERR(ic->i_recv_cq);
    ic->i_recv_cq = NULL;
    rdsdebug("ib_create_cq recv failed: %d\n", ret);
    - goto out;
    + goto send_cq_out;
    }

    ret = ib_req_notify_cq(ic->i_send_cq, IB_CQ_NEXT_COMP);
    if (ret) {
    rdsdebug("ib_req_notify_cq send failed: %d\n", ret);
    - goto out;
    + goto recv_cq_out;
    }

    ret = ib_req_notify_cq(ic->i_recv_cq, IB_CQ_SOLICITED);
    if (ret) {
    rdsdebug("ib_req_notify_cq recv failed: %d\n", ret);
    - goto out;
    + goto recv_cq_out;
    }

    /* XXX negotiate max send/recv with remote? */
    @@ -428,7 +428,7 @@ static int rds_ib_setup_qp(struct rds_co
    ret = rdma_create_qp(ic->i_cm_id, ic->i_pd, &attr);
    if (ret) {
    rdsdebug("rdma_create_qp failed: %d\n", ret);
    - goto out;
    + goto recv_cq_out;
    }

    ic->i_send_hdrs = ib_dma_alloc_coherent(dev,
    @@ -438,7 +438,7 @@ static int rds_ib_setup_qp(struct rds_co
    if (!ic->i_send_hdrs) {
    ret = -ENOMEM;
    rdsdebug("ib_dma_alloc_coherent send failed\n");
    - goto out;
    + goto qp_out;
    }

    ic->i_recv_hdrs = ib_dma_alloc_coherent(dev,
    @@ -448,7 +448,7 @@ static int rds_ib_setup_qp(struct rds_co
    if (!ic->i_recv_hdrs) {
    ret = -ENOMEM;
    rdsdebug("ib_dma_alloc_coherent recv failed\n");
    - goto out;
    + goto send_hdrs_dma_out;
    }

    ic->i_ack = ib_dma_alloc_coherent(dev, sizeof(struct rds_header),
    @@ -456,7 +456,7 @@ static int rds_ib_setup_qp(struct rds_co
    if (!ic->i_ack) {
    ret = -ENOMEM;
    rdsdebug("ib_dma_alloc_coherent ack failed\n");
    - goto out;
    + goto recv_hdrs_dma_out;
    }

    ic->i_sends = vzalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work),
    @@ -464,7 +464,7 @@ static int rds_ib_setup_qp(struct rds_co
    if (!ic->i_sends) {
    ret = -ENOMEM;
    rdsdebug("send allocation failed\n");
    - goto out;
    + goto ack_dma_out;
    }

    ic->i_recvs = vzalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work),
    @@ -472,7 +472,7 @@ static int rds_ib_setup_qp(struct rds_co
    if (!ic->i_recvs) {
    ret = -ENOMEM;
    rdsdebug("recv allocation failed\n");
    - goto out;
    + goto sends_out;
    }

    rds_ib_recv_init_ack(ic);
    @@ -480,8 +480,33 @@ static int rds_ib_setup_qp(struct rds_co
    rdsdebug("conn %p pd %p cq %p %p\n", conn, ic->i_pd,
    ic->i_send_cq, ic->i_recv_cq);

    -out:
    + return ret;
    +
    +sends_out:
    + vfree(ic->i_sends);
    +ack_dma_out:
    + ib_dma_free_coherent(dev, sizeof(struct rds_header),
    + ic->i_ack, ic->i_ack_dma);
    +recv_hdrs_dma_out:
    + ib_dma_free_coherent(dev, ic->i_recv_ring.w_nr *
    + sizeof(struct rds_header),
    + ic->i_recv_hdrs, ic->i_recv_hdrs_dma);
    +send_hdrs_dma_out:
    + ib_dma_free_coherent(dev, ic->i_send_ring.w_nr *
    + sizeof(struct rds_header),
    + ic->i_send_hdrs, ic->i_send_hdrs_dma);
    +qp_out:
    + rdma_destroy_qp(ic->i_cm_id);
    +recv_cq_out:
    + if (!ib_destroy_cq(ic->i_recv_cq))
    + ic->i_recv_cq = NULL;
    +send_cq_out:
    + if (!ib_destroy_cq(ic->i_send_cq))
    + ic->i_send_cq = NULL;
    +rds_ibdev_out:
    + rds_ib_remove_conn(rds_ibdev, conn);
    rds_ib_dev_put(rds_ibdev);
    +
    return ret;
    }


    \
     
     \ /
      Last update: 2017-10-06 11:03    [W:4.262 / U:0.456 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site