Commit dd6d7f85 authored by Akiva Goldberger's avatar Akiva Goldberger Committed by Jason Gunthorpe
Browse files

RDMA: Pass entire uverbs attr bundle to create cq function 

Changes the create_cq verb signature by sending the entire uverbs attr
bundle as a parameter. This allows drivers to send driver specific attrs
through ioctl for the create_cq verb and access them in their driver
specific code.

Also adds a new enum value for driver specific ioctl attributes for
methods already supporting UHW.

Link: https://lore.kernel.org/r/ed147343987c0d43fd391c1b2f85e2f425747387.1719512393.git.leon@kernel.org


Signed-off-by: default avatarAkiva Goldberger <agoldberger@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent a9f6282b

drivers/infiniband/core/uverbs_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,7 @@ static int create_cq(struct uverbs_attr_bundle *attrs, 
	rdma_restrack_new(&cq->res, RDMA_RESTRACK_CQ);

	rdma_restrack_set_name(&cq->res, NULL);



	ret = ib_dev->ops.create_cq(cq, &attr, &attrs->driver_udata);

	ret = ib_dev->ops.create_cq(cq, &attr, attrs);

	if (ret)

		goto err_free;

	rdma_restrack_add(&cq->res);

drivers/infiniband/core/uverbs_std_types_cq.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static int UVERBS_HANDLER(UVERBS_METHOD_CQ_CREATE)( 
	rdma_restrack_new(&cq->res, RDMA_RESTRACK_CQ);

	rdma_restrack_set_name(&cq->res, NULL);



	ret = ib_dev->ops.create_cq(cq, &attr, &attrs->driver_udata);

	ret = ib_dev->ops.create_cq(cq, &attr, attrs);

	if (ret)

		goto err_free;

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+2 −1
Original line number Diff line number Diff line
@@ -2948,10 +2948,11 @@ int bnxt_re_destroy_cq(struct ib_cq *ib_cq, struct ib_udata *udata) 
}



int bnxt_re_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,

		      struct ib_udata *udata)

		      struct uverbs_attr_bundle *attrs)

{

	struct bnxt_re_cq *cq = container_of(ibcq, struct bnxt_re_cq, ib_cq);

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibcq->device, ibdev);

	struct ib_udata *udata = &attrs->driver_udata;

	struct bnxt_re_ucontext *uctx =

		rdma_udata_to_drv_context(udata, struct bnxt_re_ucontext, ib_uctx);

	struct bnxt_qplib_dev_attr *dev_attr = &rdev->dev_attr;

drivers/infiniband/hw/bnxt_re/ib_verbs.h

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ int bnxt_re_post_send(struct ib_qp *qp, const struct ib_send_wr *send_wr, 
int bnxt_re_post_recv(struct ib_qp *qp, const struct ib_recv_wr *recv_wr,

		      const struct ib_recv_wr **bad_recv_wr);

int bnxt_re_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,

		      struct ib_udata *udata);

		      struct uverbs_attr_bundle *attrs);

int bnxt_re_resize_cq(struct ib_cq *ibcq, int cqe, struct ib_udata *udata);

int bnxt_re_destroy_cq(struct ib_cq *cq, struct ib_udata *udata);

int bnxt_re_poll_cq(struct ib_cq *cq, int num_entries, struct ib_wc *wc);

drivers/infiniband/hw/cxgb4/cq.c

+2 −1
Original line number Diff line number Diff line
@@ -995,8 +995,9 @@ int c4iw_destroy_cq(struct ib_cq *ib_cq, struct ib_udata *udata) 
}



int c4iw_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,

		   struct ib_udata *udata)

		   struct uverbs_attr_bundle *attrs)

{

	struct ib_udata *udata = &attrs->driver_udata;

	struct ib_device *ibdev = ibcq->device;

	int entries = attr->cqe;

	int vector = attr->comp_vector;