d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Walk back r337554 while discussion continues

Browse Source 
The idea was to get the uncontroversial mechanical change out of the way,
then get the meatier functional changes reviewed subsequently.  I had not
realized that the immediately adjacent issue was addressed in a different
direction in r334506 (see Warner's guidance in D15592).

Discussion continues, trying to determine if there is a secondary issue
still[1] and how best to fix it.  With 12-related activities coming up,
while that is ongoing, just take this back for now.

[1]: Shutdown-time eventhandler events fire normally during panic's reboot
path.  Driver callbacks that attempt to issue and wait on interrupt-
completed IO may never complete, hanging the system.  This is particularly
obnoxious in the shutdown/panic path, as the debugger cannot be entered
anymore and the hang prevents reboot restoring availability.

(There's nothing CAM-specific about this problem -- any shutdown
event-triggered driver could do something like this during panic.  But most
NICs, etc.  don't try to send spin-down commands at shutdown. ;-))

Discussed with:	imp, markj
This commit is contained in:
Conrad Meyer 2018-08-10 19:19:07 +00:00
parent 0915d9d070
commit f053ca1f08
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=337583
4 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/cam/ata/ata_da.c
View File

@ -1081,7 +1081,6 @@ adadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t len
(u_int8_t *) virtual,
length,
ada_default_timeout*1000);
ataio.ccb_h.xflags |= CAM_CCB_DUMP;
if ((softc->flags & ADA_FLAG_CAN_48BIT) &&
(lba + count >= ATA_MAX_28BIT_LBA ||
count >= 256)) {
@ -1116,7 +1115,6 @@ adadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t len
NULL,
0,
5*1000);
ataio.ccb_h.xflags |= CAM_CCB_DUMP;
if (softc->flags & ADA_FLAG_CAN_48BIT)
ata_48bit_cmd(&ataio, ATA_FLUSHCACHE48, 0, 0, 0);
@ -3501,7 +3499,6 @@ adaspindown(uint8_t cmd, int flags)
NULL,
0,
ada_default_timeout*1000);
local_ccb.ccb_h.xflags |= CAM_CCB_DUMP;
ata_28bit_cmd(&local_ccb, cmd, 0, 0, 0);
error = cam_periph_runccb((union ccb *)&local_ccb, adaerror,
/*cam_flags*/0, /*sense_flags*/ SF_NO_RECOVERY | SF_NO_RETRY,

3
sys/cam/cam_ccb.h
View File

@ -116,8 +116,7 @@ typedef enum {
typedef enum {
CAM_USER_DATA_ADDR = 0x00000002,/* Userspace data pointers */
CAM_SG_FORMAT_IOVEC = 0x00000004,/* iovec instead of busdma S/G*/
CAM_UNMAPPED_BUF = 0x00000008,/* use unmapped I/O */
CAM_CCB_DUMP = 0x00000010,/* polled ccb during dump */
CAM_UNMAPPED_BUF = 0x00000008 /* use unmapped I/O */
} ccb_xflags;
/* XPT Opcodes for xpt_action */

2
sys/cam/nvme/nvme_da.c
View File

@ -426,7 +426,6 @@ ndadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t len
xpt_setup_ccb(&nvmeio.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
nvmeio.ccb_state = NDA_CCB_DUMP;
nda_nvme_write(softc, &nvmeio, virtual, lba, length, count);
nvmeio.ccb_h.xflags |= CAM_CCB_DUMP;
error = cam_periph_runccb((union ccb *)&nvmeio, cam_periph_error,
0, SF_NO_RECOVERY | SF_NO_RETRY, NULL);
if (error != 0)
@ -440,7 +439,6 @@ ndadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t len
nvmeio.ccb_state = NDA_CCB_DUMP;
nda_nvme_flush(softc, &nvmeio);
nvmeio.ccb_h.xflags |= CAM_CCB_DUMP;
error = cam_periph_runccb((union ccb *)&nvmeio, cam_periph_error,
0, SF_NO_RECOVERY | SF_NO_RETRY, NULL);
if (error != 0)

2
sys/cam/scsi/scsi_da.c
View File

@ -1847,7 +1847,6 @@ dadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t leng
/*dxfer_len*/length,
/*sense_len*/SSD_FULL_SIZE,
da_default_timeout * 1000);
csio.ccb_h.xflags |= CAM_CCB_DUMP;
error = cam_periph_runccb((union ccb *)&csio, cam_periph_error,
0, SF_NO_RECOVERY | SF_NO_RETRY, NULL);
if (error != 0)
@ -1870,7 +1869,6 @@ dadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t leng
/*lb_count*/0,
SSD_FULL_SIZE,
5 * 1000);
csio.ccb_h.xflags |= CAM_CCB_DUMP;
error = cam_periph_runccb((union ccb *)&csio, cam_periph_error,
0, SF_NO_RECOVERY | SF_NO_RETRY, NULL);
if (error != 0)