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

Commit 0a690758 authored by Ariel Nahum's avatar Ariel Nahum Committed by Roland Dreier
Browse files

IB/iser: Seperate iser_conn and iscsi_endpoint storage space 



iser connection needs asynchronous cleanup completions which are
triggered in ep_disconnect.  As a result we are keeping the
corresponding iscsi_endpoint structure hanging for no good reason. In
order to avoid that, we seperate iser_conn from iscsi_endpoint storage
space to have their destruction being independent.

iscsi_endpoint will be destroyed at ep_disconnect stage, while the
iser connection will wait for asynchronous completions to be released
in an orderly fashion.

Signed-off-by: default avatarAriel Nahum <arieln@mellanox.com>
Signed-off-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 2ea32938

drivers/infiniband/ulp/iser/iscsi_iser.c

+13 −3
Original line number Diff line number Diff line
@@ -596,19 +596,28 @@ iscsi_iser_ep_connect(struct Scsi_Host *shost, struct sockaddr *dst_addr, 
	struct iser_conn *ib_conn;

	struct iscsi_endpoint *ep;



	ep = iscsi_create_endpoint(sizeof(*ib_conn));

	ep = iscsi_create_endpoint(0);

	if (!ep)

		return ERR_PTR(-ENOMEM);



	ib_conn = ep->dd_data;

	ib_conn = kzalloc(sizeof(*ib_conn), GFP_KERNEL);

	if (!ib_conn) {

		err = -ENOMEM;

		goto failure;

	}



	ep->dd_data = ib_conn;

	ib_conn->ep = ep;

	iser_conn_init(ib_conn);



	err = iser_connect(ib_conn, NULL, dst_addr, non_blocking);

	if (err)

		return ERR_PTR(err);

		goto failure;



	return ep;

failure:

	iscsi_destroy_endpoint(ep);

	return ERR_PTR(err);

}



static int
@@ -658,6 +667,7 @@ iscsi_iser_ep_disconnect(struct iscsi_endpoint *ep) 
	} else {

		iser_conn_release(ib_conn);

	}

	iscsi_destroy_endpoint(ep);

}



static umode_t iser_attr_is_visible(int param_type, int param)

drivers/infiniband/ulp/iser/iser_verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ void iser_conn_release(struct iser_conn *ib_conn) 
		rdma_destroy_id(ib_conn->cma_id);

		ib_conn->cma_id = NULL;

	}

	iscsi_destroy_endpoint(ib_conn->ep);

	kfree(ib_conn);

}



/**