torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

RDMA/hns: Fix querying wrong SCC context for DIP algorithm

Browse Source 
When using DIP algorithm, all QPs establishing connections with
the same destination IP share the same SCC, which is indexed by
dip_idx, but dip_idx isn't necessarily equal to qpn. Therefore,
dip_idx should be used to query SCC context instead of qpn.

Fixes: 124a9fbe43 ("RDMA/hns: Append SCC context to the raw dump of QPC")
Signed-off-by: wenglianfa <wenglianfa@huawei.com>
Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com>
Link: https://patch.msgid.link/20250726075345.846957-1-huangjunxian6@hisilicon.com
Reviewed-by: Zhu Yanjun <yanjun.zhu@linux.dev>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
This commit is contained in:
wenglianfa 2025-07-26 15:53:45 +08:00 committed by Leon Romanovsky
parent d4ac86b475
commit 085a1b42e5
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/infiniband/hw/hns/hns_roce_hw_v2.c
View File

@ -5476,7 +5476,7 @@ out:
return ret; return ret;
} }
static int hns_roce_v2_query_sccc(struct hns_roce_dev *hr_dev, u32 qpn, static int hns_roce_v2_query_sccc(struct hns_roce_dev *hr_dev, u32 sccn,
void *buffer) void *buffer)
{ {
struct hns_roce_v2_scc_context *context; struct hns_roce_v2_scc_context *context;
@ -5488,7 +5488,7 @@ static int hns_roce_v2_query_sccc(struct hns_roce_dev *hr_dev, u32 qpn,
return PTR_ERR(mailbox); return PTR_ERR(mailbox);
ret = hns_roce_cmd_mbox(hr_dev, 0, mailbox->dma, HNS_ROCE_CMD_QUERY_SCCC, ret = hns_roce_cmd_mbox(hr_dev, 0, mailbox->dma, HNS_ROCE_CMD_QUERY_SCCC,
qpn); sccn);
if (ret) if (ret)
goto out; goto out;

9
drivers/infiniband/hw/hns/hns_roce_restrack.c
View File

@ -100,6 +100,7 @@ int hns_roce_fill_res_qp_entry_raw(struct sk_buff *msg, struct ib_qp *ib_qp)
struct hns_roce_v2_qp_context qpc; struct hns_roce_v2_qp_context qpc;
struct hns_roce_v2_scc_context sccc; struct hns_roce_v2_scc_context sccc;
} context = {}; } context = {};
u32 sccn = hr_qp->qpn;
int ret; int ret;
if (!hr_dev->hw->query_qpc) if (!hr_dev->hw->query_qpc)
@ -116,7 +117,13 @@ int hns_roce_fill_res_qp_entry_raw(struct sk_buff *msg, struct ib_qp *ib_qp)
!hr_dev->hw->query_sccc) !hr_dev->hw->query_sccc)
goto out; goto out;
ret = hr_dev->hw->query_sccc(hr_dev, hr_qp->qpn, &context.sccc); if (hr_qp->cong_type == CONG_TYPE_DIP) {
if (!hr_qp->dip)
goto out;
sccn = hr_qp->dip->dip_idx;
}
ret = hr_dev->hw->query_sccc(hr_dev, sccn, &context.sccc);
if (ret) if (ret)
ibdev_warn_ratelimited(&hr_dev->ib_dev, ibdev_warn_ratelimited(&hr_dev->ib_dev,
"failed to query SCCC, ret = %d.\n", "failed to query SCCC, ret = %d.\n",