warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #402 from pizhenwei/debug-info-on-timeout

Browse Source 
Debug info on timeout
This commit is contained in:
Ronnie Sahlberg
2023-11-03 14:36:51 +10:00
committed by GitHub
parent c4a180fc4e 4c3ac5464a
commit 08f79ebf1d
3 changed files with 117 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/scsi-lowlevel.h
View File

@@ -205,6 +205,8 @@ EXTERN const char *scsi_sense_ascq_str(int ascq);
EXTERN const char *scsi_pr_type_str(enum scsi_persistent_out_type pr_type);
EXTERN const char *scsi_opcode_str(int opcode);
enum scsi_xfer_dir {
SCSI_XFER_NONE = 0,
SCSI_XFER_READ = 1,

18
lib/pdu.c
View File

@@ -79,12 +79,18 @@ iscsi_itt_post_increment(struct iscsi_context *iscsi) {
}
void iscsi_dump_pdu_header(struct iscsi_context *iscsi, unsigned char *data) {
char dump[ISCSI_RAW_HEADER_SIZE*3+1]={0};
char dump1[33*3+1]={0};
char dump2[(ISCSI_RAW_HEADER_SIZE-33)*3+1]={0};
const char *opcode;
int i;
for (i=0;i<ISCSI_RAW_HEADER_SIZE;i++) {
snprintf(&dump[i * 3], 4, " %02x", data[i]);
for (i=0;i<33;i++) {
snprintf(&dump1[i * 3], 4, " %02x", data[i]);
}
ISCSI_LOG(iscsi, 2, "PDU header:%s", dump);
opcode = scsi_opcode_str(data[32]);
for (;i<ISCSI_RAW_HEADER_SIZE;i++) {
snprintf(&dump2[(i-33) * 3], 4, " %02x", data[i]);
}
ISCSI_LOG(iscsi, 2, "PDU header:%s[%s]%s", dump1, opcode, dump2);
}
struct iscsi_pdu*
@@ -737,7 +743,7 @@ iscsi_timeout_scan(struct iscsi_context *iscsi)
cmdsn_gap++;
}
ISCSI_LIST_REMOVE(&iscsi->outqueue, pdu);
iscsi_set_error(iscsi, "command timed out");
iscsi_set_error(iscsi, "command timed out from outqueue");
iscsi_dump_pdu_header(iscsi, pdu->outdata.data);
if (pdu->callback) {
pdu->callback(iscsi, SCSI_STATUS_TIMEOUT,
@@ -757,7 +763,7 @@ iscsi_timeout_scan(struct iscsi_context *iscsi)
continue;
}
ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
iscsi_set_error(iscsi, "command timed out");
iscsi_set_error(iscsi, "command timed out from waitqueue");
iscsi_dump_pdu_header(iscsi, pdu->outdata.data);
if (pdu->callback) {
pdu->callback(iscsi, SCSI_STATUS_TIMEOUT,

106
lib/scsi-lowlevel.c
View File

@@ -135,7 +135,7 @@ value_string_find(struct value_string *values, int value)
const char *
scsi_sense_key_str(int key)
{
struct value_string keys[] = {
static struct value_string keys[] = {
{SCSI_SENSE_NO_SENSE,
"NO SENSE"},
{SCSI_SENSE_RECOVERED_ERROR,
@@ -173,7 +173,7 @@ scsi_sense_key_str(int key)
const char *
scsi_sense_ascq_str(int ascq)
{
struct value_string ascqs[] = {
static struct value_string ascqs[] = {
{SCSI_SENSE_ASCQ_SANITIZE_IN_PROGRESS,
"SANITIZE_IN_PROGRESS"},
{SCSI_SENSE_ASCQ_WRITE_AFTER_SANITIZE_REQUIRED,
@@ -245,7 +245,7 @@ scsi_sense_ascq_str(int ascq)
const char *
scsi_pr_type_str(enum scsi_persistent_out_type pr_type)
{
struct value_string pr_type_strings[] = {
static struct value_string pr_type_strings[] = {
{SCSI_PERSISTENT_RESERVE_TYPE_WRITE_EXCLUSIVE,
"Write Exclusive"},
{SCSI_PERSISTENT_RESERVE_TYPE_EXCLUSIVE_ACCESS,
@@ -264,6 +264,106 @@ scsi_pr_type_str(enum scsi_persistent_out_type pr_type)
return value_string_find(pr_type_strings, pr_type);
}
const char *
scsi_opcode_str(int opcode)
{
static struct value_string opcode_strings[] = {
{SCSI_OPCODE_TESTUNITREADY,
"TESTUNITREADY"},
{SCSI_OPCODE_READ6,
"READ6"},
{SCSI_OPCODE_INQUIRY,
"INQUIRY"},
{SCSI_OPCODE_MODESELECT6,
"MODESELECT6"},
{SCSI_OPCODE_RESERVE6,
"RESERVE6"},
{SCSI_OPCODE_RELEASE6,
"RELEASE6"},
{SCSI_OPCODE_MODESENSE6,
"MODESENSE6"},
{SCSI_OPCODE_STARTSTOPUNIT,
"STARTSTOPUNIT"},
{SCSI_OPCODE_PREVENTALLOW,
"PREVENTALLOW"},
{SCSI_OPCODE_READCAPACITY10,
"READCAPACITY10"},
{SCSI_OPCODE_READ10,
"READ10"},
{SCSI_OPCODE_WRITE10,
"WRITE10"},
{SCSI_OPCODE_WRITE_VERIFY10,
"WRITE VERIFY10"},
{SCSI_OPCODE_VERIFY10,
"VERIFY10"},
{SCSI_OPCODE_PREFETCH10,
"PREFETCH10"},
{SCSI_OPCODE_SYNCHRONIZECACHE10,
"SYNCHRONIZECACHE10"},
{SCSI_OPCODE_READ_DEFECT_DATA10,
"READ DEFECT DATA10"},
{SCSI_OPCODE_WRITE_SAME10,
"WRITE SAME10"},
{SCSI_OPCODE_UNMAP,
"UNMAP"},
{SCSI_OPCODE_READTOC,
"READTOC"},
{SCSI_OPCODE_SANITIZE,
"SANITIZE"},
{SCSI_OPCODE_MODESELECT10,
"MODESELECT10"},
{SCSI_OPCODE_MODESENSE10,
"MODESENSE10"},
{SCSI_OPCODE_PERSISTENT_RESERVE_IN,
"PERSISTENT RESERVE IN"},
{SCSI_OPCODE_PERSISTENT_RESERVE_OUT,
"PERSISTENT RESERVE OUT"},
{SCSI_OPCODE_EXTENDED_COPY,
"EXTENDED COPY"},
{SCSI_OPCODE_RECEIVE_COPY_RESULTS,
"RECEIVE COPY RESULTS"},
{SCSI_OPCODE_READ16,
"READ16"},
{SCSI_OPCODE_COMPARE_AND_WRITE,
"COMPARE AND WRITE"},
{SCSI_OPCODE_WRITE16,
"WRITE16"},
{SCSI_OPCODE_ORWRITE,
"ORWRITE"},
{SCSI_OPCODE_WRITE_VERIFY16,
"WRITE VERIFY16"},
{SCSI_OPCODE_VERIFY16,
"VERIFY16"},
{SCSI_OPCODE_PREFETCH16,
"PREFETCH16"},
{SCSI_OPCODE_SYNCHRONIZECACHE16,
"SYNCHRONIZECACHE16"},
{SCSI_OPCODE_WRITE_SAME16,
"WRITE SAME16"},
{SCSI_OPCODE_WRITE_ATOMIC16,
"WRITE ATOMIC16"},
{SCSI_OPCODE_SERVICE_ACTION_IN,
"SERVICE ACTION IN"},
{SCSI_OPCODE_REPORTLUNS,
"REPORTLUNS"},
{SCSI_OPCODE_MAINTENANCE_IN,
"MAINTENANCE IN"},
{SCSI_OPCODE_READ12,
"READ12"},
{SCSI_OPCODE_WRITE12,
"WRITE12"},
{SCSI_OPCODE_WRITE_VERIFY12,
"WRITE VERIFY12"},
{SCSI_OPCODE_VERIFY12,
"VERIFY12"},
{SCSI_OPCODE_READ_DEFECT_DATA12,
"READ DEFECT DATA12"},
{0, NULL}
};
return value_string_find(opcode_strings, opcode);
}
uint64_t
scsi_get_uint64(const unsigned char *c)
{