Commit 44ce37bc authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA: Move more uverbs_cmd_mask settings to the core 

These functions all depend on the driver providing a specific op:

- REREG_MR is rereg_user_mr(). bnxt_re set this without providing the op
- ATTACH/DEATCH_MCAST is attach_mcast()/detach_mcast(). usnic set this
  without providing the op
- OPEN_QP doesn't involve the driver but requires a XRCD. qedr provides
  xrcd but forgot to set it, usnic doesn't provide XRCD but set it anyhow.
- OPEN/CLOSE_XRCD are the ops alloc_xrcd()/dealloc_xrcd()
- CREATE_SRQ/DESTROY_SRQ are the ops create_srq()/destroy_srq()
- QUERY/MODIFY_SRQ is op query_srq()/modify_srq(). hns sets this but
  sometimes supplies a NULL op.
- RESIZE_CQ is op resize_cq(). bnxt_re sets this boes doesn't supply an op
- ALLOC/DEALLOC_MW is alloc_mw()/dealloc_mw(). cxgb4 provided an
  (now deleted) implementation but no userspace

All drivers were checked that no drivers provide the op without also
setting uverbs_cmd_mask so this should have no functional change.

Link: https://lore.kernel.org/r/4-v1-caa70ba3d1ab+1436e-ucmd_mask_jgg@nvidia.com


Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent c074bb1e

drivers/infiniband/core/device.c

+15 −1
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ static void ib_device_check_mandatory(struct ib_device *device) 
		IB_MANDATORY_FUNC(poll_cq),

		IB_MANDATORY_FUNC(req_notify_cq),

		IB_MANDATORY_FUNC(get_dma_mr),

		IB_MANDATORY_FUNC(reg_user_mr),

		IB_MANDATORY_FUNC(dereg_mr),

		IB_MANDATORY_FUNC(get_port_immutable)

	};
@@ -601,20 +602,33 @@ struct ib_device *_ib_alloc_device(size_t size) 
	INIT_WORK(&device->unregistration_work, ib_unregister_work);



	device->uverbs_cmd_mask =

		BIT_ULL(IB_USER_VERBS_CMD_ALLOC_MW) |

		BIT_ULL(IB_USER_VERBS_CMD_ALLOC_PD) |

		BIT_ULL(IB_USER_VERBS_CMD_ATTACH_MCAST) |

		BIT_ULL(IB_USER_VERBS_CMD_CLOSE_XRCD) |

		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_CREATE_SRQ) |

		BIT_ULL(IB_USER_VERBS_CMD_DEALLOC_MW) |

		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_DESTROY_SRQ) |

		BIT_ULL(IB_USER_VERBS_CMD_DETACH_MCAST) |

		BIT_ULL(IB_USER_VERBS_CMD_GET_CONTEXT) |

		BIT_ULL(IB_USER_VERBS_CMD_MODIFY_QP) |

		BIT_ULL(IB_USER_VERBS_CMD_MODIFY_SRQ) |

		BIT_ULL(IB_USER_VERBS_CMD_OPEN_QP) |

		BIT_ULL(IB_USER_VERBS_CMD_OPEN_XRCD) |

		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);

		BIT_ULL(IB_USER_VERBS_CMD_QUERY_SRQ) |

		BIT_ULL(IB_USER_VERBS_CMD_REG_MR) |

		BIT_ULL(IB_USER_VERBS_CMD_REREG_MR) |

		BIT_ULL(IB_USER_VERBS_CMD_RESIZE_CQ);



	device->uverbs_ex_cmd_mask =

		BIT_ULL(IB_USER_VERBS_EX_CMD_CREATE_FLOW) |

drivers/infiniband/core/uverbs_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -3999,8 +3999,7 @@ const struct uapi_definition uverbs_def_write_intf[] = { 
		DECLARE_UVERBS_WRITE(

			IB_USER_VERBS_CMD_CLOSE_XRCD,

			ib_uverbs_close_xrcd,

			UAPI_DEF_WRITE_I(struct ib_uverbs_close_xrcd),

			UAPI_DEF_METHOD_NEEDS_FN(dealloc_xrcd)),

			UAPI_DEF_WRITE_I(struct ib_uverbs_close_xrcd)),

		DECLARE_UVERBS_WRITE(IB_USER_VERBS_CMD_OPEN_QP,

				     ib_uverbs_open_qp,

				     UAPI_DEF_WRITE_UDATA_IO(
@@ -4010,8 +4009,9 @@ const struct uapi_definition uverbs_def_write_intf[] = { 
				     ib_uverbs_open_xrcd,

				     UAPI_DEF_WRITE_UDATA_IO(

					     struct ib_uverbs_open_xrcd,

					     struct ib_uverbs_open_xrcd_resp),

				     UAPI_DEF_METHOD_NEEDS_FN(alloc_xrcd))),

					     struct ib_uverbs_open_xrcd_resp)),

		UAPI_DEF_OBJ_NEEDS_FN(alloc_xrcd),

		UAPI_DEF_OBJ_NEEDS_FN(dealloc_xrcd)),



	{},

};

drivers/infiniband/hw/bnxt_re/main.c

+0 −6
Original line number Diff line number Diff line
@@ -703,12 +703,6 @@ static int bnxt_re_register_ib(struct bnxt_re_dev *rdev) 


	/* User space */

	ibdev->uverbs_cmd_mask |=

			(1ull << IB_USER_VERBS_CMD_REREG_MR)		|

			(1ull << IB_USER_VERBS_CMD_RESIZE_CQ)		|

			(1ull << IB_USER_VERBS_CMD_CREATE_SRQ)		|

			(1ull << IB_USER_VERBS_CMD_MODIFY_SRQ)		|

			(1ull << IB_USER_VERBS_CMD_QUERY_SRQ)		|

			(1ull << IB_USER_VERBS_CMD_DESTROY_SRQ)		|

			(1ull << IB_USER_VERBS_CMD_CREATE_AH)		|

			(1ull << IB_USER_VERBS_CMD_MODIFY_AH)		|

			(1ull << IB_USER_VERBS_CMD_QUERY_AH)		|

drivers/infiniband/hw/cxgb4/provider.c

+1 −4
Original line number Diff line number Diff line
@@ -535,10 +535,7 @@ void c4iw_register_device(struct work_struct *work) 
	    (1ull << IB_USER_VERBS_CMD_REQ_NOTIFY_CQ) |

	    (1ull << IB_USER_VERBS_CMD_POLL_CQ) |

	    (1ull << IB_USER_VERBS_CMD_POST_SEND) |

	    (1ull << IB_USER_VERBS_CMD_POST_RECV) |

	    (1ull << IB_USER_VERBS_CMD_CREATE_SRQ) |

	    (1ull << IB_USER_VERBS_CMD_MODIFY_SRQ) |

	    (1ull << IB_USER_VERBS_CMD_DESTROY_SRQ);

	    (1ull << IB_USER_VERBS_CMD_POST_RECV);

	dev->ibdev.node_type = RDMA_NODE_RNIC;

	BUILD_BUG_ON(sizeof(C4IW_NODE_DESC) > IB_DEVICE_NODE_DESC_MAX);

	memcpy(dev->ibdev.node_desc, C4IW_NODE_DESC, sizeof(C4IW_NODE_DESC));

drivers/infiniband/hw/hns/hns_roce_main.c

+2 −12
Original line number Diff line number Diff line
@@ -492,18 +492,12 @@ static int hns_roce_register_device(struct hns_roce_dev *hr_dev) 
	ib_dev->local_dma_lkey = hr_dev->caps.reserved_lkey;

	ib_dev->num_comp_vectors = hr_dev->caps.num_comp_vectors;



	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_REREG_MR) {

		ib_dev->uverbs_cmd_mask |= (1ULL << IB_USER_VERBS_CMD_REREG_MR);

	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_REREG_MR)

		ib_set_device_ops(ib_dev, &hns_roce_dev_mr_ops);

	}



	/* MW */

	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_MW) {

		ib_dev->uverbs_cmd_mask |=

					(1ULL << IB_USER_VERBS_CMD_ALLOC_MW) |

					(1ULL << IB_USER_VERBS_CMD_DEALLOC_MW);

	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_MW)

		ib_set_device_ops(ib_dev, &hns_roce_dev_mw_ops);

	}



	/* FRMR */

	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_FRMR)
@@ -512,10 +506,6 @@ static int hns_roce_register_device(struct hns_roce_dev *hr_dev) 
	/* SRQ */

	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_SRQ) {

		ib_dev->uverbs_cmd_mask |=

				(1ULL << IB_USER_VERBS_CMD_CREATE_SRQ) |

				(1ULL << IB_USER_VERBS_CMD_MODIFY_SRQ) |

				(1ULL << IB_USER_VERBS_CMD_QUERY_SRQ) |

				(1ULL << IB_USER_VERBS_CMD_DESTROY_SRQ) |

				(1ULL << IB_USER_VERBS_CMD_POST_SRQ_RECV);

		ib_set_device_ops(ib_dev, &hns_roce_dev_srq_ops);

		ib_set_device_ops(ib_dev, hr_dev->hw->hns_roce_dev_srq_ops);