[PATCH] iscsi: don't hang in endless loop if no targets present

2012-01-27 Thread Sasha Levin
iscsi_if_send_reply() may return -ESRCH if there were no targets to send
data to. Currently we're ignoring this value and looping in attempt to do it
over and over, which will usually lead in a hung task like this one:

[ 4920.817298] INFO: task trinity:9074 blocked for more than 120 seconds.
[ 4920.818527] echo 0  /proc/sys/kernel/hung_task_timeout_secs disables this 
message.
[ 4920.819982] trinity D   5504  9074   2756 0x0004
[ 4920.825374]  880003961a98 0086 881aa000 
881aa000
[ 4920.826791]  001d4340 880003961fd8 88000396 
001d4340
[ 4920.828241]  001d4340 001d4340 880003961fd8 
001d4340
[ 4920.833231]
[ 4920.833519] Call Trace:
[ 4920.834010]  [826363fa] schedule+0x3a/0x50
[ 4920.834953]  [82634ac9] __mutex_lock_common+0x209/0x5b0
[ 4920.836226]  [81af805d] ? iscsi_if_rx+0x2d/0x990
[ 4920.837281]  [81053943] ? sched_clock+0x13/0x20
[ 4920.838305]  [81af805d] ? iscsi_if_rx+0x2d/0x990
[ 4920.839336]  [82634eb0] mutex_lock_nested+0x40/0x50
[ 4920.840423]  [81af805d] iscsi_if_rx+0x2d/0x990
[ 4920.841434]  [810dffed] ? sub_preempt_count+0x9d/0xd0
[ 4920.842548]  [82637bb0] ? _raw_read_unlock+0x30/0x60
[ 4920.843666]  [821f71de] netlink_unicast+0x1ae/0x1f0
[ 4920.844751]  [821f7997] netlink_sendmsg+0x227/0x350
[ 4920.845850]  [821857bd] ? sock_update_netprioidx+0xdd/0x1b0
[ 4920.847060]  [82185732] ? sock_update_netprioidx+0x52/0x1b0
[ 4920.848276]  [8217f226] sock_aio_write+0x166/0x180
[ 4920.849348]  [810dfe41] ? get_parent_ip+0x11/0x50
[ 4920.850428]  [811d0d9a] do_sync_write+0xda/0x120
[ 4920.851465]  [810dffed] ? sub_preempt_count+0x9d/0xd0
[ 4920.852579]  [810dfe41] ? get_parent_ip+0x11/0x50
[ 4920.853608]  [81791887] ? security_file_permission+0x27/0xb0
[ 4920.854821]  [811d0f4c] vfs_write+0x16c/0x180
[ 4920.855781]  [811d104f] sys_write+0x4f/0xa0
[ 4920.856798]  [82638e79] system_call_fastpath+0x16/0x1b
[ 4920.877487] 1 lock held by trinity/9074:
[ 4920.878239]  #0:  (rx_queue_mutex){+.+...}, at: [81af805d] 
iscsi_if_rx+0x2d/0x990
[ 4920.880005] Kernel panic - not syncing: hung_task: blocked tasks

Signed-off-by: Sasha Levin levinsasha...@gmail.com
---
 drivers/scsi/scsi_transport_iscsi.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/scsi_transport_iscsi.c 
b/drivers/scsi/scsi_transport_iscsi.c
index cfd4914..c26707a 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -2110,7 +2110,7 @@ iscsi_if_rx(struct sk_buff *skb)
break;
err = iscsi_if_send_reply(group, nlh-nlmsg_seq,
nlh-nlmsg_type, 0, 0, ev, sizeof(*ev));
-   } while (err  0  err != -ECONNREFUSED);
+   } while (err  0  err != -ECONNREFUSED  err != -ESRCH);
skb_pull(skb, rlen);
}
mutex_unlock(rx_queue_mutex);
-- 
1.7.8.3

-- 
You received this message because you are subscribed to the Google Groups 
open-iscsi group.
To post to this group, send email to open-iscsi@googlegroups.com.
To unsubscribe from this group, send email to 
open-iscsi+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/open-iscsi?hl=en.



Re: [PATCH] iscsi: don't hang in endless loop if no targets present

2012-01-25 Thread Mike Christie
On 01/25/2012 09:16 PM, Sasha Levin wrote:
 iscsi_if_send_reply() may return -ESRCH if there were no targets to send
 data to. Currently we're ignoring this value and looping in attempt to do it
 over and over, which will usually lead in a hung task like this one:
 
 [ 4920.817298] INFO: task trinity:9074 blocked for more than 120 seconds.
 [ 4920.818527] echo 0  /proc/sys/kernel/hung_task_timeout_secs disables 
 this message.
 [ 4920.819982] trinity D   5504  9074   2756 
 0x0004
 [ 4920.825374]  880003961a98 0086 881aa000 
 881aa000
 [ 4920.826791]  001d4340 880003961fd8 88000396 
 001d4340
 [ 4920.828241]  001d4340 001d4340 880003961fd8 
 001d4340
 [ 4920.833231]
 [ 4920.833519] Call Trace:
 [ 4920.834010]  [826363fa] schedule+0x3a/0x50
 [ 4920.834953]  [82634ac9] __mutex_lock_common+0x209/0x5b0
 [ 4920.836226]  [81af805d] ? iscsi_if_rx+0x2d/0x990
 [ 4920.837281]  [81053943] ? sched_clock+0x13/0x20
 [ 4920.838305]  [81af805d] ? iscsi_if_rx+0x2d/0x990
 [ 4920.839336]  [82634eb0] mutex_lock_nested+0x40/0x50
 [ 4920.840423]  [81af805d] iscsi_if_rx+0x2d/0x990
 [ 4920.841434]  [810dffed] ? sub_preempt_count+0x9d/0xd0
 [ 4920.842548]  [82637bb0] ? _raw_read_unlock+0x30/0x60
 [ 4920.843666]  [821f71de] netlink_unicast+0x1ae/0x1f0
 [ 4920.844751]  [821f7997] netlink_sendmsg+0x227/0x350
 [ 4920.845850]  [821857bd] ? sock_update_netprioidx+0xdd/0x1b0
 [ 4920.847060]  [82185732] ? sock_update_netprioidx+0x52/0x1b0
 [ 4920.848276]  [8217f226] sock_aio_write+0x166/0x180
 [ 4920.849348]  [810dfe41] ? get_parent_ip+0x11/0x50
 [ 4920.850428]  [811d0d9a] do_sync_write+0xda/0x120
 [ 4920.851465]  [810dffed] ? sub_preempt_count+0x9d/0xd0
 [ 4920.852579]  [810dfe41] ? get_parent_ip+0x11/0x50
 [ 4920.853608]  [81791887] ? security_file_permission+0x27/0xb0
 [ 4920.854821]  [811d0f4c] vfs_write+0x16c/0x180
 [ 4920.855781]  [811d104f] sys_write+0x4f/0xa0
 [ 4920.856798]  [82638e79] system_call_fastpath+0x16/0x1b
 [ 4920.877487] 1 lock held by trinity/9074:
 [ 4920.878239]  #0:  (rx_queue_mutex){+.+...}, at: [81af805d] 
 iscsi_if_rx+0x2d/0x990
 [ 4920.880005] Kernel panic - not syncing: hung_task: blocked tasks
 
 Signed-off-by: Sasha Levin levinsasha...@gmail.com
 ---
  drivers/scsi/scsi_transport_iscsi.c |2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/drivers/scsi/scsi_transport_iscsi.c 
 b/drivers/scsi/scsi_transport_iscsi.c
 index cfd4914..c26707a 100644
 --- a/drivers/scsi/scsi_transport_iscsi.c
 +++ b/drivers/scsi/scsi_transport_iscsi.c
 @@ -2110,7 +2110,7 @@ iscsi_if_rx(struct sk_buff *skb)
   break;
   err = iscsi_if_send_reply(group, nlh-nlmsg_seq,
   nlh-nlmsg_type, 0, 0, ev, sizeof(*ev));
 - } while (err  0  err != -ECONNREFUSED);
 + } while (err  0  err != -ECONNREFUSED  err != -ESRCH);
   skb_pull(skb, rlen);
   }
   mutex_unlock(rx_queue_mutex);


Looks ok. Thanks for debugging and the patch.

Acked-by: Mike Christie micha...@cs.wisc.edu

-- 
You received this message because you are subscribed to the Google Groups 
open-iscsi group.
To post to this group, send email to open-iscsi@googlegroups.com.
To unsubscribe from this group, send email to 
open-iscsi+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/open-iscsi?hl=en.