RDMA/hns: Fix AH attr queried by query_qp
authorChengchang Tang <tangchengchang@huawei.com>
Sat, 26 Nov 2022 10:29:07 +0000 (18:29 +0800)
committerJason Gunthorpe <jgg@nvidia.com>
Wed, 7 Dec 2022 23:51:04 +0000 (19:51 -0400)
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: 926a01dc000d ("RDMA/hns: Add QP operations support for hip08 SoC")
Link: https://lore.kernel.org/r/20221126102911.2921820-3-xuhaoyue1@hisilicon.com
Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Haoyue Xu <xuhaoyue1@hisilicon.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
drivers/infiniband/hw/hns/hns_roce_hw_v2.c

index 93c6772..a8f8c79 100644 (file)
@@ -5470,6 +5470,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);