diff options
author | James Bottomley <James.Bottomley@steeleye.com> | 2005-09-18 16:05:20 -0400 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-09-19 10:24:52 -0400 |
commit | 939647ee308e0ad924e776657704c7bedd498664 (patch) | |
tree | cfff68b8f65a53e186fd1e7443aa370885ac1ed9 | |
parent | a64358db1253b35d508a411e80a3ad23b859ec88 (diff) |
[SCSI] fix oops on usb storage device disconnect
We fix the oops by enforcing the host state model. There have also
been two extra states added: SHOST_CANCEL_RECOVERY and
SHOST_DEL_RECOVERY so we can take the model through host removal while
the recovery thread is active.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r-- | drivers/scsi/hosts.c | 35 | ||||
-rw-r--r-- | drivers/scsi/scsi.c | 5 | ||||
-rw-r--r-- | drivers/scsi/scsi_error.c | 23 | ||||
-rw-r--r-- | drivers/scsi/scsi_ioctl.c | 2 | ||||
-rw-r--r-- | drivers/scsi/scsi_lib.c | 4 | ||||
-rw-r--r-- | drivers/scsi/scsi_sysfs.c | 2 | ||||
-rw-r--r-- | drivers/scsi/sg.c | 2 | ||||
-rw-r--r-- | include/scsi/scsi_host.h | 9 |
8 files changed, 66 insertions, 16 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 85503fad789a..f2a72d33132c 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c | |||
@@ -98,6 +98,7 @@ int scsi_host_set_state(struct Scsi_Host *shost, enum scsi_host_state state) | |||
98 | switch (oldstate) { | 98 | switch (oldstate) { |
99 | case SHOST_CREATED: | 99 | case SHOST_CREATED: |
100 | case SHOST_RUNNING: | 100 | case SHOST_RUNNING: |
101 | case SHOST_CANCEL_RECOVERY: | ||
101 | break; | 102 | break; |
102 | default: | 103 | default: |
103 | goto illegal; | 104 | goto illegal; |
@@ -107,12 +108,31 @@ int scsi_host_set_state(struct Scsi_Host *shost, enum scsi_host_state state) | |||
107 | case SHOST_DEL: | 108 | case SHOST_DEL: |
108 | switch (oldstate) { | 109 | switch (oldstate) { |
109 | case SHOST_CANCEL: | 110 | case SHOST_CANCEL: |
111 | case SHOST_DEL_RECOVERY: | ||
110 | break; | 112 | break; |
111 | default: | 113 | default: |
112 | goto illegal; | 114 | goto illegal; |
113 | } | 115 | } |
114 | break; | 116 | break; |
115 | 117 | ||
118 | case SHOST_CANCEL_RECOVERY: | ||
119 | switch (oldstate) { | ||
120 | case SHOST_CANCEL: | ||
121 | case SHOST_RECOVERY: | ||
122 | break; | ||
123 | default: | ||
124 | goto illegal; | ||
125 | } | ||
126 | break; | ||
127 | |||
128 | case SHOST_DEL_RECOVERY: | ||
129 | switch (oldstate) { | ||
130 | case SHOST_CANCEL_RECOVERY: | ||
131 | break; | ||
132 | default: | ||
133 | goto illegal; | ||
134 | } | ||
135 | break; | ||
116 | } | 136 | } |
117 | shost->shost_state = state; | 137 | shost->shost_state = state; |
118 | return 0; | 138 | return 0; |
@@ -134,13 +154,24 @@ EXPORT_SYMBOL(scsi_host_set_state); | |||
134 | **/ | 154 | **/ |
135 | void scsi_remove_host(struct Scsi_Host *shost) | 155 | void scsi_remove_host(struct Scsi_Host *shost) |
136 | { | 156 | { |
157 | unsigned long flags; | ||
137 | down(&shost->scan_mutex); | 158 | down(&shost->scan_mutex); |
138 | scsi_host_set_state(shost, SHOST_CANCEL); | 159 | spin_lock_irqsave(shost->host_lock, flags); |
160 | if (scsi_host_set_state(shost, SHOST_CANCEL)) | ||
161 | if (scsi_host_set_state(shost, SHOST_CANCEL_RECOVERY)) { | ||
162 | spin_unlock_irqrestore(shost->host_lock, flags); | ||
163 | up(&shost->scan_mutex); | ||
164 | return; | ||
165 | } | ||
166 | spin_unlock_irqrestore(shost->host_lock, flags); | ||
139 | up(&shost->scan_mutex); | 167 | up(&shost->scan_mutex); |
140 | scsi_forget_host(shost); | 168 | scsi_forget_host(shost); |
141 | scsi_proc_host_rm(shost); | 169 | scsi_proc_host_rm(shost); |
142 | 170 | ||
143 | scsi_host_set_state(shost, SHOST_DEL); | 171 | spin_lock_irqsave(shost->host_lock, flags); |
172 | if (scsi_host_set_state(shost, SHOST_DEL)) | ||
173 | BUG_ON(scsi_host_set_state(shost, SHOST_DEL_RECOVERY)); | ||
174 | spin_unlock_irqrestore(shost->host_lock, flags); | ||
144 | 175 | ||
145 | transport_unregister_device(&shost->shost_gendev); | 176 | transport_unregister_device(&shost->shost_gendev); |
146 | class_device_unregister(&shost->shost_classdev); | 177 | class_device_unregister(&shost->shost_classdev); |
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index a780546eda9c..1f0ebabf6d47 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c | |||
@@ -1265,9 +1265,8 @@ int scsi_device_cancel(struct scsi_device *sdev, int recovery) | |||
1265 | list_for_each_safe(lh, lh_sf, &active_list) { | 1265 | list_for_each_safe(lh, lh_sf, &active_list) { |
1266 | scmd = list_entry(lh, struct scsi_cmnd, eh_entry); | 1266 | scmd = list_entry(lh, struct scsi_cmnd, eh_entry); |
1267 | list_del_init(lh); | 1267 | list_del_init(lh); |
1268 | if (recovery) { | 1268 | if (recovery && |
1269 | scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD); | 1269 | !scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD)) { |
1270 | } else { | ||
1271 | scmd->result = (DID_ABORT << 16); | 1270 | scmd->result = (DID_ABORT << 16); |
1272 | scsi_finish_command(scmd); | 1271 | scsi_finish_command(scmd); |
1273 | } | 1272 | } |
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 895c9452be4c..af589fac814d 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
@@ -68,19 +68,24 @@ int scsi_eh_scmd_add(struct scsi_cmnd *scmd, int eh_flag) | |||
68 | { | 68 | { |
69 | struct Scsi_Host *shost = scmd->device->host; | 69 | struct Scsi_Host *shost = scmd->device->host; |
70 | unsigned long flags; | 70 | unsigned long flags; |
71 | int ret = 0; | ||
71 | 72 | ||
72 | if (shost->eh_wait == NULL) | 73 | if (shost->eh_wait == NULL) |
73 | return 0; | 74 | return 0; |
74 | 75 | ||
75 | spin_lock_irqsave(shost->host_lock, flags); | 76 | spin_lock_irqsave(shost->host_lock, flags); |
77 | if (scsi_host_set_state(shost, SHOST_RECOVERY)) | ||
78 | if (scsi_host_set_state(shost, SHOST_CANCEL_RECOVERY)) | ||
79 | goto out_unlock; | ||
76 | 80 | ||
81 | ret = 1; | ||
77 | scmd->eh_eflags |= eh_flag; | 82 | scmd->eh_eflags |= eh_flag; |
78 | list_add_tail(&scmd->eh_entry, &shost->eh_cmd_q); | 83 | list_add_tail(&scmd->eh_entry, &shost->eh_cmd_q); |
79 | scsi_host_set_state(shost, SHOST_RECOVERY); | ||
80 | shost->host_failed++; | 84 | shost->host_failed++; |
81 | scsi_eh_wakeup(shost); | 85 | scsi_eh_wakeup(shost); |
86 | out_unlock: | ||
82 | spin_unlock_irqrestore(shost->host_lock, flags); | 87 | spin_unlock_irqrestore(shost->host_lock, flags); |
83 | return 1; | 88 | return ret; |
84 | } | 89 | } |
85 | 90 | ||
86 | /** | 91 | /** |
@@ -176,8 +181,8 @@ void scsi_times_out(struct scsi_cmnd *scmd) | |||
176 | } | 181 | } |
177 | 182 | ||
178 | if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) { | 183 | if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) { |
179 | panic("Error handler thread not present at %p %p %s %d", | 184 | scmd->result |= DID_TIME_OUT << 16; |
180 | scmd, scmd->device->host, __FILE__, __LINE__); | 185 | __scsi_done(scmd); |
181 | } | 186 | } |
182 | } | 187 | } |
183 | 188 | ||
@@ -196,8 +201,7 @@ int scsi_block_when_processing_errors(struct scsi_device *sdev) | |||
196 | { | 201 | { |
197 | int online; | 202 | int online; |
198 | 203 | ||
199 | wait_event(sdev->host->host_wait, (sdev->host->shost_state != | 204 | wait_event(sdev->host->host_wait, !scsi_host_in_recovery(sdev->host)); |
200 | SHOST_RECOVERY)); | ||
201 | 205 | ||
202 | online = scsi_device_online(sdev); | 206 | online = scsi_device_online(sdev); |
203 | 207 | ||
@@ -1441,6 +1445,7 @@ static void scsi_eh_lock_door(struct scsi_device *sdev) | |||
1441 | static void scsi_restart_operations(struct Scsi_Host *shost) | 1445 | static void scsi_restart_operations(struct Scsi_Host *shost) |
1442 | { | 1446 | { |
1443 | struct scsi_device *sdev; | 1447 | struct scsi_device *sdev; |
1448 | unsigned long flags; | ||
1444 | 1449 | ||
1445 | /* | 1450 | /* |
1446 | * If the door was locked, we need to insert a door lock request | 1451 | * If the door was locked, we need to insert a door lock request |
@@ -1460,7 +1465,11 @@ static void scsi_restart_operations(struct Scsi_Host *shost) | |||
1460 | SCSI_LOG_ERROR_RECOVERY(3, printk("%s: waking up host to restart\n", | 1465 | SCSI_LOG_ERROR_RECOVERY(3, printk("%s: waking up host to restart\n", |
1461 | __FUNCTION__)); | 1466 | __FUNCTION__)); |
1462 | 1467 | ||
1463 | scsi_host_set_state(shost, SHOST_RUNNING); | 1468 | spin_lock_irqsave(shost->host_lock, flags); |
1469 | if (scsi_host_set_state(shost, SHOST_RUNNING)) | ||
1470 | if (scsi_host_set_state(shost, SHOST_CANCEL)) | ||
1471 | BUG_ON(scsi_host_set_state(shost, SHOST_DEL)); | ||
1472 | spin_unlock_irqrestore(shost->host_lock, flags); | ||
1464 | 1473 | ||
1465 | wake_up(&shost->host_wait); | 1474 | wake_up(&shost->host_wait); |
1466 | 1475 | ||
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c index b7fddac81347..de7f98cc38fe 100644 --- a/drivers/scsi/scsi_ioctl.c +++ b/drivers/scsi/scsi_ioctl.c | |||
@@ -458,7 +458,7 @@ int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd, | |||
458 | * error processing, as long as the device was opened | 458 | * error processing, as long as the device was opened |
459 | * non-blocking */ | 459 | * non-blocking */ |
460 | if (filp && filp->f_flags & O_NONBLOCK) { | 460 | if (filp && filp->f_flags & O_NONBLOCK) { |
461 | if (sdev->host->shost_state == SHOST_RECOVERY) | 461 | if (scsi_host_in_recovery(sdev->host)) |
462 | return -ENODEV; | 462 | return -ENODEV; |
463 | } else if (!scsi_block_when_processing_errors(sdev)) | 463 | } else if (!scsi_block_when_processing_errors(sdev)) |
464 | return -ENODEV; | 464 | return -ENODEV; |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index f065cbc1a6e5..dc9c772bc874 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -447,7 +447,7 @@ void scsi_device_unbusy(struct scsi_device *sdev) | |||
447 | 447 | ||
448 | spin_lock_irqsave(shost->host_lock, flags); | 448 | spin_lock_irqsave(shost->host_lock, flags); |
449 | shost->host_busy--; | 449 | shost->host_busy--; |
450 | if (unlikely((shost->shost_state == SHOST_RECOVERY) && | 450 | if (unlikely(scsi_host_in_recovery(shost) && |
451 | shost->host_failed)) | 451 | shost->host_failed)) |
452 | scsi_eh_wakeup(shost); | 452 | scsi_eh_wakeup(shost); |
453 | spin_unlock(shost->host_lock); | 453 | spin_unlock(shost->host_lock); |
@@ -1339,7 +1339,7 @@ static inline int scsi_host_queue_ready(struct request_queue *q, | |||
1339 | struct Scsi_Host *shost, | 1339 | struct Scsi_Host *shost, |
1340 | struct scsi_device *sdev) | 1340 | struct scsi_device *sdev) |
1341 | { | 1341 | { |
1342 | if (shost->shost_state == SHOST_RECOVERY) | 1342 | if (scsi_host_in_recovery(shost)) |
1343 | return 0; | 1343 | return 0; |
1344 | if (shost->host_busy == 0 && shost->host_blocked) { | 1344 | if (shost->host_busy == 0 && shost->host_blocked) { |
1345 | /* | 1345 | /* |
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 1e47b7eddef4..72a6550a056c 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c | |||
@@ -57,6 +57,8 @@ static struct { | |||
57 | { SHOST_CANCEL, "cancel" }, | 57 | { SHOST_CANCEL, "cancel" }, |
58 | { SHOST_DEL, "deleted" }, | 58 | { SHOST_DEL, "deleted" }, |
59 | { SHOST_RECOVERY, "recovery" }, | 59 | { SHOST_RECOVERY, "recovery" }, |
60 | { SHOST_CANCEL_RECOVERY, "cancel/recovery" }, | ||
61 | { SHOST_DEL_RECOVERY, "deleted/recovery", }, | ||
60 | }; | 62 | }; |
61 | const char *scsi_host_state_name(enum scsi_host_state state) | 63 | const char *scsi_host_state_name(enum scsi_host_state state) |
62 | { | 64 | { |
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 9ea4765d1d12..4d09a6e4dd2e 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
@@ -1027,7 +1027,7 @@ sg_ioctl(struct inode *inode, struct file *filp, | |||
1027 | if (sdp->detached) | 1027 | if (sdp->detached) |
1028 | return -ENODEV; | 1028 | return -ENODEV; |
1029 | if (filp->f_flags & O_NONBLOCK) { | 1029 | if (filp->f_flags & O_NONBLOCK) { |
1030 | if (sdp->device->host->shost_state == SHOST_RECOVERY) | 1030 | if (scsi_host_in_recovery(sdp->device->host)) |
1031 | return -EBUSY; | 1031 | return -EBUSY; |
1032 | } else if (!scsi_block_when_processing_errors(sdp->device)) | 1032 | } else if (!scsi_block_when_processing_errors(sdp->device)) |
1033 | return -EBUSY; | 1033 | return -EBUSY; |
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 916144be208b..540369ff815c 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h | |||
@@ -439,6 +439,8 @@ enum scsi_host_state { | |||
439 | SHOST_CANCEL, | 439 | SHOST_CANCEL, |
440 | SHOST_DEL, | 440 | SHOST_DEL, |
441 | SHOST_RECOVERY, | 441 | SHOST_RECOVERY, |
442 | SHOST_CANCEL_RECOVERY, | ||
443 | SHOST_DEL_RECOVERY, | ||
442 | }; | 444 | }; |
443 | 445 | ||
444 | struct Scsi_Host { | 446 | struct Scsi_Host { |
@@ -621,6 +623,13 @@ static inline struct Scsi_Host *dev_to_shost(struct device *dev) | |||
621 | return container_of(dev, struct Scsi_Host, shost_gendev); | 623 | return container_of(dev, struct Scsi_Host, shost_gendev); |
622 | } | 624 | } |
623 | 625 | ||
626 | static inline int scsi_host_in_recovery(struct Scsi_Host *shost) | ||
627 | { | ||
628 | return shost->shost_state == SHOST_RECOVERY || | ||
629 | shost->shost_state == SHOST_CANCEL_RECOVERY || | ||
630 | shost->shost_state == SHOST_DEL_RECOVERY; | ||
631 | } | ||
632 | |||
624 | extern int scsi_queue_work(struct Scsi_Host *, struct work_struct *); | 633 | extern int scsi_queue_work(struct Scsi_Host *, struct work_struct *); |
625 | extern void scsi_flush_work(struct Scsi_Host *); | 634 | extern void scsi_flush_work(struct Scsi_Host *); |
626 | 635 | ||