RDMA/erdma: Introduce custom implementation of drain_sq and drain_rq
Subsystems (2)
Cheng Xu
maintainerv2 cover RDMA/erdma: Introduce custom implementation of drain_sq and drain_rq
Hi,
This series introduces erdma's implementation of drain_sq and drain_rq. Our hardware will stop processing any new WRs if QP state is error. So the default __ib_drain_sq and __ib_drain_rq in core code can not work for erdma. For this reason, we implement the drain_sq and drain_rq interfaces.
In SQ draining or RQ draining, we post both drain send wr and drain recv wr, and then modify_qp to error. At last, we wait the corresponding completion in the separated interface.
The first patch introduces internal post_send/post_recv for qp drain, and the second patch implements the drain_sq and drain_rq of erdma.
Changes since V1:
* Add drain_rq/drain_sq assignments in struct ib_device_ops of erdma.
Thanks,
Cheng Xu
Cheng Xu (2):
RDMA/erdma: Introduce internal post_send/post_recv for qp drain RDMA/erdma: Add drain_sq and drain_rq support
drivers/infiniband/hw/erdma/erdma_main.c | 6 +- drivers/infiniband/hw/erdma/erdma_qp.c | 116 +++++++++++++++++++++- drivers/infiniband/hw/erdma/erdma_verbs.h | 27 ++++- 3 files changed, 138 insertions(+), 11 deletions(-)
Signature · 1 line
2.27.0
Cheng Xu
maintainerPATCH v2 1/2 RDMA/erdma: Introduce internal post_send/post_recv for qp drain
For erdma, hardware won't process newly posted send WRs or recv WRs after QP state changed to error, and no flush cqes will generated for them. So, internal post_send and post_recv functions are introduced to prevent the new send WRs or recv WRs.
--- drivers/infiniband/hw/erdma/erdma_main.c | 4 +- drivers/infiniband/hw/erdma/erdma_qp.c | 45 ++++++++++++++++++++--- drivers/infiniband/hw/erdma/erdma_verbs.h | 17 +++++++-- 3 files changed, 55 insertions(+), 11 deletions(-)
drivers/infiniband/hw/erdma/erdma_main.c +2 -2
@@ -460,8 +460,8 @@ static const struct ib_device_ops erdma_device_ops = { .mmap = erdma_mmap, .mmap_free = erdma_mmap_free, .modify_qp = erdma_modify_qp, - .post_recv = erdma_post_recv, - .post_send = erdma_post_send, + .post_recv = erdma_post_recv_nodrain, + .post_send = erdma_post_send_nodrain, .poll_cq = erdma_poll_cq, .query_device = erdma_query_device, .query_gid = erdma_query_gid,
drivers/infiniband/hw/erdma/erdma_qp.c +40 -5
85 lines not on this page · raw message
drivers/infiniband/hw/erdma/erdma_verbs.h +13 -4
@@ -195,6 +195,12 @@ struct erdma_qp_attrs {u8 pd_len; }; +enum erdma_qp_flags { +ERDMA_QP_FLAGS_DRAIN_ISSUED = (1 <<0 ), +ERDMA_QP_FLAGS_TX_STOPPED = (1 <<1 ), +ERDMA_QP_FLAGS_RX_STOPPED = (1 <<2 ), +}; +struct erdma_qp {struct ib_qp ibqp;struct kref ref;
@@ -202,6 +208,7 @@ struct erdma_qp {struct erdma_dev *dev;struct erdma_cep *cep;struct rw_semaphore state_lock; +unsigned long flags;union {struct erdma_kqp kern_qp;
@@ -328,10 +335,12 @@ void erdma_mmap_free(struct rdma_user_mmap_entry *rdma_entry);void erdma_qp_get_ref (struct ib_qp *ibqp);void erdma_qp_put_ref (struct ib_qp *ibqp);struct ib_qp *erdma_get_ibqp (struct ib_device *dev,int id); -int erdma_post_send (struct ib_qp *ibqp,const struct ib_send_wr *send_wr, -const struct ib_send_wr **bad_send_wr); -int erdma_post_recv (struct ib_qp *ibqp,const struct ib_recv_wr *recv_wr, -const struct ib_recv_wr **bad_recv_wr); +int erdma_post_send_nodrain (struct ib_qp *ibqp, +const struct ib_send_wr *send_wr, +const struct ib_send_wr **bad_send_wr); +int erdma_post_recv_nodrain (struct ib_qp *ibqp, +const struct ib_recv_wr *recv_wr, +const struct ib_recv_wr **bad_recv_wr);int erdma_poll_cq (struct ib_cq *ibcq,int num_entries,struct ib_wc *wc);struct ib_mr *erdma_ib_alloc_mr (struct ib_pd *ibpd,enum ib_mr_type mr_type,u32 max_num_sg);
Signature · 1 line
2.27.0
Cheng Xu
maintainerPATCH v2 2/2 RDMA/erdma: Add drain_sq and drain_rq support
In reply to Cheng XuFor erdma, hardware won't process any WRs after modifying QP state to error, so the default __ib_drain_sq and __ib_drain_rq can not work for erdma device. Here, we introduce custom implementation of drain_sq and drain_rq interface to fit erdma hardware.
---
v1 -> v2:
- Add drain_rq/drain_sq assignments in struct ib_device_ops of erdma.
--- drivers/infiniband/hw/erdma/erdma_main.c | 2 + drivers/infiniband/hw/erdma/erdma_qp.c | 71 +++++++++++++++++++++++ drivers/infiniband/hw/erdma/erdma_verbs.h | 10 ++++ 3 files changed, 83 insertions(+)
drivers/infiniband/hw/erdma/erdma_main.c +2 -0
@@ -446,6 +446,8 @@ static const struct ib_device_ops erdma_device_ops = { .dereg_mr = erdma_dereg_mr, .destroy_cq = erdma_destroy_cq, .destroy_qp = erdma_destroy_qp, + .drain_rq = erdma_drain_rq, + .drain_sq = erdma_drain_sq, .get_dma_mr = erdma_get_dma_mr, .get_port_immutable = erdma_get_port_immutable, .iw_accept = erdma_accept,
drivers/infiniband/hw/erdma/erdma_qp.c +71 -0
74 lines not on this page · raw message
drivers/infiniband/hw/erdma/erdma_verbs.h +10 -0
@@ -133,6 +133,11 @@ struct erdma_uqp {u32 rq_offset; }; +struct erdma_drain_cqe { +struct ib_cqe cqe; +struct completion done; +}; +struct erdma_kqp {u16 sq_pi;u16 sq_ci;
@@ -155,6 +160,9 @@ struct erdma_kqp {void *sq_db_info;void *rq_db_info; +struct erdma_drain_cqe sdrain; +struct erdma_drain_cqe rdrain; +u8 sig_all; };
@@ -341,6 +349,8 @@ int erdma_post_send_nodrain(struct ib_qp *ibqp,int erdma_post_recv_nodrain (struct ib_qp *ibqp,const struct ib_recv_wr *recv_wr,const struct ib_recv_wr **bad_recv_wr); +void erdma_drain_sq (struct ib_qp *ibqp); +void erdma_drain_rq (struct ib_qp *ibqp);int erdma_poll_cq (struct ib_cq *ibcq,int num_entries,struct ib_wc *wc);struct ib_mr *erdma_ib_alloc_mr (struct ib_pd *ibpd,enum ib_mr_type mr_type,u32 max_num_sg);
Signature · 1 line
2.27.0