RDMA: Remove elements in uverbs_cmd_mask that all drivers set

This is a step toward eliminating uverbs_cmd_mask. Preset this list in the
core code. Only the op reg_user_mr wasn't already being required from the
drivers.

Link: https://lore.kernel.org/r/3-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 6ae69e7..f99548d 100644 (file)
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -600,6 +600,22 @@ struct ib_device *_ib_alloc_device(size_t size)
        init_completion(&device->unreg_completion);
        INIT_WORK(&device->unregistration_work, ib_unregister_work);
 
+       device->uverbs_cmd_mask =
+               BIT_ULL(IB_USER_VERBS_CMD_ALLOC_PD) |
+               BIT_ULL(IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
+               BIT_ULL(IB_USER_VERBS_CMD_CREATE_CQ) |
+               BIT_ULL(IB_USER_VERBS_CMD_CREATE_QP) |
+               BIT_ULL(IB_USER_VERBS_CMD_DEALLOC_PD) |
+               BIT_ULL(IB_USER_VERBS_CMD_DEREG_MR) |
+               BIT_ULL(IB_USER_VERBS_CMD_DESTROY_CQ) |
+               BIT_ULL(IB_USER_VERBS_CMD_DESTROY_QP) |
+               BIT_ULL(IB_USER_VERBS_CMD_GET_CONTEXT) |
+               BIT_ULL(IB_USER_VERBS_CMD_MODIFY_QP) |
+               BIT_ULL(IB_USER_VERBS_CMD_QUERY_DEVICE) |
+               BIT_ULL(IB_USER_VERBS_CMD_QUERY_PORT) |
+               BIT_ULL(IB_USER_VERBS_CMD_QUERY_QP) |
+               BIT_ULL(IB_USER_VERBS_CMD_REG_MR);
+
        device->uverbs_ex_cmd_mask =
                BIT_ULL(IB_USER_VERBS_EX_CMD_CREATE_FLOW) |
                BIT_ULL(IB_USER_VERBS_EX_CMD_CREATE_RWQ_IND_TBL) |

diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
index 04621ba..46dac95 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/main.c
+++ b/drivers/infiniband/hw/bnxt_re/main.c
@@ -702,23 +702,9 @@ static int bnxt_re_register_ib(struct bnxt_re_dev *rdev)
        ibdev->local_dma_lkey = BNXT_QPLIB_RSVD_LKEY;
 
        /* User space */
-       ibdev->uverbs_cmd_mask =
-                       (1ull << IB_USER_VERBS_CMD_GET_CONTEXT)         |
-                       (1ull << IB_USER_VERBS_CMD_QUERY_DEVICE)        |
-                       (1ull << IB_USER_VERBS_CMD_QUERY_PORT)          |
-                       (1ull << IB_USER_VERBS_CMD_ALLOC_PD)            |
-                       (1ull << IB_USER_VERBS_CMD_DEALLOC_PD)          |
-                       (1ull << IB_USER_VERBS_CMD_REG_MR)              |
+       ibdev->uverbs_cmd_mask |=
                        (1ull << IB_USER_VERBS_CMD_REREG_MR)            |
-                       (1ull << IB_USER_VERBS_CMD_DEREG_MR)            |
-                       (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
-                       (1ull << IB_USER_VERBS_CMD_CREATE_CQ)           |
                        (1ull << IB_USER_VERBS_CMD_RESIZE_CQ)           |
-                       (1ull << IB_USER_VERBS_CMD_DESTROY_CQ)          |
-                       (1ull << IB_USER_VERBS_CMD_CREATE_QP)           |
-                       (1ull << IB_USER_VERBS_CMD_MODIFY_QP)           |
-                       (1ull << IB_USER_VERBS_CMD_QUERY_QP)            |
-                       (1ull << IB_USER_VERBS_CMD_DESTROY_QP)          |
                        (1ull << IB_USER_VERBS_CMD_CREATE_SRQ)          |
                        (1ull << IB_USER_VERBS_CMD_MODIFY_SRQ)          |
                        (1ull << IB_USER_VERBS_CMD_QUERY_SRQ)           |

diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
index b7fe4b4..3e6ec35 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/provider.c
+++ b/drivers/infiniband/hw/cxgb4/provider.c
@@ -531,23 +531,9 @@ void c4iw_register_device(struct work_struct *work)
        if (fastreg_support)
                dev->device_cap_flags |= IB_DEVICE_MEM_MGT_EXTENSIONS;
        dev->ibdev.local_dma_lkey = 0;
-       dev->ibdev.uverbs_cmd_mask =
-           (1ull << IB_USER_VERBS_CMD_GET_CONTEXT) |
-           (1ull << IB_USER_VERBS_CMD_QUERY_DEVICE) |
-           (1ull << IB_USER_VERBS_CMD_QUERY_PORT) |
-           (1ull << IB_USER_VERBS_CMD_ALLOC_PD) |
-           (1ull << IB_USER_VERBS_CMD_DEALLOC_PD) |
-           (1ull << IB_USER_VERBS_CMD_REG_MR) |
-           (1ull << IB_USER_VERBS_CMD_DEREG_MR) |
-           (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
-           (1ull << IB_USER_VERBS_CMD_CREATE_CQ) |
-           (1ull << IB_USER_VERBS_CMD_DESTROY_CQ) |
+       dev->ibdev.uverbs_cmd_mask |=
            (1ull << IB_USER_VERBS_CMD_REQ_NOTIFY_CQ) |
-           (1ull << IB_USER_VERBS_CMD_CREATE_QP) |
-           (1ull << IB_USER_VERBS_CMD_MODIFY_QP) |
-           (1ull << IB_USER_VERBS_CMD_QUERY_QP) |
            (1ull << IB_USER_VERBS_CMD_POLL_CQ) |
-           (1ull << IB_USER_VERBS_CMD_DESTROY_QP) |
            (1ull << IB_USER_VERBS_CMD_POST_SEND) |
            (1ull << IB_USER_VERBS_CMD_POST_RECV) |
            (1ull << IB_USER_VERBS_CMD_CREATE_SRQ) |

diff --git a/drivers/infiniband/hw/efa/efa_main.c b/drivers/infiniband/hw/efa/efa_main.c
index ff50b18..843b44a 100644 (file)
--- a/drivers/infiniband/hw/efa/efa_main.c
+++ b/drivers/infiniband/hw/efa/efa_main.c
@@ -308,21 +308,7 @@ static int efa_ib_device_add(struct efa_dev *dev)
        dev->ibdev.num_comp_vectors = 1;
        dev->ibdev.dev.parent = &pdev->dev;
 
-       dev->ibdev.uverbs_cmd_mask =
-               (1ull << IB_USER_VERBS_CMD_GET_CONTEXT) |
-               (1ull << IB_USER_VERBS_CMD_QUERY_DEVICE) |
-               (1ull << IB_USER_VERBS_CMD_QUERY_PORT) |
-               (1ull << IB_USER_VERBS_CMD_ALLOC_PD) |
-               (1ull << IB_USER_VERBS_CMD_DEALLOC_PD) |
-               (1ull << IB_USER_VERBS_CMD_REG_MR) |
-               (1ull << IB_USER_VERBS_CMD_DEREG_MR) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_CQ) |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_CQ) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_QP) |
-               (1ull << IB_USER_VERBS_CMD_MODIFY_QP) |
-               (1ull << IB_USER_VERBS_CMD_QUERY_QP) |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_QP) |
+       dev->ibdev.uverbs_cmd_mask |=
                (1ull << IB_USER_VERBS_CMD_CREATE_AH) |
                (1ull << IB_USER_VERBS_CMD_DESTROY_AH);
 

diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c
index f1aa8d2..dc64582 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_main.c
+++ b/drivers/infiniband/hw/hns/hns_roce_main.c
@@ -491,21 +491,6 @@ static int hns_roce_register_device(struct hns_roce_dev *hr_dev)
        ib_dev->phys_port_cnt = hr_dev->caps.num_ports;
        ib_dev->local_dma_lkey = hr_dev->caps.reserved_lkey;
        ib_dev->num_comp_vectors = hr_dev->caps.num_comp_vectors;
-       ib_dev->uverbs_cmd_mask =
-               (1ULL << IB_USER_VERBS_CMD_GET_CONTEXT) |
-               (1ULL << IB_USER_VERBS_CMD_QUERY_DEVICE) |
-               (1ULL << IB_USER_VERBS_CMD_QUERY_PORT) |
-               (1ULL << IB_USER_VERBS_CMD_ALLOC_PD) |
-               (1ULL << IB_USER_VERBS_CMD_DEALLOC_PD) |
-               (1ULL << IB_USER_VERBS_CMD_REG_MR) |
-               (1ULL << IB_USER_VERBS_CMD_DEREG_MR) |
-               (1ULL << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
-               (1ULL << IB_USER_VERBS_CMD_CREATE_CQ) |
-               (1ULL << IB_USER_VERBS_CMD_DESTROY_CQ) |
-               (1ULL << IB_USER_VERBS_CMD_CREATE_QP) |
-               (1ULL << IB_USER_VERBS_CMD_MODIFY_QP) |
-               (1ULL << IB_USER_VERBS_CMD_QUERY_QP) |
-               (1ULL << IB_USER_VERBS_CMD_DESTROY_QP);
 
        if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_REREG_MR) {
                ib_dev->uverbs_cmd_mask |= (1ULL << IB_USER_VERBS_CMD_REREG_MR);

diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
index 581ecba..76f7d8b 100644 (file)
--- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
@@ -2684,25 +2684,11 @@ static struct i40iw_ib_device *i40iw_init_rdma_device(struct i40iw_device *iwdev
        iwibdev->ibdev.node_type = RDMA_NODE_RNIC;
        ether_addr_copy((u8 *)&iwibdev->ibdev.node_guid, netdev->dev_addr);
 
-       iwibdev->ibdev.uverbs_cmd_mask =
-           (1ull << IB_USER_VERBS_CMD_GET_CONTEXT) |
-           (1ull << IB_USER_VERBS_CMD_QUERY_DEVICE) |
-           (1ull << IB_USER_VERBS_CMD_QUERY_PORT) |
-           (1ull << IB_USER_VERBS_CMD_ALLOC_PD) |
-           (1ull << IB_USER_VERBS_CMD_DEALLOC_PD) |
-           (1ull << IB_USER_VERBS_CMD_REG_MR) |
-           (1ull << IB_USER_VERBS_CMD_DEREG_MR) |
-           (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
-           (1ull << IB_USER_VERBS_CMD_CREATE_CQ) |
-           (1ull << IB_USER_VERBS_CMD_DESTROY_CQ) |
+       iwibdev->ibdev.uverbs_cmd_mask |=
            (1ull << IB_USER_VERBS_CMD_REQ_NOTIFY_CQ) |
-           (1ull << IB_USER_VERBS_CMD_CREATE_QP) |
-           (1ull << IB_USER_VERBS_CMD_MODIFY_QP) |
-           (1ull << IB_USER_VERBS_CMD_QUERY_QP) |
            (1ull << IB_USER_VERBS_CMD_POLL_CQ) |
            (1ull << IB_USER_VERBS_CMD_CREATE_AH) |
            (1ull << IB_USER_VERBS_CMD_DESTROY_AH) |
-           (1ull << IB_USER_VERBS_CMD_DESTROY_QP) |
            (1ull << IB_USER_VERBS_CMD_POST_RECV) |
            (1ull << IB_USER_VERBS_CMD_POST_SEND);
        iwibdev->ibdev.phys_port_cnt = 1;

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 451b248..ad064a2 100644 (file)
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -2657,23 +2657,9 @@ 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_GET_CONTEXT)         |
-               (1ull << IB_USER_VERBS_CMD_QUERY_DEVICE)        |
-               (1ull << IB_USER_VERBS_CMD_QUERY_PORT)          |
-               (1ull << IB_USER_VERBS_CMD_ALLOC_PD)            |
-               (1ull << IB_USER_VERBS_CMD_DEALLOC_PD)          |
-               (1ull << IB_USER_VERBS_CMD_REG_MR)              |
+       ibdev->ib_dev.uverbs_cmd_mask |=
                (1ull << IB_USER_VERBS_CMD_REREG_MR)            |
-               (1ull << IB_USER_VERBS_CMD_DEREG_MR)            |
-               (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_CQ)           |
                (1ull << IB_USER_VERBS_CMD_RESIZE_CQ)           |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_CQ)          |
-               (1ull << IB_USER_VERBS_CMD_CREATE_QP)           |
-               (1ull << IB_USER_VERBS_CMD_MODIFY_QP)           |
-               (1ull << IB_USER_VERBS_CMD_QUERY_QP)            |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_QP)          |
                (1ull << IB_USER_VERBS_CMD_ATTACH_MCAST)        |
                (1ull << IB_USER_VERBS_CMD_DETACH_MCAST)        |
                (1ull << IB_USER_VERBS_CMD_CREATE_SRQ)          |

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 383cd1e..656fffb 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -4139,25 +4139,11 @@ static int mlx5_ib_stage_caps_init(struct mlx5_ib_dev *dev)
        struct mlx5_core_dev *mdev = dev->mdev;
        int err;
 
-       dev->ib_dev.uverbs_cmd_mask     =
-               (1ull << IB_USER_VERBS_CMD_GET_CONTEXT)         |
-               (1ull << IB_USER_VERBS_CMD_QUERY_DEVICE)        |
-               (1ull << IB_USER_VERBS_CMD_QUERY_PORT)          |
-               (1ull << IB_USER_VERBS_CMD_ALLOC_PD)            |
-               (1ull << IB_USER_VERBS_CMD_DEALLOC_PD)          |
+       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_REG_MR)              |
                (1ull << IB_USER_VERBS_CMD_REREG_MR)            |
-               (1ull << IB_USER_VERBS_CMD_DEREG_MR)            |
-               (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_CQ)           |
                (1ull << IB_USER_VERBS_CMD_RESIZE_CQ)           |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_CQ)          |
-               (1ull << IB_USER_VERBS_CMD_CREATE_QP)           |
-               (1ull << IB_USER_VERBS_CMD_MODIFY_QP)           |
-               (1ull << IB_USER_VERBS_CMD_QUERY_QP)            |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_QP)          |
                (1ull << IB_USER_VERBS_CMD_ATTACH_MCAST)        |
                (1ull << IB_USER_VERBS_CMD_DETACH_MCAST)        |
                (1ull << IB_USER_VERBS_CMD_CREATE_SRQ)          |

diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index c4d9cdc..86840af 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -1158,22 +1158,8 @@ int mthca_register_device(struct mthca_dev *dev)
        if (ret)
                return ret;
 
-       dev->ib_dev.uverbs_cmd_mask      =
-               (1ull << IB_USER_VERBS_CMD_GET_CONTEXT)         |
-               (1ull << IB_USER_VERBS_CMD_QUERY_DEVICE)        |
-               (1ull << IB_USER_VERBS_CMD_QUERY_PORT)          |
-               (1ull << IB_USER_VERBS_CMD_ALLOC_PD)            |
-               (1ull << IB_USER_VERBS_CMD_DEALLOC_PD)          |
-               (1ull << IB_USER_VERBS_CMD_REG_MR)              |
-               (1ull << IB_USER_VERBS_CMD_DEREG_MR)            |
-               (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_CQ)           |
+       dev->ib_dev.uverbs_cmd_mask |=
                (1ull << IB_USER_VERBS_CMD_RESIZE_CQ)           |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_CQ)          |
-               (1ull << IB_USER_VERBS_CMD_CREATE_QP)           |
-               (1ull << IB_USER_VERBS_CMD_QUERY_QP)            |
-               (1ull << IB_USER_VERBS_CMD_MODIFY_QP)           |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_QP)          |
                (1ull << IB_USER_VERBS_CMD_ATTACH_MCAST)        |
                (1ull << IB_USER_VERBS_CMD_DETACH_MCAST);
        dev->ib_dev.node_type            = RDMA_NODE_IB_CA;

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 9b96661..e6611a7 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -204,23 +204,9 @@ static int ocrdma_register_device(struct ocrdma_dev *dev)
        BUILD_BUG_ON(sizeof(OCRDMA_NODE_DESC) > IB_DEVICE_NODE_DESC_MAX);
        memcpy(dev->ibdev.node_desc, OCRDMA_NODE_DESC,
               sizeof(OCRDMA_NODE_DESC));
-       dev->ibdev.uverbs_cmd_mask =
-           OCRDMA_UVERBS(GET_CONTEXT) |
-           OCRDMA_UVERBS(QUERY_DEVICE) |
-           OCRDMA_UVERBS(QUERY_PORT) |
-           OCRDMA_UVERBS(ALLOC_PD) |
-           OCRDMA_UVERBS(DEALLOC_PD) |
-           OCRDMA_UVERBS(REG_MR) |
-           OCRDMA_UVERBS(DEREG_MR) |
-           OCRDMA_UVERBS(CREATE_COMP_CHANNEL) |
-           OCRDMA_UVERBS(CREATE_CQ) |
+       dev->ibdev.uverbs_cmd_mask |=
            OCRDMA_UVERBS(RESIZE_CQ) |
-           OCRDMA_UVERBS(DESTROY_CQ) |
            OCRDMA_UVERBS(REQ_NOTIFY_CQ) |
-           OCRDMA_UVERBS(CREATE_QP) |
-           OCRDMA_UVERBS(MODIFY_QP) |
-           OCRDMA_UVERBS(QUERY_QP) |
-           OCRDMA_UVERBS(DESTROY_QP) |
            OCRDMA_UVERBS(POLL_CQ) |
            OCRDMA_UVERBS(POST_SEND) |
            OCRDMA_UVERBS(POST_RECV);

diff --git a/drivers/infiniband/hw/qedr/main.c b/drivers/infiniband/hw/qedr/main.c
index 9676416..02058f1 100644 (file)
--- a/drivers/infiniband/hw/qedr/main.c
+++ b/drivers/infiniband/hw/qedr/main.c
@@ -249,27 +249,14 @@ static int qedr_register_device(struct qedr_dev *dev)
        dev->ibdev.node_guid = dev->attr.node_guid;
        memcpy(dev->ibdev.node_desc, QEDR_NODE_DESC, sizeof(QEDR_NODE_DESC));
 
-       dev->ibdev.uverbs_cmd_mask = QEDR_UVERBS(GET_CONTEXT) |
-                                    QEDR_UVERBS(QUERY_DEVICE) |
-                                    QEDR_UVERBS(QUERY_PORT) |
-                                    QEDR_UVERBS(ALLOC_PD) |
-                                    QEDR_UVERBS(DEALLOC_PD) |
-                                    QEDR_UVERBS(CREATE_COMP_CHANNEL) |
-                                    QEDR_UVERBS(CREATE_CQ) |
+       dev->ibdev.uverbs_cmd_mask |=
                                     QEDR_UVERBS(RESIZE_CQ) |
-                                    QEDR_UVERBS(DESTROY_CQ) |
                                     QEDR_UVERBS(REQ_NOTIFY_CQ) |
-                                    QEDR_UVERBS(CREATE_QP) |
-                                    QEDR_UVERBS(MODIFY_QP) |
-                                    QEDR_UVERBS(QUERY_QP) |
-                                    QEDR_UVERBS(DESTROY_QP) |
                                     QEDR_UVERBS(CREATE_SRQ) |
                                     QEDR_UVERBS(DESTROY_SRQ) |
                                     QEDR_UVERBS(QUERY_SRQ) |
                                     QEDR_UVERBS(MODIFY_SRQ) |
                                     QEDR_UVERBS(POST_SRQ_RECV) |
-                                    QEDR_UVERBS(REG_MR) |
-                                    QEDR_UVERBS(DEREG_MR) |
                                     QEDR_UVERBS(POLL_CQ) |
                                     QEDR_UVERBS(POST_SEND) |
                                     QEDR_UVERBS(POST_RECV);

diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c
index aa2e65f..7db5c1c 100644 (file)
--- a/drivers/infiniband/hw/usnic/usnic_ib_main.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c
@@ -398,21 +398,7 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
        us_ibdev->ib_dev.num_comp_vectors = USNIC_IB_NUM_COMP_VECTORS;
        us_ibdev->ib_dev.dev.parent = &dev->dev;
 
-       us_ibdev->ib_dev.uverbs_cmd_mask =
-               (1ull << IB_USER_VERBS_CMD_GET_CONTEXT) |
-               (1ull << IB_USER_VERBS_CMD_QUERY_DEVICE) |
-               (1ull << IB_USER_VERBS_CMD_QUERY_PORT) |
-               (1ull << IB_USER_VERBS_CMD_ALLOC_PD) |
-               (1ull << IB_USER_VERBS_CMD_DEALLOC_PD) |
-               (1ull << IB_USER_VERBS_CMD_REG_MR) |
-               (1ull << IB_USER_VERBS_CMD_DEREG_MR) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_CQ) |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_CQ) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_QP) |
-               (1ull << IB_USER_VERBS_CMD_MODIFY_QP) |
-               (1ull << IB_USER_VERBS_CMD_QUERY_QP) |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_QP) |
+       us_ibdev->ib_dev.uverbs_cmd_mask |=
                (1ull << IB_USER_VERBS_CMD_ATTACH_MCAST) |
                (1ull << IB_USER_VERBS_CMD_DETACH_MCAST) |
                (1ull << IB_USER_VERBS_CMD_OPEN_QP);

diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c
index fa2a3fa..bfcffbf 100644 (file)
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c
@@ -205,23 +205,9 @@ static int pvrdma_register_device(struct pvrdma_dev *dev)
        dev->flags = 0;
        dev->ib_dev.num_comp_vectors = 1;
        dev->ib_dev.dev.parent = &dev->pdev->dev;
-       dev->ib_dev.uverbs_cmd_mask =
-               (1ull << IB_USER_VERBS_CMD_GET_CONTEXT)         |
-               (1ull << IB_USER_VERBS_CMD_QUERY_DEVICE)        |
-               (1ull << IB_USER_VERBS_CMD_QUERY_PORT)          |
-               (1ull << IB_USER_VERBS_CMD_ALLOC_PD)            |
-               (1ull << IB_USER_VERBS_CMD_DEALLOC_PD)          |
-               (1ull << IB_USER_VERBS_CMD_REG_MR)              |
-               (1ull << IB_USER_VERBS_CMD_DEREG_MR)            |
-               (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_CQ)           |
+       dev->ib_dev.uverbs_cmd_mask |=
                (1ull << IB_USER_VERBS_CMD_POLL_CQ)             |
                (1ull << IB_USER_VERBS_CMD_REQ_NOTIFY_CQ)       |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_CQ)          |
-               (1ull << IB_USER_VERBS_CMD_CREATE_QP)           |
-               (1ull << IB_USER_VERBS_CMD_MODIFY_QP)           |
-               (1ull << IB_USER_VERBS_CMD_QUERY_QP)            |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_QP)          |
                (1ull << IB_USER_VERBS_CMD_POST_SEND)           |
                (1ull << IB_USER_VERBS_CMD_POST_RECV)           |
                (1ull << IB_USER_VERBS_CMD_CREATE_AH)           |

diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
index 5221868..ef0d131 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/vt.c
+++ b/drivers/infiniband/sw/rdmavt/vt.c
@@ -593,28 +593,14 @@ int rvt_register_device(struct rvt_dev_info *rdi)
         * exactly which functions rdmavt supports, nor do they know the ABI
         * version, so we do all of this sort of stuff here.
         */
-       rdi->ibdev.uverbs_cmd_mask =
-               (1ull << IB_USER_VERBS_CMD_GET_CONTEXT)         |
-               (1ull << IB_USER_VERBS_CMD_QUERY_DEVICE)        |
-               (1ull << IB_USER_VERBS_CMD_QUERY_PORT)          |
-               (1ull << IB_USER_VERBS_CMD_ALLOC_PD)            |
-               (1ull << IB_USER_VERBS_CMD_DEALLOC_PD)          |
+       rdi->ibdev.uverbs_cmd_mask |=
                (1ull << IB_USER_VERBS_CMD_CREATE_AH)           |
                (1ull << IB_USER_VERBS_CMD_MODIFY_AH)           |
                (1ull << IB_USER_VERBS_CMD_QUERY_AH)            |
                (1ull << IB_USER_VERBS_CMD_DESTROY_AH)          |
-               (1ull << IB_USER_VERBS_CMD_REG_MR)              |
-               (1ull << IB_USER_VERBS_CMD_DEREG_MR)            |
-               (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_CQ)           |
                (1ull << IB_USER_VERBS_CMD_RESIZE_CQ)           |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_CQ)          |
                (1ull << IB_USER_VERBS_CMD_POLL_CQ)             |
                (1ull << IB_USER_VERBS_CMD_REQ_NOTIFY_CQ)       |
-               (1ull << IB_USER_VERBS_CMD_CREATE_QP)           |
-               (1ull << IB_USER_VERBS_CMD_QUERY_QP)            |
-               (1ull << IB_USER_VERBS_CMD_MODIFY_QP)           |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_QP)          |
                (1ull << IB_USER_VERBS_CMD_POST_SEND)           |
                (1ull << IB_USER_VERBS_CMD_POST_RECV)           |
                (1ull << IB_USER_VERBS_CMD_ATTACH_MCAST)        |

diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index 1fc0223..fe7bd2c 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -1132,31 +1132,18 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)
        dma_set_max_seg_size(&dev->dev, UINT_MAX);
        dma_set_coherent_mask(&dev->dev, dma_get_required_mask(&dev->dev));
 
-       dev->uverbs_cmd_mask = BIT_ULL(IB_USER_VERBS_CMD_GET_CONTEXT)
-           | BIT_ULL(IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL)
-           | BIT_ULL(IB_USER_VERBS_CMD_QUERY_DEVICE)
-           | BIT_ULL(IB_USER_VERBS_CMD_QUERY_PORT)
-           | BIT_ULL(IB_USER_VERBS_CMD_ALLOC_PD)
-           | BIT_ULL(IB_USER_VERBS_CMD_DEALLOC_PD)
-           | BIT_ULL(IB_USER_VERBS_CMD_CREATE_SRQ)
+       dev->uverbs_cmd_mask |=
+           BIT_ULL(IB_USER_VERBS_CMD_CREATE_SRQ)
            | BIT_ULL(IB_USER_VERBS_CMD_MODIFY_SRQ)
            | BIT_ULL(IB_USER_VERBS_CMD_QUERY_SRQ)
            | BIT_ULL(IB_USER_VERBS_CMD_DESTROY_SRQ)
            | BIT_ULL(IB_USER_VERBS_CMD_POST_SRQ_RECV)
-           | BIT_ULL(IB_USER_VERBS_CMD_CREATE_QP)
-           | BIT_ULL(IB_USER_VERBS_CMD_MODIFY_QP)
-           | BIT_ULL(IB_USER_VERBS_CMD_QUERY_QP)
-           | BIT_ULL(IB_USER_VERBS_CMD_DESTROY_QP)
            | BIT_ULL(IB_USER_VERBS_CMD_POST_SEND)
            | BIT_ULL(IB_USER_VERBS_CMD_POST_RECV)
-           | BIT_ULL(IB_USER_VERBS_CMD_CREATE_CQ)
            | BIT_ULL(IB_USER_VERBS_CMD_RESIZE_CQ)
-           | BIT_ULL(IB_USER_VERBS_CMD_DESTROY_CQ)
            | BIT_ULL(IB_USER_VERBS_CMD_POLL_CQ)
            | BIT_ULL(IB_USER_VERBS_CMD_PEEK_CQ)
            | BIT_ULL(IB_USER_VERBS_CMD_REQ_NOTIFY_CQ)
-           | BIT_ULL(IB_USER_VERBS_CMD_REG_MR)
-           | BIT_ULL(IB_USER_VERBS_CMD_DEREG_MR)
            | BIT_ULL(IB_USER_VERBS_CMD_CREATE_AH)
            | BIT_ULL(IB_USER_VERBS_CMD_MODIFY_AH)
            | BIT_ULL(IB_USER_VERBS_CMD_QUERY_AH)

diff --git a/drivers/infiniband/sw/siw/siw_main.c b/drivers/infiniband/sw/siw/siw_main.c
index ca8bc72..4a324b9 100644 (file)
--- a/drivers/infiniband/sw/siw/siw_main.c
+++ b/drivers/infiniband/sw/siw/siw_main.c
@@ -346,23 +346,9 @@ static struct siw_device *siw_device_create(struct net_device *netdev)
                addrconf_addr_eui48((unsigned char *)&base_dev->node_guid,
                                    addr);
        }
-       base_dev->uverbs_cmd_mask =
-               (1ull << IB_USER_VERBS_CMD_QUERY_DEVICE) |
-               (1ull << IB_USER_VERBS_CMD_QUERY_PORT) |
-               (1ull << IB_USER_VERBS_CMD_GET_CONTEXT) |
-               (1ull << IB_USER_VERBS_CMD_ALLOC_PD) |
-               (1ull << IB_USER_VERBS_CMD_DEALLOC_PD) |
-               (1ull << IB_USER_VERBS_CMD_REG_MR) |
-               (1ull << IB_USER_VERBS_CMD_DEREG_MR) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_CQ) |
+       base_dev->uverbs_cmd_mask |=
                (1ull << IB_USER_VERBS_CMD_POLL_CQ) |
                (1ull << IB_USER_VERBS_CMD_REQ_NOTIFY_CQ) |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_CQ) |
-               (1ull << IB_USER_VERBS_CMD_CREATE_QP) |
-               (1ull << IB_USER_VERBS_CMD_QUERY_QP) |
-               (1ull << IB_USER_VERBS_CMD_MODIFY_QP) |
-               (1ull << IB_USER_VERBS_CMD_DESTROY_QP) |
                (1ull << IB_USER_VERBS_CMD_POST_SEND) |
                (1ull << IB_USER_VERBS_CMD_POST_RECV) |
                (1ull << IB_USER_VERBS_CMD_CREATE_SRQ) |