RDMA/erdma: erdma updates
Subsystems (2)
Cheng Xu
maintainerv3 cover RDMA/erdma: erdma updates
Hi,
This series has some updates for erdma driver:
- #1 refactors the initialization and destruction process of EQ to make the code cleaner.
- #2 adds disassociate ucontext support.
- #3 returns QP state in erdma_query_qp.
v3:
- Remove patch "RDMA/erdma: Make the device probe process more robust" for internal discussion.
- Remove __GFP_ZERO flags when calling dma_alloc_coherent in patch #1.
- Eliminate __GFP_ZERO by calling dma_pool_zalloc instead of dma_pool_alloc in patch #1.
v2:
- Remove unsed erdma_aeq_destroy.
Thanks,
Cheng Xu
Cheng Xu (3):
RDMA/erdma: Refactor the initialization and destruction of EQ RDMA/erdma: Add disassociate ucontext support RDMA/erdma: Return QP state in erdma_query_qp
drivers/infiniband/hw/erdma/erdma.h | 3 +- drivers/infiniband/hw/erdma/erdma_cmdq.c | 26 ++----- drivers/infiniband/hw/erdma/erdma_eq.c | 87 +++++++++++------------ drivers/infiniband/hw/erdma/erdma_main.c | 5 +- drivers/infiniband/hw/erdma/erdma_verbs.c | 29 +++++++- drivers/infiniband/hw/erdma/erdma_verbs.h | 1 + 6 files changed, 81 insertions(+), 70 deletions(-)
Signature · 1 line
2.31.1
Cheng Xu
maintainerPATCH v3 1/3 RDMA/erdma: Refactor the initialization and destruction of EQ
We extracted the common parts of the initialization/destruction process to make the code cleaner.
--- drivers/infiniband/hw/erdma/erdma.h | 3 +- drivers/infiniband/hw/erdma/erdma_cmdq.c | 26 ++----- drivers/infiniband/hw/erdma/erdma_eq.c | 87 ++++++++++++------------ drivers/infiniband/hw/erdma/erdma_main.c | 4 +- 4 files changed, 51 insertions(+), 69 deletions(-)
drivers/infiniband/hw/erdma/erdma.h +2 -1
@@ -274,7 +274,8 @@ void notify_eq(struct erdma_eq *eq);void *get_next_valid_eqe (struct erdma_eq *eq);int erdma_aeq_init (struct erdma_dev *dev); -void erdma_aeq_destroy (struct erdma_dev *dev); +int erdma_eq_common_init (struct erdma_dev *dev,struct erdma_eq *eq,u32 depth); +void erdma_eq_destroy (struct erdma_dev *dev,struct erdma_eq *eq);void erdma_aeq_event_handler (struct erdma_dev *dev);void erdma_ceq_completion_handler (struct erdma_eq_cb *ceq_cb);
drivers/infiniband/hw/erdma/erdma_cmdq.c +5 -21
@@ -158,20 +158,13 @@ static int erdma_cmdq_eq_init(struct erdma_dev *dev) {struct erdma_cmdq *cmdq = &dev->cmdq;struct erdma_eq *eq = &cmdq->eq; +int ret; - eq->depth = cmdq->max_outstandings; - eq->qbuf =dma_alloc_coherent (&dev->pdev->dev, eq->depth <<EQE_SHIFT , - &eq->qbuf_dma_addr,GFP_KERNEL ); -if (!eq->qbuf) -return -ENOMEM ; - -spin_lock_init (&eq->lock); -atomic64_set (&eq->event_num,0 ); + ret =erdma_eq_common_init (dev, eq, cmdq->max_outstandings); +if (ret) +return ret; eq->db = dev->func_bar +ERDMA_REGS_CEQ_DB_BASE_REG ; - eq->dbrec =dma_pool_zalloc (dev->db_pool,GFP_KERNEL , &eq->dbrec_dma); -if (!eq->dbrec) - goto err_out;erdma_reg_write32 (dev,ERDMA_REGS_CMDQ_EQ_ADDR_H_REG ,upper_32_bits (eq->qbuf_dma_addr));
@@ -181,12 +174,6 @@ static int erdma_cmdq_eq_init(struct erdma_dev *dev)erdma_reg_write64 (dev,ERDMA_CMDQ_EQ_DB_HOST_ADDR_REG , eq->dbrec_dma);return 0 ; - -err_out: -dma_free_coherent (&dev->pdev->dev, eq->depth <<EQE_SHIFT , eq->qbuf, - eq->qbuf_dma_addr); - -return -ENOMEM ; }int erdma_cmdq_init (struct erdma_dev *dev)
@@ -247,10 +234,7 @@ void erdma_cmdq_destroy(struct erdma_dev *dev)clear_bit (ERDMA_CMDQ_STATE_OK_BIT , &cmdq->state); -dma_free_coherent (&dev->pdev->dev, cmdq->eq.depth <<EQE_SHIFT , - cmdq->eq.qbuf, cmdq->eq.qbuf_dma_addr); - -dma_pool_free (dev->db_pool, cmdq->eq.dbrec, cmdq->eq.dbrec_dma); +erdma_eq_destroy (dev, &cmdq->eq);dma_free_coherent (&dev->pdev->dev, cmdq->sq.depth <<SQEBB_SHIFT , cmdq->sq.qbuf, cmdq->sq.qbuf_dma_addr);
drivers/infiniband/hw/erdma/erdma_eq.c +42 -45
133 lines not on this page · raw message
drivers/infiniband/hw/erdma/erdma_main.c +2 -2
@@ -333,7 +333,7 @@ static int erdma_probe_dev(struct pci_dev *pdev)erdma_cmdq_destroy (dev); err_uninit_aeq: -erdma_aeq_destroy (dev); +erdma_eq_destroy (dev, &dev->aeq); err_uninit_comm_irq:erdma_comm_irq_uninit (dev);
@@ -366,7 +366,7 @@ static void erdma_remove_dev(struct pci_dev *pdev)erdma_ceqs_uninit (dev);erdma_hw_reset (dev);erdma_cmdq_destroy (dev); -erdma_aeq_destroy (dev); +erdma_eq_destroy (dev, &dev->aeq);erdma_comm_irq_uninit (dev);pci_free_irq_vectors (dev->pdev);erdma_device_uninit (dev);
Signature · 1 line
2.31.1
Cheng Xu
maintainerPATCH v3 2/3 RDMA/erdma: Add disassociate ucontext support
In reply to Cheng XuAll IO pages mapped to user space are handled by rdma_user_mmap_io, so add empty stub for disassociate ucontext.
--- drivers/infiniband/hw/erdma/erdma_main.c | 1 + drivers/infiniband/hw/erdma/erdma_verbs.c | 4 ++++ drivers/infiniband/hw/erdma/erdma_verbs.h | 1 + 3 files changed, 6 insertions(+)
drivers/infiniband/hw/erdma/erdma_main.c +1 -0
@@ -490,6 +490,7 @@ static const struct ib_device_ops erdma_device_ops = { .dereg_mr = erdma_dereg_mr, .destroy_cq = erdma_destroy_cq, .destroy_qp = erdma_destroy_qp, + .disassociate_ucontext = erdma_disassociate_ucontext, .get_dma_mr = erdma_get_dma_mr, .get_hw_stats = erdma_get_hw_stats, .get_port_immutable = erdma_get_port_immutable,
drivers/infiniband/hw/erdma/erdma_verbs.c +4 -0
@@ -1700,6 +1700,10 @@ int erdma_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,return ret; } +void erdma_disassociate_ucontext (struct ib_ucontext *ibcontext) +{ +} +void erdma_set_mtu (struct erdma_dev *dev,u32 mtu) {struct erdma_cmdq_config_mtu_req req;
drivers/infiniband/hw/erdma/erdma_verbs.h +1 -0
@@ -344,6 +344,7 @@ int erdma_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int mask, struct ib_udata *data);int erdma_destroy_qp (struct ib_qp *ibqp,struct ib_udata *udata);int erdma_destroy_cq (struct ib_cq *ibcq,struct ib_udata *udata); +void erdma_disassociate_ucontext (struct ib_ucontext *ibcontext);int erdma_req_notify_cq (struct ib_cq *ibcq,enum ib_cq_notify_flags flags);struct ib_mr *erdma_reg_user_mr (struct ib_pd *ibpd,u64 start,u64 len,u64 virt,int access,struct ib_udata *udata);
Signature · 1 line
2.31.1
Cheng Xu
maintainerPATCH v3 3/3 RDMA/erdma: Return QP state in erdma_query_qp
In reply to Cheng XuFix qp_state and cur_qp_state to return correct values in struct ib_qp_attr.
--- drivers/infiniband/hw/erdma/erdma_verbs.c | 25 ++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
drivers/infiniband/hw/erdma/erdma_verbs.c +24 -1
@@ -1544,11 +1544,31 @@ int erdma_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask,return ret; } +static inline enum ib_qp_state query_qp_state (struct erdma_qp *qp) +{ +switch (qp->attrs.state) { +case ERDMA_QP_STATE_IDLE : +return IB_QPS_INIT ; +case ERDMA_QP_STATE_RTR : +return IB_QPS_RTR ; +case ERDMA_QP_STATE_RTS : +return IB_QPS_RTS ; +case ERDMA_QP_STATE_CLOSING : +return IB_QPS_ERR ; +case ERDMA_QP_STATE_TERMINATE : +return IB_QPS_ERR ; +case ERDMA_QP_STATE_ERROR : +return IB_QPS_ERR ; +default : +return IB_QPS_ERR ; + } +} +int erdma_query_qp (struct ib_qp *ibqp,struct ib_qp_attr *qp_attr,int qp_attr_mask,struct ib_qp_init_attr *qp_init_attr) { -struct erdma_qp *qp;struct erdma_dev *dev; +struct erdma_qp *qp;if (ibqp && qp_attr && qp_init_attr) { qp =to_eqp (ibqp);
@@ -1575,6 +1595,9 @@ int erdma_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, qp_init_attr->cap = qp_attr->cap; + qp_attr->qp_state =query_qp_state (qp); + qp_attr->cur_qp_state =query_qp_state (qp); +return 0 ; }
Signature · 1 line
2.31.1
Leon Romanovsky
AppliedQuoted 6 lines · Cheng Xu
This series has some updates for erdma driver:
- #1 refactors the initialization and destruction process of EQ to make the code cleaner.
- #2 adds disassociate ucontext support.
- #3 returns QP state inerdma_query_qp.
Quoted 8 lines
v3:
- Remove patch "RDMA/erdma: Make the device probe process more robust" for internal discussion.
- Remove__GFP_ZEROflags when callingdma_alloc_coherentin patch #1.
- Eliminate__GFP_ZEROby callingdma_pool_zallocinstead ofdma_pool_allocin patch #1.[...]
Applied, thanks!
[1/3] RDMA/erdma: Refactor the initialization and destruction of EQ
https://git.kernel.org/rdma/rdma/c/2ffc67aeb99105 [2/3] RDMA/erdma: Add disassociate ucontext support https://git.kernel.org/rdma/rdma/c/05572fa5268ec6 [3/3] RDMA/erdma: Return QP state in erdma_query_qp https://git.kernel.org/rdma/rdma/c/cf2840f59119f4
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>