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

Commit 6e0ea9e6 authored by Ira Weiny's avatar Ira Weiny Committed by Roland Dreier
Browse files

IB/qib: Fix QP check when looping back to/from QP1 



The GSI QP type is compatible with and should be allowed to send data
to/from any UD QP.  This was found when testing ibacm on the same node
as an SA.

Cc: <stable@vger.kernel.org>
Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 7e22e911

drivers/infiniband/hw/qib/qib_ud.c

+8 −1
Original line number Diff line number Diff line
@@ -57,13 +57,20 @@ static void qib_ud_loopback(struct qib_qp *sqp, struct qib_swqe *swqe) 
	struct qib_sge *sge;

	struct ib_wc wc;

	u32 length;

	enum ib_qp_type sqptype, dqptype;



	qp = qib_lookup_qpn(ibp, swqe->wr.wr.ud.remote_qpn);

	if (!qp) {

		ibp->n_pkt_drops++;

		return;

	}

	if (qp->ibqp.qp_type != sqp->ibqp.qp_type ||



	sqptype = sqp->ibqp.qp_type == IB_QPT_GSI ?

			IB_QPT_UD : sqp->ibqp.qp_type;

	dqptype = qp->ibqp.qp_type == IB_QPT_GSI ?

			IB_QPT_UD : qp->ibqp.qp_type;



	if (dqptype != sqptype ||

	    !(ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK)) {

		ibp->n_pkt_drops++;

		goto drop;