mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-19 11:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

isert: Improve rdma_accept failure handling

Browse Source 
If rdma_accept fails, use the cleanup mechanism we already have
for disconnect, instead of trying to reproduce the same cleanup.
From upper layer it really does not matter if rdma_accept failed
or we received disconnect immediately after rdma_accept succeeded.

Signed-off-by: Yan Burman <yanb@mellanox.com>

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/iser@5262 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Yan Burman
2014-02-04 07:19:09 +00:00
parent bde39e463e
commit ea47bb189c
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
iscsi-scst/kernel/isert-scst/iser_rdma.c
View File

@@ -1120,6 +1120,15 @@ static void isert_sched_conn_closed(struct isert_connection *isert_conn)
isert_conn_queue_work(&isert_conn->close_work);
}
static int isert_cm_timewait_exit_handler(struct rdma_cm_id *cm_id,
struct rdma_cm_event *event)
{
struct isert_connection *isert_conn = cm_id->qp->qp_context;
isert_sched_conn_closed(isert_conn);
return 0;
}
static int isert_cm_conn_req_handler(struct rdma_cm_id *cm_id,
struct rdma_cm_event *event)
{
@@ -1157,6 +1166,11 @@ static int isert_cm_conn_req_handler(struct rdma_cm_id *cm_id,
isert_conn->state = ISER_CONN_HANDSHAKE;
mutex_lock(&dev_list_mutex);
list_add_tail(&isert_conn->portal_node, &portal->conn_list);
list_add_tail(&isert_conn->dev_node, &isert_dev->conn_list);
mutex_unlock(&dev_list_mutex);
/* initiator is dst, target is src */
memcpy(&isert_conn->peer_addr, &cm_id->route.addr.dst_addr,
sizeof(isert_conn->peer_addr));
@@ -1176,28 +1190,20 @@ static int isert_cm_conn_req_handler(struct rdma_cm_id *cm_id,
err = rdma_accept(cm_id, &tgt_conn_param);
if (unlikely(err)) {
module_put(THIS_MODULE);
pr_err("Failed to accept conn request, err:%d\n", err);
goto fail_accept;
}
mutex_lock(&dev_list_mutex);
list_add_tail(&isert_conn->portal_node, &portal->conn_list);
list_add_tail(&isert_conn->dev_node, &isert_dev->conn_list);
mutex_unlock(&dev_list_mutex);
pr_info("iser accepted connection cm_id:%p\n", cm_id);
out:
TRACE_EXIT_RES(err);
return err;
fail_accept:
isert_conn_free(isert_conn);
mutex_lock(&dev_list_mutex);
list_del(&isert_conn->portal_node);
list_del(&isert_conn->dev_node);
mutex_unlock(&dev_list_mutex);
isert_conn_qp_destroy(isert_conn);
set_bit(ISERT_CONNECTION_ABORTED, &isert_conn->flags);
isert_cm_timewait_exit_handler(cm_id, NULL);
err = 0;
goto out;
fail_conn_create:
if (new_isert_dev) {
@@ -1263,15 +1269,6 @@ static int isert_cm_disconnect_handler(struct rdma_cm_id *cm_id,
return 0;
}
static int isert_cm_timewait_exit_handler(struct rdma_cm_id *cm_id,
struct rdma_cm_event *event)
{
struct isert_connection *isert_conn = cm_id->qp->qp_context;
isert_sched_conn_closed(isert_conn);
return 0;
}
static const char *cm_event_type_str(enum rdma_cm_event_type ev_type)
{
switch (ev_type) {