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

isert: Fix possible deadlock when calling cancel_work_sync() on the workqueue we are running from

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

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/iser@5789 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Yan Burman
2014-09-10 08:53:00 +00:00
parent 914b9d4f4f
commit c682d02ebf
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
iscsi-scst/kernel/isert-scst/iser.h
View File

@@ -161,6 +161,7 @@ struct isert_connection {
unsigned long flags;
struct work_struct close_work;
struct work_struct drain_work;
struct isert_wr drain_wr;
struct kref kref;

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

@@ -486,6 +486,32 @@ static const char *wr_status_str(enum ib_wc_status status)
}
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
static void isert_conn_drained_do_work(void *ctx)
#else
static void isert_conn_drained_do_work(struct work_struct *work)
#endif
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
struct isert_connection *isert_conn = ctx;
#else
struct isert_connection *isert_conn =
container_of(work, struct isert_connection, drain_work);
#endif
isert_conn_free(isert_conn);
}
static void isert_sched_conn_drained(struct isert_connection *isert_conn)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
INIT_WORK(&isert_conn->drain_work, isert_conn_drained_do_work, isert_conn);
#else
INIT_WORK(&isert_conn->drain_work, isert_conn_drained_do_work);
#endif
isert_conn_queue_work(&isert_conn->drain_work);
}
static void isert_handle_wc_error(struct ib_wc *wc)
{
struct isert_wr *wr = _u64_to_ptr(wc->wr_id);
@@ -505,7 +531,7 @@ static void isert_handle_wc_error(struct ib_wc *wc)
/* notify upper layer */
if (!test_bit(ISERT_CONNECTION_ABORTED, &isert_conn->flags))
isert_connection_closed(&isert_conn->iscsi);
isert_conn_free(isert_conn);
isert_sched_conn_drained(isert_conn);
} else {
isert_pdu_err(&isert_pdu->iscsi);
}