[rdma-core-2403 v2 28/29] libhns: Fix missing flexible WQE buffer page flag
driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I98HIN -------------------------------------------------------------------------- Due to the lack of this flag, this feature cannot actually take effect. Fixes: bf57963e729c ("libhns: Support flexible WQE buffer page size") Signed-off-by: Chengchang Tang <tangchengchang@huawei.com> --- providers/hns/hns_roce_u.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/hns/hns_roce_u.c b/providers/hns/hns_roce_u.c index 7a3d1a2..c4a3ba5 100644 --- a/providers/hns/hns_roce_u.c +++ b/providers/hns/hns_roce_u.c @@ -342,7 +342,7 @@ static void ucontext_set_cmd(struct hns_roce_alloc_ucontext *cmd, struct hnsdv_context_attr *attr) { cmd->config |= HNS_ROCE_EXSGE_FLAGS | HNS_ROCE_RQ_INLINE_FLAGS | - HNS_ROCE_CQE_INLINE_FLAGS; + HNS_ROCE_CQE_INLINE_FLAGS | HNS_ROCE_UCTX_DYN_QP_PGSZ; if (!attr || !(attr->flags & HNSDV_CONTEXT_FLAGS_DCA)) return; -- 2.33.0
driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I98HIN -------------------------------------------------------------------------- The buffer for extending SGE must be equal to the WQE buffer page size. Fixes: bf57963e729c ("libhns: Support flexible WQE buffer page size") Signed-off-by: Chengchang Tang <tangchengchang@huawei.com> --- providers/hns/hns_roce_u_verbs.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/providers/hns/hns_roce_u_verbs.c b/providers/hns/hns_roce_u_verbs.c index 8964d53..a680339 100644 --- a/providers/hns/hns_roce_u_verbs.c +++ b/providers/hns/hns_roce_u_verbs.c @@ -1270,8 +1270,10 @@ static void get_best_multi_region_pg_shift(struct hns_roce_device *hr_dev, /* * The larger the pagesize used, the better the performance, but it * may waste more memory. Therefore, we use the least common multiple - * (aligned to power of 2) of sq wqe buffer size, rq wqe buffer size, * and ext_sge buffer size as the pagesize. Additionally, since the + * (aligned to power of 2) of sq wqe buffer size and rq wqe buffer + * size as the pagesize. And the wqe buffer page cannot be larger + * than the buffer size used by extend sge. Additionally, since the * kernel cannot guarantee the allocation of contiguous memory larger * than the system page, the pagesize must be smaller than the system * page. @@ -1281,8 +1283,10 @@ static void get_best_multi_region_pg_shift(struct hns_roce_device *hr_dev, rq_size = qp->rq.wqe_cnt << qp->rq.wqe_shift; pg_shift = max_t(uint8_t, sq_size ? hr_ilog32(sq_size) : 0, - ext_sge_size ? hr_ilog32(ext_sge_size) : 0); - pg_shift = max_t(uint8_t, pg_shift, rq_size ? hr_ilog32(rq_size) : 0); + rq_size ? hr_ilog32(rq_size) : 0); + pg_shift = ext_sge_size ? + min_t(uint8_t, pg_shift, hr_ilog32(ext_sge_size)) : + pg_shift; pg_shift = max_t(uint8_t, pg_shift, HNS_HW_PAGE_SHIFT); qp->pageshift = min_t(uint8_t, pg_shift, hr_ilog32(hr_dev->page_size)); } -- 2.33.0
participants (1)
-
Chengchang Tang