IB/hfi1: Mask upper 16Bits of Extended LID prior to rvt_cq_entry

Pass only the lower 16Bits of an Extended LIDs to rvt_cq_entry
to avoid triggering a WARN_ON_ONCE during conversion there.
These upper 16Bits are okay to drop as they are obtained elsewhere.

Fixes: 62ede7779904 ("Add OPA extended LID support")
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Don Hiatt <don.hiatt@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/rc.c b/drivers/infiniband/hw/hfi1/rc.c
index 3f21b050714f1ca1c979e74fea1a475b9b615833..fd01a760259fa1887d2f233a2fcbb3ee581e6f5f 100644 (file)
--- a/drivers/infiniband/hw/hfi1/rc.c
+++ b/drivers/infiniband/hw/hfi1/rc.c
@@ -2219,7 +2219,7 @@ send_last:
                        wc.opcode = IB_WC_RECV;
                wc.qp = &qp->ibqp;
                wc.src_qp = qp->remote_qpn;
-               wc.slid = rdma_ah_get_dlid(&qp->remote_ah_attr);
+               wc.slid = rdma_ah_get_dlid(&qp->remote_ah_attr) & U16_MAX;
                /*
                 * It seems that IB mandates the presence of an SL in a
                 * work completion only for the UD transport (see section

diff --git a/drivers/infiniband/hw/hfi1/ruc.c b/drivers/infiniband/hw/hfi1/ruc.c
index d450d4d4bda3c5d65684e11d1d24e234439d22c7..1a3ed6e81b3181469e1e3481e783a075840b24f0 100644 (file)
--- a/drivers/infiniband/hw/hfi1/ruc.c
+++ b/drivers/infiniband/hw/hfi1/ruc.c
@@ -560,7 +560,7 @@ do_write:
        wc.byte_len = wqe->length;
        wc.qp = &qp->ibqp;
        wc.src_qp = qp->remote_qpn;
-       wc.slid = rdma_ah_get_dlid(&qp->remote_ah_attr);
+       wc.slid = rdma_ah_get_dlid(&qp->remote_ah_attr) & U16_MAX;
        wc.sl = rdma_ah_get_sl(&qp->remote_ah_attr);
        wc.port_num = 1;
        /* Signal completion event if the solicited bit is set. */

diff --git a/drivers/infiniband/hw/hfi1/uc.c b/drivers/infiniband/hw/hfi1/uc.c
index fcd81866e33248fb05808fb7a15e0b1ad6046bb2..1ee80a5f258c271b2621f6708cbb447c390cef25 100644 (file)
--- a/drivers/infiniband/hw/hfi1/uc.c
+++ b/drivers/infiniband/hw/hfi1/uc.c
@@ -462,7 +462,7 @@ last_imm:
                wc.status = IB_WC_SUCCESS;
                wc.qp = &qp->ibqp;
                wc.src_qp = qp->remote_qpn;
-               wc.slid = rdma_ah_get_dlid(&qp->remote_ah_attr);
+               wc.slid = rdma_ah_get_dlid(&qp->remote_ah_attr) & U16_MAX;
                /*
                 * It seems that IB mandates the presence of an SL in a
                 * work completion only for the UD transport (see section

diff --git a/drivers/infiniband/hw/hfi1/ud.c b/drivers/infiniband/hw/hfi1/ud.c
index 84c7dbec0c2813c6462b2aa497ecc49bc7ccb5d6..5260b27f5631807774c54e4fcb72bbd4750d1c96 100644 (file)
--- a/drivers/infiniband/hw/hfi1/ud.c
+++ b/drivers/infiniband/hw/hfi1/ud.c
@@ -265,8 +265,8 @@ static void ud_loopback(struct rvt_qp *sqp, struct rvt_swqe *swqe)
        } else {
                wc.pkey_index = 0;
        }
-       wc.slid = ppd->lid | (rdma_ah_get_path_bits(ah_attr) &
-                                  ((1 << ppd->lmc) - 1));
+       wc.slid = (ppd->lid | (rdma_ah_get_path_bits(ah_attr) &
+                                  ((1 << ppd->lmc) - 1))) & U16_MAX;
        /* Check for loopback when the port lid is not set */
        if (wc.slid == 0 && sqp->ibqp.qp_type == IB_QPT_GSI)
                wc.slid = be16_to_cpu(IB_LID_PERMISSIVE);
@@ -1037,7 +1037,7 @@ void hfi1_ud_rcv(struct hfi1_packet *packet)
        }
        if (slid_is_permissive)
                slid = be32_to_cpu(OPA_LID_PERMISSIVE);
-       wc.slid = slid;
+       wc.slid = slid & U16_MAX;
        wc.sl = sl_from_sc;
 
        /*