Commit 9fbe334c authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA/core: Do not erase the type of ib_srq.uobject 

This is a struct ib_usrq_object pointer, instead of using container_of()
all over the place just store it with its actual type.

Link: https://lore.kernel.org/r/1578504126-9400-9-git-send-email-yishaih@mellanox.com


Signed-off-by: default avatarYishai Hadas <yishaih@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 620d3f81

drivers/infiniband/core/uverbs_cmd.c

+11 −6
Original line number Diff line number Diff line
@@ -1492,7 +1492,8 @@ static int create_qp(struct uverbs_attr_bundle *attrs, 
		rdma_lookup_put_uobject(&rcq->uobject->uevent.uobject,

					UVERBS_LOOKUP_READ);

	if (srq)

		uobj_put_obj_read(srq);

		rdma_lookup_put_uobject(&srq->uobject->uevent.uobject,

					UVERBS_LOOKUP_READ);

	if (ind_tbl)

		uobj_put_obj_read(ind_tbl);
@@ -1513,7 +1514,8 @@ err_put: 
		rdma_lookup_put_uobject(&rcq->uobject->uevent.uobject,

					UVERBS_LOOKUP_READ);

	if (srq)

		uobj_put_obj_read(srq);

		rdma_lookup_put_uobject(&srq->uobject->uevent.uobject,

					UVERBS_LOOKUP_READ);

	if (ind_tbl)

		uobj_put_obj_read(ind_tbl);
@@ -2390,7 +2392,8 @@ static int ib_uverbs_post_srq_recv(struct uverbs_attr_bundle *attrs) 
	resp.bad_wr = 0;

	ret = srq->device->ops.post_srq_recv(srq, wr, &bad_wr);



	uobj_put_obj_read(srq);

	rdma_lookup_put_uobject(&srq->uobject->uevent.uobject,

				UVERBS_LOOKUP_READ);



	if (ret)

		for (next = wr; next; next = next->next) {
@@ -3458,7 +3461,7 @@ static int __uverbs_create_xsrq(struct uverbs_attr_bundle *attrs, 
	srq->device        = pd->device;

	srq->pd            = pd;

	srq->srq_type	   = cmd->srq_type;

	srq->uobject       = &obj->uevent.uobject;

	srq->uobject       = obj;

	srq->event_handler = attr.event_handler;

	srq->srq_context   = attr.srq_context;
@@ -3584,7 +3587,8 @@ static int ib_uverbs_modify_srq(struct uverbs_attr_bundle *attrs) 
	ret = srq->device->ops.modify_srq(srq, &attr, cmd.attr_mask,

					  &attrs->driver_udata);



	uobj_put_obj_read(srq);

	rdma_lookup_put_uobject(&srq->uobject->uevent.uobject,

				UVERBS_LOOKUP_READ);



	return ret;

}
@@ -3607,7 +3611,8 @@ static int ib_uverbs_query_srq(struct uverbs_attr_bundle *attrs) 


	ret = ib_query_srq(srq, &attr);



	uobj_put_obj_read(srq);

	rdma_lookup_put_uobject(&srq->uobject->uevent.uobject,

				UVERBS_LOOKUP_READ);



	if (ret)

		return ret;

drivers/infiniband/core/uverbs_main.c

+1 −2
Original line number Diff line number Diff line
@@ -493,8 +493,7 @@ void ib_uverbs_srq_event_handler(struct ib_event *event, void *context_ptr) 
{

	struct ib_uevent_object *uobj;



	uobj = container_of(event->element.srq->uobject,

			    struct ib_uevent_object, uobject);

	uobj = &event->element.srq->uobject->uevent;



	ib_uverbs_async_handler(context_ptr, uobj->uobject.user_handle,

				event->event, &uobj->event_list,

include/rdma/ib_verbs.h

+2 −1
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 


struct ib_umem_odp;

struct ib_uqp_object;

struct ib_usrq_object;



extern struct workqueue_struct *ib_wq;

extern struct workqueue_struct *ib_comp_wq;
@@ -1575,7 +1576,7 @@ struct ib_cq { 
struct ib_srq {

	struct ib_device       *device;

	struct ib_pd	       *pd;

	struct ib_uobject      *uobject;

	struct ib_usrq_object  *uobject;

	void		      (*event_handler)(struct ib_event *, void *);

	void		       *srq_context;

	enum ib_srq_type	srq_type;

CRA Git | Maintained and supported by SUSTech CRA and CCSE