Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f168d2b authored by Krishna Kumar's avatar Krishna Kumar Committed by Roland Dreier
Browse files

RDMA/cma: Optimize error handling 



Reorganize code relating to cma_get_net_info() and rdam_create_id() to
optimize error case handling (no need to alloc memory/etc. as part of
rdma_create_id() if input parameters are wrong).

Signed-off-by: default avatarKrishna Kumar <krkumar2@in.ibm.com>
Signed-off-by: default avatarSean Hefty <sean.hefty@intel.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 94de178a

drivers/infiniband/core/cma.c

+14 −10
Original line number Diff line number Diff line
@@ -874,23 +874,25 @@ static struct rdma_id_private *cma_new_id(struct rdma_cm_id *listen_id, 
	__u16 port;

	u8 ip_ver;



	if (cma_get_net_info(ib_event->private_data, listen_id->ps,

			     &ip_ver, &port, &src, &dst))

		goto err;



	id = rdma_create_id(listen_id->event_handler, listen_id->context,

			    listen_id->ps);

	if (IS_ERR(id))

		return NULL;

		goto err;



	cma_save_net_info(&id->route.addr, &listen_id->route.addr,

			  ip_ver, port, src, dst);



	rt = &id->route;

	rt->num_paths = ib_event->param.req_rcvd.alternate_path ? 2 : 1;

	rt->path_rec = kmalloc(sizeof *rt->path_rec * rt->num_paths, GFP_KERNEL);

	rt->path_rec = kmalloc(sizeof *rt->path_rec * rt->num_paths,

			       GFP_KERNEL);

	if (!rt->path_rec)

		goto err;

		goto destroy_id;



	if (cma_get_net_info(ib_event->private_data, listen_id->ps,

			     &ip_ver, &port, &src, &dst))

		goto err;



	cma_save_net_info(&id->route.addr, &listen_id->route.addr,

			  ip_ver, port, src, dst);

	rt->path_rec[0] = *ib_event->param.req_rcvd.primary_path;

	if (rt->num_paths == 2)

		rt->path_rec[1] = *ib_event->param.req_rcvd.alternate_path;
@@ -903,8 +905,10 @@ static struct rdma_id_private *cma_new_id(struct rdma_cm_id *listen_id, 
	id_priv = container_of(id, struct rdma_id_private, id);

	id_priv->state = CMA_CONNECT;

	return id_priv;

err:



destroy_id:

	rdma_destroy_id(id);

err:

	return NULL;

}