|
Jiri Kosina |
2028ed |
From: Hannes Reinecke <hare@suse.de>
|
|
Jiri Kosina |
2028ed |
Date: Wed, 17 Aug 2016 09:38:40 +0200
|
|
Jiri Kosina |
2028ed |
Subject: target: fix hang in target_wait_for_sess_cmds()
|
|
Jiri Kosina |
2028ed |
References: bsc#994046
|
|
Jiri Kosina |
2028ed |
Patch-Mainline: submitted to linux-scsi, 2016/08/18
|
|
Jiri Kosina |
2028ed |
|
|
Jiri Kosina |
2028ed |
When shutting down a session I'm seeing this hung_task message:
|
|
Jiri Kosina |
2028ed |
|
|
Jiri Kosina |
2028ed |
INFO: task kworker/u128:0:6 blocked for more than 480 seconds.
|
|
Jiri Kosina |
2028ed |
Tainted: G E N 4.4.17-default+ #241
|
|
Jiri Kosina |
2028ed |
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
|
|
Jiri Kosina |
2028ed |
kworker/u128:0 D ffff880237615c00 0 6 2 0x00000000
|
|
Jiri Kosina |
2028ed |
Workqueue: fc_rport_eq fc_rport_work [libfc]
|
|
Jiri Kosina |
2028ed |
ffff88017edd7c48 ffffffff81c11500 ffff88017edd0180 ffff88017edd8000
|
|
Jiri Kosina |
2028ed |
ffff88035b6860a8 ffff88017edd0180 ffff88036461eac0 0000000000000000
|
|
Jiri Kosina |
2028ed |
ffff88017edd7c60 ffffffff815db4d5 7fffffffffffffff ffff88017edd7d10
|
|
Jiri Kosina |
2028ed |
Call Trace:
|
|
Jiri Kosina |
2028ed |
[<ffffffff815db4d5>] schedule+0x35/0x80
|
|
Jiri Kosina |
2028ed |
[<ffffffff815dde17>] schedule_timeout+0x237/0x2d0
|
|
Jiri Kosina |
2028ed |
[<ffffffff815dc6e3>] wait_for_completion+0xa3/0x110
|
|
Jiri Kosina |
2028ed |
[<ffffffffa0869fb5>] target_wait_for_sess_cmds+0x45/0x190 [target_core_mod]
|
|
Jiri Kosina |
2028ed |
[<ffffffffa03953b4>] ft_close_sess+0x24/0x30 [tcm_fc]
|
|
Jiri Kosina |
2028ed |
[<ffffffffa03955ba>] ft_prlo+0x8a/0x95 [tcm_fc]
|
|
Jiri Kosina |
2028ed |
[<ffffffffa066fc28>] fc_rport_work+0x3b8/0x7c0 [libfc]
|
|
Jiri Kosina |
2028ed |
[<ffffffff810939ee>] process_one_work+0x14e/0x410
|
|
Jiri Kosina |
2028ed |
[<ffffffff81094246>] worker_thread+0x116/0x490
|
|
Jiri Kosina |
2028ed |
|
|
Jiri Kosina |
2028ed |
Looking at the code it looks as if there is some confusion about
|
|
Jiri Kosina |
2028ed |
when to call 'wait_for_completion(&cmd->cmd_wait_comp).
|
|
Jiri Kosina |
2028ed |
The problem is that there are _two_ sections where the code
|
|
Jiri Kosina |
2028ed |
waits for 'cmd_wait_comp' completion, but the completion
|
|
Jiri Kosina |
2028ed |
is only called with 'complete', not 'complete_all'.
|
|
Jiri Kosina |
2028ed |
So we cannot have both waiting for it, doing so will lead
|
|
Jiri Kosina |
2028ed |
to a stuck wait_for_completion.
|
|
Jiri Kosina |
2028ed |
|
|
Jiri Kosina |
2028ed |
Signed-off-by: Hannes Reinecke <hare@suse.com>
|
|
Jiri Kosina |
2028ed |
---
|
|
Jiri Kosina |
2028ed |
drivers/target/target_core_transport.c | 16 ++++++++++------
|
|
Jiri Kosina |
2028ed |
1 file changed, 10 insertions(+), 6 deletions(-)
|
|
Jiri Kosina |
2028ed |
|
|
Jiri Kosina |
2028ed |
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
|
|
Jiri Kosina |
2028ed |
index 24f715e..60a1ad1 100644
|
|
Jiri Kosina |
2028ed |
--- a/drivers/target/target_core_transport.c
|
|
Jiri Kosina |
2028ed |
+++ b/drivers/target/target_core_transport.c
|
|
Jiri Kosina |
2028ed |
@@ -2528,7 +2528,7 @@ int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks)
|
|
Jiri Kosina |
2028ed |
* the remaining calls to target_put_sess_cmd(), and not the
|
|
Jiri Kosina |
2028ed |
* callers of this function.
|
|
Jiri Kosina |
2028ed |
*/
|
|
Jiri Kosina |
2028ed |
- if (aborted) {
|
|
Jiri Kosina |
2028ed |
+ if (aborted && !cmd->cmd_wait_set) {
|
|
Jiri Kosina |
2028ed |
pr_debug("Detected CMD_T_ABORTED for ITT: %llu\n", cmd->tag);
|
|
Jiri Kosina |
2028ed |
wait_for_completion(&cmd->cmd_wait_comp);
|
|
Jiri Kosina |
2028ed |
cmd->se_tfo->release_cmd(cmd);
|
|
Jiri Kosina |
2028ed |
@@ -2653,9 +2653,11 @@ void target_sess_cmd_list_set_waiting(struct se_session *se_sess)
|
|
Jiri Kosina |
2028ed |
list_for_each_entry(se_cmd, &se_sess->sess_wait_list, se_cmd_list) {
|
|
Jiri Kosina |
2028ed |
rc = kref_get_unless_zero(&se_cmd->cmd_kref);
|
|
Jiri Kosina |
2028ed |
if (rc) {
|
|
Jiri Kosina |
2028ed |
- se_cmd->cmd_wait_set = 1;
|
|
Jiri Kosina |
2028ed |
spin_lock(&se_cmd->t_state_lock);
|
|
Jiri Kosina |
2028ed |
- se_cmd->transport_state |= CMD_T_FABRIC_STOP;
|
|
Jiri Kosina |
2028ed |
+ if (!(se_cmd->transport_state & CMD_T_FABRIC_STOP)) {
|
|
Jiri Kosina |
2028ed |
+ se_cmd->cmd_wait_set = 1;
|
|
Jiri Kosina |
2028ed |
+ se_cmd->transport_state |= CMD_T_FABRIC_STOP;
|
|
Jiri Kosina |
2028ed |
+ }
|
|
Jiri Kosina |
2028ed |
spin_unlock(&se_cmd->t_state_lock);
|
|
Jiri Kosina |
2028ed |
}
|
|
Jiri Kosina |
2028ed |
}
|
|
Jiri Kosina |
2028ed |
@@ -2675,24 +2677,26 @@ void target_wait_for_sess_cmds(struct se_session *se_sess)
|
|
Jiri Kosina |
2028ed |
|
|
Jiri Kosina |
2028ed |
list_for_each_entry_safe(se_cmd, tmp_cmd,
|
|
Jiri Kosina |
2028ed |
&se_sess->sess_wait_list, se_cmd_list) {
|
|
Jiri Kosina |
2028ed |
+ int cmd_wait;
|
|
Jiri Kosina |
2028ed |
pr_debug("Waiting for se_cmd: %p t_state: %d, fabric state:"
|
|
Jiri Kosina |
2028ed |
" %d\n", se_cmd, se_cmd->t_state,
|
|
Jiri Kosina |
2028ed |
se_cmd->se_tfo->get_cmd_state(se_cmd));
|
|
Jiri Kosina |
2028ed |
|
|
Jiri Kosina |
2028ed |
spin_lock_irqsave(&se_cmd->t_state_lock, flags);
|
|
Jiri Kosina |
2028ed |
tas = (se_cmd->transport_state & CMD_T_TAS);
|
|
Jiri Kosina |
2028ed |
+ cmd_wait = se_cmd->cmd_wait_set;
|
|
Jiri Kosina |
2028ed |
spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
|
|
Jiri Kosina |
2028ed |
-
|
|
Jiri Kosina |
2028ed |
if (!target_put_sess_cmd(se_cmd)) {
|
|
Jiri Kosina |
2028ed |
if (tas)
|
|
Jiri Kosina |
2028ed |
target_put_sess_cmd(se_cmd);
|
|
Jiri Kosina |
2028ed |
}
|
|
Jiri Kosina |
2028ed |
-
|
|
Jiri Kosina |
2028ed |
+ if (!cmd_wait)
|
|
Jiri Kosina |
2028ed |
+ continue;
|
|
Jiri Kosina |
2028ed |
wait_for_completion(&se_cmd->cmd_wait_comp);
|
|
Jiri Kosina |
2028ed |
pr_debug("After cmd_wait_comp: se_cmd: %p t_state: %d"
|
|
Jiri Kosina |
2028ed |
" fabric state: %d\n", se_cmd, se_cmd->t_state,
|
|
Jiri Kosina |
2028ed |
se_cmd->se_tfo->get_cmd_state(se_cmd));
|
|
Jiri Kosina |
2028ed |
-
|
|
Jiri Kosina |
2028ed |
+ se_cmd->cmd_wait_set = 0;
|
|
Jiri Kosina |
2028ed |
se_cmd->se_tfo->release_cmd(se_cmd);
|
|
Jiri Kosina |
2028ed |
}
|
|
Jiri Kosina |
2028ed |
|
|
Jiri Kosina |
2028ed |
--
|
|
Jiri Kosina |
2028ed |
1.8.5.6
|
|
Jiri Kosina |
2028ed |
|