Commit 36332ded authored by Jack Wang's avatar Jack Wang Committed by Jason Gunthorpe

RDMA/rtrs: Replace duplicate check with is_pollqueue helper

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.comSigned-off-by: default avatarJack Wang <jinpu.wang@ionos.com>
Signed-off-by: default avatarMd Haris Iqbal <haris.iqbal@ionos.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 4b6afe9b
...@@ -222,13 +222,18 @@ static void qp_event_handler(struct ib_event *ev, void *ctx) ...@@ -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, static int create_cq(struct rtrs_con *con, int cq_vector, int nr_cqe,
enum ib_poll_context poll_ctx) enum ib_poll_context poll_ctx)
{ {
struct rdma_cm_id *cm_id = con->cm_id; struct rdma_cm_id *cm_id = con->cm_id;
struct ib_cq *cq; 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, cq = ib_alloc_cq(cm_id->device, con, nr_cqe, cq_vector,
poll_ctx); poll_ctx);
else else
...@@ -288,7 +293,7 @@ int rtrs_cq_qp_create(struct rtrs_sess *sess, struct rtrs_con *con, ...@@ -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, err = create_qp(con, sess->dev->ib_pd, max_send_wr, max_recv_wr,
max_send_sge); max_send_sge);
if (err) { if (err) {
if (con->cid >= con->sess->irq_con_num) if (is_pollqueue(con))
ib_free_cq(con->cq); ib_free_cq(con->cq);
else else
ib_cq_pool_put(con->cq, con->nr_cqe); ib_cq_pool_put(con->cq, con->nr_cqe);
...@@ -308,7 +313,7 @@ void rtrs_cq_qp_destroy(struct rtrs_con *con) ...@@ -308,7 +313,7 @@ void rtrs_cq_qp_destroy(struct rtrs_con *con)
con->qp = NULL; con->qp = NULL;
} }
if (con->cq) { if (con->cq) {
if (con->cid >= con->sess->irq_con_num) if (is_pollqueue(con))
ib_free_cq(con->cq); ib_free_cq(con->cq);
else else
ib_cq_pool_put(con->cq, con->nr_cqe); ib_cq_pool_put(con->cq, con->nr_cqe);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment