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: Mike Marciniszyn <mike.marciniszyn@intel.com>
Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/staging/rdma/hfi1/qp.c b/drivers/staging/rdma/hfi1/qp.c
index 52723c2bad3775d111bf54f430d882b7cabde2b9..05a9619752aeefd64f935fa26f3788681c3b86cb 100644 (file)
--- a/drivers/staging/rdma/hfi1/qp.c
+++ b/drivers/staging/rdma/hfi1/qp.c
@@ -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

diff --git a/drivers/staging/rdma/hfi1/verbs.c b/drivers/staging/rdma/hfi1/verbs.c
index a53d93a5245c3249c383f1ed30ce2596baac1fd8..6d541caf4a5138643d9078fe84343b1e8bc31975 100644 (file)
--- a/drivers/staging/rdma/hfi1/verbs.c
+++ b/drivers/staging/rdma/hfi1/verbs.c
@@ -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,

diff --git a/drivers/staging/rdma/hfi1/verbs.h b/drivers/staging/rdma/hfi1/verbs.h
index 79bcab61d2baba7d75ebb5f0e4ba2f83a703472c..1571ae390042a5ce3ee6c5afbf9958c759218e32 100644 (file)
--- a/drivers/staging/rdma/hfi1/verbs.h
+++ b/drivers/staging/rdma/hfi1/verbs.h
@@ -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);