Insert ordered command every 1/4 of the current command timeout, not 1/4
of the default one. Without this change setting kern.cam.ada.default_timeout to 1 instead of 30 allowed me to trigger several false positive command timeouts under heavy ZFS load on a SiI3132 siis(4) controller with 5 HDDs on a port multiplier. MFC after: 1 week
This commit is contained in:
parent
048a50f354
commit
47bb96433c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=230921
@ -1098,7 +1098,7 @@ adaregister(struct cam_periph *periph, void *arg)
|
||||
*/
|
||||
callout_init_mtx(&softc->sendordered_c, periph->sim->mtx, 0);
|
||||
callout_reset(&softc->sendordered_c,
|
||||
(ADA_DEFAULT_TIMEOUT * hz) / ADA_ORDEREDTAG_INTERVAL,
|
||||
(ada_default_timeout * hz) / ADA_ORDEREDTAG_INTERVAL,
|
||||
adasendorderedtag, softc);
|
||||
|
||||
if (ADA_RA >= 0 &&
|
||||
@ -1653,7 +1653,7 @@ adasendorderedtag(void *arg)
|
||||
}
|
||||
/* Queue us up again */
|
||||
callout_reset(&softc->sendordered_c,
|
||||
(ADA_DEFAULT_TIMEOUT * hz) / ADA_ORDEREDTAG_INTERVAL,
|
||||
(ada_default_timeout * hz) / ADA_ORDEREDTAG_INTERVAL,
|
||||
adasendorderedtag, softc);
|
||||
}
|
||||
|
||||
|
@ -1149,7 +1149,7 @@ dadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t leng
|
||||
/*data_ptr*/(u_int8_t *) virtual,
|
||||
/*dxfer_len*/length,
|
||||
/*sense_len*/SSD_FULL_SIZE,
|
||||
DA_DEFAULT_TIMEOUT * 1000);
|
||||
da_default_timeout * 1000);
|
||||
xpt_polled_action((union ccb *)&csio);
|
||||
cam_periph_unlock(periph);
|
||||
|
||||
@ -1597,7 +1597,7 @@ daregister(struct cam_periph *periph, void *arg)
|
||||
*/
|
||||
callout_init_mtx(&softc->sendordered_c, periph->sim->mtx, 0);
|
||||
callout_reset(&softc->sendordered_c,
|
||||
(DA_DEFAULT_TIMEOUT * hz) / DA_ORDEREDTAG_INTERVAL,
|
||||
(da_default_timeout * hz) / DA_ORDEREDTAG_INTERVAL,
|
||||
dasendorderedtag, softc);
|
||||
|
||||
mtx_unlock(periph->sim->mtx);
|
||||
@ -2768,7 +2768,7 @@ dasendorderedtag(void *arg)
|
||||
}
|
||||
/* Queue us up again */
|
||||
callout_reset(&softc->sendordered_c,
|
||||
(DA_DEFAULT_TIMEOUT * hz) / DA_ORDEREDTAG_INTERVAL,
|
||||
(da_default_timeout * hz) / DA_ORDEREDTAG_INTERVAL,
|
||||
dasendorderedtag, softc);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user