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

commit 6e0ea9e6cbcead7fa8c76e3e3b9de4a50c5131c5 upstream.

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.

Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/infiniband/hw/qib/qib_ud.c b/drivers/infiniband/hw/qib/qib_ud.c
index d6c7fe7f88d5..3ad651c3356c 100644
--- a/drivers/infiniband/hw/qib/qib_ud.c
+++ b/drivers/infiniband/hw/qib/qib_ud.c
@@ -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;