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 504/779] RDMA/rtrs: Replace duplicate check with is_pollqueue helper
    Date
    From: Jack Wang <jinpu.wang@ionos.com>

    [ Upstream commit 36332ded46b6292296bc7170fada6e238a0802cc ]

    if (con->cid >= con->sess->irq_con_num) check can be replaced with a
    is_pollqueue helper.

    Link: https://lore.kernel.org/r/20210922125333.351454-5-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 | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    diff --git a/drivers/infiniband/ulp/rtrs/rtrs.c b/drivers/infiniband/ulp/rtrs/rtrs.c
    index 9bc323490ce3..ac83cd97f838 100644
    --- a/drivers/infiniband/ulp/rtrs/rtrs.c
    +++ b/drivers/infiniband/ulp/rtrs/rtrs.c
    @@ -222,13 +222,18 @@ static void qp_event_handler(struct ib_event *ev, void *ctx)
    }
    }

    +static bool is_pollqueue(struct rtrs_con *con)
    +{
    + return con->cid >= con->sess->irq_con_num;
    +}
    +
    static int create_cq(struct rtrs_con *con, int cq_vector, int nr_cqe,
    enum ib_poll_context poll_ctx)
    {
    struct rdma_cm_id *cm_id = con->cm_id;
    struct ib_cq *cq;

    - if (con->cid >= con->sess->irq_con_num)
    + if (is_pollqueue(con))
    cq = ib_alloc_cq(cm_id->device, con, nr_cqe, cq_vector,
    poll_ctx);
    else
    @@ -288,7 +293,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 (con->cid >= con->sess->irq_con_num)
    + if (is_pollqueue(con))
    ib_free_cq(con->cq);
    else
    ib_cq_pool_put(con->cq, con->nr_cqe);
    @@ -308,7 +313,7 @@ void rtrs_cq_qp_destroy(struct rtrs_con *con)
    con->qp = NULL;
    }
    if (con->cq) {
    - if (con->cid >= con->sess->irq_con_num)
    + if (is_pollqueue(con))
    ib_free_cq(con->cq);
    else
    ib_cq_pool_put(con->cq, con->nr_cqe);
    --
    2.35.1


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