RDMA: Check flags during create_cq

Each driver should check that the CQ attrs is supported. Unfortuantely
when flags was added to the CQ attrs the drivers were not updated,
uverbs_ex_cmd_mask was used to block it. This was missed when create CQ
was converted to ioctl, so non-zero flags could have been passed into
drivers.

Check that flags is zero in all drivers that don't use it, remove
IB_USER_VERBS_EX_CMD_CREATE_CQ from uverbs_ex_cmd_mask.

Fixes: 41b2a71fc848 ("IB/uverbs: Move ioctl path of create_cq and destroy_cq to a new file")
Link: https://lore.kernel.org/r/7-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 6d2603571771462a58f6427f7ff8a6ced7ac63b3..64129646f6a667b11f9f9049b9bd852da20e7ec0 100644 (file)
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -632,6 +632,7 @@ struct ib_device *_ib_alloc_device(size_t size)
                BIT_ULL(IB_USER_VERBS_CMD_RESIZE_CQ);
 
        device->uverbs_ex_cmd_mask =
+               BIT_ULL(IB_USER_VERBS_EX_CMD_CREATE_CQ) |
                BIT_ULL(IB_USER_VERBS_EX_CMD_CREATE_FLOW) |
                BIT_ULL(IB_USER_VERBS_EX_CMD_CREATE_RWQ_IND_TBL) |
                BIT_ULL(IB_USER_VERBS_EX_CMD_CREATE_WQ) |

diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
index f3ec6d3fba625991f9b5584fb06761050a1f97ea..edc47093c63bbdd149f6baf614b669ef4945b006 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
@@ -2831,6 +2831,9 @@ int bnxt_re_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
        struct bnxt_qplib_nq *nq = NULL;
        unsigned int nq_alloc_cnt;
 
+       if (attr->flags)
+               return -EOPNOTSUPP;
+
        /* Validate CQ fields */
        if (cqe < 1 || cqe > dev_attr->max_cq_wqes) {
                ibdev_err(&rdev->ibdev, "Failed to create CQ -max exceeded");

diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
index 28349ed50885408eb8032373304e1e7019685245..2cb65be24770f1bb78345eaee4af3c0715ba57f0 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
@@ -1006,7 +1006,7 @@ int c4iw_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 
        pr_debug("ib_dev %p entries %d\n", ibdev, entries);
        if (attr->flags)
-               return -EINVAL;
+               return -EOPNOTSUPP;
 
        if (vector >= rhp->rdev.lldi.nciq)
                return -EINVAL;

diff --git a/drivers/infiniband/hw/efa/efa_verbs.c b/drivers/infiniband/hw/efa/efa_verbs.c
index e3d9a5a5f4d992e3ecce22a7be747fdc78f2bbf2..2fe5708b2d9d8c2689244cc98fb5e1dadcdf1aee 100644 (file)
--- a/drivers/infiniband/hw/efa/efa_verbs.c
+++ b/drivers/infiniband/hw/efa/efa_verbs.c
@@ -1032,6 +1032,9 @@ int efa_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 
        ibdev_dbg(ibdev, "create_cq entries %d\n", entries);
 
+       if (attr->flags)
+               return -EOPNOTSUPP;
+
        if (entries < 1 || entries > dev->dev_attr.max_cq_depth) {
                ibdev_dbg(ibdev,
                          "cq: requested entries[%u] non-positive or greater than max[%u]\n",

diff --git a/drivers/infiniband/hw/hns/hns_roce_cq.c b/drivers/infiniband/hw/hns/hns_roce_cq.c
index 809b22aa5056c4e701f189fb1d0b8075842b9941..68f355fba425b52c4dc49a545f469a505edb87ed 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_cq.c
+++ b/drivers/infiniband/hw/hns/hns_roce_cq.c
@@ -251,6 +251,9 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr,
        u32 cq_entries = attr->cqe;
        int ret;
 
+       if (attr->flags)
+               return -EOPNOTSUPP;
+
        if (cq_entries < 1 || cq_entries > hr_dev->caps.max_cqes) {
                ibdev_err(ibdev, "Failed to check CQ count %d max=%d\n",
                          cq_entries, hr_dev->caps.max_cqes);

diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
index acc5e945d30369d42d82f0402df70ab5d228ca72..f3eb60ba078db9bc05c9733320e77ba2d041481b 100644 (file)
--- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
@@ -1107,6 +1107,9 @@ static int i40iw_create_cq(struct ib_cq *ibcq,
        int err_code;
        int entries = attr->cqe;
 
+       if (attr->flags)
+               return -EOPNOTSUPP;
+
        if (iwdev->closing)
                return -ENODEV;
 

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 355c8268d195a1a8746729116a32826f3d19c522..c2c66b958b836a9ab316e70db8169e47732428d8 100644 (file)
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -2659,7 +2659,6 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
 
        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) |
                (1ull << IB_USER_VERBS_EX_CMD_CREATE_QP);
 
        if ((dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_RSS) &&

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index b9a12a1d1c5c92f9a17a850cac756377bea2853c..261cc669aaf1fbf89b4ae5479efcc42ac5ea6c56 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -4143,7 +4143,6 @@ static int mlx5_ib_stage_caps_init(struct mlx5_ib_dev *dev)
                (1ull << IB_USER_VERBS_CMD_CREATE_AH)           |
                (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);
 
        if (MLX5_CAP_GEN(mdev, ipoib_enhanced_offloads) &&

diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index ea4a8deabfb6ff51c7ca0b852ba72453f662715c..e37c965bb030b609b07313ead067e0eee7a5d389 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -612,7 +612,7 @@ static int mthca_create_cq(struct ib_cq *ibcq,
                udata, struct mthca_ucontext, ibucontext);
 
        if (attr->flags)
-               return -EINVAL;
+               return -EOPNOTSUPP;
 
        if (entries < 1 || entries > to_mdev(ibdev)->limits.max_cqes)
                return -EINVAL;

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 244dd22d53efa7c09444991f63d3fc398a83b704..29ec0a808a19d8da89c3eb3ef9aae8a01f27e916 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -974,7 +974,7 @@ int ocrdma_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
        struct ocrdma_create_cq_ureq ureq;
 
        if (attr->flags)
-               return -EINVAL;
+               return -EOPNOTSUPP;
 
        if (udata) {
                if (ib_copy_from_udata(&ureq, udata, sizeof(ureq)))

diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
index 34c07a18c2c218dfcaf2334d22c6a881d56d42c1..80373170ce51f55505f0565e58bbce0aa2c6f975 100644 (file)
--- a/drivers/infiniband/hw/qedr/verbs.c
+++ b/drivers/infiniband/hw/qedr/verbs.c
@@ -928,6 +928,9 @@ int qedr_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
                 "create_cq: called from %s. entries=%d, vector=%d\n",
                 udata ? "User Lib" : "Kernel", entries, vector);
 
+       if (attr->flags)
+               return -EOPNOTSUPP;
+
        if (entries > QEDR_MAX_CQES) {
                DP_ERR(dev,
                       "create cq: the number of entries %d is too high. Must be equal or below %d.\n",

diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
index a89d5816685af663bbeed3de3284e1e92b653c4b..d6708d1db73af29f200ad8eed20b200c42e9d0b7 100644 (file)
--- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
@@ -584,7 +584,7 @@ int usnic_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
                       struct ib_udata *udata)
 {
        if (attr->flags)
-               return -EINVAL;
+               return -EOPNOTSUPP;
 
        return 0;
 }

diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c
index 319546a39a0d5c891774ee1408efe709475283de..a119ac3e103c8d6aebbaf945750a9c26cefc106e 100644 (file)
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c
@@ -119,6 +119,9 @@ int pvrdma_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 
        BUILD_BUG_ON(sizeof(struct pvrdma_cqe) != 64);
 
+       if (attr->flags)
+               return -EOPNOTSUPP;
+
        entries = roundup_pow_of_two(entries);
        if (entries < 1 || entries > dev->dsr->caps.max_cqe)
                return -EINVAL;

diff --git a/drivers/infiniband/sw/rdmavt/cq.c b/drivers/infiniband/sw/rdmavt/cq.c
index 19248be140933592c3ebe53ecb2ef87a47e9bd56..20cc0799ac4bc43b331c69172939d43d73a16218 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/cq.c
+++ b/drivers/infiniband/sw/rdmavt/cq.c
@@ -211,7 +211,7 @@ int rvt_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
        int err;
 
        if (attr->flags)
-               return -EINVAL;
+               return -EOPNOTSUPP;
 
        if (entries < 1 || entries > rdi->dparms.props.max_cqe)
                return -EINVAL;

diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index dafcc0329148ef6abb4e1ee5e091acc09e7060fb..7d32cb246d9ed21711a0ea92d0597c0c7c691532 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -771,7 +771,7 @@ static int rxe_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
        }
 
        if (attr->flags)
-               return -EINVAL;
+               return -EOPNOTSUPP;
 
        err = rxe_cq_chk_attr(rxe, NULL, attr->cqe, attr->comp_vector);
        if (err)

diff --git a/drivers/infiniband/sw/siw/siw_verbs.c b/drivers/infiniband/sw/siw/siw_verbs.c
index 947b8b1cbe9af6cae2d02b8bbf9ddb4a980d2c3b..bcea5c5ace2b6bb418e8fbac64abafd0e6bdea62 100644 (file)
--- a/drivers/infiniband/sw/siw/siw_verbs.c
+++ b/drivers/infiniband/sw/siw/siw_verbs.c
@@ -1097,6 +1097,9 @@ int siw_create_cq(struct ib_cq *base_cq, const struct ib_cq_init_attr *attr,
        struct siw_cq *cq = to_siw_cq(base_cq);
        int rv, size = attr->cqe;
 
+       if (attr->flags)
+               return -EOPNOTSUPP;
+
        if (atomic_inc_return(&sdev->num_cq) > SIW_MAX_CQ) {
                siw_dbg(base_cq->device, "too many CQ's\n");
                rv = -ENOMEM;