iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Don Hiatt 2017-11-06 06:39:22 -08:00 committed by Doug Ledford
parent 19b57c6c44
commit b64581adba
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/infiniband/hw/hfi1/rc.c
View File

@ -2219,7 +2219,7 @@ send_last:
wc.opcode = IB_WC_RECV; wc.opcode = IB_WC_RECV;
wc.qp = &qp->ibqp; wc.qp = &qp->ibqp;
wc.src_qp = qp->remote_qpn; 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 * It seems that IB mandates the presence of an SL in a
* work completion only for the UD transport (see section * work completion only for the UD transport (see section

2
drivers/infiniband/hw/hfi1/ruc.c
View File

@ -560,7 +560,7 @@ do_write:
wc.byte_len = wqe->length; wc.byte_len = wqe->length;
wc.qp = &qp->ibqp; wc.qp = &qp->ibqp;
wc.src_qp = qp->remote_qpn; 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.sl = rdma_ah_get_sl(&qp->remote_ah_attr);
wc.port_num = 1; wc.port_num = 1;
/* Signal completion event if the solicited bit is set. */ /* Signal completion event if the solicited bit is set. */

2
drivers/infiniband/hw/hfi1/uc.c
View File

@ -462,7 +462,7 @@ last_imm:
wc.status = IB_WC_SUCCESS; wc.status = IB_WC_SUCCESS;
wc.qp = &qp->ibqp; wc.qp = &qp->ibqp;
wc.src_qp = qp->remote_qpn; 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 * It seems that IB mandates the presence of an SL in a
* work completion only for the UD transport (see section * work completion only for the UD transport (see section

6
drivers/infiniband/hw/hfi1/ud.c
View File

@ -265,8 +265,8 @@ static void ud_loopback(struct rvt_qp *sqp, struct rvt_swqe *swqe)
} else { } else {
wc.pkey_index = 0; wc.pkey_index = 0;
} }
wc.slid = ppd->lid | (rdma_ah_get_path_bits(ah_attr) & wc.slid = (ppd->lid | (rdma_ah_get_path_bits(ah_attr) &
((1 << ppd->lmc) - 1)); ((1 << ppd->lmc) - 1))) & U16_MAX;
/* Check for loopback when the port lid is not set */ /* Check for loopback when the port lid is not set */
if (wc.slid == 0 && sqp->ibqp.qp_type == IB_QPT_GSI) if (wc.slid == 0 && sqp->ibqp.qp_type == IB_QPT_GSI)
wc.slid = be16_to_cpu(IB_LID_PERMISSIVE); wc.slid = be16_to_cpu(IB_LID_PERMISSIVE);
@ -1037,7 +1037,7 @@ void hfi1_ud_rcv(struct hfi1_packet *packet)
} }
if (slid_is_permissive) if (slid_is_permissive)
slid = be32_to_cpu(OPA_LID_PERMISSIVE); slid = be32_to_cpu(OPA_LID_PERMISSIVE);
wc.slid = slid; wc.slid = slid & U16_MAX;
wc.sl = sl_from_sc; wc.sl = sl_from_sc;
/* /*