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

MFprojects/camlock r248928:

Browse Source 
Move CAM_DEBUG_CDB messages from the point of queuing to the point of
sending to SIM.  That allows to inspect real requests execution order,
respecting priorities, freezing, etc.

MFC after:	2 weeks
This commit is contained in:
Alexander Motin 2013-04-04 18:59:29 +00:00
parent 7aba111672
commit de9ebb6812
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/cam/cam_xpt.c
View File

@ -2430,7 +2430,6 @@ xpt_action(union ccb *start_ccb)
void
xpt_action_default(union ccb *start_ccb)
{
char cdb_str[(SCSI_MAX_CDBLEN * 3) + 1];
struct cam_path *path;
path = start_ccb->ccb_h.path;
@ -2466,11 +2465,6 @@ xpt_action_default(union ccb *start_ccb)
start_ccb->ccb_h.target_lun << 5;
}
start_ccb->csio.scsi_status = SCSI_STATUS_OK;
CAM_DEBUG(path, CAM_DEBUG_CDB,("%s. CDB: %s\n",
scsi_op_desc(start_ccb->csio.cdb_io.cdb_bytes[0],
&path->device->inq_data),
scsi_cdb_string(start_ccb->csio.cdb_io.cdb_bytes,
cdb_str, sizeof(cdb_str))));
}
/* FALLTHROUGH */
case XPT_TARGET_IO:
@ -2479,13 +2473,8 @@ xpt_action_default(union ccb *start_ccb)
start_ccb->csio.resid = 0;
/* FALLTHROUGH */
case XPT_ATA_IO:
if (start_ccb->ccb_h.func_code == XPT_ATA_IO) {
if (start_ccb->ccb_h.func_code == XPT_ATA_IO)
start_ccb->ataio.resid = 0;
CAM_DEBUG(path, CAM_DEBUG_CDB,("%s. ACB: %s\n",
ata_op_string(&start_ccb->ataio.cmd),
ata_cmd_string(&start_ccb->ataio.cmd,
cdb_str, sizeof(cdb_str))));
}
/* FALLTHROUGH */
case XPT_RESET_DEV:
case XPT_ENG_EXEC:
@ -3228,6 +3217,7 @@ static void
xpt_run_dev_sendq(struct cam_eb *bus)
{
struct cam_devq *devq;
char cdb_str[(SCSI_MAX_CDBLEN * 3) + 1];
CAM_DEBUG_PRINT(CAM_DEBUG_XPT, ("xpt_run_dev_sendq\n"));
@ -3309,6 +3299,26 @@ xpt_run_dev_sendq(struct cam_eb *bus)
work_ccb->ccb_h.flags &= ~CAM_TAG_ACTION_VALID;
}
switch (work_ccb->ccb_h.func_code) {
case XPT_SCSI_IO:
CAM_DEBUG(work_ccb->ccb_h.path,
CAM_DEBUG_CDB,("%s. CDB: %s\n",
scsi_op_desc(work_ccb->csio.cdb_io.cdb_bytes[0],
&device->inq_data),
scsi_cdb_string(work_ccb->csio.cdb_io.cdb_bytes,
cdb_str, sizeof(cdb_str))));
break;
case XPT_ATA_IO:
CAM_DEBUG(work_ccb->ccb_h.path,
CAM_DEBUG_CDB,("%s. ACB: %s\n",
ata_op_string(&work_ccb->ataio.cmd),
ata_cmd_string(&work_ccb->ataio.cmd,
cdb_str, sizeof(cdb_str))));
break;
default:
break;
}
/*
* Device queues can be shared among multiple sim instances
* that reside on different busses. Use the SIM in the queue