renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-13 08:04:45 +08:00
Code

iser-target: Don't wait for session commands from completion context

Browse Source 
Might result in a deadlock where completion context waits for
session commands release where the later might need a final
completion for it.

Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Sagi Grimberg 2014-12-02 16:57:46 +02:00 committed by Nicholas Bellinger
parent 36ea63b523
commit c7e160ee09
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/infiniband/ulp/isert/ib_isert.c
View File

@ -1984,13 +1984,6 @@ static void
isert_cq_comp_err(struct isert_conn *isert_conn, struct ib_wc *wc)
{
if (wc->wr_id == ISER_BEACON_WRID) {
struct iscsi_conn *conn = isert_conn->conn;
if (conn->sess) {
target_sess_cmd_list_set_waiting(conn->sess->se_sess);
target_wait_for_sess_cmds(conn->sess->se_sess);
}
pr_info("conn %p completing conn_wait_comp_err\n",
isert_conn);
complete(&isert_conn->conn_wait_comp_err);
@ -3242,6 +3235,15 @@ static void isert_release_work(struct work_struct *work)
isert_put_conn(isert_conn);
}
static void
isert_wait4cmds(struct iscsi_conn *conn)
{
if (conn->sess) {
target_sess_cmd_list_set_waiting(conn->sess->se_sess);
target_wait_for_sess_cmds(conn->sess->se_sess);
}
}
static void
isert_wait4flush(struct isert_conn *isert_conn)
{
@ -3276,6 +3278,7 @@ static void isert_wait_conn(struct iscsi_conn *conn)
isert_conn_terminate(isert_conn);
mutex_unlock(&isert_conn->conn_mutex);
isert_wait4cmds(conn);
isert_wait4flush(isert_conn);
INIT_WORK(&isert_conn->release_work, isert_release_work);