Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[SCSI] zfcp: Do not wakeup while suspended

If the mapping of FCP device bus ID and corresponding subchannel
is modified while the Linux image is suspended, the resume of FCP
devices can fail. During resume, zfcp gets callbacks from cio regarding
the modified subchannels but they can be arbitrarily mixed with the
restore/resume callback. Since the cio callbacks would trigger
adapter recovery, zfcp could wakeup before the resume callback.
Therefore, ignore the cio callbacks regarding subchannels while
being suspended. We can safely do so, since zfcp does not deal itself
with subchannels. For problem determination purposes, we still trace the
ignored callback events.

The following kernel messages could be seen on resume:

kernel: <WWPN>: parent <FCP device bus ID> should not be sleeping

As part of adapter reopen recovery, zfcp performs auto port scanning
which can erroneously try to register new remote ports with
scsi_transport_fc and the device core code complains about the parent
(adapter) still sleeping.

kernel: zfcp.3dff9c: <FCP device bus ID>:\
Setting up the QDIO connection to the FCP adapter failed
<last kernel message repeated 3 more times>
kernel: zfcp.574d43: <FCP device bus ID>:\
ERP cannot recover an error on the FCP device

In such cases, the adapter gave up recovery and remained blocked along
with its child objects: remote ports and LUNs/scsi devices. Even the
adapter shutdown as part of giving up recovery failed because the ccw
device state remained disconnected. Later, the corresponding remote
ports ran into dev_loss_tmo. As a result, the LUNs were erroneously
not available again after resume.

Even a manually triggered adapter recovery (e.g. sysfs attribute
failed, or device offline/online via sysfs) could not recover the
adapter due to the remaining disconnected state of the corresponding
ccw device.

Signed-off-by: Steffen Maier <maier@linux.vnet.ibm.com>
Cc: <stable@vger.kernel.org> #2.6.32+
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

authored by

Steffen Maier and committed by
James Bottomley
cb452149 01e60527

+93 -17
+70 -17
drivers/s390/scsi/zfcp_ccw.c
··· 39 39 spin_unlock_irqrestore(&zfcp_ccw_adapter_ref_lock, flags); 40 40 } 41 41 42 - static int zfcp_ccw_activate(struct ccw_device *cdev) 43 - 42 + /** 43 + * zfcp_ccw_activate - activate adapter and wait for it to finish 44 + * @cdev: pointer to belonging ccw device 45 + * @clear: Status flags to clear. 46 + * @tag: s390dbf trace record tag 47 + */ 48 + static int zfcp_ccw_activate(struct ccw_device *cdev, int clear, char *tag) 44 49 { 45 50 struct zfcp_adapter *adapter = zfcp_ccw_adapter_by_cdev(cdev); 46 51 47 52 if (!adapter) 48 53 return 0; 49 54 55 + zfcp_erp_clear_adapter_status(adapter, clear); 50 56 zfcp_erp_set_adapter_status(adapter, ZFCP_STATUS_COMMON_RUNNING); 51 57 zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED, 52 - "ccresu2"); 58 + tag); 53 59 zfcp_erp_wait(adapter); 54 60 flush_work(&adapter->scan_work); 55 61 ··· 170 164 BUG_ON(!zfcp_reqlist_isempty(adapter->req_list)); 171 165 adapter->req_no = 0; 172 166 173 - zfcp_ccw_activate(cdev); 167 + zfcp_ccw_activate(cdev, 0, "ccsonl1"); 168 + zfcp_ccw_adapter_put(adapter); 169 + return 0; 170 + } 171 + 172 + /** 173 + * zfcp_ccw_offline_sync - shut down adapter and wait for it to finish 174 + * @cdev: pointer to belonging ccw device 175 + * @set: Status flags to set. 176 + * @tag: s390dbf trace record tag 177 + * 178 + * This function gets called by the common i/o layer and sets an adapter 179 + * into state offline. 180 + */ 181 + static int zfcp_ccw_offline_sync(struct ccw_device *cdev, int set, char *tag) 182 + { 183 + struct zfcp_adapter *adapter = zfcp_ccw_adapter_by_cdev(cdev); 184 + 185 + if (!adapter) 186 + return 0; 187 + 188 + zfcp_erp_set_adapter_status(adapter, set); 189 + zfcp_erp_adapter_shutdown(adapter, 0, tag); 190 + zfcp_erp_wait(adapter); 191 + 174 192 zfcp_ccw_adapter_put(adapter); 175 193 return 0; 176 194 } ··· 208 178 */ 209 179 static int zfcp_ccw_set_offline(struct ccw_device *cdev) 210 180 { 211 - struct zfcp_adapter *adapter = zfcp_ccw_adapter_by_cdev(cdev); 212 - 213 - if (!adapter) 214 - return 0; 215 - 216 - zfcp_erp_adapter_shutdown(adapter, 0, "ccsoff1"); 217 - zfcp_erp_wait(adapter); 218 - 219 - zfcp_ccw_adapter_put(adapter); 220 - return 0; 181 + return zfcp_ccw_offline_sync(cdev, 0, "ccsoff1"); 221 182 } 222 183 223 184 /** ··· 228 207 229 208 switch (event) { 230 209 case CIO_GONE: 210 + if (atomic_read(&adapter->status) & 211 + ZFCP_STATUS_ADAPTER_SUSPENDED) { /* notification ignore */ 212 + zfcp_dbf_hba_basic("ccnigo1", adapter); 213 + break; 214 + } 231 215 dev_warn(&cdev->dev, "The FCP device has been detached\n"); 232 216 zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti1"); 233 217 break; ··· 242 216 zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti2"); 243 217 break; 244 218 case CIO_OPER: 219 + if (atomic_read(&adapter->status) & 220 + ZFCP_STATUS_ADAPTER_SUSPENDED) { /* notification ignore */ 221 + zfcp_dbf_hba_basic("ccniop1", adapter); 222 + break; 223 + } 245 224 dev_info(&cdev->dev, "The FCP device is operational again\n"); 246 225 zfcp_erp_set_adapter_status(adapter, 247 226 ZFCP_STATUS_COMMON_RUNNING); ··· 282 251 zfcp_ccw_adapter_put(adapter); 283 252 } 284 253 254 + static int zfcp_ccw_suspend(struct ccw_device *cdev) 255 + { 256 + zfcp_ccw_offline_sync(cdev, ZFCP_STATUS_ADAPTER_SUSPENDED, "ccsusp1"); 257 + return 0; 258 + } 259 + 260 + static int zfcp_ccw_thaw(struct ccw_device *cdev) 261 + { 262 + /* trace records for thaw and final shutdown during suspend 263 + can only be found in system dump until the end of suspend 264 + but not after resume because it's based on the memory image 265 + right after the very first suspend (freeze) callback */ 266 + zfcp_ccw_activate(cdev, 0, "ccthaw1"); 267 + return 0; 268 + } 269 + 270 + static int zfcp_ccw_resume(struct ccw_device *cdev) 271 + { 272 + zfcp_ccw_activate(cdev, ZFCP_STATUS_ADAPTER_SUSPENDED, "ccresu1"); 273 + return 0; 274 + } 275 + 285 276 struct ccw_driver zfcp_ccw_driver = { 286 277 .driver = { 287 278 .owner = THIS_MODULE, ··· 316 263 .set_offline = zfcp_ccw_set_offline, 317 264 .notify = zfcp_ccw_notify, 318 265 .shutdown = zfcp_ccw_shutdown, 319 - .freeze = zfcp_ccw_set_offline, 320 - .thaw = zfcp_ccw_activate, 321 - .restore = zfcp_ccw_activate, 266 + .freeze = zfcp_ccw_suspend, 267 + .thaw = zfcp_ccw_thaw, 268 + .restore = zfcp_ccw_resume, 322 269 };
+20
drivers/s390/scsi/zfcp_dbf.c
··· 200 200 spin_unlock_irqrestore(&dbf->pay_lock, flags); 201 201 } 202 202 203 + /** 204 + * zfcp_dbf_hba_basic - trace event for basic adapter events 205 + * @adapter: pointer to struct zfcp_adapter 206 + */ 207 + void zfcp_dbf_hba_basic(char *tag, struct zfcp_adapter *adapter) 208 + { 209 + struct zfcp_dbf *dbf = adapter->dbf; 210 + struct zfcp_dbf_hba *rec = &dbf->hba_buf; 211 + unsigned long flags; 212 + 213 + spin_lock_irqsave(&dbf->hba_lock, flags); 214 + memset(rec, 0, sizeof(*rec)); 215 + 216 + memcpy(rec->tag, tag, ZFCP_DBF_TAG_LEN); 217 + rec->id = ZFCP_DBF_HBA_BASIC; 218 + 219 + debug_event(dbf->hba, 1, rec, sizeof(*rec)); 220 + spin_unlock_irqrestore(&dbf->hba_lock, flags); 221 + } 222 + 203 223 static void zfcp_dbf_set_common(struct zfcp_dbf_rec *rec, 204 224 struct zfcp_adapter *adapter, 205 225 struct zfcp_port *port,
+1
drivers/s390/scsi/zfcp_dbf.h
··· 154 154 ZFCP_DBF_HBA_RES = 1, 155 155 ZFCP_DBF_HBA_USS = 2, 156 156 ZFCP_DBF_HBA_BIT = 3, 157 + ZFCP_DBF_HBA_BASIC = 4, 157 158 }; 158 159 159 160 /**
+1
drivers/s390/scsi/zfcp_def.h
··· 77 77 #define ZFCP_STATUS_ADAPTER_SIOSL_ISSUED 0x00000004 78 78 #define ZFCP_STATUS_ADAPTER_XCONFIG_OK 0x00000008 79 79 #define ZFCP_STATUS_ADAPTER_HOST_CON_INIT 0x00000010 80 + #define ZFCP_STATUS_ADAPTER_SUSPENDED 0x00000040 80 81 #define ZFCP_STATUS_ADAPTER_ERP_PENDING 0x00000100 81 82 #define ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED 0x00000200 82 83 #define ZFCP_STATUS_ADAPTER_DATA_DIV_ENABLED 0x00000400
+1
drivers/s390/scsi/zfcp_ext.h
··· 54 54 extern void zfcp_dbf_hba_bit_err(char *, struct zfcp_fsf_req *); 55 55 extern void zfcp_dbf_hba_berr(struct zfcp_dbf *, struct zfcp_fsf_req *); 56 56 extern void zfcp_dbf_hba_def_err(struct zfcp_adapter *, u64, u16, void **); 57 + extern void zfcp_dbf_hba_basic(char *, struct zfcp_adapter *); 57 58 extern void zfcp_dbf_san_req(char *, struct zfcp_fsf_req *, u32); 58 59 extern void zfcp_dbf_san_res(char *, struct zfcp_fsf_req *); 59 60 extern void zfcp_dbf_san_in_els(char *, struct zfcp_fsf_req *);