[OLK-5.10 v2 00/10] A set of patches for openEuler

List overview All Threads
Download

newer

older

[PATCH openEuler-22.03-LTS-SP2...

[PATCH OLK-5.10 0/2] Fixed two...

Chengchang Tang

7 Dec 2023 7 Dec '23

10:40 a.m.

From: Juan Zhou zhoujuan51@h-partners.com

Some cleanups.

Chengchang Tang (5): RDMA/hns: Replace magic number when fill ADDR to HW RDMA/hns: Remove extra blank line in get_sge_num_from_max_inl_data() RDMA/hns: Remove unused parameters detected by -Wextra RDMA/hns: Refactor mtr find RDMA/hns: Remove useless NULL check in hns_roce_get_netdev()

Junxian Huang (2): RDMA/hns: Improve readability of check_bond_support() RDMA/hns: Add more check for bonding-unsupported cases

Yangyang Li (1): RDMA/hns: Use macro instead of magic number

wenglianfa (2): RDMA/hns: Fix the spin_lock and spin_unlock objects are inconsistent RDMA/hns: Cleanup for debugfs

drivers/infiniband/hw/hns/hns_roce_alloc.c | 5 +- drivers/infiniband/hw/hns/hns_roce_bond.c | 107 ++++++++----- drivers/infiniband/hw/hns/hns_roce_cq.c | 11 +- drivers/infiniband/hw/hns/hns_roce_dca.c | 13 +- drivers/infiniband/hw/hns/hns_roce_dca.h | 3 +- drivers/infiniband/hw/hns/hns_roce_debugfs.c | 14 +- drivers/infiniband/hw/hns/hns_roce_debugfs.h | 4 +- drivers/infiniband/hw/hns/hns_roce_device.h | 13 +- drivers/infiniband/hw/hns/hns_roce_hem.c | 13 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 157 +++++++++---------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 12 ++ drivers/infiniband/hw/hns/hns_roce_main.c | 5 +- drivers/infiniband/hw/hns/hns_roce_mr.c | 95 +++++++---- drivers/infiniband/hw/hns/hns_roce_qp.c | 15 +- drivers/infiniband/hw/hns/hns_roce_srq.c | 4 +- 15 files changed, 263 insertions(+), 208 deletions(-)

-- 2.30.0

Show replies by date

Chengchang Tang

7 Dec 7 Dec

10:40 a.m.

New subject: [OLK-5.10 v2 01/10] RDMA/hns: Replace magic number when fill ADDR to HW

driver inclusion category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/I8LY0D

--------------------------------------------------------------------------

This patch repalce magic number in filling ADDR to HW.

Signed-off-by: Chengchang Tang tangchengchang@huawei.com --- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 29 ++++++++++++---------- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 12 +++++++++ drivers/infiniband/hw/hns/hns_roce_qp.c | 3 ++- 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index ee0c4dcfad68..2e6366bdeb75 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -3638,11 +3638,12 @@ static int set_mtpt_pbl(struct hns_roce_dev *hr_dev,

/* Aligned to the hardware address access unit */ for (i = 0; i < count; i++) - pages[i] >>= 6; + pages[i] >>= MPT_PBL_BUF_ADDR_S;

mpt_entry->pbl_size = cpu_to_le32(mr->npages); - mpt_entry->pbl_ba_l = cpu_to_le32(pbl_ba >> 3); - hr_reg_write(mpt_entry, MPT_PBL_BA_H, upper_32_bits(pbl_ba >> 3)); + mpt_entry->pbl_ba_l = cpu_to_le32(pbl_ba >> MPT_PBL_BA_ADDR_S); + hr_reg_write(mpt_entry, MPT_PBL_BA_H, + upper_32_bits(pbl_ba >> MPT_PBL_BA_ADDR_S));

mpt_entry->pa0_l = cpu_to_le32(lower_32_bits(pages[0])); hr_reg_write(mpt_entry, MPT_PA0_H, upper_32_bits(pages[0])); @@ -3769,8 +3770,10 @@ static int hns_roce_v2_frmr_write_mtpt(struct hns_roce_dev *hr_dev,

mpt_entry->pbl_size = cpu_to_le32(mr->npages);

- mpt_entry->pbl_ba_l = cpu_to_le32(lower_32_bits(pbl_ba >> 3)); - hr_reg_write(mpt_entry, MPT_PBL_BA_H, upper_32_bits(pbl_ba >> 3)); + mpt_entry->pbl_ba_l = cpu_to_le32(lower_32_bits( + pbl_ba >> MPT_PBL_BA_ADDR_S)); + hr_reg_write(mpt_entry, MPT_PBL_BA_H, + upper_32_bits(pbl_ba >> MPT_PBL_BA_ADDR_S));

return 0; } @@ -4061,14 +4064,14 @@ static void hns_roce_v2_write_cqc(struct hns_roce_dev *hr_dev, to_hr_hw_page_shift(hr_cq->mtr.hem_cfg.ba_pg_shift)); hr_reg_write(cq_context, CQC_CQE_BUF_PG_SZ, to_hr_hw_page_shift(hr_cq->mtr.hem_cfg.buf_pg_shift)); - hr_reg_write(cq_context, CQC_CQE_BA_L, dma_handle >> 3); - hr_reg_write(cq_context, CQC_CQE_BA_H, (dma_handle >> (32 + 3))); + hr_reg_write(cq_context, CQC_CQE_BA_L, dma_handle >> CQC_CQE_BA_L_S); + hr_reg_write(cq_context, CQC_CQE_BA_H, dma_handle >> CQC_CQE_BA_H_S); hr_reg_write_bool(cq_context, CQC_DB_RECORD_EN, hr_cq->flags & HNS_ROCE_CQ_FLAG_RECORD_DB); hr_reg_write(cq_context, CQC_CQE_DB_RECORD_ADDR_L, ((u32)hr_cq->db.dma) >> 1); hr_reg_write(cq_context, CQC_CQE_DB_RECORD_ADDR_H, - hr_cq->db.dma >> 32); + hr_cq->db.dma >> CQC_CQE_DB_RECORD_ADDR_H_S); hr_reg_write(cq_context, CQC_CQ_MAX_CNT, HNS_ROCE_V2_CQ_DEFAULT_BURST_NUM); hr_reg_write(cq_context, CQC_CQ_PERIOD, @@ -5029,11 +5032,11 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp, return -EINVAL; }

- hr_reg_write(context, QPC_TRRL_BA_L, trrl_ba >> 4); + hr_reg_write(context, QPC_TRRL_BA_L, trrl_ba >> QPC_TRRL_BA_L_S); hr_reg_clear(qpc_mask, QPC_TRRL_BA_L); - context->trrl_ba = cpu_to_le32(trrl_ba >> (16 + 4)); + context->trrl_ba = cpu_to_le32(trrl_ba >> QPC_TRRL_BA_M_S); qpc_mask->trrl_ba = 0; - hr_reg_write(context, QPC_TRRL_BA_H, trrl_ba >> (32 + 16 + 4)); + hr_reg_write(context, QPC_TRRL_BA_H, trrl_ba >> QPC_TRRL_BA_H_S); hr_reg_clear(qpc_mask, QPC_TRRL_BA_H);

if (hr_dev->pci_dev->revision >= PCI_REVISION_ID_HIP09) { @@ -5046,9 +5049,9 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp, hr_reg_clear(qpc_mask, QPC_V2_IRRL_HEAD); }

- context->irrl_ba = cpu_to_le32(irrl_ba >> 6); + context->irrl_ba = cpu_to_le32(irrl_ba >> QPC_IRRL_BA_L_S); qpc_mask->irrl_ba = 0; - hr_reg_write(context, QPC_IRRL_BA_H, irrl_ba >> (32 + 6)); + hr_reg_write(context, QPC_IRRL_BA_H, irrl_ba >> QPC_IRRL_BA_H_S); hr_reg_clear(qpc_mask, QPC_IRRL_BA_H);

hr_reg_enable(context, QPC_RMT_E2E); diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h index 7cdad3d04022..fa6989914f6b 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h @@ -288,6 +288,10 @@ struct hns_roce_v2_cq_context { __le32 byte_64_se_cqe_idx; };

+#define CQC_CQE_BA_L_S 3 +#define CQC_CQE_BA_H_S (32 + CQC_CQE_BA_L_S) +#define CQC_CQE_DB_RECORD_ADDR_H_S 32 + #define HNS_ROCE_V2_CQ_DEFAULT_BURST_NUM 0x0 #define HNS_ROCE_V2_CQ_DEFAULT_INTERVAL 0x0

@@ -482,6 +486,11 @@ struct hns_roce_v2_qp_context {

struct hns_roce_v2_qp_context_ex ext; }; +#define QPC_TRRL_BA_L_S 4 +#define QPC_TRRL_BA_M_S (16 + QPC_TRRL_BA_L_S) +#define QPC_TRRL_BA_H_S (32 + QPC_TRRL_BA_M_S) +#define QPC_IRRL_BA_L_S 6 +#define QPC_IRRL_BA_H_S (32 + QPC_IRRL_BA_L_S)

#define QPC_FIELD_LOC(h, l) FIELD_LOC(struct hns_roce_v2_qp_context, h, l)

@@ -752,6 +761,9 @@ struct hns_roce_v2_mpt_entry { __le32 byte_64_buf_pa1; };

+#define MPT_PBL_BUF_ADDR_S 6 +#define MPT_PBL_BA_ADDR_S 3 + #define MPT_FIELD_LOC(h, l) FIELD_LOC(struct hns_roce_v2_mpt_entry, h, l)

#define MPT_ST MPT_FIELD_LOC(1, 0) diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c b/drivers/infiniband/hw/hns/hns_roce_qp.c index d3251fa82242..9c46948dd738 100644 --- a/drivers/infiniband/hw/hns/hns_roce_qp.c +++ b/drivers/infiniband/hw/hns/hns_roce_qp.c @@ -416,7 +416,8 @@ static void free_qpn(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp)

bankid = get_qp_bankid(hr_qp->qpn);

- ida_free(&hr_dev->qp_table.bank[bankid].ida, hr_qp->qpn >> 3); + ida_free(&hr_dev->qp_table.bank[bankid].ida, + hr_qp->qpn / HNS_ROCE_QP_BANK_NUM);

mutex_lock(&hr_dev->qp_table.bank_mutex); hr_dev->qp_table.bank[bankid].inuse--;

-- 2.30.0

Chengchang Tang

10:40 a.m.

New subject: [OLK-5.10 v2 02/10] RDMA/hns: Remove extra blank line in get_sge_num_from_max_inl_data()

driver inclusion category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/I8LY0D

--------------------------------------------------------------------------

Remove redundant blank lines between value judgments and function calls.

Signed-off-by: Chengchang Tang tangchengchang@huawei.com --- drivers/infiniband/hw/hns/hns_roce_qp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c b/drivers/infiniband/hw/hns/hns_roce_qp.c index 9c46948dd738..11ffd38c3a0d 100644 --- a/drivers/infiniband/hw/hns/hns_roce_qp.c +++ b/drivers/infiniband/hw/hns/hns_roce_qp.c @@ -545,13 +545,12 @@ static unsigned int get_sge_num_from_max_inl_data(bool is_ud_or_gsi, { unsigned int inline_sge;

- inline_sge = roundup_pow_of_two(max_inline_data) / HNS_ROCE_SGE_SIZE; - /* * if max_inline_data less than * HNS_ROCE_SGE_IN_WQE * HNS_ROCE_SGE_SIZE, * In addition to ud's mode, no need to extend sge. */ + inline_sge = roundup_pow_of_two(max_inline_data) / HNS_ROCE_SGE_SIZE; if ((!is_ud_or_gsi) && (inline_sge <= HNS_ROCE_SGE_IN_WQE)) inline_sge = 0;

-- 2.30.0

Chengchang Tang

10:40 a.m.

New subject: [OLK-5.10 v2 03/10] RDMA/hns: Remove unused parameters detected by -Wextra

driver inclusion category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/I8LY0D

--------------------------------------------------------------------------

-Wextra will check the unused parameters. This patch removes these unused parameters.

Signed-off-by: Chengchang Tang tangchengchang@huawei.com --- drivers/infiniband/hw/hns/hns_roce_alloc.c | 5 ++- drivers/infiniband/hw/hns/hns_roce_dca.c | 13 +++----- drivers/infiniband/hw/hns/hns_roce_dca.h | 3 +- drivers/infiniband/hw/hns/hns_roce_debugfs.c | 3 +- drivers/infiniband/hw/hns/hns_roce_debugfs.h | 3 +- drivers/infiniband/hw/hns/hns_roce_device.h | 7 ++-- drivers/infiniband/hw/hns/hns_roce_hem.c | 13 +++----- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 34 ++++++-------------- drivers/infiniband/hw/hns/hns_roce_main.c | 2 +- drivers/infiniband/hw/hns/hns_roce_mr.c | 6 ++-- drivers/infiniband/hw/hns/hns_roce_qp.c | 9 ++---- drivers/infiniband/hw/hns/hns_roce_srq.c | 4 +-- 12 files changed, 36 insertions(+), 66 deletions(-)

diff --git a/drivers/infiniband/hw/hns/hns_roce_alloc.c b/drivers/infiniband/hw/hns/hns_roce_alloc.c index 60269322ba98..b3edc09c2dc7 100644 --- a/drivers/infiniband/hw/hns/hns_roce_alloc.c +++ b/drivers/infiniband/hw/hns/hns_roce_alloc.c @@ -129,7 +129,7 @@ struct hns_roce_buf *hns_roce_buf_alloc(struct hns_roce_dev *hr_dev, u32 size, return buf; }

-int hns_roce_get_kmem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs, +int hns_roce_get_kmem_bufs(dma_addr_t *bufs, int buf_cnt, struct hns_roce_buf *buf, unsigned int page_shift) { @@ -147,8 +147,7 @@ int hns_roce_get_kmem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs, return total; }

-int hns_roce_get_umem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs, - int buf_cnt, struct ib_umem *umem, +int hns_roce_get_umem_bufs(dma_addr_t *bufs, int buf_cnt, struct ib_umem *umem, unsigned int page_shift) { struct ib_block_iter biter; diff --git a/drivers/infiniband/hw/hns/hns_roce_dca.c b/drivers/infiniband/hw/hns/hns_roce_dca.c index 458d3753d56d..12bf7668f8d4 100644 --- a/drivers/infiniband/hw/hns/hns_roce_dca.c +++ b/drivers/infiniband/hw/hns/hns_roce_dca.c @@ -149,8 +149,7 @@ static void *alloc_dca_pages(struct hns_roce_dev *hr_dev, bool is_user,

}

-static void init_dca_kmem_states(struct hns_roce_dev *hr_dev, - struct hns_dca_page_state *states, int count, +static void init_dca_kmem_states(struct hns_dca_page_state *states, int count, struct hns_roce_buf *kmem) { dma_addr_t cur_addr; @@ -167,8 +166,7 @@ static void init_dca_kmem_states(struct hns_roce_dev *hr_dev, } }

-static void init_dca_umem_states(struct hns_roce_dev *hr_dev, - struct hns_dca_page_state *states, int count, +static void init_dca_umem_states(struct hns_dca_page_state *states, int count, struct ib_umem *umem) { struct ib_block_iter biter; @@ -201,9 +199,9 @@ static struct hns_dca_page_state *alloc_dca_states(struct hns_roce_dev *hr_dev, return NULL;

if (is_user) - init_dca_umem_states(hr_dev, states, count, pages); + init_dca_umem_states(states, count, pages); else - init_dca_kmem_states(hr_dev, states, count, pages); + init_dca_kmem_states(states, count, pages);

return states; } @@ -1482,8 +1480,7 @@ static void teardown_kdca(struct hns_roce_dca_cfg *cfg) cfg->buf_list = NULL; }

-int hns_roce_enable_dca(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp, - struct ib_udata *udata) +int hns_roce_enable_dca(struct hns_roce_qp *hr_qp, struct ib_udata *udata) { struct hns_roce_dca_cfg *cfg = &hr_qp->dca_cfg;

diff --git a/drivers/infiniband/hw/hns/hns_roce_dca.h b/drivers/infiniband/hw/hns/hns_roce_dca.h index 7733887ce5e1..68f46f8688ae 100644 --- a/drivers/infiniband/hw/hns/hns_roce_dca.h +++ b/drivers/infiniband/hw/hns/hns_roce_dca.h @@ -61,8 +61,7 @@ void hns_roce_register_udca(struct hns_roce_dev *hr_dev, int max_qps, void hns_roce_unregister_udca(struct hns_roce_dev *hr_dev, struct hns_roce_ucontext *uctx);

-int hns_roce_enable_dca(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp, - struct ib_udata *udata); +int hns_roce_enable_dca(struct hns_roce_qp *hr_qp, struct ib_udata *udata); void hns_roce_disable_dca(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp, struct ib_udata *udata);

diff --git a/drivers/infiniband/hw/hns/hns_roce_debugfs.c b/drivers/infiniband/hw/hns/hns_roce_debugfs.c index cff0ebbce004..86894432c4dc 100644 --- a/drivers/infiniband/hw/hns/hns_roce_debugfs.c +++ b/drivers/infiniband/hw/hns/hns_roce_debugfs.c @@ -607,8 +607,7 @@ void hns_roce_register_uctx_debugfs(struct hns_roce_dev *hr_dev, hr_dev, uctx); }

-void hns_roce_unregister_uctx_debugfs(struct hns_roce_dev *hr_dev, - struct hns_roce_ucontext *uctx) +void hns_roce_unregister_uctx_debugfs(struct hns_roce_ucontext *uctx) { debugfs_remove_recursive(uctx->dca_dbgfs.root); } diff --git a/drivers/infiniband/hw/hns/hns_roce_debugfs.h b/drivers/infiniband/hw/hns/hns_roce_debugfs.h index 3c1f428b47e2..be952fed25df 100644 --- a/drivers/infiniband/hw/hns/hns_roce_debugfs.h +++ b/drivers/infiniband/hw/hns/hns_roce_debugfs.h @@ -67,7 +67,6 @@ void hns_roce_register_debugfs(struct hns_roce_dev *hr_dev); void hns_roce_unregister_debugfs(struct hns_roce_dev *hr_dev); void hns_roce_register_uctx_debugfs(struct hns_roce_dev *hr_dev, struct hns_roce_ucontext *uctx); -void hns_roce_unregister_uctx_debugfs(struct hns_roce_dev *hr_dev, - struct hns_roce_ucontext *uctx); +void hns_roce_unregister_uctx_debugfs(struct hns_roce_ucontext *uctx);

#endif diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h index a9ff1eb81506..2f8ccf05abbb 100644 --- a/drivers/infiniband/hw/hns/hns_roce_device.h +++ b/drivers/infiniband/hw/hns/hns_roce_device.h @@ -1052,8 +1052,7 @@ struct hns_roce_hw { int (*rereg_write_mtpt)(struct hns_roce_dev *hr_dev, struct hns_roce_mr *mr, int flags, void *mb_buf); - int (*frmr_write_mtpt)(struct hns_roce_dev *hr_dev, void *mb_buf, - struct hns_roce_mr *mr); + int (*frmr_write_mtpt)(void *mb_buf, struct hns_roce_mr *mr); int (*mw_write_mtpt)(void *mb_buf, struct hns_roce_mw *mw); void (*write_cqc)(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq, void *mb_buf, u64 *mtts, @@ -1442,10 +1441,10 @@ void hns_roce_buf_free(struct hns_roce_dev *hr_dev, struct hns_roce_buf *buf); struct hns_roce_buf *hns_roce_buf_alloc(struct hns_roce_dev *hr_dev, u32 size, u32 page_shift, u32 flags);

-int hns_roce_get_kmem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs, +int hns_roce_get_kmem_bufs(dma_addr_t *bufs, int buf_cnt, struct hns_roce_buf *buf, unsigned int page_shift); -int hns_roce_get_umem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs, +int hns_roce_get_umem_bufs(dma_addr_t *bufs, int buf_cnt, struct ib_umem *umem, unsigned int page_shift);

diff --git a/drivers/infiniband/hw/hns/hns_roce_hem.c b/drivers/infiniband/hw/hns/hns_roce_hem.c index 0520cb6dd168..709a446465a4 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hem.c +++ b/drivers/infiniband/hw/hns/hns_roce_hem.c @@ -1043,15 +1043,13 @@ static void hem_list_free_all(struct hns_roce_dev *hr_dev, } }

-static void hem_list_link_bt(struct hns_roce_dev *hr_dev, void *base_addr, - u64 table_addr) +static void hem_list_link_bt(void *base_addr, u64 table_addr) { *(u64 *)(base_addr) = table_addr; }

/* assign L0 table address to hem from root bt */ -static void hem_list_assign_bt(struct hns_roce_dev *hr_dev, - struct hns_roce_hem_item *hem, void *cpu_addr, +static void hem_list_assign_bt(struct hns_roce_hem_item *hem, void *cpu_addr, u64 phy_addr) { hem->addr = cpu_addr; @@ -1220,8 +1218,7 @@ static int hem_list_alloc_mid_bt(struct hns_roce_dev *hr_dev, if (level > 1) { pre = hem_ptrs[level - 1]; step = (cur->start - pre->start) / step * BA_BYTE_LEN; - hem_list_link_bt(hr_dev, pre->addr + step, - cur->dma_addr); + hem_list_link_bt(pre->addr + step, cur->dma_addr); } }

@@ -1279,7 +1276,7 @@ static int alloc_fake_root_bt(struct hns_roce_dev *hr_dev, void *cpu_base, if (!hem) return -ENOMEM;

- hem_list_assign_bt(hr_dev, hem, cpu_base, phy_base); + hem_list_assign_bt(hem, cpu_base, phy_base); list_add(&hem->list, branch_head); list_add(&hem->sibling, leaf_head);

@@ -1302,7 +1299,7 @@ static int setup_middle_bt(struct hns_roce_dev *hr_dev, void *cpu_base, /* if exist mid bt, link L1 to L0 */ list_for_each_entry_safe(hem, temp_hem, branch_head, list) { offset = (hem->start - r->offset) / step * BA_BYTE_LEN; - hem_list_link_bt(hr_dev, cpu_base + offset, hem->dma_addr); + hem_list_link_bt(cpu_base + offset, hem->dma_addr); total++; }

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index 2e6366bdeb75..613e8ed7002a 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -3736,21 +3736,14 @@ static int hns_roce_v2_rereg_write_mtpt(struct hns_roce_dev *hr_dev, return ret; }

-static int hns_roce_v2_frmr_write_mtpt(struct hns_roce_dev *hr_dev, - void *mb_buf, struct hns_roce_mr *mr) +static int hns_roce_v2_frmr_write_mtpt(void *mb_buf, struct hns_roce_mr *mr) { - struct ib_device *ibdev = &hr_dev->ib_dev; + dma_addr_t pbl_ba = mr->pbl_mtr.hem_cfg.root_ba; struct hns_roce_v2_mpt_entry *mpt_entry; - dma_addr_t pbl_ba = 0;

mpt_entry = mb_buf; memset(mpt_entry, 0, sizeof(*mpt_entry));

- if (hns_roce_mtr_find(hr_dev, &mr->pbl_mtr, 0, NULL, 0, &pbl_ba) < 0) { - ibdev_err(ibdev, "failed to find frmr mtr.\n"); - return -ENOBUFS; - } - hr_reg_write(mpt_entry, MPT_ST, V2_MPT_ST_FREE); hr_reg_write(mpt_entry, MPT_PD, mr->pd);

@@ -4724,8 +4717,7 @@ static void set_access_flags(struct hns_roce_qp *hr_qp, }

static void set_qpc_wqe_cnt(struct hns_roce_qp *hr_qp, - struct hns_roce_v2_qp_context *context, - struct hns_roce_v2_qp_context *qpc_mask) + struct hns_roce_v2_qp_context *context) { hr_reg_write(context, QPC_SGE_SHIFT, to_hr_hem_entries_shift(hr_qp->sge.sge_cnt, @@ -4747,10 +4739,7 @@ static inline int get_pdn(struct ib_pd *ib_pd) }

static void modify_qp_reset_to_init(struct ib_qp *ibqp, - const struct ib_qp_attr *attr, - int attr_mask, - struct hns_roce_v2_qp_context *context, - struct hns_roce_v2_qp_context *qpc_mask) + struct hns_roce_v2_qp_context *context) { struct hns_roce_dev *hr_dev = to_hr_dev(ibqp->device); struct hns_roce_qp *hr_qp = to_hr_qp(ibqp); @@ -4767,7 +4756,7 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp,

hr_reg_write(context, QPC_RQWS, ilog2(hr_qp->rq.max_gs));

- set_qpc_wqe_cnt(hr_qp, context, qpc_mask); + set_qpc_wqe_cnt(hr_qp, context);

/* No VLAN need to set 0xFFF */ hr_reg_write(context, QPC_VLAN_ID, 0xfff); @@ -4809,7 +4798,6 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp, }

static void modify_qp_init_to_init(struct ib_qp *ibqp, - const struct ib_qp_attr *attr, int attr_mask, struct hns_roce_v2_qp_context *context, struct hns_roce_v2_qp_context *qpc_mask) { @@ -5140,8 +5128,7 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp, return 0; }

-static int modify_qp_rtr_to_rts(struct ib_qp *ibqp, - const struct ib_qp_attr *attr, int attr_mask, +static int modify_qp_rtr_to_rts(struct ib_qp *ibqp, int attr_mask, struct hns_roce_v2_qp_context *context, struct hns_roce_v2_qp_context *qpc_mask) { @@ -5555,17 +5542,14 @@ static int hns_roce_v2_set_abs_fields(struct ib_qp *ibqp,

if (cur_state == IB_QPS_RESET && new_state == IB_QPS_INIT) { memset(qpc_mask, 0, hr_dev->caps.qpc_sz); - modify_qp_reset_to_init(ibqp, attr, attr_mask, context, - qpc_mask); + modify_qp_reset_to_init(ibqp, context); } else if (cur_state == IB_QPS_INIT && new_state == IB_QPS_INIT) { - modify_qp_init_to_init(ibqp, attr, attr_mask, context, - qpc_mask); + modify_qp_init_to_init(ibqp, context, qpc_mask); } else if (cur_state == IB_QPS_INIT && new_state == IB_QPS_RTR) { ret = modify_qp_init_to_rtr(ibqp, attr, attr_mask, context, qpc_mask, udata); } else if (cur_state == IB_QPS_RTR && new_state == IB_QPS_RTS) { - ret = modify_qp_rtr_to_rts(ibqp, attr, attr_mask, context, - qpc_mask); + ret = modify_qp_rtr_to_rts(ibqp, attr_mask, context, qpc_mask); }

return ret; diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c index 83ecff014924..c05ac62a3b76 100644 --- a/drivers/infiniband/hw/hns/hns_roce_main.c +++ b/drivers/infiniband/hw/hns/hns_roce_main.c @@ -645,7 +645,7 @@ static void hns_roce_dealloc_ucontext(struct ib_ucontext *ibcontext) list_del(&context->list); spin_unlock(&hr_dev->uctx_list_lock);

- hns_roce_unregister_uctx_debugfs(hr_dev, context); + hns_roce_unregister_uctx_debugfs(context);

hns_roce_unregister_udca(hr_dev, context);

diff --git a/drivers/infiniband/hw/hns/hns_roce_mr.c b/drivers/infiniband/hw/hns/hns_roce_mr.c index a2970e732034..0c27f6148955 100644 --- a/drivers/infiniband/hw/hns/hns_roce_mr.c +++ b/drivers/infiniband/hw/hns/hns_roce_mr.c @@ -177,7 +177,7 @@ static int hns_roce_mr_enable(struct hns_roce_dev *hr_dev, if (mr->type != MR_TYPE_FRMR) ret = hr_dev->hw->write_mtpt(hr_dev, mailbox->buf, mr); else - ret = hr_dev->hw->frmr_write_mtpt(hr_dev, mailbox->buf, mr); + ret = hr_dev->hw->frmr_write_mtpt(mailbox->buf, mr); if (ret) { dev_err(dev, "failed to write mtpt, ret = %d.\n", ret); goto err_page; @@ -761,10 +761,10 @@ static int mtr_map_bufs(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr) return -ENOMEM;

if (mtr->umem) - npage = hns_roce_get_umem_bufs(hr_dev, pages, page_count, + npage = hns_roce_get_umem_bufs(pages, page_count, mtr->umem, page_shift); else - npage = hns_roce_get_kmem_bufs(hr_dev, pages, page_count, + npage = hns_roce_get_kmem_bufs(pages, page_count, mtr->kmem, page_shift);

if (npage != page_count) { diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c b/drivers/infiniband/hw/hns/hns_roce_qp.c index 11ffd38c3a0d..4989828b5bad 100644 --- a/drivers/infiniband/hw/hns/hns_roce_qp.c +++ b/drivers/infiniband/hw/hns/hns_roce_qp.c @@ -655,7 +655,6 @@ static int set_user_sq_size(struct hns_roce_dev *hr_dev, }

static bool check_dca_is_enable(struct hns_roce_dev *hr_dev, - struct hns_roce_qp *hr_qp, struct ib_qp_init_attr *init_attr, bool is_user, unsigned long addr) { @@ -794,7 +793,7 @@ static int alloc_wqe_buf(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp,

if (dca_en) { /* DCA must be enabled after the buffer attr is configured. */ - ret = hns_roce_enable_dca(hr_dev, hr_qp, udata); + ret = hns_roce_enable_dca(hr_qp, udata); if (ret) { ibdev_err(ibdev, "failed to enable DCA, ret = %d.\n", ret); @@ -858,8 +857,7 @@ static int alloc_qp_wqe(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp, if (uctx && (uctx->config & HNS_ROCE_UCTX_DYN_QP_PGSZ)) page_shift = ucmd->pageshift;

- dca_en = check_dca_is_enable(hr_dev, hr_qp, init_attr, - !!udata, ucmd->buf_addr); + dca_en = check_dca_is_enable(hr_dev, init_attr, !!udata, ucmd->buf_addr); ret = set_wqe_buf_attr(hr_dev, hr_qp, dca_en, page_shift, &buf_attr); if (ret) { ibdev_err(ibdev, "failed to split WQE buf, ret = %d.\n", ret); @@ -1292,7 +1290,6 @@ static int set_qp_param(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp, }

static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev, - struct ib_pd *ib_pd, struct ib_qp_init_attr *init_attr, struct ib_udata *udata, struct hns_roce_qp *hr_qp) @@ -1466,7 +1463,7 @@ struct ib_qp *hns_roce_create_qp(struct ib_pd *pd, hr_qp->phy_port = hr_dev->iboe.phy_port[hr_qp->port]; }

- ret = hns_roce_create_qp_common(hr_dev, pd, init_attr, udata, hr_qp); + ret = hns_roce_create_qp_common(hr_dev, init_attr, udata, hr_qp); if (ret) { ibdev_err(ibdev, "Create QP type 0x%x failed(%d)\n", init_attr->qp_type, ret); diff --git a/drivers/infiniband/hw/hns/hns_roce_srq.c b/drivers/infiniband/hw/hns/hns_roce_srq.c index 0f2f4e897738..4779232ee318 100644 --- a/drivers/infiniband/hw/hns/hns_roce_srq.c +++ b/drivers/infiniband/hw/hns/hns_roce_srq.c @@ -284,7 +284,7 @@ static void free_srq_wqe_buf(struct hns_roce_dev *hr_dev, } }

-static int alloc_srq_wrid(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq) +static int alloc_srq_wrid(struct hns_roce_srq *srq) { srq->wrid = kvmalloc_array(srq->wqe_cnt, sizeof(u64), GFP_KERNEL); if (!srq->wrid) @@ -401,7 +401,7 @@ static int alloc_srq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq, goto err_idx;

if (!udata) { - ret = alloc_srq_wrid(hr_dev, srq); + ret = alloc_srq_wrid(srq); if (ret) goto err_wqe_buf; }

-- 2.30.0

Chengchang Tang

10:40 a.m.

New subject: [OLK-5.10 v2 04/10] RDMA/hns: Refactor mtr find

driver inclusion category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/I8LY0D

--------------------------------------------------------------------------

'hns_roce_mtr_find' is a collection of multiple functions, and the return value is also difficult to understand, which is not conducive to modification and maintenance.

Separate the function of obtaining MTR root BA from this function. And some adjustments has bee made to improve readability.

Signed-off-by: Chengchang Tang tangchengchang@huawei.com --- drivers/infiniband/hw/hns/hns_roce_cq.c | 11 ++- drivers/infiniband/hw/hns/hns_roce_device.h | 6 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 89 ++++++++++++--------- drivers/infiniband/hw/hns/hns_roce_mr.c | 87 +++++++++++++------- 4 files changed, 117 insertions(+), 76 deletions(-)

diff --git a/drivers/infiniband/hw/hns/hns_roce_cq.c b/drivers/infiniband/hw/hns/hns_roce_cq.c index 3110b4fd00ed..2363e338765c 100644 --- a/drivers/infiniband/hw/hns/hns_roce_cq.c +++ b/drivers/infiniband/hw/hns/hns_roce_cq.c @@ -133,14 +133,12 @@ static int alloc_cqc(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq) struct hns_roce_cq_table *cq_table = &hr_dev->cq_table; struct ib_device *ibdev = &hr_dev->ib_dev; u64 mtts[MTT_MIN_COUNT] = {}; - dma_addr_t dma_handle; int ret;

- ret = hns_roce_mtr_find(hr_dev, &hr_cq->mtr, 0, mtts, ARRAY_SIZE(mtts), - &dma_handle); - if (!ret) { + ret = hns_roce_mtr_find(hr_dev, &hr_cq->mtr, 0, mtts, ARRAY_SIZE(mtts)); + if (ret) { ibdev_err(ibdev, "failed to find CQ mtr, ret = %d.\n", ret); - return -EINVAL; + return ret; }

/* Get CQC memory HEM(Hardware Entry Memory) table */ @@ -157,7 +155,8 @@ static int alloc_cqc(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq) goto err_put; }

- ret = hns_roce_create_cqc(hr_dev, hr_cq, mtts, dma_handle); + ret = hns_roce_create_cqc(hr_dev, hr_cq, mtts, + hns_roce_get_mtr_ba(&hr_cq->mtr)); if (ret) goto err_xa;

diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h index 2f8ccf05abbb..9a3c79dc6759 100644 --- a/drivers/infiniband/hw/hns/hns_roce_device.h +++ b/drivers/infiniband/hw/hns/hns_roce_device.h @@ -1385,8 +1385,12 @@ void hns_roce_cmd_use_polling(struct hns_roce_dev *hr_dev);

/* hns roce hw need current block and next block addr from mtt */ #define MTT_MIN_COUNT 2 +static inline dma_addr_t hns_roce_get_mtr_ba(struct hns_roce_mtr *mtr) +{ + return mtr->hem_cfg.root_ba; +} int hns_roce_mtr_find(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, - u32 offset, u64 *mtt_buf, int mtt_max, u64 *base_addr); + u32 offset, u64 *mtt_buf, int mtt_max); int hns_roce_mtr_create(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, struct hns_roce_buf_attr *buf_attr, unsigned int page_shift, struct ib_udata *udata, diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index 613e8ed7002a..426123e2b267 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -3625,21 +3625,22 @@ static int set_mtpt_pbl(struct hns_roce_dev *hr_dev, u64 pages[HNS_ROCE_V2_MAX_INNER_MTPT_NUM] = { 0 }; struct ib_device *ibdev = &hr_dev->ib_dev; dma_addr_t pbl_ba; - int i, count; + int ret; + int i;

- count = hns_roce_mtr_find(hr_dev, &mr->pbl_mtr, 0, pages, - min_t(int, ARRAY_SIZE(pages), mr->npages), - &pbl_ba); - if (count < 1) { - ibdev_err(ibdev, "failed to find PBL mtr, count = %d.\n", - count); - return -ENOBUFS; + ret = hns_roce_mtr_find(hr_dev, &mr->pbl_mtr, 0, pages, + min_t(int, ARRAY_SIZE(pages), mr->npages)); + if (ret) { + ibdev_err(ibdev, "failed to find PBL mtr, ret = %d.\n", ret); + return ret; }

/* Aligned to the hardware address access unit */ - for (i = 0; i < count; i++) + for (i = 0; i < ARRAY_SIZE(pages); i++) pages[i] >>= MPT_PBL_BUF_ADDR_S;

+ pbl_ba = hns_roce_get_mtr_ba(&mr->pbl_mtr); + mpt_entry->pbl_size = cpu_to_le32(mr->npages); mpt_entry->pbl_ba_l = cpu_to_le32(pbl_ba >> MPT_PBL_BA_ADDR_S); hr_reg_write(mpt_entry, MPT_PBL_BA_H, @@ -4834,17 +4835,19 @@ static int config_qp_rq_buf(struct hns_roce_dev *hr_dev, { u64 mtts[MTT_MIN_COUNT] = { 0 }; u64 wqe_sge_ba; - int count; + int ret;

/* Search qp buf's mtts */ - count = hns_roce_mtr_find(hr_dev, &hr_qp->mtr, hr_qp->rq.wqe_offset, - mtts, ARRAY_SIZE(mtts), &wqe_sge_ba); - if (hr_qp->rq.wqe_cnt && count < 1) { + ret = hns_roce_mtr_find(hr_dev, &hr_qp->mtr, hr_qp->rq.wqe_offset, + mtts, ARRAY_SIZE(mtts)); + if (hr_qp->rq.wqe_cnt && ret) { ibdev_err(&hr_dev->ib_dev, "failed to find RQ WQE, QPN = 0x%lx.\n", hr_qp->qpn); return -EINVAL; }

+ wqe_sge_ba = hns_roce_get_mtr_ba(&hr_qp->mtr); + context->wqe_sge_ba = cpu_to_le32(wqe_sge_ba >> 3); qpc_mask->wqe_sge_ba = 0;

@@ -4909,24 +4912,24 @@ static int config_qp_sq_buf(struct hns_roce_dev *hr_dev, struct ib_device *ibdev = &hr_dev->ib_dev; u64 sge_cur_blk = 0; u64 sq_cur_blk = 0; - int count; + int ret;

/* search qp buf's mtts */ - count = hns_roce_mtr_find(hr_dev, &hr_qp->mtr, hr_qp->sq.wqe_offset, - &sq_cur_blk, 1, NULL); - if (count < 1) { - ibdev_err(ibdev, "failed to find QP(0x%lx) SQ buf.\n", - hr_qp->qpn); - return -EINVAL; + ret = hns_roce_mtr_find(hr_dev, &hr_qp->mtr, hr_qp->sq.wqe_offset, + &sq_cur_blk, 1); + if (ret) { + ibdev_err(ibdev, "failed to find QP(0x%lx) SQ buf, ret = %d.\n", + hr_qp->qpn, ret); + return ret; } if (hr_qp->sge.sge_cnt > 0) { - count = hns_roce_mtr_find(hr_dev, &hr_qp->mtr, + ret = hns_roce_mtr_find(hr_dev, &hr_qp->mtr, hr_qp->sge.wqe_offset, &sge_cur_blk, - 1, NULL); - if (count < 1) { - ibdev_err(ibdev, "failed to find QP(0x%lx) SGE buf.\n", - hr_qp->qpn); - return -EINVAL; + 1); + if (ret) { + ibdev_err(ibdev, "failed to find QP(0x%lx) SGE buf, ret = %d.\n", + hr_qp->qpn, ret); + return ret; } }

@@ -6233,18 +6236,20 @@ static int hns_roce_v2_write_srqc_index_queue(struct hns_roce_srq *srq, struct ib_device *ibdev = srq->ibsrq.device; struct hns_roce_dev *hr_dev = to_hr_dev(ibdev); u64 mtts_idx[MTT_MIN_COUNT] = {}; - dma_addr_t dma_handle_idx = 0; + dma_addr_t dma_handle_idx; int ret;

/* Get physical address of idx que buf */ ret = hns_roce_mtr_find(hr_dev, &idx_que->mtr, 0, mtts_idx, - ARRAY_SIZE(mtts_idx), &dma_handle_idx); - if (ret < 1) { + ARRAY_SIZE(mtts_idx)); + if (ret) { ibdev_err(ibdev, "failed to find mtr for SRQ idx, ret = %d.\n", ret); - return -ENOBUFS; + return ret; }

+ dma_handle_idx = hns_roce_get_mtr_ba(&idx_que->mtr); + hr_reg_write(ctx, SRQC_IDX_HOP_NUM, to_hr_hem_hopnum(hr_dev->caps.idx_hop_num, srq->wqe_cnt));

@@ -6276,20 +6281,22 @@ static int hns_roce_v2_write_srqc(struct hns_roce_srq *srq, void *mb_buf) struct hns_roce_dev *hr_dev = to_hr_dev(ibdev); struct hns_roce_srq_context *ctx = mb_buf; u64 mtts_wqe[MTT_MIN_COUNT] = {}; - dma_addr_t dma_handle_wqe = 0; + dma_addr_t dma_handle_wqe; int ret;

memset(ctx, 0, sizeof(*ctx));

/* Get the physical address of srq buf */ ret = hns_roce_mtr_find(hr_dev, &srq->buf_mtr, 0, mtts_wqe, - ARRAY_SIZE(mtts_wqe), &dma_handle_wqe); - if (ret < 1) { + ARRAY_SIZE(mtts_wqe)); + if (ret) { ibdev_err(ibdev, "failed to find mtr for SRQ WQE, ret = %d.\n", ret); - return -ENOBUFS; + return ret; }

+ dma_handle_wqe = hns_roce_get_mtr_ba(&srq->buf_mtr); + hr_reg_write(ctx, SRQC_SRQ_ST, 1); hr_reg_write_bool(ctx, SRQC_SRQ_TYPE, srq->ibsrq.srq_type == IB_SRQT_XRC); @@ -7002,7 +7009,7 @@ static int config_eqc(struct hns_roce_dev *hr_dev, struct hns_roce_eq *eq, u64 eqe_ba[MTT_MIN_COUNT] = { 0 }; struct hns_roce_eq_context *eqc; u64 bt_ba = 0; - int count; + int ret;

eqc = mb_buf; memset(eqc, 0, sizeof(struct hns_roce_eq_context)); @@ -7010,13 +7017,15 @@ static int config_eqc(struct hns_roce_dev *hr_dev, struct hns_roce_eq *eq, init_eq_config(hr_dev, eq);

/* if not multi-hop, eqe buffer only use one trunk */ - count = hns_roce_mtr_find(hr_dev, &eq->mtr, 0, eqe_ba, MTT_MIN_COUNT, - &bt_ba); - if (count < 1) { - dev_err(hr_dev->dev, "failed to find EQE mtr\n"); - return -ENOBUFS; + ret = hns_roce_mtr_find(hr_dev, &eq->mtr, 0, eqe_ba, + ARRAY_SIZE(eqe_ba)); + if (ret) { + dev_err(hr_dev->dev, "failed to find EQE mtr, ret = %d\n", ret); + return ret; }

+ bt_ba = hns_roce_get_mtr_ba(&eq->mtr); + hr_reg_write(eqc, EQC_EQ_ST, HNS_ROCE_V2_EQ_STATE_VALID); hr_reg_write(eqc, EQC_EQE_HOP_NUM, eq->hop_num); hr_reg_write(eqc, EQC_OVER_IGNORE, eq->over_ignore); diff --git a/drivers/infiniband/hw/hns/hns_roce_mr.c b/drivers/infiniband/hw/hns/hns_roce_mr.c index 0c27f6148955..d1542653f326 100644 --- a/drivers/infiniband/hw/hns/hns_roce_mr.c +++ b/drivers/infiniband/hw/hns/hns_roce_mr.c @@ -849,47 +849,53 @@ int hns_roce_mtr_map(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, return ret; }

-int hns_roce_mtr_find(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, - u32 offset, u64 *mtt_buf, int mtt_max, u64 *base_addr) +static int hns_roce_get_direct_addr_mtt(struct hns_roce_hem_cfg *cfg, + u32 start_index, u64 *mtt_buf, + int mtt_cnt) { - struct hns_roce_hem_cfg *cfg = &mtr->hem_cfg; - int mtt_count, left; - u32 start_index; + int mtt_count; int total = 0; - __le64 *mtts; u32 npage; u64 addr;

- if (!mtt_buf || mtt_max < 1) - goto done; + if (mtt_cnt > cfg->region_count) + return -EINVAL;

- /* no mtt memory in direct mode, so just return the buffer address */ - if (cfg->is_direct) { - start_index = offset >> HNS_HW_PAGE_SHIFT; - for (mtt_count = 0; mtt_count < cfg->region_count && - total < mtt_max; mtt_count++) { - npage = cfg->region[mtt_count].offset; - if (npage < start_index) - continue; + for (mtt_count = 0; mtt_count < cfg->region_count && + total < mtt_cnt; mtt_count++) { + npage = cfg->region[mtt_count].offset; + if (npage < start_index) + continue;

- addr = cfg->root_ba + (npage << HNS_HW_PAGE_SHIFT); - mtt_buf[total] = addr; + addr = cfg->root_ba + (npage << HNS_HW_PAGE_SHIFT); + mtt_buf[total] = addr;

- total++; - } - - goto done; + total++; }

- start_index = offset >> cfg->buf_pg_shift; - left = mtt_max; + if (!total) + return -ENOENT; + + return 0; +} + +static int hns_roce_get_mhop_mtt(struct hns_roce_dev *hr_dev, + struct hns_roce_mtr *mtr, u32 start_index, + u64 *mtt_buf, int mtt_cnt) +{ + int left = mtt_cnt; + int total = 0; + int mtt_count; + __le64 *mtts; + u32 npage; + while (left > 0) { mtt_count = 0; mtts = hns_roce_hem_list_find_mtt(hr_dev, &mtr->hem_list, start_index + total, &mtt_count); if (!mtts || !mtt_count) - goto done; + break;

npage = min(mtt_count, left); left -= npage; @@ -897,11 +903,34 @@ int hns_roce_mtr_find(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, mtt_buf[total++] = le64_to_cpu(mtts[mtt_count]); }

-done: - if (base_addr) - *base_addr = cfg->root_ba; + if (!total) + return -ENOENT; + + return 0; +} + +int hns_roce_mtr_find(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, + u32 offset, u64 *mtt_buf, int mtt_max) +{ + struct hns_roce_hem_cfg *cfg = &mtr->hem_cfg; + u32 start_index; + int ret; + + if (!mtt_buf || mtt_max < 1) + return -EINVAL; + + /* no mtt memory in direct mode, so just return the buffer address */ + if (cfg->is_direct) { + start_index = offset >> HNS_HW_PAGE_SHIFT; + ret = hns_roce_get_direct_addr_mtt(cfg, start_index, + mtt_buf, mtt_max); + } else { + start_index = offset >> cfg->buf_pg_shift; + ret = hns_roce_get_mhop_mtt(hr_dev, mtr, start_index, + mtt_buf, mtt_max); + }

- return total; + return ret; }

/**

-- 2.30.0

Chengchang Tang

10:40 a.m.

New subject: [OLK-5.10 v2 05/10] RDMA/hns: Remove useless NULL check in hns_roce_get_netdev()

driver inclusion category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/I8LY0D

--------------------------------------------------------------------------

This patch removes an unnecessary NULL check for ndev in hns_roce_get_netdev().

Signed-off-by: Chengchang Tang tangchengchang@huawei.com --- drivers/infiniband/hw/hns/hns_roce_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c index c05ac62a3b76..a1b4f84675bc 100644 --- a/drivers/infiniband/hw/hns/hns_roce_main.c +++ b/drivers/infiniband/hw/hns/hns_roce_main.c @@ -61,8 +61,7 @@ static struct net_device *hns_roce_get_netdev(struct ib_device *ib_dev, if (!ndev) ndev = get_hr_netdev(hr_dev, port_num - 1);

- if (ndev) - dev_hold(ndev); + dev_hold(ndev);

rcu_read_unlock();

-- 2.30.0

Chengchang Tang

10:40 a.m.

New subject: [OLK-5.10 v2 06/10] RDMA/hns: Use macro instead of magic number

From: Yangyang Li liyangyang20@huawei.com

driver inclusion category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/I8LY0D

--------------------------------------------------------------------------

Use macro instead of magic number, or some warning would be reported by statictool.

Signed-off-by: Yangyang Li liyangyang20@huawei.com --- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index 426123e2b267..978d26ba153e 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -5104,8 +5104,9 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp, hr_reg_clear(qpc_mask, QPC_TRRL_HEAD_MAX); hr_reg_clear(qpc_mask, QPC_TRRL_TAIL_MAX);

+#define MAX_LP_SGEN 3 /* rocee send 2^lp_sgen_ini segs every time */ - hr_reg_write(context, QPC_LP_SGEN_INI, 3); + hr_reg_write(context, QPC_LP_SGEN_INI, MAX_LP_SGEN); hr_reg_clear(qpc_mask, QPC_LP_SGEN_INI);

if (udata && (ibqp->qp_type == IB_QPT_RC) && @@ -5196,7 +5197,7 @@ static int get_dip_ctx_idx(struct ib_qp *ibqp, const struct ib_qp_attr *attr, *tail = (*tail == hr_dev->caps.num_qps - 1) ? 0 : (*tail + 1);

list_for_each_entry(hr_dip, &hr_dev->dip_list, node) { - if (!memcmp(grh->dgid.raw, hr_dip->dgid, 16)) { + if (!memcmp(grh->dgid.raw, hr_dip->dgid, GID_LEN_V2)) { *dip_idx = hr_dip->dip_idx; goto out; }

-- 2.30.0

Chengchang Tang

10:40 a.m.

New subject: [OLK-5.10 v2 07/10] RDMA/hns: Fix the spin_lock and spin_unlock objects are inconsistent

From: wenglianfa wenglianfa@huawei.com

driver inclusion category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/I8LY0D

--------------------------------------------------------------------------

Fix the spin_lock and spin_unlock objects are inconsistent.

Fixes: 431c875e4b02 ("RDMA/hns: Fix simultaneous reset and resource deregistration") Signed-off-by: wenglianfa wenglianfa@huawei.com --- drivers/infiniband/hw/hns/hns_roce_mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/infiniband/hw/hns/hns_roce_mr.c b/drivers/infiniband/hw/hns/hns_roce_mr.c index d1542653f326..68049467a721 100644 --- a/drivers/infiniband/hw/hns/hns_roce_mr.c +++ b/drivers/infiniband/hw/hns/hns_roce_mr.c @@ -1330,5 +1330,5 @@ void hns_roce_free_unfree_umem(struct hns_roce_dev *hr_dev) ib_umem_release(pos->umem); kvfree(pos); } - spin_unlock(&hr_dev->mtr_unfree_list_lock); + spin_unlock(&hr_dev->umem_unfree_list_lock); }

-- 2.30.0

Chengchang Tang

10:40 a.m.

New subject: [OLK-5.10 v2 08/10] RDMA/hns: Improve readability of check_bond_support()

From: Junxian Huang huangjunxian6@hisilicon.com

driver inclusion category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/I8LY0D

--------------------------------------------------------------------------

Extract linking check and unlinking check into 2 functions from check_bond_support() to improve readability.

Fixes: 6ba084e0f031 ("RDMA/hns: add constraints for bonding-unsupported situations") Signed-off-by: Junxian Huang huangjunxian6@hisilicon.com --- drivers/infiniband/hw/hns/hns_roce_bond.c | 94 +++++++++++++++-------- 1 file changed, 60 insertions(+), 34 deletions(-)

diff --git a/drivers/infiniband/hw/hns/hns_roce_bond.c b/drivers/infiniband/hw/hns/hns_roce_bond.c index 849e2388d181..060b07bfeb3d 100644 --- a/drivers/infiniband/hw/hns/hns_roce_bond.c +++ b/drivers/infiniband/hw/hns/hns_roce_bond.c @@ -783,18 +783,71 @@ static struct hns_roce_bond_group *hns_roce_alloc_bond_grp(struct hns_roce_dev * return bond_grp; }

+static bool is_dev_bond_supported(struct hns_roce_dev *hr_dev, int *bus_num) +{ + if (!hr_dev) + return false; + + if (hr_dev->is_vf || pci_num_vf(hr_dev->pci_dev) > 0) + return false; + + if (bus_num != get_hr_bus_num(hr_dev)) + return false; + + return true; +} + +static bool check_unlinking_bond_support(struct hns_roce_bond_group *bond_grp) +{ + struct net_device *net_dev; + u8 slave_num = 0; + + rcu_read_lock(); + for_each_netdev_in_bond_rcu(bond_grp->upper_dev, net_dev) { + if (get_netdev_bond_slave_id(net_dev, bond_grp) >= 0) + slave_num++; + } + rcu_read_unlock(); + + return (slave_num > 1); +} + +static bool check_linking_bond_support(struct netdev_lag_upper_info *bond_info, + struct net_device *upper_dev, + int bus_num) +{ + struct hns_roce_dev *hr_dev; + struct net_device *net_dev; + u8 slave_num = 0; + + if (!hns_roce_bond_mode_is_supported(bond_info->tx_type)) + return false; + + rcu_read_lock(); + for_each_netdev_in_bond_rcu(upper_dev, net_dev) { + hr_dev = hns_roce_get_hrdev_by_netdev(net_dev); + if (is_dev_bond_supported(hr_dev, bus_num)) { + slave_num++; + } else { + rcu_read_unlock(); + return false; + } + } + rcu_read_unlock(); + + return (slave_num > 1 && slave_num <= ROCE_BOND_FUNC_MAX); +} + static enum bond_support_type check_bond_support(struct hns_roce_dev *hr_dev, struct net_device **upper_dev, struct netdev_notifier_changeupper_info *info) { struct net_device *net_dev = get_hr_netdev(hr_dev, 0); - struct netdev_lag_upper_info *bond_upper_info = NULL; struct hns_roce_bond_group *bond_grp; int bus_num = get_hr_bus_num(hr_dev); bool bond_grp_exist = false; - bool support = true; - u8 slave_num = 0; + bool support;

*upper_dev = info->upper_dev; bond_grp = hns_roce_get_bond_grp(net_dev, bus_num); @@ -805,37 +858,10 @@ static enum bond_support_type return BOND_NOT_SUPPORT;

if (info->linking) - bond_upper_info = info->upper_info; - - if (bond_upper_info && - !hns_roce_bond_mode_is_supported(bond_upper_info->tx_type)) - return BOND_NOT_SUPPORT; - - bus_num = -1; - rcu_read_lock(); - for_each_netdev_in_bond_rcu(*upper_dev, net_dev) { - if (!info->linking && bond_grp_exist) { - if (get_netdev_bond_slave_id(net_dev, bond_grp) >= 0) - slave_num++; - } else { - hr_dev = hns_roce_get_hrdev_by_netdev(net_dev); - if (hr_dev) { - slave_num++; - if (bus_num == -1) - bus_num = get_hr_bus_num(hr_dev); - if (hr_dev->is_vf || - pci_num_vf(hr_dev->pci_dev) > 0 || - bus_num != get_hr_bus_num(hr_dev)) { - support = false; - break; - } - } - } - } - rcu_read_unlock(); - - if (slave_num <= 1 || slave_num > ROCE_BOND_FUNC_MAX) - support = false; + support = check_linking_bond_support(info->upper_info, + *upper_dev, bus_num); + else + support = check_unlinking_bond_support(bond_grp); if (support) return BOND_SUPPORT;

-- 2.30.0

Chengchang Tang

10:40 a.m.

New subject: [OLK-5.10 v2 09/10] RDMA/hns: Add more check for bonding-unsupported cases

From: Junxian Huang huangjunxian6@hisilicon.com

driver inclusion category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/I8LY0D

--------------------------------------------------------------------------

Add check for the following bonding-unsupported cases: 1. non-hns slaves 2. hns slaves without setting bonding cap_flag 3. unsupported hash type

Fixes: 6ba084e0f031 ("RDMA/hns: add constraints for bonding-unsupported situations") Signed-off-by: Junxian Huang huangjunxian6@hisilicon.com --- drivers/infiniband/hw/hns/hns_roce_bond.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/infiniband/hw/hns/hns_roce_bond.c b/drivers/infiniband/hw/hns/hns_roce_bond.c index 060b07bfeb3d..2923acb810bd 100644 --- a/drivers/infiniband/hw/hns/hns_roce_bond.c +++ b/drivers/infiniband/hw/hns/hns_roce_bond.c @@ -658,10 +658,17 @@ static bool hns_roce_bond_lowerstate_event(struct hns_roce_dev *hr_dev, return true; }

-static inline bool hns_roce_bond_mode_is_supported(enum netdev_lag_tx_type tx_type) +static bool is_bond_setting_supported(struct netdev_lag_upper_info *bond_info) { - if (tx_type != NETDEV_LAG_TX_TYPE_ACTIVEBACKUP && - tx_type != NETDEV_LAG_TX_TYPE_HASH) + if (!bond_info) + return false; + + if (bond_info->tx_type != NETDEV_LAG_TX_TYPE_ACTIVEBACKUP && + bond_info->tx_type != NETDEV_LAG_TX_TYPE_HASH) + return false; + + if (bond_info->tx_type == NETDEV_LAG_TX_TYPE_HASH && + bond_info->hash_type > NETDEV_LAG_HASH_L23) return false;

return true; @@ -783,9 +790,9 @@ static struct hns_roce_bond_group *hns_roce_alloc_bond_grp(struct hns_roce_dev * return bond_grp; }

-static bool is_dev_bond_supported(struct hns_roce_dev *hr_dev, int *bus_num) +static bool is_dev_bond_supported(struct hns_roce_dev *hr_dev, int bus_num) { - if (!hr_dev) + if (!hr_dev || !(hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_BOND)) return false;

if (hr_dev->is_vf || pci_num_vf(hr_dev->pci_dev) > 0) @@ -820,7 +827,7 @@ static bool check_linking_bond_support(struct netdev_lag_upper_info *bond_info, struct net_device *net_dev; u8 slave_num = 0;

- if (!hns_roce_bond_mode_is_supported(bond_info->tx_type)) + if (!is_bond_setting_supported(bond_info)) return false;

rcu_read_lock();

-- 2.30.0

Chengchang Tang

10:40 a.m.

New subject: [OLK-5.10 v2 10/10] RDMA/hns: Cleanup for debugfs

From: wenglianfa wenglianfa@huawei.com

driver inclusion category: cleanup bugzilla: https://gitee.com/openeuler/kernel/issues/I8LY0D

--------------------------------------------------------------------------

The structure member of hns_debugfs_seqfile records the handle of the debugfs file After the debugfs file is created, a value is assigned to the handle. It is originally used to destroy the created debugfs subdirectory when the debugfs file system is uninstalled. Because debugfs_remove_recursive() has been introduced in previous reconstruction, this function only needs to know the root directory of the debugfs file system and can automatically destroy subdirectories recursively. The function of the structure member entry of hns_debugfs_seqfile has been replaced. The deletion is performed here.

Fixes: b6643496e2b4 ("RDMA/hns: Refactor hns RoCE debugfs") Signed-off-by: wenglianfa wenglianfa@huawei.com --- drivers/infiniband/hw/hns/hns_roce_debugfs.c | 11 ++++------- drivers/infiniband/hw/hns/hns_roce_debugfs.h | 1 - 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/infiniband/hw/hns/hns_roce_debugfs.c b/drivers/infiniband/hw/hns/hns_roce_debugfs.c index 86894432c4dc..d42bea711507 100644 --- a/drivers/infiniband/hw/hns/hns_roce_debugfs.c +++ b/drivers/infiniband/hw/hns/hns_roce_debugfs.c @@ -137,14 +137,11 @@ static void init_debugfs_seqfile(struct hns_debugfs_seqfile *seq, int (*read_fn)(struct seq_file *, void *), void *data) { - struct dentry *entry; - - entry = debugfs_create_file(name, 0400, parent, seq, - &hns_debugfs_seqfile_fops); + debugfs_create_file(name, 0400, parent, seq, + &hns_debugfs_seqfile_fops);

seq->read = read_fn; seq->data = data; - seq->entry = entry; }

struct dca_mem_stats { @@ -666,8 +663,8 @@ static void create_srq_debugfs(struct hns_roce_dev *hr_dev,

dbgfs->root = debugfs_create_dir("srq", parent);

- dbgfs->srqn.entry = debugfs_create_file("srqn", 0600, dbgfs->root, - hr_dev, &hns_srqn_fops); + debugfs_create_file("srqn", 0600, dbgfs->root, + hr_dev, &hns_srqn_fops);

init_debugfs_seqfile(&dbgfs->srqc, "srqc", dbgfs->root, srqc_debugfs_show, hr_dev); diff --git a/drivers/infiniband/hw/hns/hns_roce_debugfs.h b/drivers/infiniband/hw/hns/hns_roce_debugfs.h index be952fed25df..509260edcb19 100644 --- a/drivers/infiniband/hw/hns/hns_roce_debugfs.h +++ b/drivers/infiniband/hw/hns/hns_roce_debugfs.h @@ -6,7 +6,6 @@

/* debugfs seqfile */ struct hns_debugfs_seqfile { - struct dentry *entry; int (*read)(struct seq_file *seq, void *data); void *data; };

-- 2.30.0

353

Age (days ago)

353

Last active (days ago)

kernel@openeuler.org

10 comments

1 participants

tags (0)

participants (1)

Chengchang Tang