Commit fa5d010c authored by Maor Gottlieb's avatar Maor Gottlieb Committed by Jason Gunthorpe
Browse files

RDMA: Group create AH arguments in struct 

Following patch adds additional argument to the create AH function, so it
make sense to group ah_attr and flags arguments in struct.

Link: https://lore.kernel.org/r/20200430192146.12863-13-maorg@mellanox.com


Signed-off-by: default avatarMaor Gottlieb <maorg@mellanox.com>
Acked-by: default avatarDevesh Sharma <devesh.sharma@broadcom.com>
Acked-by: default avatarGal Pressman <galpress@amazon.com>
Acked-by: default avatarWeihang Li <liweihang@huawei.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 451c9fc7

drivers/infiniband/core/verbs.c

+4 −1
Original line number Diff line number Diff line
@@ -502,6 +502,7 @@ static struct ib_ah *_rdma_create_ah(struct ib_pd *pd, 
				     u32 flags,

				     struct ib_udata *udata)

{

	struct rdma_ah_init_attr init_attr = {};

	struct ib_device *device = pd->device;

	struct ib_ah *ah;

	int ret;
@@ -521,8 +522,10 @@ static struct ib_ah *_rdma_create_ah(struct ib_pd *pd, 
	ah->pd = pd;

	ah->type = ah_attr->type;

	ah->sgid_attr = rdma_update_sgid_attr(ah_attr, NULL);

	init_attr.ah_attr = ah_attr;

	init_attr.flags = flags;



	ret = device->ops.create_ah(ah, ah_attr, flags, udata);

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

	if (ret) {

		kfree(ah);

		return ERR_PTR(ret);

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+5 −3
Original line number Diff line number Diff line
@@ -631,11 +631,12 @@ static u8 bnxt_re_stack_to_dev_nw_type(enum rdma_network_type ntype) 
	return nw_type;

}



int bnxt_re_create_ah(struct ib_ah *ib_ah, struct rdma_ah_attr *ah_attr,

		      u32 flags, struct ib_udata *udata)

int bnxt_re_create_ah(struct ib_ah *ib_ah, struct rdma_ah_init_attr *init_attr,

		      struct ib_udata *udata)

{

	struct ib_pd *ib_pd = ib_ah->pd;

	struct bnxt_re_pd *pd = container_of(ib_pd, struct bnxt_re_pd, ib_pd);

	struct rdma_ah_attr *ah_attr = init_attr->ah_attr;

	const struct ib_global_route *grh = rdma_ah_read_grh(ah_attr);

	struct bnxt_re_dev *rdev = pd->rdev;

	const struct ib_gid_attr *sgid_attr;
@@ -673,7 +674,8 @@ int bnxt_re_create_ah(struct ib_ah *ib_ah, struct rdma_ah_attr *ah_attr, 


	memcpy(ah->qplib_ah.dmac, ah_attr->roce.dmac, ETH_ALEN);

	rc = bnxt_qplib_create_ah(&rdev->qplib_res, &ah->qplib_ah,

				  !(flags & RDMA_CREATE_AH_SLEEPABLE));

				  !(init_attr->flags &

				    RDMA_CREATE_AH_SLEEPABLE));

	if (rc) {

		ibdev_err(&rdev->ibdev, "Failed to allocate HW AH");

		return rc;

drivers/infiniband/hw/bnxt_re/ib_verbs.h

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ enum rdma_link_layer bnxt_re_get_link_layer(struct ib_device *ibdev, 
					    u8 port_num);

int bnxt_re_alloc_pd(struct ib_pd *pd, struct ib_udata *udata);

void bnxt_re_dealloc_pd(struct ib_pd *pd, struct ib_udata *udata);

int bnxt_re_create_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr, u32 flags,

int bnxt_re_create_ah(struct ib_ah *ah, struct rdma_ah_init_attr *init_attr,

		      struct ib_udata *udata);

int bnxt_re_modify_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr);

int bnxt_re_query_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr);

drivers/infiniband/hw/efa/efa.h

+1 −2
Original line number Diff line number Diff line
@@ -153,8 +153,7 @@ int efa_mmap(struct ib_ucontext *ibucontext, 
	     struct vm_area_struct *vma);

void efa_mmap_free(struct rdma_user_mmap_entry *rdma_entry);

int efa_create_ah(struct ib_ah *ibah,

		  struct rdma_ah_attr *ah_attr,

		  u32 flags,

		  struct rdma_ah_init_attr *init_attr,

		  struct ib_udata *udata);

void efa_destroy_ah(struct ib_ah *ibah, u32 flags);

int efa_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr,

drivers/infiniband/hw/efa/efa_verbs.c

+3 −3
Original line number Diff line number Diff line
@@ -1639,10 +1639,10 @@ static int efa_ah_destroy(struct efa_dev *dev, struct efa_ah *ah) 
}



int efa_create_ah(struct ib_ah *ibah,

		  struct rdma_ah_attr *ah_attr,

		  u32 flags,

		  struct rdma_ah_init_attr *init_attr,

		  struct ib_udata *udata)

{

	struct rdma_ah_attr *ah_attr = init_attr->ah_attr;

	struct efa_dev *dev = to_edev(ibah->device);

	struct efa_com_create_ah_params params = {};

	struct efa_ibv_create_ah_resp resp = {};
@@ -1650,7 +1650,7 @@ int efa_create_ah(struct ib_ah *ibah, 
	struct efa_ah *ah = to_eah(ibah);

	int err;



	if (!(flags & RDMA_CREATE_AH_SLEEPABLE)) {

	if (!(init_attr->flags & RDMA_CREATE_AH_SLEEPABLE)) {

		ibdev_dbg(&dev->ibdev,

			  "Create address handle is not supported in atomic context\n");

		err = -EOPNOTSUPP;

CRA Git | Maintained and supported by SUSTech CRA and CCSE