Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85d7d672 authored by Kamal Heib's avatar Kamal Heib Committed by Greg Kroah-Hartman
Browse files

RDMA/qedr: Fix reporting QP timeout attribute 

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: cecbcddf ("qedr: Add support for QP verbs")
Link: https://lore.kernel.org/r/20220525132029.84813-1-kamalheib1@gmail.com


Signed-off-by: default avatarKamal Heib <kamalheib1@gmail.com>
Acked-by: default avatarMichal <Kalderon &lt;michal.kalderon@marvell.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea0519bc

drivers/infiniband/hw/qedr/qedr.h

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ struct qedr_qp { 
	u32 sq_psn;

	u32 qkey;

	u32 dest_qp_num;

	u8 timeout;



	/* Relevant to qps created from kernel space only (ULPs) */

	u8 prev_wqe_size;

drivers/infiniband/hw/qedr/verbs.c

+3 −1
Original line number Diff line number Diff line
@@ -2259,6 +2259,8 @@ int qedr_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
					1 << max_t(int, attr->timeout - 8, 0);

		else

			qp_params.ack_timeout = 0;



		qp->timeout = attr->timeout;

	}



	if (attr_mask & IB_QP_RETRY_CNT) {
@@ -2418,7 +2420,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_port_num(&qp_attr->ah_attr, 1);

	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->retry_cnt = params.retry_cnt;

	qp_attr->min_rnr_timer = params.min_rnr_nak_timer;