Commit 6ef793cb authored by Prabhakar Kushwaha's avatar Prabhakar Kushwaha Committed by Jason Gunthorpe
Browse files

RDMA/qedr: Move variables reset to qedr_set_common_qp_params() 

Qedr code is tightly coupled with existing both INIT transitions.  Here,
during first INIT transition all variables are reset and the RESET state
is checked in post_recv() before any posting.

Commit dc70f7c3 ("RDMA/cma: Remove unnecessary INIT->INIT transition")
exposed this bug.

So moving variables reset to qedr_set_common_qp_params() and also avoid
RESET state check for post_recv().

Link: https://lore.kernel.org/r/20210811051650.14914-1-pkushwaha@marvell.com


Signed-off-by: default avatarMichal Kalderon <mkalderon@marvell.com>
Signed-off-by: default avatarAriel Elior <aelior@marvell.com>
Signed-off-by: default avatarShai Malin <smalin@marvell.com>
Signed-off-by: default avatarPrabhakar Kushwaha <pkushwaha@marvell.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 4b89451d

drivers/infiniband/hw/qedr/verbs.c

+14 −18
Original line number Diff line number Diff line
@@ -1339,6 +1339,15 @@ static int qedr_copy_qp_uresp(struct qedr_dev *dev, 
	return rc;

}



static void qedr_reset_qp_hwq_info(struct qedr_qp_hwq_info *qph)

{

	qed_chain_reset(&qph->pbl);

	qph->prod = 0;

	qph->cons = 0;

	qph->wqe_cons = 0;

	qph->db_data.data.value = cpu_to_le16(0);

}



static void qedr_set_common_qp_params(struct qedr_dev *dev,

				      struct qedr_qp *qp,

				      struct qedr_pd *pd,
@@ -1354,9 +1363,13 @@ static void qedr_set_common_qp_params(struct qedr_dev *dev, 
	qp->qp_type = attrs->qp_type;

	qp->max_inline_data = attrs->cap.max_inline_data;

	qp->state = QED_ROCE_QP_STATE_RESET;



	qp->prev_wqe_size = 0;



	qp->signaled = (attrs->sq_sig_type == IB_SIGNAL_ALL_WR) ? true : false;

	qp->dev = dev;

	if (qedr_qp_has_sq(qp)) {

		qedr_reset_qp_hwq_info(&qp->sq);

		qp->sq.max_sges = attrs->cap.max_send_sge;

		qp->sq_cq = get_qedr_cq(attrs->send_cq);

		DP_DEBUG(dev, QEDR_MSG_QP,
@@ -1368,6 +1381,7 @@ static void qedr_set_common_qp_params(struct qedr_dev *dev, 
		qp->srq = get_qedr_srq(attrs->srq);



	if (qedr_qp_has_rq(qp)) {

		qedr_reset_qp_hwq_info(&qp->rq);

		qp->rq_cq = get_qedr_cq(attrs->recv_cq);

		qp->rq.max_sges = attrs->cap.max_recv_sge;

		DP_DEBUG(dev, QEDR_MSG_QP,
@@ -2342,15 +2356,6 @@ static enum qed_roce_qp_state qedr_get_state_from_ibqp( 
	}

}



static void qedr_reset_qp_hwq_info(struct qedr_qp_hwq_info *qph)

{

	qed_chain_reset(&qph->pbl);

	qph->prod = 0;

	qph->cons = 0;

	qph->wqe_cons = 0;

	qph->db_data.data.value = cpu_to_le16(0);

}



static int qedr_update_qp_state(struct qedr_dev *dev,

				struct qedr_qp *qp,

				enum qed_roce_qp_state cur_state,
@@ -2365,9 +2370,6 @@ static int qedr_update_qp_state(struct qedr_dev *dev, 
	case QED_ROCE_QP_STATE_RESET:

		switch (new_state) {

		case QED_ROCE_QP_STATE_INIT:

			qp->prev_wqe_size = 0;

			qedr_reset_qp_hwq_info(&qp->sq);

			qedr_reset_qp_hwq_info(&qp->rq);

			break;

		default:

			status = -EINVAL;
@@ -3908,12 +3910,6 @@ int qedr_post_recv(struct ib_qp *ibqp, const struct ib_recv_wr *wr, 


	spin_lock_irqsave(&qp->q_lock, flags);



	if (qp->state == QED_ROCE_QP_STATE_RESET) {

		spin_unlock_irqrestore(&qp->q_lock, flags);

		*bad_wr = wr;

		return -EINVAL;

	}



	while (wr) {

		int i;