RDMA/mana_ib: UC QP support
Subsystems (2)
v5 cover RDMA/mana_ib: UC QP support
From: Konstantin Taranov <[email protected]>
Implement UC QP creation in the RNIC HW for user API.
v5: revised 1/2 to incorporate the drain fix from Leon
v4: renamed rc_qp destroy helper to rnic_qp. Use the latest robust udata API. Unified QP lookup table to simplify code for inserting UC QPs. That is why the changes were split into 2 patches. The first patch is about the changes related to qp lookup/store.
v3: use new udata helpers
v2: removed udata check and removed enum from mana-abi.h
Konstantin Taranov (2):
RDMA/mana_ib: unify QP lookup table
RDMA/mana_ib: UC QP support for UAPI
drivers/infiniband/hw/mana/main.c | 49 +++++++- drivers/infiniband/hw/mana/mana_ib.h | 83 +++++++++++- drivers/infiniband/hw/mana/qp.c | 181 ++++++++++++++++++--------- include/uapi/rdma/mana-abi.h | 11 ++ 4 files changed, 255 insertions(+), 69 deletions(-)
Signature · 1 line
2.43.0
PATCH v5 1/2 RDMA/mana_ib: unify QP lookup table
From: Konstantin Taranov <[email protected]>
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.
---v4->v5: inline store functions inside mana_table_store_qp() to explicitly see the call of drain at the same level.
drivers/infiniband/hw/mana/mana_ib.h | 30 +++++++++ drivers/infiniband/hw/mana/qp.c | 97 ++++++++++++---------------- 2 files changed, 71 insertions(+), 56 deletions(-)
drivers/infiniband/hw/mana/mana_ib.h +30 -0
@@ -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 ;
drivers/infiniband/hw/mana/qp.c +41 -56
130 lines not on this page · raw message
Signature · 1 line
2.43.0
RE: [PATCH rdma-next v5 1/2] RDMA/mana_ib: unify QP lookup table
Quoted 8 lines
From: Konstantin Taranov <[email protected]>
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 <[email protected]>
Quoted 218 lines
---
v4->v5: inline store functions insidemana_table_store_qp()tov4->explicitly
see the call of drain at the same level.drivers/infiniband/hw/mana/mana_ib.h | 30 +++++++++ drivers/infiniband/hw/mana/qp.c | 97 ++++++++++++---------------- 2 files changed, 71 insertions(+), 56 deletions(-)drivers/infiniband/hw/mana/mana_ib.h +2
-0@@ -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(structmana_ib_dev*mdev)drivers/infiniband/hw/mana/mana_ib.h +5
-0return 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-Quoted 1 line
rc_qp.queues[MANA_RC_SEND_QUEUE_REQUESTER];
drivers/infiniband/hw/mana/mana_ib.h +13
-0+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-Quoted 1 line
rc_qp.queues[MANA_RC_RECV_QUEUE_RESPONDER];
drivers/infiniband/hw/mana/mana_ib.h +8
-0+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,
drivers/infiniband/hw/mana/mana_ib.h +2
-0u32 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 ;(quoted diff) +0
-0
b/drivers/infiniband/hw/mana/qp.cindexc52f3ec14..47e1fadbd100644drivers/infiniband/hw/mana/qp.c +0
-0@@ -461,89 +461,74 @@ static enum gdma_queue_typemana_ib_queue_type(struct
ib_qp_init_attr*attr, u32drivers/infiniband/hw/mana/qp.c +0
-1return type; } -static int mana_table_store_rc_qp(struct mana_ib_dev *mdev, struct
mana_ib_qp*qp)drivers/infiniband/hw/mana/qp.c +3
-3+static void mana_table_drain_qp_ref (struct mana_ib_qp *qp) { -return xa_insert_irq (&mdev->qp_table_wq, qp->ibqp.qp_num, qp, -GFP_KERNEL ); +mana_put_qp_ref (qp); +wait_for_completion (&qp->free); } -static void mana_table_remove_rc_qp(struct mana_ib_dev *mdev, struct
mana_ib_qp*qp)
+static int mana_table_store_qp_qid(structmana_ib_dev*mdev, structmana_ib_qp*qp,drivers/infiniband/hw/mana/qp.c +8
-2+ u32 qid, bool is_sq) { -xa_erase_irq (&mdev->qp_table_wq, qp->ibqp.qp_num); +/* Remove subtype bits */ + qid &= ~MANA_QID_SUBTYPE_MASK ; +if (is_sq) + qid |=MANA_SENDQ_MASK ; + +return xa_insert_irq (&mdev->qp_table_wq, qid, qp,GFP_KERNEL ); } -static void mana_table_drain_qp_ref (struct mana_ib_qp *qp) +static void mana_table_remove_qp_qid(struct mana_ib_dev *mdev, u32qid,
drivers/infiniband/hw/mana/qp.c +7
-3+bool is_sq) { -mana_put_qp_ref (qp); -wait_for_completion (&qp->free); +/* Remove subtype bits */ + qid &= ~MANA_QID_SUBTYPE_MASK ; +if (is_sq) + qid |=MANA_SENDQ_MASK ; + +xa_erase_irq (&mdev->qp_table_wq, qid); } -static int mana_table_store_ud_qp(struct mana_ib_dev *mdev, struct
mana_ib_qp*qp)drivers/infiniband/hw/mana/qp.c +2
-1+static int mana_table_store_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;drivers/infiniband/hw/mana/qp.c +14
-7-u32 qidr = qp->ud_qp.queues[MANA_UD_RECV_QUEUE ].id; +struct mana_ib_queue *sq, *rq;int err; - err =xa_insert_irq (&mdev->qp_table_wq, qids, qp,GFP_KERNEL ); +refcount_set (&qp->refcount,1 ); +init_completion (&qp->free); + sq =mana_qp_get_sq (qp); + rq =mana_qp_get_rq (qp); + +if (!sq || !rq) +return -EINVAL ; + + err =mana_table_store_qp_qid (mdev, qp, sq->id, true);if (err)return err; - err =xa_insert_irq (&mdev->qp_table_wq, qidr, qp,GFP_KERNEL ); + err =mana_table_store_qp_qid (mdev, qp, rq->id, false);if (err) - goto remove_sq; + goto err_remove_sq;return 0 ; -remove_sq: -xa_erase_irq (&mdev->qp_table_wq, qids); +err_remove_sq: +mana_table_remove_qp_qid (mdev, sq->id, true);mana_table_drain_qp_ref (qp);return err; } -static void mana_table_remove_ud_qp(struct mana_ib_dev *mdev, struct
mana_ib_qp*qp) -{drivers/infiniband/hw/mana/qp.c +0
-1- u32 qids = qp->ud_qp.queues[MANA_UD_SEND_QUEUE].id |
MANA_SENDQ_MASK;drivers/infiniband/hw/mana/qp.c +0
-7-u32 qidr = qp->ud_qp.queues[MANA_UD_RECV_QUEUE ].id; - -xa_erase_irq (&mdev->qp_table_wq, qids); -xa_erase_irq (&mdev->qp_table_wq, qidr); -} - -static int mana_table_store_qp(struct mana_ib_dev *mdev, struct
mana_ib_qp*qp)drivers/infiniband/hw/mana/qp.c +2
-11+static void mana_table_remove_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 inmana table, %d\n",
drivers/infiniband/hw/mana/qp.c +3
-17- qp->ibqp.qp_type); - } +struct mana_ib_queue *sq, *rq; -return -EINVAL ; -} + sq =mana_qp_get_sq (qp); + rq =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 removingfrom mana table, %d\n",
drivers/infiniband/hw/mana/qp.c +4
-3- qp->ibqp.qp_type); +if (!sq || !rq)return ; - } + +mana_table_remove_qp_qid (mdev, sq->id, true); +mana_table_remove_qp_qid (mdev, rq->id, false);mana_table_drain_qp_ref (qp); } --2.43.0
PATCH v5 2/2 RDMA/mana_ib: UC QP support for UAPI
In reply to Konstantin TaranovFrom: Konstantin Taranov <[email protected]>
Implement UC QP creation in the RNIC HW for user API. An UC QP is exposed as three work queues: send, receive, and memory management. The latter is used for bind and invalidate WQEs to support memory windows.
---
v5: no changes
v4: renamed rc_qp destroy helper to rnic_qp. Use the latest robust udata API. Use new store/lookup introduced in 1/2
v3: use new udata helpers
v2: removed udata check and removed enum from mana-abi.h
drivers/infiniband/hw/mana/main.c | 49 ++++++++++++++-- drivers/infiniband/hw/mana/mana_ib.h | 53 ++++++++++++++++-- drivers/infiniband/hw/mana/qp.c | 84 +++++++++++++++++++++++++++- include/uapi/rdma/mana-abi.h | 11 ++++ 4 files changed, 184 insertions(+), 13 deletions(-)
drivers/infiniband/hw/mana/main.c +44 -5
@@ -1046,16 +1046,55 @@ int mana_ib_gd_create_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp,return 0 ; } -int mana_ib_gd_destroy_rc_qp (struct mana_ib_dev *mdev,struct mana_ib_qp *qp) +int mana_ib_gd_create_uc_qp (struct mana_ib_dev *mdev,struct mana_ib_qp *qp, +struct ib_qp_init_attr *attr,u32 doorbell,u64 flags) { -struct mana_rnic_destroy_rc_qp_resp resp = {0 }; -struct mana_rnic_destroy_rc_qp_req req = {0 }; + struct mana_ib_cq *send_cq = container_of(qp->ibqp.send_cq, struct mana_ib_cq, ibcq); + struct mana_ib_cq *recv_cq = container_of(qp->ibqp.recv_cq, struct mana_ib_cq, ibcq); + struct mana_ib_pd *pd = container_of(qp->ibqp.pd, struct mana_ib_pd, ibpd);struct gdma_context *gc =mdev_to_gc (mdev); +struct mana_rnic_create_uc_qp_resp resp = {}; +struct mana_rnic_create_uc_qp_req req = {}; +int err, i; -mana_gd_init_req_hdr (&req.hdr,MANA_IB_DESTROY_RC_QP ,sizeof (req),sizeof (resp)); +mana_gd_init_req_hdr (&req.hdr,MANA_IB_CREATE_UC_QP ,sizeof (req),sizeof (resp)); req.hdr.dev_id = mdev->gdma_dev->dev_id; req.adapter = mdev->adapter_handle; - req.rc_qp_handle = qp->qp_handle; + req.pd_handle = pd->pd_handle; + req.send_cq_handle = send_cq->cq_handle; + req.recv_cq_handle = recv_cq->cq_handle; +for (i =0 ; i <MANA_UC_QUEUE_TYPE_MAX ; i++) + req.dma_region[i] = qp->uc_qp.queues[i].gdma_region; + req.doorbell_page = doorbell; + req.max_send_wr = attr->cap.max_send_wr; + req.max_recv_wr = attr->cap.max_recv_wr; + req.max_send_sge = attr->cap.max_send_sge; + req.max_recv_sge = attr->cap.max_recv_sge; + req.flags = flags; + + err =mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp); +if (err) +return err; + + qp->qp_handle = resp.qp_handle; +for (i =0 ; i <MANA_UC_QUEUE_TYPE_MAX ; i++) { + qp->uc_qp.queues[i].id = resp.queue_ids[i]; +/* The GDMA regions are now owned by the RNIC QP handle */ + qp->uc_qp.queues[i].gdma_region =GDMA_INVALID_DMA_REGION ; + } +return 0 ; +} + +int mana_ib_gd_destroy_rnic_qp (struct mana_ib_dev *mdev,struct mana_ib_qp *qp) +{ +struct mana_rnic_destroy_rnic_qp_resp resp = {0 }; +struct mana_rnic_destroy_rnic_qp_req req = {0 }; +struct gdma_context *gc =mdev_to_gc (mdev); + +mana_gd_init_req_hdr (&req.hdr,MANA_IB_DESTROY_RNIC_QP ,sizeof (req),sizeof (resp)); + req.hdr.dev_id = mdev->gdma_dev->dev_id; + req.adapter = mdev->adapter_handle; + req.qp_handle = qp->qp_handle;return mana_gd_send_request (gc,sizeof (req), &req,sizeof (resp), &resp); }
drivers/infiniband/hw/mana/mana_ib.h +47 -6
103 lines not on this page · raw message
drivers/infiniband/hw/mana/qp.c +82 -2
126 lines not on this page · raw message
include/uapi/rdma/mana-abi.h +11 -0
@@ -57,6 +57,17 @@ struct mana_ib_create_rc_qp_resp {__u32 queue_id[4 ]; }; +struct mana_ib_create_uc_qp { +__aligned_u64 queue_buf[3 ]; +__u32 queue_size[3 ]; +__u32 comp_mask; +}; + +struct mana_ib_create_uc_qp_resp { +__u32 queue_id[3 ]; +__u32 reserved; +}; +struct mana_ib_create_wq {__aligned_u64 wq_buf_addr;__u32 wq_buf_size;
Signature · 1 line
2.43.0
RE: [PATCH rdma-next v5 2/2] RDMA/mana_ib: UC QP support for UAPI
Quoted 7 lines
From: Konstantin Taranov <[email protected]>
Implement UC QP creation in the RNIC HW for user API. An UC QP is exposed as three work queues: send, receive, and memory management. The latter is used for bind and invalidate WQEs to support memory windows.
Signed-off-by Konstantin Taranov <[email protected]>
Quoted 382 lines
---
v5: no changes
v4: renamedrc_qpdestroy helper tornic_qp. Use the latest robust udata API. Use new store/lookup introduced in 1/2
v3: use new udata helpers
v2: removed udata check and removed enum frommana-abi.hdrivers/infiniband/hw/mana/main.c | 49 ++++++++++++++-- drivers/infiniband/hw/mana/mana_ib.h | 53 ++++++++++++++++-- drivers/infiniband/hw/mana/qp.c | 84 +++++++++++++++++++++++++++- include/uapi/rdma/mana-abi.h | 11 ++++ 4 files changed, 184 insertions(+), 13 deletions(-)drivers/infiniband/hw/mana/main.c +9
-4@@ -1046,16 +1046,55 @@ int mana_ib_gd_create_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp, return 0; } -int mana_ib_gd_destroy_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp) +int mana_ib_gd_create_uc_qp (struct mana_ib_dev *mdev,struct mana_ib_qp *qp, +struct ib_qp_init_attr *attr,u32 doorbell,u64 flags) { -struct mana_rnic_destroy_rc_qp_resp resp = {0 }; -struct mana_rnic_destroy_rc_qp_req req = {0 }; + struct mana_ib_cq *send_cq = container_of(qp->ibqp.send_cq, struct mana_ib_cq, ibcq); + struct mana_ib_cq *recv_cq = container_of(qp->ibqp.recv_cq, struct mana_ib_cq, ibcq); + struct mana_ib_pd *pd = container_of(qp->ibqp.pd, struct mana_ib_pd, +ibpd);struct gdma_context *gc =mdev_to_gc (mdev); +struct mana_rnic_create_uc_qp_resp resp = {}; +struct mana_rnic_create_uc_qp_req req = {}; +int err, i; - mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_RC_QP,sizeof(req), sizeof(resp));
drivers/infiniband/hw/mana/main.c +1
-0+ mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_UC_QP,sizeof(req),
drivers/infiniband/hw/mana/main.c +14
-1+sizeof(resp)); req.hdr.dev_id = mdev->gdma_dev->dev_id; req.adapter = mdev->adapter_handle; - req.rc_qp_handle = qp->qp_handle; + req.pd_handle = pd->pd_handle; + req.send_cq_handle = send_cq->cq_handle; + req.recv_cq_handle = recv_cq->cq_handle; +for (i =0 ; i <MANA_UC_QUEUE_TYPE_MAX ; i++) + req.dma_region[i] = qp->uc_qp.queues[i].gdma_region; + req.doorbell_page = doorbell; + req.max_send_wr = attr->cap.max_send_wr; + req.max_recv_wr = attr->cap.max_recv_wr; + req.max_send_sge = attr->cap.max_send_sge; + req.max_recv_sge = attr->cap.max_recv_sge; + req.flags = flags; + + err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp),&resp);
drivers/infiniband/hw/mana/main.c +7
-0+if (err) +return err; + + qp->qp_handle = resp.qp_handle; +for (i =0 ; i <MANA_UC_QUEUE_TYPE_MAX ; i++) { + qp->uc_qp.queues[i].id = resp.queue_ids[i]; +/* The GDMA regions are now owned by the RNIC QP handle */
drivers/infiniband/hw/mana/main.c +1
-0+ qp->uc_qp.queues[i].gdma_region =
GDMA_INVALID_DMA_REGION;drivers/infiniband/hw/mana/main.c +11
-0+ } +return 0 ; +} + +int mana_ib_gd_destroy_rnic_qp (struct mana_ib_dev *mdev,struct +mana_ib_qp *qp) { +struct mana_rnic_destroy_rnic_qp_resp resp = {0 }; +struct mana_rnic_destroy_rnic_qp_req req = {0 }; +struct gdma_context *gc =mdev_to_gc (mdev); + + mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_RNIC_QP,sizeof(req), sizeof(resp));
drivers/infiniband/hw/mana/main.c +3
-0+ req.hdr.dev_id = mdev->gdma_dev->dev_id; + req.adapter = mdev->adapter_handle; + req.qp_handle = qp->qp_handle; return mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp),&resp); } diff --git
a/drivers/infiniband/hw/mana/mana_ib.hb/drivers/infiniband/hw/mana/mana_ib.h
index18688072f..f69866696100644drivers/infiniband/hw/mana/mana_ib.h +42
-4@@ -182,6 +182,17 @@ struct mana_ib_rc_qp {struct mana_ib_queue queues[MANA_RC_QUEUE_TYPE_MAX ]; }; +enum mana_uc_queue_type { +MANA_UC_SEND_QUEUE_REQUESTER =0 , +MANA_UC_RECV_QUEUE_RESPONDER , +MANA_UC_SEND_QUEUE_MMQ , +MANA_UC_QUEUE_TYPE_MAX , +}; + +struct mana_ib_uc_qp { +struct mana_ib_queue queues[MANA_UC_QUEUE_TYPE_MAX ]; }; +enum mana_ud_queue_type {MANA_UD_SEND_QUEUE =0 ,MANA_UD_RECV_QUEUE ,@@ -200,6 +211,7 @@ struct mana_ib_qp {union {struct mana_ib_queue raw_sq;struct mana_ib_rc_qp rc_qp; +struct mana_ib_uc_qp uc_qp;struct mana_ib_ud_qp ud_qp; };@@ -235,8 +247,9 @@ enum mana_ib_command_code {MANA_IB_CREATE_CQ =0x30008 ,MANA_IB_DESTROY_CQ =0x30009 ,MANA_IB_CREATE_RC_QP =0x3000a , -MANA_IB_DESTROY_RC_QP =0x3000b , +MANA_IB_DESTROY_RNIC_QP =0x3000b ,MANA_IB_SET_QP_STATE =0x3000d , +MANA_IB_CREATE_UC_QP =0x30020 ,MANA_IB_QUERY_VF_COUNTERS =0x30022 , MANA_IB_QUERY_DEVICE_COUNTERS = 0x30023, }; @@ -386,16 +399,39 @@ struct mana_rnic_create_qp_resp { u32 reserved; };/* HW Data*/ -struct mana_rnic_destroy_rc_qp_req { +struct mana_rnic_destroy_rnic_qp_req {struct gdma_req_hdr hdr;mana_handle_t adapter; -mana_handle_t rc_qp_handle; +mana_handle_t qp_handle; };/* HW Data */ -struct mana_rnic_destroy_rc_qp_resp { +struct mana_rnic_destroy_rnic_qp_resp {struct gdma_resp_hdr hdr; };/* HW Data */ +struct mana_rnic_create_uc_qp_req { +struct gdma_req_hdr hdr; +mana_handle_t adapter; +mana_handle_t pd_handle; +mana_handle_t send_cq_handle; +mana_handle_t recv_cq_handle; +u64 dma_region[MANA_UC_QUEUE_TYPE_MAX ]; +u64 flags; +u32 doorbell_page; +u32 max_send_wr; +u32 max_recv_wr; +u32 max_send_sge; +u32 max_recv_sge; +u32 reserved; +};/* HW Data */ + +struct mana_rnic_create_uc_qp_resp { +struct gdma_resp_hdr hdr; +mana_handle_t qp_handle; +u32 queue_ids[MANA_UC_QUEUE_TYPE_MAX ]; +u32 reserved; +};/* HW Data*/ +struct mana_rnic_create_udqp_req {struct gdma_req_hdr hdr;mana_handle_t adapter;@@ -589,6 +625,8 @@ 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_UC : +return &qp- >uc_qp.queues[MANA_UC_SEND_QUEUE_REQUESTER];drivers/infiniband/hw/mana/mana_ib.h +2
-0case IB_QPT_UD :case IB_QPT_GSI :return &qp->ud_qp.queues[MANA_UD_SEND_QUEUE ];@@ -602,6 +640,8 @@ 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_UC : +return &qp- >uc_qp.queues[MANA_UC_RECV_QUEUE_RESPONDER];drivers/infiniband/hw/mana/mana_ib.h +0
-0case IB_QPT_UD :case IB_QPT_GSI :return &qp->ud_qp.queues[MANA_UD_RECV_QUEUE ];@@ -766,8 +806,9 @@ int mana_ib_gd_destroy_cq(struct mana_ib_dev *mdev, struct mana_ib_cq *cq);int mana_ib_gd_create_rc_qp (struct mana_ib_dev *mdev,struct mana_ib_qp *qp, struct ib_qp_init_attr *attr, u32 doorbell, u64flags); -int
mana_ib_gd_destroy_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp);drivers/infiniband/hw/mana/mana_ib.h +2
-1- +int mana_ib_gd_destroy_rnic_qp (struct mana_ib_dev *mdev,struct +mana_ib_qp *qp); int mana_ib_gd_create_uc_qp(struct mana_ib_dev*mdev, struct
mana_ib_qp*qp,drivers/infiniband/hw/mana/mana_ib.h +1
-0+ struct ib_qp_init_attr *attr, u32 doorbell, u64flags);
int mana_ib_gd_create_ud_qp(structmana_ib_dev*mdev, structmana_ib_qp*qp,
structib_qp_init_attr*attr, u32 doorbell, u32
type); intmana_ib_gd_destroy_ud_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp); diff --gita/drivers/infiniband/hw/mana/qp.cb/drivers/infiniband/hw/mana/qp.cindex47e1fadbd..8b7be1255100644drivers/infiniband/hw/mana/qp.c +5
-1@@ -597,13 +597,67 @@ static int mana_ib_create_rc_qp(struct ib_qp *ibqp, struct ib_pd *ibpd, return 0; destroy_qp: -mana_ib_gd_destroy_rc_qp (mdev, qp); +mana_ib_gd_destroy_rnic_qp (mdev, qp); destroy_queues:while (i-- >0 )mana_ib_destroy_queue (mdev, &qp->rc_qp.queues[i]);return err; } +static int mana_ib_create_uc_qp (struct ib_qp *ibqp,struct ib_pd *ibpd, +struct ib_qp_init_attr *attr,struct ib_udata *udata) { + struct mana_ib_dev *mdev = container_of(ibpd->device, struct mana_ib_dev, ib_dev); + struct mana_ib_qp *qp = container_of(ibqp, struct mana_ib_qp,ibqp);
drivers/infiniband/hw/mana/qp.c +11
-0+struct mana_ib_create_uc_qp_resp resp = {}; +struct mana_ib_ucontext *mana_ucontext; +struct mana_ib_create_uc_qp ucmd; +u64 flags =0 ; +u32 doorbell; +int err, i; + +if (!udata) +return -EINVAL ; + + mana_ucontext = rdma_udata_to_drv_context(udata, struct
mana_ib_ucontext, ibucontext);drivers/infiniband/hw/mana/qp.c +7
-0+ doorbell = mana_ucontext->doorbell; + err =ib_copy_validate_udata_in_cm (udata, ucmd, comp_mask,0 ); +if (err) +return err; + +for (i =0 ; i <MANA_UC_QUEUE_TYPE_MAX ; ++i) { + err = mana_ib_create_queue(mdev, ucmd.queue_buf[i],ucmd.queue_size[i],
drivers/infiniband/hw/mana/qp.c +10
-0+ &qp->uc_qp.queues[i]); +if (err) + goto destroy_queues; + } + + err =mana_ib_gd_create_uc_qp (mdev, qp, attr, doorbell, flags); +if (err) + goto destroy_queues; + + qp->ibqp.qp_num = qp-Quoted 1 line
uc_qp.queues[MANA_UC_RECV_QUEUE_RESPONDER].id;
drivers/infiniband/hw/mana/qp.c +21
-0+ qp->port = attr->port_num; + +for (i =0 ; i <MANA_UC_QUEUE_TYPE_MAX ; ++i) + resp.queue_id[i] = qp->uc_qp.queues[i].id; + + err =ib_respond_udata (udata, resp); +if (err) + goto destroy_qp; + + err =mana_table_store_qp (mdev, qp); +if (err) + goto destroy_qp; +return 0 ; +destroy_qp: +mana_ib_gd_destroy_rnic_qp (mdev, qp); +destroy_queues: +while (i-- >0 ) +mana_ib_destroy_queue (mdev, &qp->uc_qp.queues[i]); +return err; +} +static void mana_add_qp_to_cqs (struct mana_ib_qp *qp) { struct mana_ib_cq *send_cq = container_of(qp->ibqp.send_cq, struct
mana_ib_cq, ibcq); @@ -713,6 +767,8 @@ int mana_ib_create_qp(structib_qp*ibqp, structib_qp_init_attr*attr,drivers/infiniband/hw/mana/qp.c +25
-1return mana_ib_create_qp_raw (ibqp, ibqp->pd, attr, udata);case IB_QPT_RC :return mana_ib_create_rc_qp (ibqp, ibqp->pd, attr, udata); +case IB_QPT_UC : +return mana_ib_create_uc_qp (ibqp, ibqp->pd, attr, udata);case IB_QPT_UD :case IB_QPT_GSI :return mana_ib_create_ud_qp (ibqp, ibqp->pd, attr, udata);@@ -803,6 +859,7 @@ int mana_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, {switch (ibqp->qp_type) {case IB_QPT_RC : +case IB_QPT_UC :case IB_QPT_UD :case IB_QPT_GSI :return mana_ib_gd_modify_qp (ibqp, attr, attr_mask, udata);@@ -908,13 +965,34 @@ static int mana_ib_destroy_rc_qp(struct mana_ib_qp *qp, struct ib_udata *udata)/* Ignore return code as there is not much we can do about it. * The error message is printed inside. */ -mana_ib_gd_destroy_rc_qp (mdev ,qp ); +mana_ib_gd_destroy_rnic_qp (mdev ,qp );for (i =0 ; i <MANA_RC_QUEUE_TYPE_MAX ; ++i)mana_ib_destroy_queue (mdev, &qp->rc_qp.queues[i]);return 0 ; } +static int mana_ib_destroy_uc_qp (struct mana_ib_qp *qp,struct ib_udata +*udata) { +struct mana_ib_dev *mdev = + container_of(qp->ibqp.device, struct mana_ib_dev, ib_dev); +int i, err; + + err =ib_no_udata_io (udata); +if (err) +return err; + +mana_table_remove_qp (mdev, qp); +/* Ignore return code as there is not much we can do about it. +* The error message is printed inside. +*/ +mana_ib_gd_destroy_rnic_qp (mdev, qp); +for (i =0 ; i <MANA_UC_QUEUE_TYPE_MAX ; ++i) +mana_ib_destroy_queue (mdev, &qp->uc_qp.queues[i]); + +return 0 ; +} +static int mana_ib_destroy_ud_qp (struct mana_ib_qp *qp,struct ib_udata *udata) {drivers/infiniband/hw/mana/qp.c +2
-0struct mana_ib_dev *mdev =@@ -954,6 +1032,8 @@ int mana_ib_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata)return mana_ib_destroy_qp_raw (qp, udata);case IB_QPT_RC :return mana_ib_destroy_rc_qp (qp, udata); +case IB_QPT_UC : +return mana_ib_destroy_uc_qp (qp, udata);case IB_QPT_UD :case IB_QPT_GSI :return
mana_ib_destroy_ud_qp(qp, udata); diff --gita/include/uapi/rdma/mana-abi.hb/include/uapi/rdma/mana-abi.hindex8336bf51b..169bf91b3100644include/uapi/rdma/mana-abi.h +11
-1@@ -57,6 +57,17 @@ struct mana_ib_create_rc_qp_resp {__u32 queue_id[4 ]; }; +struct mana_ib_create_uc_qp { +__aligned_u64 queue_buf[3 ]; +__u32 queue_size[3 ]; +__u32 comp_mask; +}; + +struct mana_ib_create_uc_qp_resp { +__u32 queue_id[3 ]; +__u32 reserved; +}; +struct mana_ib_create_wq {__aligned_u64 wq_buf_addr;__u32 wq_buf_size; --2.43.0
Leon Romanovsky
AppliedQuoted 12 lines · Konstantin Taranov
From: Konstantin Taranov <[email protected]>
Implement UC QP creation in the RNIC HW for user API.
v5: revised 1/2 to incorporate the drain fix from Leon
v4: renamedrc_qpdestroy helper tornic_qp. Use the latest robust udata API. Unified QP lookup table to simplify code for inserting UC QPs. That is why the changes were split into 2 patches. The first patch is about the changes related to qp lookup/store.
v3: use new udata helpers
v2: removed udata check and removed enum frommana-abi.h
Quoted 1 line
[...]
Applied, thanks!
[1/2] RDMA/mana_ib: unify QP lookup table
https://git.kernel.org/rdma/rdma/c/a489ab44ab73a6 [2/2] RDMA/mana_ib: UC QP support for UAPI https://git.kernel.org/rdma/rdma/c/6aad80a1d4e70c
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>