diff options
author | James.Smart@Emulex.Com <James.Smart@Emulex.Com> | 2005-12-15 09:56:22 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-12-15 22:22:14 -0500 |
commit | 42e33148df38c60b99d984b76b302c64397ebe4c (patch) | |
tree | 8f7b7f446250d7ae5261c09aaf4a8f5e245794dd /include/scsi | |
parent | 7116317dc9148d783846299fc80a7d377baa6dca (diff) |
[SCSI] fix for fc transport recursion problem.
In the scenario that a link was broken, the devloss timer for each
rport was expire at roughly the same time, causing lots of "delete"
workqueue items being queued. Depth is dependent upon the number of
rports that were on the link.
The rport target remove calls were calling flush_scheduled_work(),
which would interrupt the stream, and start the next workqueue item,
which did the same thing, and so on until recursion depth was large.
This fix stops the recursion in the initial delete path, and pushes it
off to a host-level work item that reaps the dead rports.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/scsi')
-rw-r--r-- | include/scsi/scsi_transport_fc.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h index fac547d32a98..394f14a5b7cb 100644 --- a/include/scsi/scsi_transport_fc.h +++ b/include/scsi/scsi_transport_fc.h | |||
@@ -79,6 +79,7 @@ enum fc_port_state { | |||
79 | FC_PORTSTATE_LINKDOWN, | 79 | FC_PORTSTATE_LINKDOWN, |
80 | FC_PORTSTATE_ERROR, | 80 | FC_PORTSTATE_ERROR, |
81 | FC_PORTSTATE_LOOPBACK, | 81 | FC_PORTSTATE_LOOPBACK, |
82 | FC_PORTSTATE_DELETED, | ||
82 | }; | 83 | }; |
83 | 84 | ||
84 | 85 | ||
@@ -325,8 +326,14 @@ struct fc_host_attrs { | |||
325 | struct list_head rport_bindings; | 326 | struct list_head rport_bindings; |
326 | u32 next_rport_number; | 327 | u32 next_rport_number; |
327 | u32 next_target_id; | 328 | u32 next_target_id; |
329 | u8 flags; | ||
330 | struct work_struct rport_del_work; | ||
328 | }; | 331 | }; |
329 | 332 | ||
333 | /* values for struct fc_host_attrs "flags" field: */ | ||
334 | #define FC_SHOST_RPORT_DEL_SCHEDULED 0x01 | ||
335 | |||
336 | |||
330 | #define fc_host_node_name(x) \ | 337 | #define fc_host_node_name(x) \ |
331 | (((struct fc_host_attrs *)(x)->shost_data)->node_name) | 338 | (((struct fc_host_attrs *)(x)->shost_data)->node_name) |
332 | #define fc_host_port_name(x) \ | 339 | #define fc_host_port_name(x) \ |
@@ -365,6 +372,10 @@ struct fc_host_attrs { | |||
365 | (((struct fc_host_attrs *)(x)->shost_data)->next_rport_number) | 372 | (((struct fc_host_attrs *)(x)->shost_data)->next_rport_number) |
366 | #define fc_host_next_target_id(x) \ | 373 | #define fc_host_next_target_id(x) \ |
367 | (((struct fc_host_attrs *)(x)->shost_data)->next_target_id) | 374 | (((struct fc_host_attrs *)(x)->shost_data)->next_target_id) |
375 | #define fc_host_flags(x) \ | ||
376 | (((struct fc_host_attrs *)(x)->shost_data)->flags) | ||
377 | #define fc_host_rport_del_work(x) \ | ||
378 | (((struct fc_host_attrs *)(x)->shost_data)->rport_del_work) | ||
368 | 379 | ||
369 | 380 | ||
370 | /* The functions by which the transport class and the driver communicate */ | 381 | /* The functions by which the transport class and the driver communicate */ |