81 lines
2.8 KiB
Diff
81 lines
2.8 KiB
Diff
|
From 0979a83d9f48d301722e43b72b1800d99a996603 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Xinghai Cen <cenxinghai@h-partners.com>
|
||
|
|
Date: Thu, 27 Feb 2025 17:03:58 +0800
|
||
|
|
Subject: [PATCH] libhns: Fix missing fields for SRQ WC
|
||
|
|
|
||
|
|
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.
|
||
|
|
|
||
|
|
mainline inclusion
|
||
|
|
from mainline-master
|
||
|
|
commit c4119911c212aaa552c9cb928fba0a696640c9b5
|
||
|
|
category: bugfix
|
||
|
|
bugzilla: https://gitee.com/src-openeuler/rdma-core/issues/IBPB3C
|
||
|
|
CVE: NA
|
||
|
|
Reference:https://github.com/linux-rdma/rdma-core/pull/1543/commits/65a7ce99cf4bfd6748346206f546e51c0a82c993
|
||
|
|
|
||
|
|
Fixes:68c547c02bf5 ("libhns: Support user to choose using UD sl or pktype to adapt MPI APP")
|
||
|
|
Signed-off-by: wenglianfa <wenglianfa@huawei.com>
|
||
|
|
Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com>
|
||
|
|
Signed-off-by: Xinghai Cen <cenxinghai@h-partners.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 1bbd788..f05b839 100644
|
||
|
|
--- a/providers/hns/hns_roce_u_hw_v2.c
|
||
|
|
+++ b/providers/hns/hns_roce_u_hw_v2.c
|
||
|
|
@@ -540,7 +540,8 @@ 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;
|
||
|
|
|
||
|
|
@@ -550,6 +551,9 @@ static void parse_cqe_for_srq(struct hns_roce_v2_cqe *cqe, struct ibv_wc *wc,
|
||
|
|
|
||
|
|
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, hr_qp->enable_ud_sl);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
static int parse_cqe_for_resp(struct hns_roce_v2_cqe *cqe, struct ibv_wc *wc,
|
||
|
|
@@ -561,13 +565,12 @@ static int 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, hr_qp->enable_ud_sl);
|
||
|
|
-
|
||
|
|
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, hr_qp->enable_ud_sl);
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
@@ -777,7 +780,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);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|