[PATCH rdma-next v4 1/2] RDMA/mana_ib: unify QP lookup table
From: Konstantin Taranov
Date: Fri Jul 17 2026 - 15:17:38 EST
From: Konstantin Taranov <kotaranov@xxxxxxxxxxxxx>
Add helpers to retrieve the send and receive queues of a QP.
Use these helpers when storing queue IDs in the lookup table.
MANA queue IDs are 2-bit aligned, allowing the two least
significant bits to be omitted when storing and looking up
queue IDs.
Signed-off-by: Konstantin Taranov <kotaranov@xxxxxxxxxxxxx>
---
drivers/infiniband/hw/mana/mana_ib.h | 30 ++++++++++++
drivers/infiniband/hw/mana/qp.c | 70 ++++++++++++----------------
2 files changed, 59 insertions(+), 41 deletions(-)
diff --git a/drivers/infiniband/hw/mana/mana_ib.h b/drivers/infiniband/hw/mana/mana_ib.h
index da05966af..18688072f 100644
--- a/drivers/infiniband/hw/mana/mana_ib.h
+++ b/drivers/infiniband/hw/mana/mana_ib.h
@@ -26,6 +26,8 @@
/* Send queue ID mask */
#define MANA_SENDQ_MASK BIT(31)
+/* Queue ID encodes type in the lower 2 bits */
+#define MANA_QID_SUBTYPE_MASK 0x3
/*
* The hardware limit of number of MRs is greater than maximum number of MRs
@@ -582,12 +584,40 @@ static inline struct gdma_context *mdev_to_gc(struct mana_ib_dev *mdev)
return mdev->gdma_dev->gdma_context;
}
+static inline struct mana_ib_queue *mana_qp_get_sq(struct mana_ib_qp *qp)
+{
+ switch (qp->ibqp.qp_type) {
+ case IB_QPT_RC:
+ return &qp->rc_qp.queues[MANA_RC_SEND_QUEUE_REQUESTER];
+ case IB_QPT_UD:
+ case IB_QPT_GSI:
+ return &qp->ud_qp.queues[MANA_UD_SEND_QUEUE];
+ default:
+ return NULL;
+ }
+}
+
+static inline struct mana_ib_queue *mana_qp_get_rq(struct mana_ib_qp *qp)
+{
+ switch (qp->ibqp.qp_type) {
+ case IB_QPT_RC:
+ return &qp->rc_qp.queues[MANA_RC_RECV_QUEUE_RESPONDER];
+ case IB_QPT_UD:
+ case IB_QPT_GSI:
+ return &qp->ud_qp.queues[MANA_UD_RECV_QUEUE];
+ default:
+ return NULL;
+ }
+}
+
static inline struct mana_ib_qp *mana_get_qp_ref(struct mana_ib_dev *mdev,
u32 qid, bool is_sq)
{
struct mana_ib_qp *qp;
unsigned long flag;
+ /* Remove subtype bits */
+ qid &= ~MANA_QID_SUBTYPE_MASK;
if (is_sq)
qid |= MANA_SENDQ_MASK;
diff --git a/drivers/infiniband/hw/mana/qp.c b/drivers/infiniband/hw/mana/qp.c
index b5ff07e34..5e53f6ac2 100644
--- a/drivers/infiniband/hw/mana/qp.c
+++ b/drivers/infiniband/hw/mana/qp.c
@@ -461,22 +461,22 @@ static enum gdma_queue_type mana_ib_queue_type(struct ib_qp_init_attr *attr, u32
return type;
}
-static int mana_table_store_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp)
+static int mana_table_store_qp_qids(struct mana_ib_dev *mdev, struct mana_ib_qp *qp,
+ struct mana_ib_queue *sq, struct mana_ib_queue *rq)
{
- return xa_insert_irq(&mdev->qp_table_wq, qp->ibqp.qp_num, qp,
- GFP_KERNEL);
-}
+ u32 qids, qidr;
+ int err;
-static void mana_table_remove_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp)
-{
- xa_erase_irq(&mdev->qp_table_wq, qp->ibqp.qp_num);
-}
+ if (!sq || !rq)
+ return -EINVAL;
-static int mana_table_store_ud_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp)
-{
- u32 qids = qp->ud_qp.queues[MANA_UD_SEND_QUEUE].id | MANA_SENDQ_MASK;
- u32 qidr = qp->ud_qp.queues[MANA_UD_RECV_QUEUE].id;
- int err;
+ /* Set the send queue bit */
+ qids = sq->id | MANA_SENDQ_MASK;
+ qidr = rq->id;
+
+ /* Remove subtype bits */
+ qids &= ~MANA_QID_SUBTYPE_MASK;
+ qidr &= ~MANA_QID_SUBTYPE_MASK;
err = xa_insert_irq(&mdev->qp_table_wq, qids, qp, GFP_KERNEL);
if (err)
@@ -493,10 +493,21 @@ static int mana_table_store_ud_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *q
return err;
}
-static void mana_table_remove_ud_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp)
+static void mana_table_remove_qp_qids(struct mana_ib_dev *mdev, struct mana_ib_queue *sq,
+ struct mana_ib_queue *rq)
{
- u32 qids = qp->ud_qp.queues[MANA_UD_SEND_QUEUE].id | MANA_SENDQ_MASK;
- u32 qidr = qp->ud_qp.queues[MANA_UD_RECV_QUEUE].id;
+ u32 qids, qidr;
+
+ if (!sq || !rq)
+ return;
+
+ /* Set the send queue bit */
+ qids = sq->id | MANA_SENDQ_MASK;
+ qidr = rq->id;
+
+ /* Remove subtype bits */
+ qids &= ~MANA_QID_SUBTYPE_MASK;
+ qidr &= ~MANA_QID_SUBTYPE_MASK;
xa_erase_irq(&mdev->qp_table_wq, qids);
xa_erase_irq(&mdev->qp_table_wq, qidr);
@@ -507,36 +518,13 @@ static int mana_table_store_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp)
refcount_set(&qp->refcount, 1);
init_completion(&qp->free);
- switch (qp->ibqp.qp_type) {
- case IB_QPT_RC:
- return mana_table_store_rc_qp(mdev, qp);
- case IB_QPT_UD:
- case IB_QPT_GSI:
- return mana_table_store_ud_qp(mdev, qp);
- default:
- ibdev_dbg(&mdev->ib_dev, "Unknown QP type for storing in mana table, %d\n",
- qp->ibqp.qp_type);
- }
-
- return -EINVAL;
+ return mana_table_store_qp_qids(mdev, qp, mana_qp_get_sq(qp), mana_qp_get_rq(qp));
}
static void mana_table_remove_qp(struct mana_ib_dev *mdev,
struct mana_ib_qp *qp)
{
- switch (qp->ibqp.qp_type) {
- case IB_QPT_RC:
- mana_table_remove_rc_qp(mdev, qp);
- break;
- case IB_QPT_UD:
- case IB_QPT_GSI:
- mana_table_remove_ud_qp(mdev, qp);
- break;
- default:
- ibdev_dbg(&mdev->ib_dev, "Unknown QP type for removing from mana table, %d\n",
- qp->ibqp.qp_type);
- return;
- }
+ mana_table_remove_qp_qids(mdev, mana_qp_get_sq(qp), mana_qp_get_rq(qp));
mana_put_qp_ref(qp);
wait_for_completion(&qp->free);
}
--
2.43.0