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

Commit 40fc069a authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Nicholas Bellinger
Browse files

iser-target: Split isert_setup_qp 



Simplify iser QP creation by splitting some unrelated
logic bulks to routines.

Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 6700425e

drivers/infiniband/ulp/isert/ib_isert.c

+42 −14
Original line number Original line Diff line number Diff line
@@ -107,13 +107,12 @@ isert_query_device(struct ib_device *ib_dev, struct ib_device_attr *devattr) 
	return 0;

	return 0;

}

}





static int

static struct isert_comp *

isert_conn_setup_qp(struct isert_conn *isert_conn, struct rdma_cm_id *cma_id)

isert_comp_get(struct isert_conn *isert_conn)

{

{

	struct isert_device *device = isert_conn->conn_device;

	struct isert_device *device = isert_conn->conn_device;

	struct ib_qp_init_attr attr;

	struct isert_comp *comp;

	struct isert_comp *comp;

	int ret, i, min = 0;

	int i, min = 0;





	mutex_lock(&device_list_mutex);

	mutex_lock(&device_list_mutex);

	for (i = 0; i < device->comps_used; i++)

	for (i = 0; i < device->comps_used; i++)
@@ -122,9 +121,30 @@ isert_conn_setup_qp(struct isert_conn *isert_conn, struct rdma_cm_id *cma_id) 
			min = i;

			min = i;

	comp = &device->comps[min];

	comp = &device->comps[min];

	comp->active_qps++;

	comp->active_qps++;

	mutex_unlock(&device_list_mutex);



	isert_info("conn %p, using comp %p min_index: %d\n",

	isert_info("conn %p, using comp %p min_index: %d\n",

		   isert_conn, comp, min);

		   isert_conn, comp, min);



	return comp;

}



static void

isert_comp_put(struct isert_comp *comp)

{

	mutex_lock(&device_list_mutex);

	comp->active_qps--;

	mutex_unlock(&device_list_mutex);

	mutex_unlock(&device_list_mutex);

}



static struct ib_qp *

isert_create_qp(struct isert_conn *isert_conn,

		struct isert_comp *comp,

		struct rdma_cm_id *cma_id)

{

	struct isert_device *device = isert_conn->conn_device;

	struct ib_qp_init_attr attr;

	int ret;





	memset(&attr, 0, sizeof(struct ib_qp_init_attr));

	memset(&attr, 0, sizeof(struct ib_qp_init_attr));

	attr.event_handler = isert_qp_event_callback;

	attr.event_handler = isert_qp_event_callback;
@@ -152,16 +172,28 @@ isert_conn_setup_qp(struct isert_conn *isert_conn, struct rdma_cm_id *cma_id) 
	ret = rdma_create_qp(cma_id, device->pd, &attr);

	ret = rdma_create_qp(cma_id, device->pd, &attr);

	if (ret) {

	if (ret) {

		isert_err("rdma_create_qp failed for cma_id %d\n", ret);

		isert_err("rdma_create_qp failed for cma_id %d\n", ret);

		return ERR_PTR(ret);

	}



	return cma_id->qp;

}



static int

isert_conn_setup_qp(struct isert_conn *isert_conn, struct rdma_cm_id *cma_id)

{

	struct isert_comp *comp;

	int ret;



	comp = isert_comp_get(isert_conn);

	isert_conn->conn_qp = isert_create_qp(isert_conn, comp, cma_id);

	if (IS_ERR(isert_conn->conn_qp)) {

		ret = PTR_ERR(isert_conn->conn_qp);

		goto err;

		goto err;

	}

	}

	isert_conn->conn_qp = cma_id->qp;





	return 0;

	return 0;

err:

err:

	mutex_lock(&device_list_mutex);

	isert_comp_put(comp);

	comp->active_qps--;

	mutex_unlock(&device_list_mutex);



	return ret;

	return ret;

}

}
@@ -736,11 +768,7 @@ isert_connect_release(struct isert_conn *isert_conn) 
	if (isert_conn->conn_qp) {

	if (isert_conn->conn_qp) {

		struct isert_comp *comp = isert_conn->conn_qp->recv_cq->cq_context;

		struct isert_comp *comp = isert_conn->conn_qp->recv_cq->cq_context;





		isert_dbg("dec completion context %p active_qps\n", comp);

		isert_comp_put(comp);

		mutex_lock(&device_list_mutex);

		comp->active_qps--;

		mutex_unlock(&device_list_mutex);



		ib_destroy_qp(isert_conn->conn_qp);

		ib_destroy_qp(isert_conn->conn_qp);

	}

	}