Commit cb45214960bc989af8b911ebd77da541c797717d

Authored by Steffen Maier
Committed by James Bottomley
1 parent 01e60527f0

[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>

Showing 5 changed files with 86 additions and 10 deletions Side-by-side Diff

drivers/s390/scsi/zfcp_ccw.c
... ... @@ -39,17 +39,23 @@
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  
56 62  
57 63  
58 64  
59 65  
... ... @@ -164,26 +170,29 @@
164 170 BUG_ON(!zfcp_reqlist_isempty(adapter->req_list));
165 171 adapter->req_no = 0;
166 172  
167   - zfcp_ccw_activate(cdev);
  173 + zfcp_ccw_activate(cdev, 0, "ccsonl1");
168 174 zfcp_ccw_adapter_put(adapter);
169 175 return 0;
170 176 }
171 177  
172 178 /**
173   - * zfcp_ccw_set_offline - set_offline function of zfcp driver
  179 + * zfcp_ccw_offline_sync - shut down adapter and wait for it to finish
174 180 * @cdev: pointer to belonging ccw device
  181 + * @set: Status flags to set.
  182 + * @tag: s390dbf trace record tag
175 183 *
176 184 * This function gets called by the common i/o layer and sets an adapter
177 185 * into state offline.
178 186 */
179   -static int zfcp_ccw_set_offline(struct ccw_device *cdev)
  187 +static int zfcp_ccw_offline_sync(struct ccw_device *cdev, int set, char *tag)
180 188 {
181 189 struct zfcp_adapter *adapter = zfcp_ccw_adapter_by_cdev(cdev);
182 190  
183 191 if (!adapter)
184 192 return 0;
185 193  
186   - zfcp_erp_adapter_shutdown(adapter, 0, "ccsoff1");
  194 + zfcp_erp_set_adapter_status(adapter, set);
  195 + zfcp_erp_adapter_shutdown(adapter, 0, tag);
187 196 zfcp_erp_wait(adapter);
188 197  
189 198 zfcp_ccw_adapter_put(adapter);
... ... @@ -191,6 +200,18 @@
191 200 }
192 201  
193 202 /**
  203 + * zfcp_ccw_set_offline - set_offline function of zfcp driver
  204 + * @cdev: pointer to belonging ccw device
  205 + *
  206 + * This function gets called by the common i/o layer and sets an adapter
  207 + * into state offline.
  208 + */
  209 +static int zfcp_ccw_set_offline(struct ccw_device *cdev)
  210 +{
  211 + return zfcp_ccw_offline_sync(cdev, 0, "ccsoff1");
  212 +}
  213 +
  214 +/**
194 215 * zfcp_ccw_notify - ccw notify function
195 216 * @cdev: pointer to belonging ccw device
196 217 * @event: indicates if adapter was detached or attached
... ... @@ -207,6 +228,11 @@
207 228  
208 229 switch (event) {
209 230 case CIO_GONE:
  231 + if (atomic_read(&adapter->status) &
  232 + ZFCP_STATUS_ADAPTER_SUSPENDED) { /* notification ignore */
  233 + zfcp_dbf_hba_basic("ccnigo1", adapter);
  234 + break;
  235 + }
210 236 dev_warn(&cdev->dev, "The FCP device has been detached\n");
211 237 zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti1");
212 238 break;
... ... @@ -216,6 +242,11 @@
216 242 zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti2");
217 243 break;
218 244 case CIO_OPER:
  245 + if (atomic_read(&adapter->status) &
  246 + ZFCP_STATUS_ADAPTER_SUSPENDED) { /* notification ignore */
  247 + zfcp_dbf_hba_basic("ccniop1", adapter);
  248 + break;
  249 + }
219 250 dev_info(&cdev->dev, "The FCP device is operational again\n");
220 251 zfcp_erp_set_adapter_status(adapter,
221 252 ZFCP_STATUS_COMMON_RUNNING);
... ... @@ -251,6 +282,28 @@
251 282 zfcp_ccw_adapter_put(adapter);
252 283 }
253 284  
  285 +static int zfcp_ccw_suspend(struct ccw_device *cdev)
  286 +{
  287 + zfcp_ccw_offline_sync(cdev, ZFCP_STATUS_ADAPTER_SUSPENDED, "ccsusp1");
  288 + return 0;
  289 +}
  290 +
  291 +static int zfcp_ccw_thaw(struct ccw_device *cdev)
  292 +{
  293 + /* trace records for thaw and final shutdown during suspend
  294 + can only be found in system dump until the end of suspend
  295 + but not after resume because it's based on the memory image
  296 + right after the very first suspend (freeze) callback */
  297 + zfcp_ccw_activate(cdev, 0, "ccthaw1");
  298 + return 0;
  299 +}
  300 +
  301 +static int zfcp_ccw_resume(struct ccw_device *cdev)
  302 +{
  303 + zfcp_ccw_activate(cdev, ZFCP_STATUS_ADAPTER_SUSPENDED, "ccresu1");
  304 + return 0;
  305 +}
  306 +
254 307 struct ccw_driver zfcp_ccw_driver = {
255 308 .driver = {
256 309 .owner = THIS_MODULE,
... ... @@ -263,8 +316,8 @@
263 316 .set_offline = zfcp_ccw_set_offline,
264 317 .notify = zfcp_ccw_notify,
265 318 .shutdown = zfcp_ccw_shutdown,
266   - .freeze = zfcp_ccw_set_offline,
267   - .thaw = zfcp_ccw_activate,
268   - .restore = zfcp_ccw_activate,
  319 + .freeze = zfcp_ccw_suspend,
  320 + .thaw = zfcp_ccw_thaw,
  321 + .restore = zfcp_ccw_resume,
269 322 };
drivers/s390/scsi/zfcp_dbf.c
... ... @@ -200,6 +200,26 @@
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,
drivers/s390/scsi/zfcp_dbf.h
... ... @@ -154,6 +154,7 @@
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 /**
drivers/s390/scsi/zfcp_def.h
... ... @@ -77,6 +77,7 @@
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
drivers/s390/scsi/zfcp_ext.h
... ... @@ -54,6 +54,7 @@
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 *);