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

Commit 31e7af1c authored by Ira Weiny's avatar Ira Weiny Committed by Doug Ledford
Browse files

staging/rdma/hfi1: Fix SL->SC checks 



SLs which are mapped to SC15 are invalid and should fail the
operation.

For RC/UC QP types, verify the AH information at modify_qp time and
fail the modify_qp if the SL is invalid.

For other QP types check the SL during post_send via the new rdmavt
callback.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent affa48de

drivers/staging/rdma/hfi1/qp.c

+20 −0
Original line number Diff line number Diff line
@@ -185,6 +185,9 @@ int hfi1_check_modify_qp(struct rvt_qp *qp, struct ib_qp_attr *attr, 


	if (attr_mask & IB_QP_AV) {

		sc = ah_to_sc(ibqp->device, &attr->ah_attr);

		if (sc == 0xf)

			return -EINVAL;



		if (!qp_to_sdma_engine(qp, sc) &&

		    dd->flags & HFI1_HAS_SEND_DMA)

			return -EINVAL;
@@ -192,6 +195,9 @@ int hfi1_check_modify_qp(struct rvt_qp *qp, struct ib_qp_attr *attr, 


	if (attr_mask & IB_QP_ALT_PATH) {

		sc = ah_to_sc(ibqp->device, &attr->alt_ah_attr);

		if (sc == 0xf)

			return -EINVAL;



		if (!qp_to_sdma_engine(qp, sc) &&

		    dd->flags & HFI1_HAS_SEND_DMA)

			return -EINVAL;
@@ -220,6 +226,20 @@ void hfi1_modify_qp(struct rvt_qp *qp, struct ib_qp_attr *attr, 
	}

}



int hfi1_check_send_wr(struct rvt_qp *qp, struct ib_send_wr *wr)

{

	struct hfi1_ibport *ibp = to_iport(qp->ibqp.device, qp->port_num);

	struct rvt_ah *ah = ibah_to_rvtah(ud_wr(wr)->ah);



	if (qp->ibqp.qp_type != IB_QPT_RC &&

	    qp->ibqp.qp_type != IB_QPT_UC &&

	    qp->ibqp.qp_type != IB_QPT_SMI &&

	    ibp->sl_to_sc[ah->attr.sl] == 0xf) {

		return -EINVAL;

	}

	return 0;

}



/**

 * hfi1_compute_aeth - compute the AETH (syndrome + MSN)

 * @qp: the queue pair to compute the AETH for

drivers/staging/rdma/hfi1/verbs.c

+1 −0
Original line number Diff line number Diff line
@@ -1561,6 +1561,7 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd) 
	dd->verbs_dev.rdi.driver_f.mtu_to_path_mtu = mtu_to_path_mtu;

	dd->verbs_dev.rdi.driver_f.check_modify_qp = hfi1_check_modify_qp;

	dd->verbs_dev.rdi.driver_f.modify_qp = hfi1_modify_qp;

	dd->verbs_dev.rdi.driver_f.check_send_wr = hfi1_check_send_wr;



	/* completeion queue */

	snprintf(dd->verbs_dev.rdi.dparms.cq_name,

drivers/staging/rdma/hfi1/verbs.h

+2 −0
Original line number Diff line number Diff line
@@ -439,6 +439,8 @@ int hfi1_check_modify_qp(struct rvt_qp *qp, struct ib_qp_attr *attr, 
void hfi1_modify_qp(struct rvt_qp *qp, struct ib_qp_attr *attr,

		    int attr_mask, struct ib_udata *udata);



int hfi1_check_send_wr(struct rvt_qp *qp, struct ib_send_wr *wr);



int hfi1_ruc_check_hdr(struct hfi1_ibport *ibp, struct hfi1_ib_header *hdr,

		       int has_grh, struct rvt_qp *qp, u32 bth0);