Commit 676a80ad authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA: Remove AH from uverbs_cmd_mask 

Drivers that need a uverbs AH should instead set the create_user_ah() op
similar to reg_user_mr(). MODIFY_AH and QUERY_AH cmds were never
implemented so are just deleted.

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


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

drivers/infiniband/core/device.c

+3 −0
Original line number Diff line number Diff line
@@ -606,6 +606,7 @@ struct ib_device *_ib_alloc_device(size_t size) 
		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_AH) |

		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) |
@@ -614,6 +615,7 @@ struct ib_device *_ib_alloc_device(size_t size) 
		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_AH) |

		BIT_ULL(IB_USER_VERBS_CMD_DESTROY_CQ) |

		BIT_ULL(IB_USER_VERBS_CMD_DESTROY_QP) |

		BIT_ULL(IB_USER_VERBS_CMD_DESTROY_SRQ) |
@@ -2606,6 +2608,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops) 
	SET_DEVICE_OP(dev_ops, create_qp);

	SET_DEVICE_OP(dev_ops, create_rwq_ind_table);

	SET_DEVICE_OP(dev_ops, create_srq);

	SET_DEVICE_OP(dev_ops, create_user_ah);

	SET_DEVICE_OP(dev_ops, create_wq);

	SET_DEVICE_OP(dev_ops, dealloc_dm);

	SET_DEVICE_OP(dev_ops, dealloc_driver);

drivers/infiniband/core/uverbs_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -3689,13 +3689,13 @@ const struct uapi_definition uverbs_def_write_intf[] = { 
				     ib_uverbs_create_ah,

				     UAPI_DEF_WRITE_UDATA_IO(

					     struct ib_uverbs_create_ah,

					     struct ib_uverbs_create_ah_resp),

				     UAPI_DEF_METHOD_NEEDS_FN(create_ah)),

					     struct ib_uverbs_create_ah_resp)),

		DECLARE_UVERBS_WRITE(

			IB_USER_VERBS_CMD_DESTROY_AH,

			ib_uverbs_destroy_ah,

			UAPI_DEF_WRITE_I(struct ib_uverbs_destroy_ah),

			UAPI_DEF_METHOD_NEEDS_FN(destroy_ah))),

			UAPI_DEF_WRITE_I(struct ib_uverbs_destroy_ah)),

		UAPI_DEF_OBJ_NEEDS_FN(create_user_ah),

		UAPI_DEF_OBJ_NEEDS_FN(destroy_ah)),



	DECLARE_UVERBS_OBJECT(

		UVERBS_OBJECT_COMP_CHANNEL,

drivers/infiniband/core/verbs.c

+4 −1
Original line number Diff line number Diff line
@@ -533,7 +533,10 @@ static struct ib_ah *_rdma_create_ah(struct ib_pd *pd, 
	init_attr.flags = flags;

	init_attr.xmit_slave = xmit_slave;



	ret = device->ops.create_ah(ah, &init_attr, udata);

	if (udata)

		ret = device->ops.create_user_ah(ah, &init_attr, udata);

	else

		ret = device->ops.create_ah(ah, &init_attr, NULL);

	if (ret) {

		kfree(ah);

		return ERR_PTR(ret);

drivers/infiniband/hw/bnxt_re/main.c

+1 −9
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ static const struct ib_device_ops bnxt_re_dev_ops = { 
	.create_cq = bnxt_re_create_cq,

	.create_qp = bnxt_re_create_qp,

	.create_srq = bnxt_re_create_srq,

	.create_user_ah = bnxt_re_create_ah,

	.dealloc_driver = bnxt_re_dealloc_driver,

	.dealloc_pd = bnxt_re_dealloc_pd,

	.dealloc_ucontext = bnxt_re_dealloc_ucontext,
@@ -701,15 +702,6 @@ static int bnxt_re_register_ib(struct bnxt_re_dev *rdev) 
	ibdev->dev.parent = &rdev->en_dev->pdev->dev;

	ibdev->local_dma_lkey = BNXT_QPLIB_RSVD_LKEY;



	/* User space */

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

	/* POLL_CQ and REQ_NOTIFY_CQ is directly handled in libbnxt_re */





	rdma_set_device_sysfs_group(ibdev, &bnxt_re_dev_attr_group);

	ib_set_device_ops(ibdev, &bnxt_re_dev_ops);

	ret = ib_device_set_netdev(&rdev->ibdev, rdev->netdev, 1);

drivers/infiniband/hw/efa/efa_main.c

+1 −4
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ static const struct ib_device_ops efa_dev_ops = { 
	.create_ah = efa_create_ah,

	.create_cq = efa_create_cq,

	.create_qp = efa_create_qp,

	.create_user_ah = efa_create_ah,

	.dealloc_pd = efa_dealloc_pd,

	.dealloc_ucontext = efa_dealloc_ucontext,

	.dereg_mr = efa_dereg_mr,
@@ -308,10 +309,6 @@ 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_CREATE_AH) |

		(1ull << IB_USER_VERBS_CMD_DESTROY_AH);



	ib_set_device_ops(&dev->ibdev, &efa_dev_ops);



	err = ib_register_device(&dev->ibdev, "efa_%d", &pdev->dev);