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

Prevent potential deadlock between scst_del_threads() and commands taking scst_mutex

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5532 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2014-05-20 23:39:57 +00:00
parent e6fda471d9
commit e49da284e9
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scst/src/scst_sysfs.c
View File

@@ -6060,10 +6060,20 @@ static int scst_process_threads_store(int newtn)
TRACE_DBG("newtn %d", newtn);
res = mutex_lock_interruptible(&scst_mutex);
/*
* Some commands are taking scst_mutex on commands processing path,
* so we need to drain them, because otherwise we can fall into a
* deadlock with kthread_stop() in scst_del_threads() waiting for
* those commands to finish.
*/
res = scst_suspend_activity(SCST_SUSPEND_TIMEOUT_USER);
if (res != 0)
goto out;
res = mutex_lock_interruptible(&scst_mutex);
if (res != 0)
goto out_resume;
oldtn = scst_main_cmd_threads.nr_threads;
delta = newtn - oldtn;
@@ -6080,6 +6090,9 @@ static int scst_process_threads_store(int newtn)
out_up:
mutex_unlock(&scst_mutex);
out_resume:
scst_resume_activity();
out:
TRACE_EXIT_RES(res);
return res;