RDMA/bnxt_re: Enable PCIe relaxed ordering support for MRs
Subsystems (2)
Selvin Xavier
maintainercover RDMA/bnxt_re: Enable PCIe relaxed ordering support for MRs
Latest generation adapters support PCIe relaxed ordering for MRs. Enable it for those adapters if the user requests for this support.
Please review and apply
Thanks,
Selvin Xavier
Kalesh AP (4):
RDMA/bnxt_re: Update HW interface headers RDMA/bnxt_re: Rename a variable RDMA/bnxt_re: Avoid an extra hwrm per MR creation RDMA/bnxt_re: Add support for MR Relaxed Ordering
drivers/infiniband/hw/bnxt_re/ib_verbs.c | 58 +++++++++++++++++++++---------- drivers/infiniband/hw/bnxt_re/qplib_res.h | 10 ++++++ drivers/infiniband/hw/bnxt_re/qplib_sp.c | 12 +++++-- drivers/infiniband/hw/bnxt_re/qplib_sp.h | 3 +- drivers/infiniband/hw/bnxt_re/roce_hsi.h | 36 ++++++++++++++----- 5 files changed, 89 insertions(+), 30 deletions(-)
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 1/4 RDMA/bnxt_re: Update HW interface headers
From: Kalesh AP <[email protected]>
Updating the HW structures for the pcie relax ordering support. Newly added interface structures will be used in the followup patch.
--- drivers/infiniband/hw/bnxt_re/roce_hsi.h | 36 ++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 9 deletions(-)
drivers/infiniband/hw/bnxt_re/roce_hsi.h +27 -9
@@ -409,7 +409,7 @@ struct creq_deinitialize_fw_resp {u8 reserved48[6 ]; }; -/* cmdq_create_qp (size:768b/96B) */ +/* cmdq_create_qp (size:832b/104B) */ struct cmdq_create_qp {u8 opcode;#define CMDQ_CREATE_QP_OPCODE_CREATE_QP 0x1UL
@@ -430,8 +430,11 @@ struct cmdq_create_qp {#define CMDQ_CREATE_QP_QP_FLAGS_OPTIMIZED_TRANSMIT_ENABLED 0x20UL#define CMDQ_CREATE_QP_QP_FLAGS_RESPONDER_UD_CQE_WITH_CFA 0x40UL#define CMDQ_CREATE_QP_QP_FLAGS_EXT_STATS_ENABLED 0x80UL +#define CMDQ_CREATE_QP_QP_FLAGS_EXPRESS_MODE_ENABLED 0x100UL +#define CMDQ_CREATE_QP_QP_FLAGS_STEERING_TAG_VALID 0x200UL +#define CMDQ_CREATE_QP_QP_FLAGS_RDMA_READ_OR_ATOMICS_USED 0x400UL#define CMDQ_CREATE_QP_QP_FLAGS_LAST \ - CMDQ_CREATE_QP_QP_FLAGS_EXT_STATS_ENABLED + CMDQ_CREATE_QP_QP_FLAGS_RDMA_READ_OR_ATOMICS_USEDu8 type;#define CMDQ_CREATE_QP_TYPE_RC 0x2UL#define CMDQ_CREATE_QP_TYPE_UD 0x4UL
@@ -492,6 +495,9 @@ struct cmdq_create_qp {__le64 rq_pbl;__le64 irrq_addr;__le64 orrq_addr; +__le32 request_xid; +__le16 steering_tag; +__le16 reserved16; };/* creq_create_qp_resp (size:128b/16B) */
@@ -972,13 +978,14 @@ struct creq_query_qp_extend_resp_sb_tlv {__le16 reserved_16; }; -/* cmdq_create_srq (size:384b/48B) */ +/* cmdq_create_srq (size:448b/56B) */ struct cmdq_create_srq {u8 opcode;#define CMDQ_CREATE_SRQ_OPCODE_CREATE_SRQ 0x5UL#define CMDQ_CREATE_SRQ_OPCODE_LAST CMDQ_CREATE_SRQ_OPCODE_CREATE_SRQu8 cmd_size;__le16 flags; +#define CMDQ_CREATE_SRQ_FLAGS_STEERING_TAG_VALID 0x1UL__le16 cookie;u8 resp_size;u8 reserved8;
@@ -1012,6 +1019,8 @@ struct cmdq_create_srq {__le32 dpi;__le32 pd_id;__le64 pbl; +__le16 steering_tag; +u8 reserved48[6 ]; };/* creq_create_srq_resp (size:128b/16B) */
@@ -1118,7 +1127,7 @@ struct creq_query_srq_resp_sb {__le32 data[4 ]; }; -/* cmdq_create_cq (size:384b/48B) */ +/* cmdq_create_cq (size:448b/56B) */ struct cmdq_create_cq {u8 opcode;#define CMDQ_CREATE_CQ_OPCODE_CREATE_CQ 0x9UL
@@ -1126,6 +1135,8 @@ struct cmdq_create_cq {u8 cmd_size;__le16 flags;#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__le16 cookie;u8 resp_size;u8 reserved8;
@@ -1157,6 +1168,8 @@ struct cmdq_create_cq {__le32 dpi;__le32 cq_size;__le64 pbl; +__le16 steering_tag; +u8 reserved48[6 ]; };/* creq_create_cq_resp (size:128b/16B) */
@@ -1288,11 +1301,12 @@ struct cmdq_allocate_mrw {#define CMDQ_ALLOCATE_MRW_MRW_FLAGS_MW_TYPE2A 0x3UL#define CMDQ_ALLOCATE_MRW_MRW_FLAGS_MW_TYPE2B 0x4UL#define CMDQ_ALLOCATE_MRW_MRW_FLAGS_LAST CMDQ_ALLOCATE_MRW_MRW_FLAGS_MW_TYPE2B -#define CMDQ_ALLOCATE_MRW_UNUSED4_MASK 0xf0UL -#define CMDQ_ALLOCATE_MRW_UNUSED4_SFT 4 +#define CMDQ_ALLOCATE_MRW_STEERING_TAG_VALID 0x10UL +#define CMDQ_ALLOCATE_MRW_UNUSED4_MASK 0xe0UL +#define CMDQ_ALLOCATE_MRW_UNUSED4_SFT 5u8 access;#define CMDQ_ALLOCATE_MRW_ACCESS_CONSUMER_OWNED_KEY 0x20UL -__le16 unused16; +__le16 steering_tag;__le32 pd_id; };
@@ -1359,14 +1373,16 @@ struct creq_deallocate_key_resp {__le32 bound_window_info; }; -/* cmdq_register_mr (size:384b/48B) */ +/* cmdq_register_mr (size:448b/56B) */ struct cmdq_register_mr {u8 opcode;#define CMDQ_REGISTER_MR_OPCODE_REGISTER_MR 0xfUL#define CMDQ_REGISTER_MR_OPCODE_LAST CMDQ_REGISTER_MR_OPCODE_REGISTER_MRu8 cmd_size;__le16 flags; -#define CMDQ_REGISTER_MR_FLAGS_ALLOC_MR 0x1UL +#define CMDQ_REGISTER_MR_FLAGS_ALLOC_MR 0x1UL +#define CMDQ_REGISTER_MR_FLAGS_STEERING_TAG_VALID 0x2UL +#define CMDQ_REGISTER_MR_FLAGS_ENABLE_RO 0x4UL__le16 cookie;u8 resp_size;u8 reserved8;
@@ -1415,6 +1431,8 @@ struct cmdq_register_mr {__le64 pbl;__le64 va;__le64 mr_size; +__le16 steering_tag; +u8 reserved48[6 ]; };/* creq_register_mr_resp (size:128b/16B) */
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 2/4 RDMA/bnxt_re: Rename a variable
In reply to Selvin XavierFrom: Kalesh AP <[email protected]>
Renaming flags to access_flags for clarity.
--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 8 ++++---- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 4 ++-- drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +4 -4
@@ -517,7 +517,7 @@ static int bnxt_re_create_fence_mr(struct bnxt_re_pd *pd) mr->rdev = rdev; mr->qplib_mr.pd = &pd->qplib_pd; mr->qplib_mr.type =CMDQ_ALLOCATE_MRW_MRW_FLAGS_PMR ; - mr->qplib_mr.flags =__from_ib_access_flags (mr_access_flags); + mr->qplib_mr.access_flags =__from_ib_access_flags (mr_access_flags); rc =bnxt_qplib_alloc_mrw (&rdev->qplib_res, &mr->qplib_mr);if (rc) {ibdev_err (&rdev->ibdev,"Failed to alloc fence-HW-MR\n" );
@@ -3868,7 +3868,7 @@ struct ib_mr *bnxt_re_get_dma_mr(struct ib_pd *ib_pd, int mr_access_flags) mr->rdev = rdev; mr->qplib_mr.pd = &pd->qplib_pd; - mr->qplib_mr.flags =__from_ib_access_flags (mr_access_flags); + mr->qplib_mr.access_flags =__from_ib_access_flags (mr_access_flags); mr->qplib_mr.type =CMDQ_ALLOCATE_MRW_MRW_FLAGS_PMR ;/* Allocate and register 0 as the address */
@@ -3968,7 +3968,7 @@ struct ib_mr *bnxt_re_alloc_mr(struct ib_pd *ib_pd, enum ib_mr_type type, mr->rdev = rdev; mr->qplib_mr.pd = &pd->qplib_pd; - mr->qplib_mr.flags =BNXT_QPLIB_FR_PMR ; + mr->qplib_mr.access_flags =BNXT_QPLIB_FR_PMR ; mr->qplib_mr.type =CMDQ_ALLOCATE_MRW_MRW_FLAGS_PMR ; rc =bnxt_qplib_alloc_mrw (&rdev->qplib_res, &mr->qplib_mr);
@@ -4085,7 +4085,7 @@ static struct ib_mr *__bnxt_re_user_reg_mr(struct ib_pd *ib_pd, u64 length, u64 mr->rdev = rdev; mr->qplib_mr.pd = &pd->qplib_pd; - mr->qplib_mr.flags =__from_ib_access_flags (mr_access_flags); + mr->qplib_mr.access_flags =__from_ib_access_flags (mr_access_flags); mr->qplib_mr.type =CMDQ_ALLOCATE_MRW_MRW_FLAGS_MR ; rc =bnxt_qplib_alloc_mrw (&rdev->qplib_res, &mr->qplib_mr);
drivers/infiniband/hw/bnxt_re/qplib_sp.c +2 -2
@@ -544,7 +544,7 @@ int bnxt_qplib_alloc_mrw(struct bnxt_qplib_res *res, struct bnxt_qplib_mrw *mrw) req.pd_id =cpu_to_le32 (mrw->pd->id); req.mrw_flags = mrw->type;if ((mrw->type ==CMDQ_ALLOCATE_MRW_MRW_FLAGS_PMR && - mrw->flags &BNXT_QPLIB_FR_PMR ) || + mrw->access_flags &BNXT_QPLIB_FR_PMR ) || mrw->type ==CMDQ_ALLOCATE_MRW_MRW_FLAGS_MW_TYPE2A || mrw->type ==CMDQ_ALLOCATE_MRW_MRW_FLAGS_MW_TYPE2B ) req.access =CMDQ_ALLOCATE_MRW_ACCESS_CONSUMER_OWNED_KEY ;
@@ -656,7 +656,7 @@ int bnxt_qplib_reg_mr(struct bnxt_qplib_res *res, struct bnxt_qplib_mrw *mr, req.log2_pbl_pg_size =cpu_to_le16 (((ilog2 (PAGE_SIZE ) <<CMDQ_REGISTER_MR_LOG2_PBL_PG_SIZE_SFT ) &CMDQ_REGISTER_MR_LOG2_PBL_PG_SIZE_MASK )); - req.access = (mr->flags &0xFFFF ); + req.access = (mr->access_flags &0xFFFF ); req.va =cpu_to_le64 (mr->va); req.key =cpu_to_le32 (mr->lkey); req.mr_size =cpu_to_le64 (mr->total_size);
drivers/infiniband/hw/bnxt_re/qplib_sp.h +1 -1
@@ -109,7 +109,7 @@ struct bnxt_qplib_ah {struct bnxt_qplib_mrw {struct bnxt_qplib_pd *pd;int type; -u32 flags; +u32 access_flags;#define BNXT_QPLIB_FR_PMR 0x80000000u32 lkey;u32 rkey;
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 3/4 RDMA/bnxt_re: Avoid an extra hwrm per MR creation
In reply to Selvin XavierFrom: Kalesh AP <[email protected]>
Firmware now have a new mr registration command where both MR allocation and registration can be done in a single hwrm command. Driver has to issue this new hwrm command whenever the support flag is set. This reduces the number of hwrm issued per MR creation and speed up the MR creation.
--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 36 +++++++++++++++++++------------ drivers/infiniband/hw/bnxt_re/qplib_res.h | 5 +++++ drivers/infiniband/hw/bnxt_re/qplib_sp.c | 8 +++++++ drivers/infiniband/hw/bnxt_re/qplib_sp.h | 1 + 4 files changed, 36 insertions(+), 14 deletions(-)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +22 -14
@@ -518,14 +518,18 @@ static int bnxt_re_create_fence_mr(struct bnxt_re_pd *pd) mr->qplib_mr.pd = &pd->qplib_pd; mr->qplib_mr.type =CMDQ_ALLOCATE_MRW_MRW_FLAGS_PMR ; mr->qplib_mr.access_flags =__from_ib_access_flags (mr_access_flags); - rc =bnxt_qplib_alloc_mrw (&rdev->qplib_res, &mr->qplib_mr); -if (rc) { -ibdev_err (&rdev->ibdev,"Failed to alloc fence-HW-MR\n" ); - goto fail; - } +if (!_is_alloc_mr_unified (rdev->dev_attr.dev_cap_flags)) { + rc =bnxt_qplib_alloc_mrw (&rdev->qplib_res, &mr->qplib_mr); +if (rc) { +ibdev_err (&rdev->ibdev,"Failed to alloc fence-HW-MR\n" ); + goto fail; + } -/* Register MR */ - mr->ib_mr.lkey = mr->qplib_mr.lkey; +/* Register MR */ + mr->ib_mr.lkey = mr->qplib_mr.lkey; + }else { + mr->qplib_mr.flags =CMDQ_REGISTER_MR_FLAGS_ALLOC_MR ; + } mr->qplib_mr.va = (u64 )(unsigned long )fence->va; mr->qplib_mr.total_size =BNXT_RE_FENCE_BYTES ; rc = bnxt_qplib_reg_mr(&rdev->qplib_res, &mr->qplib_mr, NULL,
@@ -4088,14 +4092,18 @@ static struct ib_mr *__bnxt_re_user_reg_mr(struct ib_pd *ib_pd, u64 length, u64 mr->qplib_mr.access_flags =__from_ib_access_flags (mr_access_flags); mr->qplib_mr.type =CMDQ_ALLOCATE_MRW_MRW_FLAGS_MR ; - rc =bnxt_qplib_alloc_mrw (&rdev->qplib_res, &mr->qplib_mr); -if (rc) { -ibdev_err (&rdev->ibdev,"Failed to allocate MR rc = %d" , rc); - rc = -EIO ; - goto free_mr; +if (!_is_alloc_mr_unified (rdev->dev_attr.dev_cap_flags)) { + rc =bnxt_qplib_alloc_mrw (&rdev->qplib_res, &mr->qplib_mr); +if (rc) { +ibdev_err (&rdev->ibdev,"Failed to allocate MR rc = %d" , rc); + rc = -EIO ; + goto free_mr; + } +/* The fixed portion of the rkey is the same as the lkey */ + mr->ib_mr.rkey = mr->qplib_mr.rkey; + }else { + mr->qplib_mr.flags =CMDQ_REGISTER_MR_FLAGS_ALLOC_MR ; } -/* The fixed portion of the rkey is the same as the lkey */ - mr->ib_mr.rkey = mr->qplib_mr.rkey; mr->ib_umem = umem; mr->qplib_mr.va = virt_addr; mr->qplib_mr.total_size = length;
drivers/infiniband/hw/bnxt_re/qplib_res.h +5 -0
@@ -565,4 +565,9 @@ static inline u8 bnxt_qplib_dbr_pacing_en(struct bnxt_qplib_chip_ctx *cctx) return cctx->modes.dbr_pacing; } +static inline bool _is_alloc_mr_unified (u16 dev_cap_flags) +{ +return dev_cap_flags &CREQ_QUERY_FUNC_RESP_SB_MR_REGISTER_ALLOC ; +} +#endif /* __BNXT_QPLIB_RES_H__ */
drivers/infiniband/hw/bnxt_re/qplib_sp.c +8 -0
@@ -659,6 +659,9 @@ int bnxt_qplib_reg_mr(struct bnxt_qplib_res *res, struct bnxt_qplib_mrw *mr, req.access = (mr->access_flags &0xFFFF ); req.va =cpu_to_le64 (mr->va); req.key =cpu_to_le32 (mr->lkey); +if (_is_alloc_mr_unified (res->dattr->dev_cap_flags)) + req.key =cpu_to_le32 (mr->pd->id); + req.flags =cpu_to_le16 (mr->flags); req.mr_size =cpu_to_le64 (mr->total_size); bnxt_qplib_fill_cmdqmsg(&msg, &req, &resp, NULL, sizeof(req),
@@ -667,6 +670,11 @@ int bnxt_qplib_reg_mr(struct bnxt_qplib_res *res, struct bnxt_qplib_mrw *mr,if (rc) goto fail; +if (_is_alloc_mr_unified (res->dattr->dev_cap_flags)) { + mr->lkey =le32_to_cpu (resp.xid); + mr->rkey = mr->lkey; + } +return 0 ; fail:
drivers/infiniband/hw/bnxt_re/qplib_sp.h +1 -0
@@ -117,6 +117,7 @@ struct bnxt_qplib_mrw {u64 va;u64 total_size;u32 npages; +u16 flags;u64 mr_handle;struct bnxt_qplib_hwq hwq; };
Signature · 1 line
2.5.5
Selvin Xavier
maintainerPATCH 4/4 RDMA/bnxt_re: Add support for MR Relaxed Ordering
In reply to Selvin XavierFrom: Kalesh AP <[email protected]>
Some of the adapters support Relaxed Ordering for the MRs. Driver queries support for Memory region relax ordering support from firmware and set relax ordering bit in REGISTER_MR request, if the users request for the support. Also, this is supported only if the PCIe device has enabled relaxed ordering attribute.
--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 14 ++++++++++++++ drivers/infiniband/hw/bnxt_re/qplib_res.h | 5 +++++ 2 files changed, 19 insertions(+)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +14 -0
@@ -115,6 +115,14 @@ static enum ib_access_flags __to_ib_access_flags(int qflags)return iflags; }; +static void bnxt_re_check_and_set_relaxed_ordering (struct bnxt_re_dev *rdev, +struct bnxt_qplib_mrw *qplib_mr) +{ +if (_is_relaxed_ordering_supported (rdev->dev_attr.dev_cap_flags2) && +pcie_relaxed_ordering_enabled (rdev->en_dev->pdev)) + qplib_mr->flags |=CMDQ_REGISTER_MR_FLAGS_ENABLE_RO ; +} +static int bnxt_re_build_sgl (struct ib_sge *ib_sg_list,struct bnxt_qplib_sge *sg_list,int num) {
@@ -3875,6 +3883,9 @@ struct ib_mr *bnxt_re_get_dma_mr(struct ib_pd *ib_pd, int mr_access_flags) mr->qplib_mr.access_flags =__from_ib_access_flags (mr_access_flags); mr->qplib_mr.type =CMDQ_ALLOCATE_MRW_MRW_FLAGS_PMR ; +if (mr_access_flags &IB_ACCESS_RELAXED_ORDERING ) +bnxt_re_check_and_set_relaxed_ordering (rdev, &mr->qplib_mr); +/* Allocate and register 0 as the address */ rc =bnxt_qplib_alloc_mrw (&rdev->qplib_res, &mr->qplib_mr);if (rc)
@@ -4108,6 +4119,9 @@ static struct ib_mr *__bnxt_re_user_reg_mr(struct ib_pd *ib_pd, u64 length, u64 mr->qplib_mr.va = virt_addr; mr->qplib_mr.total_size = length; +if (mr_access_flags &IB_ACCESS_RELAXED_ORDERING ) +bnxt_re_check_and_set_relaxed_ordering (rdev, &mr->qplib_mr); + umem_pgs =ib_umem_num_dma_blocks (umem, page_size); rc =bnxt_qplib_reg_mr (&rdev->qplib_res, &mr->qplib_mr, umem, umem_pgs, page_size);
drivers/infiniband/hw/bnxt_re/qplib_res.h +5 -0
@@ -570,4 +570,9 @@ static inline bool _is_alloc_mr_unified(u16 dev_cap_flags) return dev_cap_flags & CREQ_QUERY_FUNC_RESP_SB_MR_REGISTER_ALLOC; } +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 ; +} +#endif /* __BNXT_QPLIB_RES_H__ */
Signature · 1 line
2.5.5
Leon Romanovsky
AppliedQuoted 9 lines · Selvin Xavier
Latest generation adapters support PCIe relaxed ordering for MRs. Enable it for those adapters if the user requests for this support.
Please review and apply
Thanks,
Selvin Xavier[...]
Applied, thanks!
[1/4] RDMA/bnxt_re: Update HW interface headers
https://git.kernel.org/rdma/rdma/c/543b455c6e9cf0 [2/4] RDMA/bnxt_re: Rename a variable https://git.kernel.org/rdma/rdma/c/b98d96971908b7 [3/4] RDMA/bnxt_re: Avoid an extra hwrm per MR creation https://git.kernel.org/rdma/rdma/c/f786eebbbefa0c [4/4] RDMA/bnxt_re: Add support for MR Relaxed Ordering https://git.kernel.org/rdma/rdma/c/dc116b7fddbdad
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>