Skip to content

Commit 53657a0

Browse files
Konstantin Taranovrleon
authored andcommitted
RDMA/mana_ib: Create and destroy RC QP
Implement HW requests to create and destroy an RC QP. An RC QP may have 5 queues. Signed-off-by: Konstantin Taranov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Long Li <[email protected]> Reviewed-by: Zhu Yanjun <[email protected]> Signed-off-by: Leon Romanovsky <[email protected]>
1 parent 38c02d8 commit 53657a0

File tree

2 files changed

+116
-1
lines changed

2 files changed

+116
-1
lines changed

drivers/infiniband/hw/mana/main.c

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -888,3 +888,62 @@ int mana_ib_gd_destroy_cq(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)
888888

889889
return 0;
890890
}
891+
892+
int mana_ib_gd_create_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp,
893+
struct ib_qp_init_attr *attr, u32 doorbell, u64 flags)
894+
{
895+
struct mana_ib_cq *send_cq = container_of(qp->ibqp.send_cq, struct mana_ib_cq, ibcq);
896+
struct mana_ib_cq *recv_cq = container_of(qp->ibqp.recv_cq, struct mana_ib_cq, ibcq);
897+
struct mana_ib_pd *pd = container_of(qp->ibqp.pd, struct mana_ib_pd, ibpd);
898+
struct gdma_context *gc = mdev_to_gc(mdev);
899+
struct mana_rnic_create_qp_resp resp = {};
900+
struct mana_rnic_create_qp_req req = {};
901+
int err, i;
902+
903+
mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_RC_QP, sizeof(req), sizeof(resp));
904+
req.hdr.dev_id = gc->mana_ib.dev_id;
905+
req.adapter = mdev->adapter_handle;
906+
req.pd_handle = pd->pd_handle;
907+
req.send_cq_handle = send_cq->cq_handle;
908+
req.recv_cq_handle = recv_cq->cq_handle;
909+
for (i = 0; i < MANA_RC_QUEUE_TYPE_MAX; i++)
910+
req.dma_region[i] = qp->rc_qp.queues[i].gdma_region;
911+
req.doorbell_page = doorbell;
912+
req.max_send_wr = attr->cap.max_send_wr;
913+
req.max_recv_wr = attr->cap.max_recv_wr;
914+
req.max_send_sge = attr->cap.max_send_sge;
915+
req.max_recv_sge = attr->cap.max_recv_sge;
916+
req.flags = flags;
917+
918+
err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
919+
if (err) {
920+
ibdev_err(&mdev->ib_dev, "Failed to create rc qp err %d", err);
921+
return err;
922+
}
923+
qp->qp_handle = resp.rc_qp_handle;
924+
for (i = 0; i < MANA_RC_QUEUE_TYPE_MAX; i++) {
925+
qp->rc_qp.queues[i].id = resp.queue_ids[i];
926+
/* The GDMA regions are now owned by the RNIC QP handle */
927+
qp->rc_qp.queues[i].gdma_region = GDMA_INVALID_DMA_REGION;
928+
}
929+
return 0;
930+
}
931+
932+
int mana_ib_gd_destroy_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp)
933+
{
934+
struct mana_rnic_destroy_rc_qp_resp resp = {0};
935+
struct mana_rnic_destroy_rc_qp_req req = {0};
936+
struct gdma_context *gc = mdev_to_gc(mdev);
937+
int err;
938+
939+
mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_RC_QP, sizeof(req), sizeof(resp));
940+
req.hdr.dev_id = gc->mana_ib.dev_id;
941+
req.adapter = mdev->adapter_handle;
942+
req.rc_qp_handle = qp->qp_handle;
943+
err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
944+
if (err) {
945+
ibdev_err(&mdev->ib_dev, "Failed to destroy rc qp err %d", err);
946+
return err;
947+
}
948+
return 0;
949+
}

drivers/infiniband/hw/mana/mana_ib.h

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,27 @@ struct mana_ib_cq {
9595
mana_handle_t cq_handle;
9696
};
9797

98+
enum mana_rc_queue_type {
99+
MANA_RC_SEND_QUEUE_REQUESTER = 0,
100+
MANA_RC_SEND_QUEUE_RESPONDER,
101+
MANA_RC_SEND_QUEUE_FMR,
102+
MANA_RC_RECV_QUEUE_REQUESTER,
103+
MANA_RC_RECV_QUEUE_RESPONDER,
104+
MANA_RC_QUEUE_TYPE_MAX,
105+
};
106+
107+
struct mana_ib_rc_qp {
108+
struct mana_ib_queue queues[MANA_RC_QUEUE_TYPE_MAX];
109+
};
110+
98111
struct mana_ib_qp {
99112
struct ib_qp ibqp;
100113

101114
mana_handle_t qp_handle;
102-
struct mana_ib_queue raw_sq;
115+
union {
116+
struct mana_ib_queue raw_sq;
117+
struct mana_ib_rc_qp rc_qp;
118+
};
103119

104120
/* The port on the IB device, starting with 1 */
105121
u32 port;
@@ -122,6 +138,8 @@ enum mana_ib_command_code {
122138
MANA_IB_CONFIG_MAC_ADDR = 0x30005,
123139
MANA_IB_CREATE_CQ = 0x30008,
124140
MANA_IB_DESTROY_CQ = 0x30009,
141+
MANA_IB_CREATE_RC_QP = 0x3000a,
142+
MANA_IB_DESTROY_RC_QP = 0x3000b,
125143
};
126144

127145
struct mana_ib_query_adapter_caps_req {
@@ -230,6 +248,40 @@ struct mana_rnic_destroy_cq_resp {
230248
struct gdma_resp_hdr hdr;
231249
}; /* HW Data */
232250

251+
struct mana_rnic_create_qp_req {
252+
struct gdma_req_hdr hdr;
253+
mana_handle_t adapter;
254+
mana_handle_t pd_handle;
255+
mana_handle_t send_cq_handle;
256+
mana_handle_t recv_cq_handle;
257+
u64 dma_region[MANA_RC_QUEUE_TYPE_MAX];
258+
u64 deprecated[2];
259+
u64 flags;
260+
u32 doorbell_page;
261+
u32 max_send_wr;
262+
u32 max_recv_wr;
263+
u32 max_send_sge;
264+
u32 max_recv_sge;
265+
u32 reserved;
266+
}; /* HW Data */
267+
268+
struct mana_rnic_create_qp_resp {
269+
struct gdma_resp_hdr hdr;
270+
mana_handle_t rc_qp_handle;
271+
u32 queue_ids[MANA_RC_QUEUE_TYPE_MAX];
272+
u32 reserved;
273+
}; /* HW Data*/
274+
275+
struct mana_rnic_destroy_rc_qp_req {
276+
struct gdma_req_hdr hdr;
277+
mana_handle_t adapter;
278+
mana_handle_t rc_qp_handle;
279+
}; /* HW Data */
280+
281+
struct mana_rnic_destroy_rc_qp_resp {
282+
struct gdma_resp_hdr hdr;
283+
}; /* HW Data */
284+
233285
static inline struct gdma_context *mdev_to_gc(struct mana_ib_dev *mdev)
234286
{
235287
return mdev->gdma_dev->gdma_context;
@@ -354,4 +406,8 @@ int mana_ib_gd_config_mac(struct mana_ib_dev *mdev, enum mana_ib_addr_op op, u8
354406
int mana_ib_gd_create_cq(struct mana_ib_dev *mdev, struct mana_ib_cq *cq, u32 doorbell);
355407

356408
int mana_ib_gd_destroy_cq(struct mana_ib_dev *mdev, struct mana_ib_cq *cq);
409+
410+
int mana_ib_gd_create_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp,
411+
struct ib_qp_init_attr *attr, u32 doorbell, u64 flags);
412+
int mana_ib_gd_destroy_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp *qp);
357413
#endif

0 commit comments

Comments
 (0)