RDMA: Check srq_type during create_srq

uverbs was blocking srq_types the driver doesn't support based on the
CREATE_XSRQ cmd_mask. Fix all drivers to check for supported srq_types
during create_srq and move CREATE_XSRQ to the core code.

Link: https://lore.kernel.org/r/5-v1-caa70ba3d1ab+1436e-ucmd_mask_jgg@nvidia.com
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 9e925369215c454238ba053c5c1305464512f071..efcadbda44095c9dda1c4f335822acb4d575c053 100644 (file)
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -610,6 +610,7 @@ struct ib_device *_ib_alloc_device(size_t size)
                BIT_ULL(IB_USER_VERBS_CMD_CREATE_CQ) |
                BIT_ULL(IB_USER_VERBS_CMD_CREATE_QP) |
                BIT_ULL(IB_USER_VERBS_CMD_CREATE_SRQ) |
+               BIT_ULL(IB_USER_VERBS_CMD_CREATE_XSRQ) |
                BIT_ULL(IB_USER_VERBS_CMD_DEALLOC_MW) |
                BIT_ULL(IB_USER_VERBS_CMD_DEALLOC_PD) |
                BIT_ULL(IB_USER_VERBS_CMD_DEREG_MR) |

diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index f20379e4e2ec2202115864c78ed621c9b484dfe3..d2b46c5c1645e4b727df9f7b567b8e86ee8ea791 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -2680,6 +2680,9 @@ int c4iw_create_srq(struct ib_srq *ib_srq, struct ib_srq_init_attr *attrs,
        int ret;
        int wr_len;
 
+       if (attrs->srq_type != IB_SRQT_BASIC)
+               return -EOPNOTSUPP;
+
        pr_debug("%s ib_pd %p\n", __func__, pd);
 
        php = to_c4iw_pd(pd);

diff --git a/drivers/infiniband/hw/hns/hns_roce_srq.c b/drivers/infiniband/hw/hns/hns_roce_srq.c
index 8caf74e44efd964c8db889a54477b72ae0dff354..27646b9e35dfd291b844f3019fd6d5fbdde5e432 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_srq.c
+++ b/drivers/infiniband/hw/hns/hns_roce_srq.c
@@ -288,6 +288,10 @@ int hns_roce_create_srq(struct ib_srq *ib_srq,
        int ret;
        u32 cqn;
 
+       if (init_attr->srq_type != IB_SRQT_BASIC &&
+           init_attr->srq_type != IB_SRQT_XRC)
+               return -EOPNOTSUPP;
+
        /* Check the actual SRQ wqe and SRQ sge num */
        if (init_attr->attr.max_wr >= hr_dev->caps.max_srq_wrs ||
            init_attr->attr.max_sge > hr_dev->caps.max_srq_sges)

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 63007ece56b41677eecbf53dd1bf3779f4a43c1f..355c8268d195a1a8746729116a32826f3d19c522 100644 (file)
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -2657,9 +2657,6 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
        ibdev->ib_dev.num_comp_vectors  = dev->caps.num_comp_vectors;
        ibdev->ib_dev.dev.parent        = &dev->persist->pdev->dev;
 
-       ibdev->ib_dev.uverbs_cmd_mask |=
-               (1ull << IB_USER_VERBS_CMD_CREATE_XSRQ);
-
        ib_set_device_ops(&ibdev->ib_dev, &mlx4_ib_dev_ops);
        ibdev->ib_dev.uverbs_ex_cmd_mask |=
                (1ull << IB_USER_VERBS_EX_CMD_CREATE_CQ) |

diff --git a/drivers/infiniband/hw/mlx4/srq.c b/drivers/infiniband/hw/mlx4/srq.c
index bf618529e734d2b091fcc30b65dc8af4241221b4..6a381751c0d8eea74b5003b845388db8aa390f7d 100644 (file)
--- a/drivers/infiniband/hw/mlx4/srq.c
+++ b/drivers/infiniband/hw/mlx4/srq.c
@@ -86,6 +86,10 @@ int mlx4_ib_create_srq(struct ib_srq *ib_srq,
        int err;
        int i;
 
+       if (init_attr->srq_type != IB_SRQT_BASIC &&
+           init_attr->srq_type != IB_SRQT_XRC)
+               return -EOPNOTSUPP;
+
        /* 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/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index b17c2c8758f2623ab909fb4ee653f9f1d181a295..ab469bc835dcb95e616d2a0f3cfe82d3ef11b03b 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -4141,8 +4141,7 @@ static int mlx5_ib_stage_caps_init(struct mlx5_ib_dev *dev)
 
        dev->ib_dev.uverbs_cmd_mask |=
                (1ull << IB_USER_VERBS_CMD_CREATE_AH)           |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_AH)          |
-               (1ull << IB_USER_VERBS_CMD_CREATE_XSRQ);
+               (1ull << IB_USER_VERBS_CMD_DESTROY_AH);
        dev->ib_dev.uverbs_ex_cmd_mask |=
                (1ull << IB_USER_VERBS_EX_CMD_CREATE_CQ)        |
                (1ull << IB_USER_VERBS_EX_CMD_CREATE_QP)        |

diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index e2f720eec1e18b01191f4e2a2ac2dc2d4208ef71..12d485872e77165c85a14150eb6e15c3c9a465ff 100644 (file)
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -226,6 +226,11 @@ int mlx5_ib_create_srq(struct ib_srq *ib_srq,
        struct mlx5_srq_attr in = {};
        __u32 max_srq_wqes = 1 << MLX5_CAP_GEN(dev->mdev, log_max_srq_sz);
 
+       if (init_attr->srq_type != IB_SRQT_BASIC &&
+           init_attr->srq_type != IB_SRQT_XRC &&
+           init_attr->srq_type != IB_SRQT_TM)
+               return -EOPNOTSUPP;
+
        /* Sanity check SRQ size before proceeding */
        if (init_attr->attr.max_wr >= max_srq_wqes) {
                mlx5_ib_dbg(dev, "max_wr %d, cap %d\n",

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 7350fe16f164d336bcb2890dc6e751b3c5d51f5d..b392e15d7592b6e0799be9ae7abf23f7cc50c1c9 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1770,6 +1770,9 @@ int ocrdma_create_srq(struct ib_srq *ibsrq, struct ib_srq_init_attr *init_attr,
        struct ocrdma_dev *dev = get_ocrdma_dev(ibsrq->device);
        struct ocrdma_srq *srq = get_ocrdma_srq(ibsrq);
 
+       if (init_attr->srq_type != IB_SRQT_BASIC)
+               return -EOPNOTSUPP;
+
        if (init_attr->attr.max_sge > dev->attr.max_recv_sge)
                return -EINVAL;
        if (init_attr->attr.max_wr > dev->attr.max_rqe)

diff --git a/drivers/infiniband/hw/qedr/main.c b/drivers/infiniband/hw/qedr/main.c
index a092e73eb39b62efacade8fd68b0c62956ab9fd7..f3a5946fe93e3b374a564d1b430a772d367865fe 100644 (file)
--- a/drivers/infiniband/hw/qedr/main.c
+++ b/drivers/infiniband/hw/qedr/main.c
@@ -188,9 +188,6 @@ static void qedr_roce_register_device(struct qedr_dev *dev)
        dev->ibdev.node_type = RDMA_NODE_IB_CA;
 
        ib_set_device_ops(&dev->ibdev, &qedr_roce_dev_ops);
-
-       dev->ibdev.uverbs_cmd_mask |=
-               QEDR_UVERBS(CREATE_XSRQ);
 }
 
 static const struct ib_device_ops qedr_dev_ops = {

diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
index 019642ff24a704a0e06ad282a866a30730513651..29a96ff6fc66b66e8df5a98f48d642cd852c92f6 100644 (file)
--- a/drivers/infiniband/hw/qedr/verbs.c
+++ b/drivers/infiniband/hw/qedr/verbs.c
@@ -1546,6 +1546,10 @@ int qedr_create_srq(struct ib_srq *ibsrq, struct ib_srq_init_attr *init_attr,
                 "create SRQ called from %s (pd %p)\n",
                 (udata) ? "User lib" : "kernel", pd);
 
+       if (init_attr->srq_type != IB_SRQT_BASIC &&
+           init_attr->srq_type != IB_SRQT_XRC)
+               return -EOPNOTSUPP;
+
        rc = qedr_check_srq_params(dev, init_attr, udata);
        if (rc)
                return -EINVAL;

diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c
index 082208f9aa9006339ad456e30b27c09c247ff85a..bdc2703532c6cc1ee8276c41050eaad148641c08 100644 (file)
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c
@@ -121,7 +121,7 @@ int pvrdma_create_srq(struct ib_srq *ibsrq, struct ib_srq_init_attr *init_attr,
                dev_warn(&dev->pdev->dev,
                         "shared receive queue type %d not supported\n",
                         init_attr->srq_type);
-               return -EINVAL;
+               return -EOPNOTSUPP;
        }
 
        if (init_attr->attr.max_wr  > dev->dsr->caps.max_srq_wr ||

diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index 02b7f92ac878440c1f1280e983e12a8f0a7a143b..d40ebb2e0fce6ced16bc7c469f9d4118cd276204 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -265,6 +265,9 @@ static int rxe_create_srq(struct ib_srq *ibsrq, struct ib_srq_init_attr *init,
        struct rxe_srq *srq = to_rsrq(ibsrq);
        struct rxe_create_srq_resp __user *uresp = NULL;
 
+       if (init->srq_type != IB_SRQT_BASIC)
+               return -EOPNOTSUPP;
+
        if (udata) {
                if (udata->outlen < sizeof(*uresp))
                        return -EINVAL;

diff --git a/drivers/infiniband/sw/siw/siw_verbs.c b/drivers/infiniband/sw/siw/siw_verbs.c
index 7cf3242ffb41f9b8438395c30ea16ca9be8479c5..1c469f967ab9b2695d832a87d1728fb08d62eeb7 100644 (file)
--- a/drivers/infiniband/sw/siw/siw_verbs.c
+++ b/drivers/infiniband/sw/siw/siw_verbs.c
@@ -1555,6 +1555,9 @@ int siw_create_srq(struct ib_srq *base_srq,
                                          base_ucontext);
        int rv;
 
+       if (init_attrs->srq_type != IB_SRQT_BASIC)
+               return -EOPNOTSUPP;
+
        if (atomic_inc_return(&sdev->num_srq) > SIW_MAX_SRQ) {
                siw_dbg_pd(base_srq->pd, "too many SRQ's\n");
                rv = -ENOMEM;