Commit 19b95f6e authored by Chengchang Tang's avatar Chengchang Tang Committed by Juan Zhou
Browse files

RDMA/hns: Fix AH attr queried by query_qp 

mainline inclusion
from mainline-v6.2-rc1
commit bc34c04f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8E9OJ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bc34c04f7b97c3794dec5a6d6d27ffd5f0e4f5c8

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

The queried AH attr is invalid. This patch fix it.

This problem is found by rdma-core test test_mr_rereg_pd

ERROR: test_mr_rereg_pd (tests.test_mr.MRTest)
Test that cover rereg MR's PD with this flow:
----------------------------------------------------------------------
Traceback (most recent call last):
  File "./tests/test_mr.py", line 157, in test_mr_rereg_pd
    self.restate_qps()
  File "./tests/test_mr.py", line 113, in restate_qps
    self.server.qp.to_rts(self.server_qp_attr)
  File "qp.pyx", line 1137, in pyverbs.qp.QP.to_rts
  File "qp.pyx", line 1123, in pyverbs.qp.QP.to_rtr
pyverbs.pyverbs_error.PyverbsRDMAError: Failed to modify QP state to RTR.
Errno: 22, Invalid argument

Fixes: 926a01dc ("RDMA/hns: Add QP operations support for hip08 SoC")
Link: https://lore.kernel.org/r/20221126102911.2921820-3-xuhaoyue1@hisilicon.com


Signed-off-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Signed-off-by: default avatarHaoyue Xu <xuhaoyue1@hisilicon.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarJuan Zhou <zhoujuan51@h-partners.com>
parent 09291ed5

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+2 −0
Original line number Diff line number Diff line
@@ -5935,6 +5935,8 @@ static int hns_roce_v2_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, 


		rdma_ah_set_sl(&qp_attr->ah_attr,

			       hr_reg_read(&context, QPC_SL));

		rdma_ah_set_port_num(&qp_attr->ah_attr, hr_qp->port + 1);

		rdma_ah_set_ah_flags(&qp_attr->ah_attr, IB_AH_GRH);

		grh->flow_label = hr_reg_read(&context, QPC_FL);

		grh->sgid_index = hr_reg_read(&context, QPC_GMV_IDX);

		grh->hop_limit = hr_reg_read(&context, QPC_HOPLIMIT);