mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-20 06:06:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

isert: add conn to portal conn list only if rdma_accept succeeded

Browse Source 
If rdma_accept() failed then we shouldn't call rdma_disconnect() on that QP
as the result is unexpected.

Signed-off-by: Israel Rukshin <israelr@mellanox.com>

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6957 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Israel Rukshin
2016-08-17 07:28:47 +00:00
parent 183ef82731
commit 0498de2100
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iscsi-scst/kernel/isert-scst/iser.h
+2
View File
@@ -63,6 +63,7 @@ struct isert_portal {
/* protected by dev_list_mutex */
struct list_head conn_list; /* head of conns list */
enum isert_portal_state state;
int refcnt;
};
struct isert_buf {
@@ -162,6 +163,7 @@ struct isert_cq {
#define ISERT_DRAINED_RQ 3
#define ISERT_DRAINED_SQ 4
#define ISERT_CONNECTION_CLOSE 5
#define ISERT_IN_PORTAL_LIST 6
struct isert_connection {
struct iscsi_conn iscsi ____cacheline_aligned;
iscsi-scst/kernel/isert-scst/iser_rdma.c
+12 -5
View File
@@ -1368,8 +1368,10 @@ static void isert_kref_free(struct kref *kref)
isert_conn->qp = NULL;
mutex_lock(&dev_list_mutex);
isert_conn->portal->refcnt--;
isert_dev->cq_qps[cq->idx]--;
list_del(&isert_conn->portal_node);
if (test_bit(ISERT_IN_PORTAL_LIST, &isert_conn->flags))
list_del(&isert_conn->portal_node);
isert_deref_device(isert_dev);
if (unlikely(isert_conn->portal->state == ISERT_PORTAL_INACTIVE))
isert_portal_free(isert_conn->portal);
@@ -1455,7 +1457,7 @@ static int isert_cm_conn_req_handler(struct rdma_cm_id *cm_id,
isert_conn->portal = portal;
mutex_lock(&dev_list_mutex);
list_add_tail(&isert_conn->portal_node, &portal->conn_list);
portal->refcnt++;
mutex_unlock(&dev_list_mutex);
/* initiator is dst, target is src */
@@ -1484,7 +1486,7 @@ static int isert_cm_conn_req_handler(struct rdma_cm_id *cm_id,
err = rdma_accept(cm_id, &tgt_conn_param);
if (unlikely(err)) {
PRINT_ERROR("Failed to accept conn request, err:%d", err);
PRINT_ERROR("Failed to accept conn request, err:%d conn:%p", err, isert_conn);
goto fail_accept;
}
@@ -1519,6 +1521,11 @@ static int isert_cm_conn_req_handler(struct rdma_cm_id *cm_id,
PRINT_INFO("iser accepted connection cm_id:%p", cm_id);
}
mutex_lock(&dev_list_mutex);
list_add_tail(&isert_conn->portal_node, &portal->conn_list);
set_bit(ISERT_IN_PORTAL_LIST, &isert_conn->flags);
mutex_unlock(&dev_list_mutex);
out:
TRACE_EXIT_RES(err);
return err;
@@ -1867,7 +1874,7 @@ static void isert_portal_free(struct isert_portal *portal)
{
lockdep_assert_held(&dev_list_mutex);
if (!list_empty(&portal->conn_list))
if (portal->refcnt > 0)
return;
kfree(portal);
@@ -1897,7 +1904,7 @@ void isert_portal_release(struct isert_portal *portal)
isert_portal_free(portal);
mutex_unlock(&dev_list_mutex);
while (!list_empty(&portal->conn_list)) {
while (portal->refcnt > 0) {
msleep(100);
}