Commit c074bb1e authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

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: default avatarJason Gunthorpe <jgg@nvidia.com>
parent b8e3130d

drivers/infiniband/core/device.c

+16 −0
Original line number Diff line number Diff line
@@ -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) |

drivers/infiniband/hw/bnxt_re/main.c

+1 −15
Original line number Diff line number Diff line
@@ -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)		|

drivers/infiniband/hw/cxgb4/provider.c

+1 −15
Original line number Diff line number Diff line
@@ -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) |

drivers/infiniband/hw/efa/efa_main.c

+1 −15
Original line number Diff line number Diff line
@@ -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);

drivers/infiniband/hw/hns/hns_roce_main.c

+0 −15
Original line number Diff line number Diff line
@@ -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);