This is a re-post of the scsi_decide_disposition_update against scsi-post-merge-2.6 with corrections to the sign off lines. This patch series has been tested against the scsi-post-merge-2.6 git tree plus the latest updates from the linux-2.6-block for-2.6.28 branch. Previous post url: http://thread.gmane.org/gmane.linux.scsi/44412/focus=44463 Previous cover email: This patch series is an update to a previous set of patches posted by Mike Christie in the thread referenced below. http://thread.gmane.org/gmane.linux.scsi/44058/focus=4405 This patch series creates new return codes for scsi_decide_disposition and scsi_check_sense so that retry restrictions and disposition can be implied directly from the return code. Retry restrictions have also been moved into the requeue function. Mike C and I have tested a few of the return code types, but it would be good to have other return types check with different hardware. Change in behavior. - dm-mp fast fail on transport errors. - device busy and host busy limited by wait_for check. - A few more error cases will return DRIVER_TIMEOUT. Possibly should add more DRIVER_ error codes. A summary of the current disposition is shown below. 1.) Current disposition policy. 2.6.27 policy + DID_TRANSPORT patches ============================================================================== scsi_queue_insert ============================================================================== SCSI_MLQUEUE_EH_RETRY retry SCSI_MLQUEUE_DEVICE_BUSY retry, set device_blocked SCSI_MLQUEUE_HOST_BUSY retry, set host_blocked ============================================================================== scsi_softirq_done ============================================================================== disposition SUCCESS: scsi_finish_command disposition NEEDS_RETRY: scsi_queue_insert SCSI_MLQUEUE_EH_RETRY disposition ADD_TO_MLQUEUE: scsi_queue_insert SCSI_MLQUEUE_DEVICE_BUSY default: scsi_eh_scmd_add ============================================================================== host_byte ============================================================================== DID_OK goto status_byte DID_NO_CONNECT SUCCESS DID_BUS_BUSY allowed && !blk_noretry DID_TIME_OUT SUCCESS (TUR/INQ) / FAILED DID_BAD_TARGET SUCCESS DID_ABORT SUCCESS DID_PARITY allowed && !blk_noretry DID_ERROR allowed && !blk_noretry (status for RES) DID_RESET SUCCESS DID_BAD_INTR default DID_PASSTHROUGH SUCCESS DID_SOFT_ERROR allowed && !blk_noretry DID_IMM_RETRY NEEDS_RETRY DID_REQUEUE ADD_TO_MLQUEUE DID_TRANSPORT_DISRUPTED ADD_TO_MLQUEUE DID_TRANSPORT_FAILFAST SUCCESS default FAILED ============================================================================== status_byte ============================================================================== QUEUE_FULL ADD_TO_MLQUEUE BUSY ADD_TO_MLQUEUE GOOD SUCCESS COMMAND_TERMINATED SUCCESS TASK_ABORTED SUCCESS CHECK_CONDITION SEE SENSE CONDITION_GOOD SUCCESS INTERMEDIATE_GOOD SUCCESS INTERMEDIATE_C_GOOD SUCCESS ACA_ACTIVE SUCCESS RESERVATION_CONFLICT SUCCESS default FAILED ============================================================================== sense ============================================================================== !normalize_sense FAILED scsi_sense_is_deferred NEEDS_RETRY (allowed && !blk_noretry) scsi_dh->check_sense handler return FILEMARK, EOM or ILI SUCCESS NO_SENSE SUCCESS RECOVERED_ERROR SUCCESS ABORTED_COMMAND SUCCESS (DIF) / NEEDS_RETRY NOT_READY NEEDS_RETRY (ua, bc rdy) / FAILED (restart) / SUCCESS UNIT_ATTENTION NEEDS_RETRY (ua, bc rdy) / FAILED (restart) / SUCCESS COPY_ABORTED SUCCESS VOLUME_OVERFLOW SUCCESS MISCOMPARE SUCCESS MEDIUM_ERROR SUCCESS (0x11, 0x13, 0x14) / NEEDS_RETRY HARDWARE_ERROR ADD_TO_MLQUEUE (retry_hwerror) / SUCCESS ILLEGAL_REQUEST SUCCESS BLANK_CHECK SUCCESS DATA_PROTECT SUCCESS default SUCCESS -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
