lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 505/779] RDMA/rtrs: Introduce destroy_cq helper
    Date
    From: Md Haris Iqbal <haris.iqbal@ionos.com>

    [ Upstream commit 6f5649afd3984e35c4b862a05c4511c6d18b27af ]

    The same code snip used twice, to avoid duplicate, replace it with a
    destroy_cq helper.

    Link: https://lore.kernel.org/r/20210922125333.351454-6-haris.iqbal@ionos.com
    Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
    Signed-off-by: Md Haris Iqbal <haris.iqbal@ionos.com>
    Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/ulp/rtrs/rtrs.c | 25 +++++++++++++------------
    1 file changed, 13 insertions(+), 12 deletions(-)

    diff --git a/drivers/infiniband/ulp/rtrs/rtrs.c b/drivers/infiniband/ulp/rtrs/rtrs.c
    index ac83cd97f838..37952c8e768c 100644
    --- a/drivers/infiniband/ulp/rtrs/rtrs.c
    +++ b/drivers/infiniband/ulp/rtrs/rtrs.c
    @@ -279,6 +279,17 @@ static int create_qp(struct rtrs_con *con, struct ib_pd *pd,
    return ret;
    }

    +static void destroy_cq(struct rtrs_con *con)
    +{
    + if (con->cq) {
    + if (is_pollqueue(con))
    + ib_free_cq(con->cq);
    + else
    + ib_cq_pool_put(con->cq, con->nr_cqe);
    + }
    + con->cq = NULL;
    +}
    +
    int rtrs_cq_qp_create(struct rtrs_sess *sess, struct rtrs_con *con,
    u32 max_send_sge, int cq_vector, int nr_cqe,
    u32 max_send_wr, u32 max_recv_wr,
    @@ -293,11 +304,7 @@ int rtrs_cq_qp_create(struct rtrs_sess *sess, struct rtrs_con *con,
    err = create_qp(con, sess->dev->ib_pd, max_send_wr, max_recv_wr,
    max_send_sge);
    if (err) {
    - if (is_pollqueue(con))
    - ib_free_cq(con->cq);
    - else
    - ib_cq_pool_put(con->cq, con->nr_cqe);
    - con->cq = NULL;
    + destroy_cq(con);
    return err;
    }
    con->sess = sess;
    @@ -312,13 +319,7 @@ void rtrs_cq_qp_destroy(struct rtrs_con *con)
    rdma_destroy_qp(con->cm_id);
    con->qp = NULL;
    }
    - if (con->cq) {
    - if (is_pollqueue(con))
    - ib_free_cq(con->cq);
    - else
    - ib_cq_pool_put(con->cq, con->nr_cqe);
    - con->cq = NULL;
    - }
    + destroy_cq(con);
    }
    EXPORT_SYMBOL_GPL(rtrs_cq_qp_destroy);

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-15 21:23    [W:2.491 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site