IB/rdmavt: add modify queue pair driver helpers

Low level drivers need to be able to check incoming attributes as well as be
able to adjust their private data on queue pair modification.  Add 2 driver
callbacks, check_modify_qp and modify_qp, to facilitate this.

Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
index 64b9c0191366d514cbca9a2050eef357638128df..615358ec394df61e06125c2d22aec51eabe06952 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/qp.c
+++ b/drivers/infiniband/sw/rdmavt/qp.c
@@ -970,6 +970,10 @@ int rvt_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                                attr_mask, link))
                goto inval;
 
+       if (rdi->driver_f.check_modify_qp &&
+           rdi->driver_f.check_modify_qp(qp, attr, attr_mask, udata))
+               goto inval;
+
        if (attr_mask & IB_QP_AV) {
                if (attr->ah_attr.dlid >= be16_to_cpu(IB_MULTICAST_LID_BASE))
                        goto inval;
@@ -1166,6 +1170,9 @@ int rvt_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
        if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC)
                qp->s_max_rd_atomic = attr->max_rd_atomic;
 
+       if (rdi->driver_f.modify_qp)
+               rdi->driver_f.modify_qp(qp, attr, attr_mask, udata);
+
        spin_unlock(&qp->s_lock);
        spin_unlock_irq(&qp->r_lock);
 

diff --git a/include/rdma/rdma_vt.h b/include/rdma/rdma_vt.h
index 04e90192a50dd7f825fe8f8e9df35d7cfb1456c3..e382cca3fc4f6a16ef21848f4d10ceae9b5601c3 100644 (file)
--- a/include/rdma/rdma_vt.h
+++ b/include/rdma/rdma_vt.h
@@ -256,6 +256,13 @@ struct rvt_driver_provided {
                              struct rvt_ah *);
        int (*alloc_qpn)(struct rvt_dev_info *rdi, struct rvt_qpn_table *qpt,
                         enum ib_qp_type type, u8 port, gfp_t gfp);
+       /**
+        * Return 0 if modification is valid, -errno otherwise
+        */
+       int (*check_modify_qp)(struct rvt_qp *qp, struct ib_qp_attr *attr,
+                              int attr_mask, struct ib_udata *udata);
+       void (*modify_qp)(struct rvt_qp *qp, struct ib_qp_attr *attr,
+                         int attr_mask, struct ib_udata *udata);
 };
 
 struct rvt_dev_info {