RDMA/core: Add SRQ type field

Currently, there is only a single ("basic") type of SRQ, but with XRC
support we will add a second.  Prepare for this by defining an SRQ type
and setting all current users to IB_SRQT_BASIC.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

8 files changed, 22 insertions, 0 deletions

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index c42699285f8e..48d21d09afe7 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -2013,6 +2013,7 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file,
 
         attr.event_handler  = ib_uverbs_srq_event_handler;
         attr.srq_context    = file;
+        attr.srq_type       = IB_SRQT_BASIC;
         attr.attr.max_wr    = cmd.max_wr;
         attr.attr.max_sge   = cmd.max_sge;
         attr.attr.srq_limit = cmd.srq_limit;
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 5e03ab78fc8e..cbe85ddaf898 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -250,6 +250,7 @@ struct ib_srq *ib_create_srq(struct ib_pd *pd,
                 srq->uobject       = NULL;
                 srq->event_handler = srq_init_attr->event_handler;
                 srq->srq_context   = srq_init_attr->srq_context;
+                srq->srq_type      = srq_init_attr->srq_type;
                 atomic_inc(&pd->usecnt);
                 atomic_set(&srq->usecnt, 0);
         }
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index 32fb34201aba..964f85520798 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -977,6 +977,9 @@ struct ib_srq *ehca_create_srq(struct ib_pd *pd,
         struct hcp_modify_qp_control_block *mqpcb;
         u64 hret, update_mask;
 
+        if (srq_init_attr->srq_type != IB_SRQT_BASIC)
+                return ERR_PTR(-ENOSYS);
+
         /* For common attributes, internal_create_qp() takes its info
          * out of qp_init_attr, so copy all common attrs there.
          */
diff --git a/drivers/infiniband/hw/ipath/ipath_srq.c b/drivers/infiniband/hw/ipath/ipath_srq.c
index 386e2c717c53..26271984b717 100644
--- a/drivers/infiniband/hw/ipath/ipath_srq.c
+++ b/drivers/infiniband/hw/ipath/ipath_srq.c
@@ -107,6 +107,11 @@ struct ib_srq *ipath_create_srq(struct ib_pd *ibpd,
         u32 sz;
         struct ib_srq *ret;
 
+        if (srq_init_attr->srq_type != IB_SRQT_BASIC) {
+                ret = ERR_PTR(-ENOSYS);
+                goto done;
+        }
+
         if (srq_init_attr->attr.max_wr == 0) {
                 ret = ERR_PTR(-EINVAL);
                 goto done;
diff --git a/drivers/infiniband/hw/mlx4/srq.c b/drivers/infiniband/hw/mlx4/srq.c
index 818b7ecace5e..4f7f7600d27c 100644
--- a/drivers/infiniband/hw/mlx4/srq.c
+++ b/drivers/infiniband/hw/mlx4/srq.c
@@ -81,6 +81,9 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
         int err;
         int i;
 
+        if (init_attr->srq_type != IB_SRQT_BASIC)
+                return ERR_PTR(-ENOSYS);
+
         /* Sanity check SRQ size before proceeding */
         if (init_attr->attr.max_wr  >= dev->dev->caps.max_srq_wqes ||
             init_attr->attr.max_sge >  dev->dev->caps.max_srq_sge)
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index 365fe0e14192..cb9a0b976804 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -438,6 +438,9 @@ static struct ib_srq *mthca_create_srq(struct ib_pd *pd,
         struct mthca_srq *srq;
         int err;
 
+        if (init_attr->srq_type != IB_SRQT_BASIC)
+                return ERR_PTR(-ENOSYS);
+
         srq = kmalloc(sizeof *srq, GFP_KERNEL);
         if (!srq)
                 return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/qib/qib_srq.c b/drivers/infiniband/hw/qib/qib_srq.c
index c3ec8efc2ed8..d6235931a1ba 100644
--- a/drivers/infiniband/hw/qib/qib_srq.c
+++ b/drivers/infiniband/hw/qib/qib_srq.c
@@ -107,6 +107,11 @@ struct ib_srq *qib_create_srq(struct ib_pd *ibpd,
         u32 sz;
         struct ib_srq *ret;
 
+        if (srq_init_attr->srq_type != IB_SRQT_BASIC) {
+                ret = ERR_PTR(-ENOSYS);
+                goto done;
+        }
+
         if (srq_init_attr->attr.max_sge == 0 ||
             srq_init_attr->attr.max_sge > ib_qib_max_srq_sges ||
             srq_init_attr->attr.max_wr == 0 ||
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 39913a065f99..ef003cc54a43 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -1496,6 +1496,7 @@ static void ipoib_cm_create_srq(struct net_device *dev, int max_sge)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ib_srq_init_attr srq_init_attr = {
+                .srq_type = IB_SRQT_BASIC,
                 .attr = {
                         .max_wr  = ipoib_recvq_size,
                         .max_sge = max_sge