RDMA/erdma: Misc fixes for the erdma RoCEv2 protocol
Subsystems (2)
cover RDMA/erdma: Misc fixes for the erdma RoCEv2 protocol
Hi,
This patch series addresses several issues for the erdma RoCEv2 protocol.
- #1 adds missing fields to the erdma_device_ops_rocev2.
- #2 fixes incorrect response returned from query_qp.
- #3~#4 support posting create_ah and destroy_ah commands to the cmdq in polling mode to eliminate the hard lockup issue.
Thanks,
Boshi Yu
Boshi Yu (4):
RDMA/erdma: Add missing fields to the erdma_device_ops_rocev2 RDMA/erdma: Fix incorrect response returned from query_qp RDMA/erdma: Support non-sleeping erdma_post_cmd_wait() RDMA/erdma: Support create_ah/destroy_ah in non-sleepable contexts
drivers/infiniband/hw/erdma/erdma.h | 4 +- drivers/infiniband/hw/erdma/erdma_cmdq.c | 26 +++++----- drivers/infiniband/hw/erdma/erdma_eq.c | 6 ++- drivers/infiniband/hw/erdma/erdma_main.c | 10 ++-- drivers/infiniband/hw/erdma/erdma_qp.c | 8 ++-- drivers/infiniband/hw/erdma/erdma_verbs.c | 58 ++++++++++++++--------- 6 files changed, 64 insertions(+), 48 deletions(-)
Signature · 1 line
2.46.0
PATCH 1/4 RDMA/erdma: Add missing fields to the erdma_device_ops_rocev2
Set the query_ah field to the erdma_create_ah() function and set the size_ib_ah field to the size of struct erdma_ah.
--- drivers/infiniband/hw/erdma/erdma_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/infiniband/hw/erdma/erdma_main.c +3 -0
@@ -486,6 +486,9 @@ static const struct ib_device_ops erdma_device_ops_rocev2 = { .query_pkey = erdma_query_pkey, .create_ah = erdma_create_ah, .destroy_ah = erdma_destroy_ah, + .query_ah = erdma_query_ah, + + INIT_RDMA_OBJ_SIZE(ib_ah, erdma_ah, ibah), };static const struct ib_device_ops erdma_device_ops_iwarp = {
Signature · 1 line
2.46.0
PATCH 2/4 RDMA/erdma: Fix incorrect response returned from query_qp
In reply to Boshi YuThe erdma_post_cmd_wait() function returns the cmdq response only when both resp0 and resp1 are not NULL.
--- drivers/infiniband/hw/erdma/erdma_verbs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/infiniband/hw/erdma/erdma_verbs.c +8 -8
@@ -1799,7 +1799,7 @@ int erdma_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr,struct erdma_cmdq_query_qp_req_rocev2 req;struct erdma_dev *dev;struct erdma_qp *qp; -u64 resp; +u64 resp0, resp1;int ret;if (ibqp && qp_attr && qp_init_attr) {
@@ -1833,20 +1833,20 @@ int erdma_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, CMDQ_OPCODE_QUERY_QP); req.qpn =QP_ID (qp); - ret =erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req), &resp, -NULL ); + ret =erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req), &resp0, + &resp1);if (ret)return ret; qp_attr->sq_psn = -FIELD_GET (ERDMA_CMD_QUERY_QP_RESP_SQ_PSN_MASK , resp); +FIELD_GET (ERDMA_CMD_QUERY_QP_RESP_SQ_PSN_MASK , resp0); qp_attr->rq_psn = -FIELD_GET (ERDMA_CMD_QUERY_QP_RESP_RQ_PSN_MASK , resp); - qp_attr->qp_state =rocev2_to_ib_qps ( -FIELD_GET (ERDMA_CMD_QUERY_QP_RESP_QP_STATE_MASK , resp)); +FIELD_GET (ERDMA_CMD_QUERY_QP_RESP_RQ_PSN_MASK , resp0); + qp_attr->qp_state =rocev2_to_ib_qps (FIELD_GET ( +ERDMA_CMD_QUERY_QP_RESP_QP_STATE_MASK , resp0)); qp_attr->cur_qp_state = qp_attr->qp_state; qp_attr->sq_draining =FIELD_GET ( -ERDMA_CMD_QUERY_QP_RESP_SQ_DRAINING_MASK , resp); +ERDMA_CMD_QUERY_QP_RESP_SQ_DRAINING_MASK , resp0); qp_attr->pkey_index =0 ; qp_attr->dest_qp_num = qp->attrs.rocev2.dst_qpn;
Signature · 1 line
2.46.0
PATCH 3/4 RDMA/erdma: Support non-sleeping erdma_post_cmd_wait()
In reply to Boshi YuSeveral scenarios require posting commands to the cmdq in a non-sleepable context. For example, the cm_alloc_msg() might call erdma_create_ah() while still holding a spinlock. So we add support for non-sleeping erdma_post_cmd_wait().
--- drivers/infiniband/hw/erdma/erdma.h | 4 +-- drivers/infiniband/hw/erdma/erdma_cmdq.c | 26 +++++++------- drivers/infiniband/hw/erdma/erdma_eq.c | 6 ++-- drivers/infiniband/hw/erdma/erdma_main.c | 7 ++-- drivers/infiniband/hw/erdma/erdma_qp.c | 8 +++-- drivers/infiniband/hw/erdma/erdma_verbs.c | 44 ++++++++++++++--------- 6 files changed, 54 insertions(+), 41 deletions(-)
drivers/infiniband/hw/erdma/erdma.h +1 -3
@@ -101,8 +101,6 @@ struct erdma_cmdq {struct erdma_comp_wait *wait_pool;spinlock_t lock; -bool use_event; -struct erdma_cmdq_sq sq;struct erdma_cmdq_cq cq;struct erdma_eq eq;
@@ -269,7 +267,7 @@ void erdma_cmdq_destroy(struct erdma_dev *dev);void erdma_cmdq_build_reqhdr (u64 *hdr,u32 mod,u32 op);int erdma_post_cmd_wait (struct erdma_cmdq *cmdq,void *req,u32 req_size, -u64 *resp0,u64 *resp1); +u64 *resp0,u64 *resp1,bool sleepable);void erdma_cmdq_completion_handler (struct erdma_cmdq *cmdq);int erdma_ceqs_init (struct erdma_dev *dev);
drivers/infiniband/hw/erdma/erdma_cmdq.c +12 -14
@@ -182,7 +182,6 @@ int erdma_cmdq_init(struct erdma_dev *dev)int err; cmdq->max_outstandings =ERDMA_CMDQ_MAX_OUTSTANDING ; - cmdq->use_event = false;sema_init (&cmdq->credits, cmdq->max_outstandings);
@@ -223,8 +222,6 @@ int erdma_cmdq_init(struct erdma_dev *dev)void erdma_finish_cmdq_init (struct erdma_dev *dev) { -/* after device init successfully, change cmdq to event mode. */ - dev->cmdq.use_event = true;arm_cmdq_cq (&dev->cmdq); }
@@ -312,8 +309,7 @@ static int erdma_poll_single_cmd_completion(struct erdma_cmdq *cmdq)/* Copy 16B comp data after cqe hdr to outer */ be32_to_cpu_array (comp_wait->comp_data, cqe +2 ,4 ); -if (cmdq->use_event) -complete (&comp_wait->wait_event); +complete (&comp_wait->wait_event);return 0 ; }
@@ -332,9 +328,6 @@ static void erdma_polling_cmd_completions(struct erdma_cmdq *cmdq)if (erdma_poll_single_cmd_completion (cmdq))break ; -if (comp_num && cmdq->use_event) -arm_cmdq_cq (cmdq); -spin_unlock_irqrestore (&cmdq->cq.lock, flags); }
@@ -342,8 +335,7 @@ void erdma_cmdq_completion_handler(struct erdma_cmdq *cmdq) {int got_event =0 ; -if (!test_bit (ERDMA_CMDQ_STATE_OK_BIT , &cmdq->state) || - !cmdq->use_event) +if (!test_bit (ERDMA_CMDQ_STATE_OK_BIT , &cmdq->state))return ;while (get_next_valid_eqe (&cmdq->eq)) {
@@ -354,6 +346,7 @@ void erdma_cmdq_completion_handler(struct erdma_cmdq *cmdq)if (got_event) { cmdq->cq.cmdsn++;erdma_polling_cmd_completions (cmdq); +arm_cmdq_cq (cmdq); }notify_eq (&cmdq->eq);
@@ -372,7 +365,7 @@ static int erdma_poll_cmd_completion(struct erdma_comp_wait *comp_ctx,if (time_is_before_jiffies (comp_timeout))return -ETIME ; -msleep (20 ); +udelay (20 ); }return 0 ;
@@ -403,7 +396,7 @@ void erdma_cmdq_build_reqhdr(u64 *hdr, u32 mod, u32 op) }int erdma_post_cmd_wait (struct erdma_cmdq *cmdq,void *req,u32 req_size, -u64 *resp0,u64 *resp1) +u64 *resp0,u64 *resp1,bool sleepable) {struct erdma_comp_wait *comp_wait;int ret;
@@ -411,7 +404,12 @@ int erdma_post_cmd_wait(struct erdma_cmdq *cmdq, void *req, u32 req_size,if (!test_bit (ERDMA_CMDQ_STATE_OK_BIT , &cmdq->state))return -ENODEV ; -down (&cmdq->credits); +if (!sleepable) { +while (down_trylock (&cmdq->credits)) + ; + }else { +down (&cmdq->credits); + } comp_wait =get_comp_wait (cmdq);if (IS_ERR (comp_wait)) {
@@ -425,7 +423,7 @@ int erdma_post_cmd_wait(struct erdma_cmdq *cmdq, void *req, u32 req_size,push_cmdq_sqe (cmdq, req, req_size, comp_wait);spin_unlock (&cmdq->sq.lock); -if (cmdq->use_event) +if (sleepable) ret =erdma_wait_cmd_completion (comp_wait, cmdq,ERDMA_CMDQ_TIMEOUT_MS );else
drivers/infiniband/hw/erdma/erdma_eq.c +4 -2
@@ -236,7 +236,8 @@ static int create_eq_cmd(struct erdma_dev *dev, u32 eqn, struct erdma_eq *eq) req.db_dma_addr_l =lower_32_bits (eq->dbrec_dma); req.db_dma_addr_h =upper_32_bits (eq->dbrec_dma); -return erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL ); +return erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL , + false); }static int erdma_ceq_init_one (struct erdma_dev *dev,u16 ceqn)
@@ -278,7 +279,8 @@ static void erdma_ceq_uninit_one(struct erdma_dev *dev, u16 ceqn) req.qtype =ERDMA_EQ_TYPE_CEQ ; req.vector_idx = ceqn +1 ; - err =erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL ); + err =erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL , + false);if (err)return ;
drivers/infiniband/hw/erdma/erdma_main.c +4 -3
@@ -392,7 +392,7 @@ static int erdma_dev_attrs_init(struct erdma_dev *dev) CMDQ_OPCODE_QUERY_DEVICE); err =erdma_post_cmd_wait (&dev->cmdq, &req_hdr,sizeof (req_hdr), &cap0, - &cap1); + &cap1, true);if (err)return err;
@@ -425,7 +425,7 @@ static int erdma_dev_attrs_init(struct erdma_dev *dev) CMDQ_OPCODE_QUERY_FW_INFO); err =erdma_post_cmd_wait (&dev->cmdq, &req_hdr,sizeof (req_hdr), &cap0, - &cap1); + &cap1, true);if (!err) dev->attrs.fw_version =FIELD_GET (ERDMA_CMD_INFO0_FW_VER_MASK , cap0);
@@ -446,7 +446,8 @@ static int erdma_device_config(struct erdma_dev *dev) req.cfg =FIELD_PREP (ERDMA_CMD_CONFIG_DEVICE_PGSHIFT_MASK ,PAGE_SHIFT ) |FIELD_PREP (ERDMA_CMD_CONFIG_DEVICE_PS_EN_MASK ,1 ); -return erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL ); +return erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL , + true); }static int erdma_res_cb_init (struct erdma_dev *dev)
drivers/infiniband/hw/erdma/erdma_qp.c +5 -3
@@ -98,7 +98,8 @@ erdma_modify_qp_state_to_rts(struct erdma_qp *qp, req.send_nxt +=MPA_DEFAULT_HDR_LEN + params->pd_len; req.recv_nxt = tp->rcv_nxt; - ret =erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL ); + ret =erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL , + true);if (ret)return ret;
@@ -131,7 +132,8 @@ erdma_modify_qp_state_to_stop(struct erdma_qp *qp, req.cfg =FIELD_PREP (ERDMA_CMD_MODIFY_QP_STATE_MASK , params->state) |FIELD_PREP (ERDMA_CMD_MODIFY_QP_QPN_MASK ,QP_ID (qp)); - ret =erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL ); + ret =erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL , + true);if (ret)return ret;
@@ -246,7 +248,7 @@ static int modify_qp_cmd_rocev2(struct erdma_qp *qp, req.attr_mask = attr_mask;return erdma_post_cmd_wait (&qp->dev->cmdq, &req,sizeof (req),NULL , -NULL ); +NULL , true); }static void erdma_reset_qp (struct erdma_qp *qp)
drivers/infiniband/hw/erdma/erdma_verbs.c +28 -16
134 lines not on this page · raw message
Signature · 1 line
2.46.0
PATCH 4/4 RDMA/erdma: Support create_ah/destroy_ah in non-sleepable contexts
In reply to Boshi YuThe RDMA CM module might invoke erdma_create_ah() or erdma_destroy_ah() in a non-sleepable context. Both of these functions will call the erdma_post_cmd_wait(), which can potentially sleep and occasionally lead to a hard lockup. Therefore, post the create_ah and destroy_ah commands in polling mode if the RDMA_CREATE_AH_SLEEPABLE and RDMA_DESTROY_AH_SLEEPABLE flags are not set, respectively.
--- drivers/infiniband/hw/erdma/erdma_verbs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/erdma/erdma_verbs.c +2 -2
@@ -2223,7 +2223,7 @@ int erdma_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr,erdma_set_av_cfg (&req.av_cfg, &ah->av); ret =erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL , - true); + init_attr->flags &RDMA_CREATE_AH_SLEEPABLE );if (ret) {erdma_free_idx (&dev->res_cb[ERDMA_RES_TYPE_AH ], ah->ahn);return ret;
@@ -2247,7 +2247,7 @@ int erdma_destroy_ah(struct ib_ah *ibah, u32 flags) req.ahn = ah->ahn; ret =erdma_post_cmd_wait (&dev->cmdq, &req,sizeof (req),NULL ,NULL , - true); + flags &RDMA_DESTROY_AH_SLEEPABLE );if (ret)return ret;
Signature · 1 line
2.46.0
Leon Romanovsky
AppliedQuoted 8 lines · Boshi Yu
This patch series addresses several issues for the erdma RoCEv2 protocol.
- #1 adds missing fields to the
erdma_device_ops_rocev2.
- #2 fixes incorrect response returned fromquery_qp.
- #3~#4 support postingcreate_ahanddestroy_ahcommands to the cmdq in polling mode to eliminate the hard lockup issue.[...]
Applied, thanks!
[1/4] RDMA/erdma: Add missing fields to the erdma_device_ops_rocev2
https://git.kernel.org/rdma/rdma/c/67831baff0d7a7 [2/4] RDMA/erdma: Fix incorrect response returned from query_qp https://git.kernel.org/rdma/rdma/c/3761e0ad79c137 [3/4] RDMA/erdma: Support non-sleeping erdma_post_cmd_wait() https://git.kernel.org/rdma/rdma/c/26981e688ca896 [4/4] RDMA/erdma: Support create_ah/destroy_ah in non-sleepable contexts https://git.kernel.org/rdma/rdma/c/a6c346760a52af
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>