From: wenglianfa wenglianfa@huawei.com

The sl and src_qpn fields in recv-WC are not filled when the QP is UD and has an SRQ. Here fix it.

In addition, UD QP does not support RQ INLINE and CQE INLINE features. Reorder the related if-else statements to reduce the number of conditional checks in IO path.

Fixes: 061f7e1757ca ("libhns: Refactor the poll one interface") Signed-off-by: wenglianfa wenglianfa@huawei.com Signed-off-by: Junxian Huang huangjunxian6@hisilicon.com --- providers/hns/hns_roce_u_hw_v2.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/providers/hns/hns_roce_u_hw_v2.c b/providers/hns/hns_roce_u_hw_v2.c index 1d5c9a6a5..f46337226 100644 --- a/providers/hns/hns_roce_u_hw_v2.c +++ b/providers/hns/hns_roce_u_hw_v2.c @@ -510,12 +510,15 @@ static void parse_for_ud_qp(struct hns_roce_v2_cqe *cqe, struct ibv_wc *wc) }

static void parse_cqe_for_srq(struct hns_roce_v2_cqe *cqe, struct ibv_wc *wc, - struct hns_roce_srq *srq) + struct hns_roce_srq *srq, + struct hns_roce_qp *hr_qp) { uint32_t wqe_idx;

if (hr_reg_read(cqe, CQE_CQE_INLINE)) handle_recv_cqe_inl_from_srq(cqe, srq); + else if (hr_qp->verbs_qp.qp.qp_type == IBV_QPT_UD) + parse_for_ud_qp(cqe, wc);

wqe_idx = hr_reg_read(cqe, CQE_WQE_IDX); wc->wr_id = srq->wrid[wqe_idx & (srq->wqe_cnt - 1)]; @@ -531,13 +534,13 @@ static void parse_cqe_for_resp(struct hns_roce_v2_cqe *cqe, struct ibv_wc *wc, wc->wr_id = wq->wrid[wq->tail & (wq->wqe_cnt - 1)]; ++wq->tail;

- if (hr_qp->verbs_qp.qp.qp_type == IBV_QPT_UD) - parse_for_ud_qp(cqe, wc); - if (hr_reg_read(cqe, CQE_CQE_INLINE)) handle_recv_cqe_inl_from_rq(cqe, hr_qp); else if (hr_reg_read(cqe, CQE_RQ_INLINE)) handle_recv_rq_inl(cqe, hr_qp); + else if (hr_qp->verbs_qp.qp.qp_type == IBV_QPT_UD) + parse_for_ud_qp(cqe, wc); + }

static void parse_cqe_for_req(struct hns_roce_v2_cqe *cqe, struct ibv_wc *wc, @@ -669,7 +672,7 @@ static int parse_cqe_for_cq(struct hns_roce_context *ctx, struct hns_roce_cq *cq return V2_CQ_POLL_ERR;

if (srq) - parse_cqe_for_srq(cqe, wc, srq); + parse_cqe_for_srq(cqe, wc, srq, cur_qp); else parse_cqe_for_resp(cqe, wc, cur_qp); }