xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RDMA/qedr: Fix reporting QP timeout attribute

Browse Source 
commit 118f767413ada4eef7825fbd4af7c0866f883441 upstream.

Make sure to save the passed QP timeout attribute when the QP gets modified,
so when calling query QP the right value is reported and not the
converted value that is required by the firmware. This issue was found
while running the pyverbs tests.

Fixes: cecbcddf64 ("qedr: Add support for QP verbs")
Link: https://lore.kernel.org/r/20220525132029.84813-1-kamalheib1@gmail.com
Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
Acked-by: Michal Kalderon <michal.kalderon@marvell.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kamal Heib
2022-05-25 16:20:29 +03:00
committed by Greg Kroah-Hartman
parent a42bd00f00
commit 9de276dfb2
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/infiniband/hw/qedr/qedr.h
View File

@@ -418,6 +418,7 @@ struct qedr_qp {
u32 sq_psn; u32 sq_psn;
u32 qkey; u32 qkey;
u32 dest_qp_num; u32 dest_qp_num;
u8 timeout;
/* Relevant to qps created from kernel space only (ULPs) */ /* Relevant to qps created from kernel space only (ULPs) */
u8 prev_wqe_size; u8 prev_wqe_size;

4
drivers/infiniband/hw/qedr/verbs.c
View File

@@ -2622,6 +2622,8 @@ int qedr_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
1 << max_t(int, attr->timeout - 8, 0); 1 << max_t(int, attr->timeout - 8, 0);
else else
qp_params.ack_timeout = 0; qp_params.ack_timeout = 0;
qp->timeout = attr->timeout;
} }
if (attr_mask & IB_QP_RETRY_CNT) { if (attr_mask & IB_QP_RETRY_CNT) {
@@ -2781,7 +2783,7 @@ int qedr_query_qp(struct ib_qp *ibqp,
rdma_ah_set_dgid_raw(&qp_attr->ah_attr, &params.dgid.bytes[0]); rdma_ah_set_dgid_raw(&qp_attr->ah_attr, &params.dgid.bytes[0]);
rdma_ah_set_port_num(&qp_attr->ah_attr, 1); rdma_ah_set_port_num(&qp_attr->ah_attr, 1);
rdma_ah_set_sl(&qp_attr->ah_attr, 0); rdma_ah_set_sl(&qp_attr->ah_attr, 0);
qp_attr->timeout = params.timeout; qp_attr->timeout = qp->timeout;
qp_attr->rnr_retry = params.rnr_retry; qp_attr->rnr_retry = params.rnr_retry;
qp_attr->retry_cnt = params.retry_cnt; qp_attr->retry_cnt = params.retry_cnt;
qp_attr->min_rnr_timer = params.min_rnr_nak_timer; qp_attr->min_rnr_timer = params.min_rnr_nak_timer;