RDMA/bnxt_re: driver update
Subsystems (2)
Selvin Xavier
maintainerv3 cover RDMA/bnxt_re: driver update
Includes some generic driver updates.
Please review and apply.
Thanks,
Selvin Xavier
v2 -> v3:
- A bug fix in patch 4
v1 -> v2:
- Fix the sparse warning reported by kernel test robot for the first patch
- Fix a minor checkpatch warning in patch 2
Chandramohan Akula (1):
RDMA/bnxt_re: Add support for CQ rx coalescing
Hongguang Gao (1):
RDMA/bnxt_re: Fix access flags for MR and QP modify
Kalesh AP (2):
RDMA/bnxt_re: Add support for optimized modify QP RDMA/bnxt_re: Add support for modify_device hook
drivers/infiniband/hw/bnxt_re/bnxt_re.h | 8 ++++ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 76 ++++++++++++++++++++++++++---- drivers/infiniband/hw/bnxt_re/ib_verbs.h | 3 ++ drivers/infiniband/hw/bnxt_re/main.c | 10 ++++ drivers/infiniband/hw/bnxt_re/qplib_fp.c | 60 +++++++++++++++++++++++ drivers/infiniband/hw/bnxt_re/qplib_fp.h | 20 ++++++++ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 6 ++- drivers/infiniband/hw/bnxt_re/qplib_res.h | 10 ++++ drivers/infiniband/hw/bnxt_re/roce_hsi.h | 17 ++++++- 9 files changed, 199 insertions(+), 11 deletions(-)
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH v3 1/4 RDMA/bnxt_re: Add support for optimized modify QP
From: Kalesh AP <[email protected]>
Modify QP improvements are for state transitions from INIT -> RTR and RTR -> RTS.
In order to support the Modify QP Optimization feature, the driver is expected to check for the feature support in the CMDQ_QUERY_FUNC and register its support for this feature with the FW in CMDQ_INITIALIZE_FIRMWARE.
Additionally, the driver is required to specify the new fields and attribute masks for the transitions as follows:
1. INIT -> RTR:
- New fields: srq_used, type.
- enable srq_used when RC QP is configured to use SRQ.
- set the type based on the QP type.
- Mandatory masks:
- RC: CMDQ_MODIFY_QP_MODIFY_MASK_ACCESS, CMDQ_MODIFY_QP_MODIFY_MASK_PKEY
- UD QP and QP1: CMDQ_MODIFY_QP_MODIFY_MASK_PKEY, CMDQ_MODIFY_QP_MODIFY_MASK_QKEY
2. RTR -> RTS:
- New fields: type
- set the type based on the QP type.
- Mandatory masks:
- RC: CMDQ_MODIFY_QP_MODIFY_MASK_ACCESS
- UD QP and QP1: CMDQ_MODIFY_QP_MODIFY_MASK_QKEY
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 40 ++++++++++++++++++++++++++++++ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 6 ++++- drivers/infiniband/hw/bnxt_re/qplib_res.h | 5 ++++ drivers/infiniband/hw/bnxt_re/roce_hsi.h | 3 +++ 4 files changed, 53 insertions(+), 1 deletion(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +40 -0
@@ -1277,6 +1277,40 @@ static void __filter_modify_flags(struct bnxt_qplib_qp *qp) } } +static void bnxt_set_mandatory_attributes (struct bnxt_qplib_qp *qp, +struct cmdq_modify_qp *req) +{ +u32 mandatory_flags =0 ; + +if (qp->type ==CMDQ_MODIFY_QP_QP_TYPE_RC ) + mandatory_flags |=CMDQ_MODIFY_QP_MODIFY_MASK_ACCESS ; + +if (qp->cur_qp_state ==CMDQ_MODIFY_QP_NEW_STATE_INIT && + qp->state ==CMDQ_MODIFY_QP_NEW_STATE_RTR ) { +if (qp->type ==CMDQ_MODIFY_QP_QP_TYPE_RC && qp->srq) + req->flags =cpu_to_le16 (CMDQ_MODIFY_QP_FLAGS_SRQ_USED ); + mandatory_flags |=CMDQ_MODIFY_QP_MODIFY_MASK_PKEY ; + } + +if (qp->type ==CMDQ_MODIFY_QP_QP_TYPE_UD || + qp->type ==CMDQ_MODIFY_QP_QP_TYPE_GSI ) + mandatory_flags |=CMDQ_MODIFY_QP_MODIFY_MASK_QKEY ; + + qp->modify_flags |= mandatory_flags; + req->qp_type = qp->type; +} + +static bool is_optimized_state_transition (struct bnxt_qplib_qp *qp) +{ +if ((qp->cur_qp_state ==CMDQ_MODIFY_QP_NEW_STATE_INIT && + qp->state ==CMDQ_MODIFY_QP_NEW_STATE_RTR ) || + (qp->cur_qp_state ==CMDQ_MODIFY_QP_NEW_STATE_RTR && + qp->state ==CMDQ_MODIFY_QP_NEW_STATE_RTS )) +return true; + +return false; +} +int bnxt_qplib_modify_qp (struct bnxt_qplib_res *res,struct bnxt_qplib_qp *qp) {struct bnxt_qplib_rcfw *rcfw = res->rcfw;
@@ -1293,6 +1327,12 @@ int bnxt_qplib_modify_qp(struct bnxt_qplib_res *res, struct bnxt_qplib_qp *qp)/* Filter out the qp_attr_mask based on the state->new transition */ __filter_modify_flags (qp); +if (qp->modify_flags &CMDQ_MODIFY_QP_MODIFY_MASK_STATE ) { +/* Set mandatory attributes for INIT -> RTR and RTR -> RTS transition */ +if (_is_optimize_modify_qp_supported (res->dattr->dev_cap_flags2) && +is_optimized_state_transition (qp)) +bnxt_set_mandatory_attributes (qp, &req); + } bmask = qp->modify_flags; req.modify_mask =cpu_to_le32 (qp->modify_flags); req.qp_cid =cpu_to_le32 (qp->id);
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +5 -1
@@ -832,6 +832,7 @@ int bnxt_qplib_init_rcfw(struct bnxt_qplib_rcfw *rcfw,struct creq_initialize_fw_resp resp = {};struct cmdq_initialize_fw req = {};struct bnxt_qplib_cmdqmsg msg = {}; +u16 flags =0 ;u8 pgsz, lvl;int rc;
@@ -906,7 +907,10 @@ int bnxt_qplib_init_rcfw(struct bnxt_qplib_rcfw *rcfw, skip_ctx_setup:if (BNXT_RE_HW_RETX (rcfw->res->dattr->dev_cap_flags)) - req.flags |=cpu_to_le16 (CMDQ_INITIALIZE_FW_FLAGS_HW_REQUESTER_RETX_SUPPORTED ); + flags |=CMDQ_INITIALIZE_FW_FLAGS_HW_REQUESTER_RETX_SUPPORTED ; +if (_is_optimize_modify_qp_supported (rcfw->res->dattr->dev_cap_flags2)) + flags |=CMDQ_INITIALIZE_FW_FLAGS_OPTIMIZE_MODIFY_QP_SUPPORTED ; + req.flags |=cpu_to_le16 (flags); req.stat_ctx_id =cpu_to_le32 (ctx->stats.fw_id);bnxt_qplib_fill_cmdqmsg (&msg, &req, &resp,NULL ,sizeof (req),sizeof (resp),0 ); rc =bnxt_qplib_rcfw_send_message (rcfw, &msg);
drivers/infiniband/hw/bnxt_re/qplib_res.h +5 -0
@@ -576,4 +576,9 @@ static inline bool _is_relaxed_ordering_supported(u16 dev_cap_ext_flags2) return dev_cap_ext_flags2 & CREQ_QUERY_FUNC_RESP_SB_MEMORY_REGION_RO_SUPPORTED; } +static inline bool _is_optimize_modify_qp_supported (u16 dev_cap_ext_flags2) +{ +return dev_cap_ext_flags2 &CREQ_QUERY_FUNC_RESP_SB_OPTIMIZE_MODIFY_QP_SUPPORTED ; +} +#endif /* __BNXT_QPLIB_RES_H__ */
drivers/infiniband/hw/bnxt_re/roce_hsi.h +3 -0
@@ -216,6 +216,8 @@ struct cmdq_initialize_fw {__le16 flags;#define CMDQ_INITIALIZE_FW_FLAGS_MRAV_RESERVATION_SPLIT 0x1UL#define CMDQ_INITIALIZE_FW_FLAGS_HW_REQUESTER_RETX_SUPPORTED 0x2UL +#define CMDQ_INITIALIZE_FW_FLAGS_DRV_VERSION 0x4UL +#define CMDQ_INITIALIZE_FW_FLAGS_OPTIMIZE_MODIFY_QP_SUPPORTED 0x8UL__le16 cookie;u8 resp_size;u8 reserved8;
@@ -559,6 +561,7 @@ struct cmdq_modify_qp {#define CMDQ_MODIFY_QP_OPCODE_LAST CMDQ_MODIFY_QP_OPCODE_MODIFY_QPu8 cmd_size;__le16 flags; +#define CMDQ_MODIFY_QP_FLAGS_SRQ_USED 0x1UL__le16 cookie;u8 resp_size;u8 qp_type;
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 1/1 RDMA/bnxt_re: Fix access flags for MR and QP modify
In reply to Selvin XavierFrom: Hongguang Gao <[email protected]>
Access flag definition in MR and QP is different in FW. Currently both reg/bind MR and modify/query QP uses the same flags. Add a different function to map the QP access flags for newer adapters.
--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 59 +++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 9 deletions(-)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +50 -9
@@ -94,9 +94,9 @@ static int __from_ib_access_flags(int iflags)return qflags; }; -static enum ib_access_flags __to_ib_access_flags (int qflags) +static int __to_ib_access_flags (int qflags) { -enum ib_access_flags iflags =0 ; +int iflags =0 ;if (qflags &BNXT_QPLIB_ACCESS_LOCAL_WRITE ) iflags |=IB_ACCESS_LOCAL_WRITE ;
@@ -113,7 +113,49 @@ static enum ib_access_flags __to_ib_access_flags(int qflags)if (qflags &BNXT_QPLIB_ACCESS_ON_DEMAND ) iflags |=IB_ACCESS_ON_DEMAND ;return iflags; -}; +} + +static u8 __qp_access_flags_from_ib (struct bnxt_qplib_chip_ctx *cctx,int iflags) +{ +u8 qflags =0 ; + +if (!bnxt_qplib_is_chip_gen_p5_p7 (cctx)) +/* For Wh+ */ +return (u8 )__from_ib_access_flags (iflags); + +/* For P5, P7 and later chips */ +if (iflags &IB_ACCESS_LOCAL_WRITE ) + qflags |=CMDQ_MODIFY_QP_ACCESS_LOCAL_WRITE ; +if (iflags &IB_ACCESS_REMOTE_WRITE ) + qflags |=CMDQ_MODIFY_QP_ACCESS_REMOTE_WRITE ; +if (iflags &IB_ACCESS_REMOTE_READ ) + qflags |=CMDQ_MODIFY_QP_ACCESS_REMOTE_READ ; +if (iflags &IB_ACCESS_REMOTE_ATOMIC ) + qflags |=CMDQ_MODIFY_QP_ACCESS_REMOTE_ATOMIC ; + +return qflags; +} + +static int __qp_access_flags_to_ib (struct bnxt_qplib_chip_ctx *cctx,u8 qflags) +{ +int iflags =0 ; + +if (!bnxt_qplib_is_chip_gen_p5_p7 (cctx)) +/* For Wh+ */ +return __to_ib_access_flags (qflags); + +/* For P5, P7 and later chips */ +if (qflags &CMDQ_MODIFY_QP_ACCESS_LOCAL_WRITE ) + iflags |=IB_ACCESS_LOCAL_WRITE ; +if (qflags &CMDQ_MODIFY_QP_ACCESS_REMOTE_WRITE ) + iflags |=IB_ACCESS_REMOTE_WRITE ; +if (qflags &CMDQ_MODIFY_QP_ACCESS_REMOTE_READ ) + iflags |=IB_ACCESS_REMOTE_READ ; +if (qflags &CMDQ_MODIFY_QP_ACCESS_REMOTE_ATOMIC ) + iflags |=IB_ACCESS_REMOTE_ATOMIC ; + +return iflags; +}static void bnxt_re_check_and_set_relaxed_ordering (struct bnxt_re_dev *rdev,struct bnxt_qplib_mrw *qplib_mr)
@@ -2053,12 +2095,10 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,if (qp_attr_mask &IB_QP_ACCESS_FLAGS ) { qp->qplib_qp.modify_flags |=CMDQ_MODIFY_QP_MODIFY_MASK_ACCESS ; qp->qplib_qp.access = -__from_ib_access_flags (qp_attr->qp_access_flags); +__qp_access_flags_from_ib (qp->qplib_qp.cctx, + qp_attr->qp_access_flags);/* LOCAL_WRITE access must be set to allow RC receive */ - qp->qplib_qp.access |=BNXT_QPLIB_ACCESS_LOCAL_WRITE ; -/* Temp: Set all params on QP as of now */ - qp->qplib_qp.access |=CMDQ_MODIFY_QP_ACCESS_REMOTE_WRITE ; - qp->qplib_qp.access |=CMDQ_MODIFY_QP_ACCESS_REMOTE_READ ; + qp->qplib_qp.access |=CMDQ_MODIFY_QP_ACCESS_LOCAL_WRITE ; }if (qp_attr_mask &IB_QP_PKEY_INDEX ) { qp->qplib_qp.modify_flags |=CMDQ_MODIFY_QP_MODIFY_MASK_PKEY ;
@@ -2263,7 +2303,8 @@ int bnxt_re_query_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr, qp_attr->qp_state =__to_ib_qp_state (qplib_qp->state); qp_attr->cur_qp_state =__to_ib_qp_state (qplib_qp->cur_qp_state); qp_attr->en_sqd_async_notify = qplib_qp->en_sqd_async_notify ?1 :0 ; - qp_attr->qp_access_flags =__to_ib_access_flags (qplib_qp->access); + qp_attr->qp_access_flags =__qp_access_flags_to_ib (qp->qplib_qp.cctx, + qplib_qp->access); qp_attr->pkey_index = qplib_qp->pkey_index; qp_attr->qkey = qplib_qp->qkey; qp_attr->ah_attr.type =RDMA_AH_ATTR_TYPE_ROCE ;
Signature · 1 line
2.5.5
Selvin Xavier
maintainerRe: [PATCH] RDMA/bnxt_re: Fix access flags for MR and QP modify
Hi Leon/Jason,
Ignore this patch. This patch is sent by mistake. It is available as 4/4 patch in the previous series. Sorry for the confusion.
Thanks,
Selvin
Quoted 112 lines · Selvin Xavier
From: Hongguang Gao <[email protected]>
Access flag definition in MR and QP is different in FW. Currently both reg/bind MR and modify/query QP uses the same flags. Add a different function to map the QP access flags for newer adapters.
Signed-off-by Kalesh AP <[email protected]>Signed-off-by Hongguang Gao <[email protected]>Reviewed-by Damodharam Ammepalli <[email protected]>Signed-off-by Selvin Xavier <[email protected]>--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 59 +++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 9 deletions(-)drivers/infiniband/hw/bnxt_re/ib_verbs.c +50
-10@@ -94,9 +94,9 @@ static int __from_ib_access_flags(int iflags)return qflags; }; -static enum ib_access_flags __to_ib_access_flags (int qflags) +static int __to_ib_access_flags (int qflags) { -enum ib_access_flags iflags =0 ; +int iflags =0 ;if (qflags &BNXT_QPLIB_ACCESS_LOCAL_WRITE ) iflags |=IB_ACCESS_LOCAL_WRITE ;@@ -113,7 +113,49 @@ static enum ib_access_flags __to_ib_access_flags(int qflags)if (qflags &BNXT_QPLIB_ACCESS_ON_DEMAND ) iflags |=IB_ACCESS_ON_DEMAND ;return iflags; -}; +} + +static u8 __qp_access_flags_from_ib (struct bnxt_qplib_chip_ctx *cctx,int iflags) +{ +u8 qflags =0 ; + +if (!bnxt_qplib_is_chip_gen_p5_p7 (cctx)) +/* For Wh+ */ +return (u8 )__from_ib_access_flags (iflags); + +/* For P5, P7 and later chips */ +if (iflags &IB_ACCESS_LOCAL_WRITE ) + qflags |=CMDQ_MODIFY_QP_ACCESS_LOCAL_WRITE ; +if (iflags &IB_ACCESS_REMOTE_WRITE ) + qflags |=CMDQ_MODIFY_QP_ACCESS_REMOTE_WRITE ; +if (iflags &IB_ACCESS_REMOTE_READ ) + qflags |=CMDQ_MODIFY_QP_ACCESS_REMOTE_READ ; +if (iflags &IB_ACCESS_REMOTE_ATOMIC ) + qflags |=CMDQ_MODIFY_QP_ACCESS_REMOTE_ATOMIC ; + +return qflags; +} + +static int __qp_access_flags_to_ib (struct bnxt_qplib_chip_ctx *cctx,u8 qflags) +{ +int iflags =0 ; + +if (!bnxt_qplib_is_chip_gen_p5_p7 (cctx)) +/* For Wh+ */ +return __to_ib_access_flags (qflags); + +/* For P5, P7 and later chips */ +if (qflags &CMDQ_MODIFY_QP_ACCESS_LOCAL_WRITE ) + iflags |=IB_ACCESS_LOCAL_WRITE ; +if (qflags &CMDQ_MODIFY_QP_ACCESS_REMOTE_WRITE ) + iflags |=IB_ACCESS_REMOTE_WRITE ; +if (qflags &CMDQ_MODIFY_QP_ACCESS_REMOTE_READ ) + iflags |=IB_ACCESS_REMOTE_READ ; +if (qflags &CMDQ_MODIFY_QP_ACCESS_REMOTE_ATOMIC ) + iflags |=IB_ACCESS_REMOTE_ATOMIC ; + +return iflags; +}static void bnxt_re_check_and_set_relaxed_ordering (struct bnxt_re_dev *rdev,struct bnxt_qplib_mrw *qplib_mr)@@ -2053,12 +2095,10 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,if (qp_attr_mask &IB_QP_ACCESS_FLAGS ) { qp->qplib_qp.modify_flags |=CMDQ_MODIFY_QP_MODIFY_MASK_ACCESS ; qp->qplib_qp.access = -__from_ib_access_flags (qp_attr->qp_access_flags); +__qp_access_flags_from_ib (qp->qplib_qp.cctx, + qp_attr->qp_access_flags);/* LOCAL_WRITE access must be set to allow RC receive */ - qp->qplib_qp.access |=BNXT_QPLIB_ACCESS_LOCAL_WRITE ; -/* Temp: Set all params on QP as of now */ - qp->qplib_qp.access |=CMDQ_MODIFY_QP_ACCESS_REMOTE_WRITE ; - qp->qplib_qp.access |=CMDQ_MODIFY_QP_ACCESS_REMOTE_READ ; + qp->qplib_qp.access |=CMDQ_MODIFY_QP_ACCESS_LOCAL_WRITE ; }if (qp_attr_mask &IB_QP_PKEY_INDEX ) { qp->qplib_qp.modify_flags |=CMDQ_MODIFY_QP_MODIFY_MASK_PKEY ;@@ -2263,7 +2303,8 @@ int bnxt_re_query_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr, qp_attr->qp_state =__to_ib_qp_state (qplib_qp->state); qp_attr->cur_qp_state =__to_ib_qp_state (qplib_qp->cur_qp_state); qp_attr->en_sqd_async_notify = qplib_qp->en_sqd_async_notify ?1 :0 ; - qp_attr->qp_access_flags =__to_ib_access_flags (qplib_qp->access); + qp_attr->qp_access_flags =__qp_access_flags_to_ib (qp->qplib_qp.cctx, + qplib_qp->access); qp_attr->pkey_index = qplib_qp->pkey_index; qp_attr->qkey = qplib_qp->qkey; qp_attr->ah_attr.type =RDMA_AH_ATTR_TYPE_ROCE ; --2.5.5
Selvin Xavier
maintainerPATCH v3 2/4 RDMA/bnxt_re: Add support for CQ rx coalescing
In reply to Selvin XavierFrom: Chandramohan Akula <[email protected]>
RoCE message rate performance is heavily degraded without the use of cq coalescing. With proper coalescing, message rates get better. Furthermore, coalescing significantly reduces contention on the PCIe Root Complex/Memory subsystems.
Add the changes to configure CQ rx colascing parameters based on adapter revision when CQ is created.
--- drivers/infiniband/hw/bnxt_re/bnxt_re.h | 8 ++++++++ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 1 + drivers/infiniband/hw/bnxt_re/main.c | 9 +++++++++ drivers/infiniband/hw/bnxt_re/qplib_fp.c | 20 ++++++++++++++++++++ drivers/infiniband/hw/bnxt_re/qplib_fp.h | 20 ++++++++++++++++++++ drivers/infiniband/hw/bnxt_re/qplib_res.h | 5 +++++ drivers/infiniband/hw/bnxt_re/roce_hsi.h | 14 +++++++++++++- 7 files changed, 76 insertions(+), 1 deletion(-)
drivers/infiniband/hw/bnxt_re/bnxt_re.h +8 -0
@@ -156,6 +156,13 @@ struct bnxt_re_pacing {#define MAX_CQ_HASH_BITS (16)#define MAX_SRQ_HASH_BITS (16) + +static inline bool bnxt_re_chip_gen_p7 (u16 chip_num) +{ +return (chip_num ==CHIP_NUM_58818 || + chip_num ==CHIP_NUM_57608 ); +} +struct bnxt_re_dev {struct ib_device ibdev;struct list_head list;
@@ -195,6 +202,7 @@ struct bnxt_re_dev {struct bnxt_qplib_ctx qplib_ctx;struct bnxt_qplib_res qplib_res;struct bnxt_qplib_dpi dpi_privileged; +struct bnxt_qplib_cq_coal_param cq_coalescing;struct mutex qp_lock;/* protect qp list */ struct list_head qp_list;
drivers/infiniband/hw/bnxt_re/ib_verbs.c +1 -0
@@ -3065,6 +3065,7 @@ int bnxt_re_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, cq->qplib_cq.max_wqe = entries; cq->qplib_cq.cnq_hw_ring_id = nq->ring_id; cq->qplib_cq.nq = nq; + cq->qplib_cq.coalescing = &rdev->cq_coalescing; rc =bnxt_qplib_create_cq (&rdev->qplib_res, &cq->qplib_cq);if (rc) {
drivers/infiniband/hw/bnxt_re/main.c +9 -0
@@ -986,6 +986,15 @@ static struct bnxt_re_dev *bnxt_re_dev_add(struct bnxt_aux_priv *aux_priv,atomic_set (&rdev->stats.res.pd_count,0 ); rdev->cosq[0 ] =0xFFFF ; rdev->cosq[1 ] =0xFFFF ; + rdev->cq_coalescing.buf_maxtime =BNXT_QPLIB_CQ_COAL_DEF_BUF_MAXTIME ; +if (bnxt_re_chip_gen_p7 (en_dev->chip_num)) { + rdev->cq_coalescing.normal_maxbuf =BNXT_QPLIB_CQ_COAL_DEF_NORMAL_MAXBUF_P7 ; + rdev->cq_coalescing.during_maxbuf =BNXT_QPLIB_CQ_COAL_DEF_DURING_MAXBUF_P7 ; + }else { + rdev->cq_coalescing.normal_maxbuf =BNXT_QPLIB_CQ_COAL_DEF_NORMAL_MAXBUF_P5 ; + rdev->cq_coalescing.during_maxbuf =BNXT_QPLIB_CQ_COAL_DEF_DURING_MAXBUF_P5 ; + } + rdev->cq_coalescing.en_ring_idle_mode =BNXT_QPLIB_CQ_COAL_DEF_EN_RING_IDLE_MODE ;return rdev; }
drivers/infiniband/hw/bnxt_re/qplib_fp.c +20 -0
@@ -2182,6 +2182,7 @@ int bnxt_qplib_create_cq(struct bnxt_qplib_res *res, struct bnxt_qplib_cq *cq)struct bnxt_qplib_cmdqmsg msg = {};struct cmdq_create_cq req = {};struct bnxt_qplib_pbl *pbl; +u32 coalescing =0 ;u32 pg_sz_lvl;int rc;
@@ -2208,6 +2209,25 @@ int bnxt_qplib_create_cq(struct bnxt_qplib_res *res, struct bnxt_qplib_cq *cq) req.dpi =cpu_to_le32 (cq->dpi->dpi); req.cq_handle =cpu_to_le64 (cq->cq_handle); req.cq_size =cpu_to_le32 (cq->max_wqe); + +if (_is_cq_coalescing_supported (res->dattr->dev_cap_flags2)) { + req.flags |=cpu_to_le16 (CMDQ_CREATE_CQ_FLAGS_COALESCING_VALID ); + coalescing |= ((cq->coalescing->buf_maxtime << +CMDQ_CREATE_CQ_BUF_MAXTIME_SFT ) & +CMDQ_CREATE_CQ_BUF_MAXTIME_MASK ); + coalescing |= ((cq->coalescing->normal_maxbuf << +CMDQ_CREATE_CQ_NORMAL_MAXBUF_SFT ) & +CMDQ_CREATE_CQ_NORMAL_MAXBUF_MASK ); + coalescing |= ((cq->coalescing->during_maxbuf << +CMDQ_CREATE_CQ_DURING_MAXBUF_SFT ) & +CMDQ_CREATE_CQ_DURING_MAXBUF_MASK ); +if (cq->coalescing->en_ring_idle_mode) + coalescing |=CMDQ_CREATE_CQ_ENABLE_RING_IDLE_MODE ; +else + coalescing &= ~CMDQ_CREATE_CQ_ENABLE_RING_IDLE_MODE ; + req.coalescing =cpu_to_le32 (coalescing); + } + pbl = &cq->hwq.pbl[PBL_LVL_0 ]; pg_sz_lvl = (bnxt_qplib_base_pg_size (&cq->hwq) <<CMDQ_CREATE_CQ_PG_SIZE_SFT );
drivers/infiniband/hw/bnxt_re/qplib_fp.h +20 -0
@@ -383,6 +383,25 @@ static inline bool bnxt_qplib_queue_full(struct bnxt_qplib_q *que,return avail <= slots; } +/* CQ coalescing parameters */ +struct bnxt_qplib_cq_coal_param { +u16 buf_maxtime; +u8 normal_maxbuf; +u8 during_maxbuf; +u8 en_ring_idle_mode; +}; + +#define BNXT_QPLIB_CQ_COAL_DEF_BUF_MAXTIME 0x1 +#define BNXT_QPLIB_CQ_COAL_DEF_NORMAL_MAXBUF_P7 0x8 +#define BNXT_QPLIB_CQ_COAL_DEF_DURING_MAXBUF_P7 0x8 +#define BNXT_QPLIB_CQ_COAL_DEF_NORMAL_MAXBUF_P5 0x1 +#define BNXT_QPLIB_CQ_COAL_DEF_DURING_MAXBUF_P5 0x1 +#define BNXT_QPLIB_CQ_COAL_DEF_EN_RING_IDLE_MODE 0x1 +#define BNXT_QPLIB_CQ_COAL_MAX_BUF_MAXTIME 0x1bf +#define BNXT_QPLIB_CQ_COAL_MAX_NORMAL_MAXBUF 0x1f +#define BNXT_QPLIB_CQ_COAL_MAX_DURING_MAXBUF 0x1f +#define BNXT_QPLIB_CQ_COAL_MAX_EN_RING_IDLE_MODE 0x1 +struct bnxt_qplib_cqe {u8 status;u8 type;
@@ -445,6 +464,7 @@ struct bnxt_qplib_cq {*/ spinlock_t flush_lock;/* QP flush management */ u16 cnq_events; +struct bnxt_qplib_cq_coal_param *coalescing; };#define BNXT_QPLIB_MAX_IRRQE_ENTRY_SIZE sizeof(struct xrrq_irrq)
drivers/infiniband/hw/bnxt_re/qplib_res.h +5 -0
@@ -581,4 +581,9 @@ static inline bool _is_optimize_modify_qp_supported(u16 dev_cap_ext_flags2) return dev_cap_ext_flags2 & CREQ_QUERY_FUNC_RESP_SB_OPTIMIZE_MODIFY_QP_SUPPORTED; } +static inline bool _is_cq_coalescing_supported (u16 dev_cap_ext_flags2) +{ +return dev_cap_ext_flags2 &CREQ_QUERY_FUNC_RESP_SB_CQ_COALESCING_SUPPORTED ; +} +#endif /* __BNXT_QPLIB_RES_H__ */
drivers/infiniband/hw/bnxt_re/roce_hsi.h +13 -1
@@ -1140,6 +1140,7 @@ struct cmdq_create_cq {#define CMDQ_CREATE_CQ_FLAGS_DISABLE_CQ_OVERFLOW_DETECTION 0x1UL#define CMDQ_CREATE_CQ_FLAGS_STEERING_TAG_VALID 0x2UL#define CMDQ_CREATE_CQ_FLAGS_INFINITE_CQ_MODE 0x4UL +#define CMDQ_CREATE_CQ_FLAGS_COALESCING_VALID 0x8UL__le16 cookie;u8 resp_size;u8 reserved8;
@@ -1172,7 +1173,18 @@ struct cmdq_create_cq {__le32 cq_size;__le64 pbl;__le16 steering_tag; -u8 reserved48[6 ]; +u8 reserved48[2 ]; +__le32 coalescing; +#define CMDQ_CREATE_CQ_BUF_MAXTIME_MASK 0x1ffUL +#define CMDQ_CREATE_CQ_BUF_MAXTIME_SFT 0 +#define CMDQ_CREATE_CQ_NORMAL_MAXBUF_MASK 0x3e00UL +#define CMDQ_CREATE_CQ_NORMAL_MAXBUF_SFT 9 +#define CMDQ_CREATE_CQ_DURING_MAXBUF_MASK 0x7c000UL +#define CMDQ_CREATE_CQ_DURING_MAXBUF_SFT 14 +#define CMDQ_CREATE_CQ_ENABLE_RING_IDLE_MODE 0x80000UL +#define CMDQ_CREATE_CQ_UNUSED12_MASK 0xfff00000UL +#define CMDQ_CREATE_CQ_UNUSED12_SFT 20 +__le64 reserved64; };/* creq_create_cq_resp (size:128b/16B) */
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH v3 3/4 RDMA/bnxt_re: Add support for modify_device hook
In reply to Selvin XavierFrom: Kalesh AP <[email protected]>
Adds support for modify_device in the driver
for node desc changes.
--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 16 ++++++++++++++++ drivers/infiniband/hw/bnxt_re/ib_verbs.h | 3 +++ drivers/infiniband/hw/bnxt_re/main.c | 1 + 3 files changed, 20 insertions(+)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +16 -0
@@ -211,6 +211,22 @@ int bnxt_re_query_device(struct ib_device *ibdev,return 0 ; } +int bnxt_re_modify_device (struct ib_device *ibdev, +int device_modify_mask, +struct ib_device_modify *device_modify) +{ +ibdev_dbg (ibdev,"Modify device with mask 0x%x" , device_modify_mask); + +if (device_modify_mask & ~IB_DEVICE_MODIFY_NODE_DESC ) +return -EOPNOTSUPP ; + +if (!(device_modify_mask &IB_DEVICE_MODIFY_NODE_DESC )) +return 0 ; + +memcpy (ibdev->node_desc, device_modify->node_desc,IB_DEVICE_NODE_DESC_MAX ); +return 0 ; +} +/* Port */ int bnxt_re_query_port (struct ib_device *ibdev,u32 port_num,struct ib_port_attr *port_attr)
drivers/infiniband/hw/bnxt_re/ib_verbs.h +3 -0
@@ -196,6 +196,9 @@ static inline bool bnxt_re_is_var_size_supported(struct bnxt_re_dev *rdev,int bnxt_re_query_device (struct ib_device *ibdev,struct ib_device_attr *ib_attr,struct ib_udata *udata); +int bnxt_re_modify_device (struct ib_device *ibdev, +int device_modify_mask, +struct ib_device_modify *device_modify);int bnxt_re_query_port (struct ib_device *ibdev,u32 port_num,struct ib_port_attr *port_attr); int bnxt_re_get_port_immutable(struct ib_device *ibdev, u32 port_num,
drivers/infiniband/hw/bnxt_re/main.c +1 -0
@@ -911,6 +911,7 @@ static const struct ib_device_ops bnxt_re_dev_ops = { .post_srq_recv = bnxt_re_post_srq_recv, .query_ah = bnxt_re_query_ah, .query_device = bnxt_re_query_device, + .modify_device = bnxt_re_modify_device, .query_pkey = bnxt_re_query_pkey, .query_port = bnxt_re_query_port, .query_qp = bnxt_re_query_qp,
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH v3 4/4 RDMA/bnxt_re: Fix access flags for MR and QP modify
In reply to Selvin XavierFrom: Hongguang Gao <[email protected]>
Access flag definition in MR and QP is different in FW. Currently both reg/bind MR and modify/query QP uses the same flags. Add a different function to map the QP access flags for newer adapters.
---
v2 -> v3 :
Use qp->qplib_qp.cctx instead of the local variable qplib_qp->cctx in bnxt_re_query_qp drivers/infiniband/hw/bnxt_re/ib_verbs.c | 59 +++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 9 deletions(-)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +50 -9
@@ -94,9 +94,9 @@ static int __from_ib_access_flags(int iflags)return qflags; }; -static enum ib_access_flags __to_ib_access_flags (int qflags) +static int __to_ib_access_flags (int qflags) { -enum ib_access_flags iflags =0 ; +int iflags =0 ;if (qflags &BNXT_QPLIB_ACCESS_LOCAL_WRITE ) iflags |=IB_ACCESS_LOCAL_WRITE ;
@@ -113,7 +113,49 @@ static enum ib_access_flags __to_ib_access_flags(int qflags)if (qflags &BNXT_QPLIB_ACCESS_ON_DEMAND ) iflags |=IB_ACCESS_ON_DEMAND ;return iflags; -}; +} + +static u8 __qp_access_flags_from_ib (struct bnxt_qplib_chip_ctx *cctx,int iflags) +{ +u8 qflags =0 ; + +if (!bnxt_qplib_is_chip_gen_p5_p7 (cctx)) +/* For Wh+ */ +return (u8 )__from_ib_access_flags (iflags); + +/* For P5, P7 and later chips */ +if (iflags &IB_ACCESS_LOCAL_WRITE ) + qflags |=CMDQ_MODIFY_QP_ACCESS_LOCAL_WRITE ; +if (iflags &IB_ACCESS_REMOTE_WRITE ) + qflags |=CMDQ_MODIFY_QP_ACCESS_REMOTE_WRITE ; +if (iflags &IB_ACCESS_REMOTE_READ ) + qflags |=CMDQ_MODIFY_QP_ACCESS_REMOTE_READ ; +if (iflags &IB_ACCESS_REMOTE_ATOMIC ) + qflags |=CMDQ_MODIFY_QP_ACCESS_REMOTE_ATOMIC ; + +return qflags; +} + +static int __qp_access_flags_to_ib (struct bnxt_qplib_chip_ctx *cctx,u8 qflags) +{ +int iflags =0 ; + +if (!bnxt_qplib_is_chip_gen_p5_p7 (cctx)) +/* For Wh+ */ +return __to_ib_access_flags (qflags); + +/* For P5, P7 and later chips */ +if (qflags &CMDQ_MODIFY_QP_ACCESS_LOCAL_WRITE ) + iflags |=IB_ACCESS_LOCAL_WRITE ; +if (qflags &CMDQ_MODIFY_QP_ACCESS_REMOTE_WRITE ) + iflags |=IB_ACCESS_REMOTE_WRITE ; +if (qflags &CMDQ_MODIFY_QP_ACCESS_REMOTE_READ ) + iflags |=IB_ACCESS_REMOTE_READ ; +if (qflags &CMDQ_MODIFY_QP_ACCESS_REMOTE_ATOMIC ) + iflags |=IB_ACCESS_REMOTE_ATOMIC ; + +return iflags; +}static void bnxt_re_check_and_set_relaxed_ordering (struct bnxt_re_dev *rdev,struct bnxt_qplib_mrw *qplib_mr)
@@ -2053,12 +2095,10 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,if (qp_attr_mask &IB_QP_ACCESS_FLAGS ) { qp->qplib_qp.modify_flags |=CMDQ_MODIFY_QP_MODIFY_MASK_ACCESS ; qp->qplib_qp.access = -__from_ib_access_flags (qp_attr->qp_access_flags); +__qp_access_flags_from_ib (qp->qplib_qp.cctx, + qp_attr->qp_access_flags);/* LOCAL_WRITE access must be set to allow RC receive */ - qp->qplib_qp.access |=BNXT_QPLIB_ACCESS_LOCAL_WRITE ; -/* Temp: Set all params on QP as of now */ - qp->qplib_qp.access |=CMDQ_MODIFY_QP_ACCESS_REMOTE_WRITE ; - qp->qplib_qp.access |=CMDQ_MODIFY_QP_ACCESS_REMOTE_READ ; + qp->qplib_qp.access |=CMDQ_MODIFY_QP_ACCESS_LOCAL_WRITE ; }if (qp_attr_mask &IB_QP_PKEY_INDEX ) { qp->qplib_qp.modify_flags |=CMDQ_MODIFY_QP_MODIFY_MASK_PKEY ;
@@ -2263,7 +2303,8 @@ int bnxt_re_query_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr, qp_attr->qp_state =__to_ib_qp_state (qplib_qp->state); qp_attr->cur_qp_state =__to_ib_qp_state (qplib_qp->cur_qp_state); qp_attr->en_sqd_async_notify = qplib_qp->en_sqd_async_notify ?1 :0 ; - qp_attr->qp_access_flags =__to_ib_access_flags (qplib_qp->access); + qp_attr->qp_access_flags =__qp_access_flags_to_ib (qp->qplib_qp.cctx, + qplib_qp->access); qp_attr->pkey_index = qplib_qp->pkey_index; qp_attr->qkey = qplib_qp->qkey; qp_attr->ah_attr.type =RDMA_AH_ATTR_TYPE_ROCE ;
Signature · 1 line
2.5.5
Leon Romanovsky
AppliedQuoted 10 lines · Selvin Xavier
Includes some generic driver updates.
Please review and apply.Thanks,
Selvin Xavierv2 -> v3:
- A bug fix in patch 4[...]
Applied, thanks!
[1/4] RDMA/bnxt_re: Add support for optimized modify QP
https://git.kernel.org/rdma/rdma/c/82c32d219272fc [2/4] RDMA/bnxt_re: Add support for CQ rx coalescing https://git.kernel.org/rdma/rdma/c/9c4927caccf372 [3/4] RDMA/bnxt_re: Add support for modify_device hook https://git.kernel.org/rdma/rdma/c/9a420bb2b4ff15 [4/4] RDMA/bnxt_re: Fix access flags for MR and QP modify https://git.kernel.org/rdma/rdma/c/52f70dea4201f1
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>