[RFC PATCH -logging 00/10] scsi/constants: Output continuous error messages on trace

[RFC PATCH -logging 00/10] scsi/constants: Output continuous error messages on trace

[Yoshihiro YUNOMAE]

Hi All,

This patch set introduces new traceevents in order to output continuous error
messages. Current SCSI printk messages in upstream kernel can be divided by and
mixed with other messages. Even if each error message has its device id,
sometimes we can easily be lost in mixed logs because the message's device id
is separated from it's body. To avoid it, I'd like to use traceevents to
store error messages into the ftrace or perf buuffer, because traceevents
are atomically commited to the buffer.

In this patch set, all printk messages are removed based on a local
discussion with Hannes, but I think printk messages should be kept because all
users don't enable traceevents and rsyslog can store as files.

However, if printk of logging branch is kept, the messages are duplicate and
it can induce stack overflow by using local buffer(*1).

 (*1) https://lkml.org/lkml/2014/5/20/742

So, my suggestion is follows:

1) printk
Keeps current implemntation of upstream kernel.
The messages are divided and can be mixed, but all users can check the error
messages without any settings.

2) traceevents
To get the complete messages, we can use ftrace or perf (or something on them).
Users can always understand correct messages, but they need to set up the
tracers.

This patch set is based on Hannes' logging branch:
http://git.kernel.org/cgit/linux/kernel/git/hare/scsi-devel.git/log/?h=logging

[1/10] ~  [6/10]: just cleanup for logging branch
[7/10] ~ [10/10]: introduce new traceevents

Any comments are welcome!

Thanks,
Yoshihiro YUNOMAE

---

Yoshihiro YUNOMAE (10):
      scsi/constants: Cleanup printk message in __scsi_print_sense()
      scsi/constants: Cleanup printk message in scsi_decode_sense_extras()
      scsi/constants: Cleanup printk message in __scsi_print_command()
      scsi/constants: Cleanup printk message in scsi_dump_sense_buffer()
      scsi/trace: Use macros for getting driver byte, host byte, msg byte, and status byte
      scsi/sd: Delete extra scsi_show_extd_sense() in sd_print_sense_hdr()
      scsi/trace: Use scsi_show_result trace point instead of printk
      scsi/trace: Use scsi_print_sense trace point instead of printk
      scsi/trace: Add additional sense code and additional sense code qualifier to scsi_print_sense trace point
      scsi/trace: Use scsi_print_command trace point instead of printk


 drivers/scsi/Makefile       |    2 
 drivers/scsi/constants.c    | 1543 -------------------------------------------
 drivers/scsi/scsi_trace.c   | 1484 +++++++++++++++++++++++++++++++++++++++++
 drivers/scsi/sd.c           |    2 
 include/scsi/scsi.h         |    8 
 include/scsi/scsi_dbg.h     |    2 
 include/scsi/scsi_eh.h      |    7 
 include/trace/events/scsi.h |  145 ++++
 8 files changed, 1633 insertions(+), 1560 deletions(-)
 delete mode 100644 drivers/scsi/constants.c

-- 
Yoshihiro YUNOMAE
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: yoshihiro.yunomae.ez@hitachi.com

[RFC PATCH 01/10] scsi/constants: Cleanup printk message in __scsi_print_sense()

[Yoshihiro YUNOMAE]

A device name is output like "sda: Sense Key : Medium Error [current]"
in __scsi_print_sense(), but it should be "[sda] Sense Key : Medium Error
[current]" because other printk messages output a device name like "[sda] foo."

Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Doug Gilbert <dgilbert@interlog.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
 drivers/scsi/constants.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index c6a7a4a..a0e8159 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -1470,7 +1470,7 @@ void __scsi_print_sense(struct scsi_device *sdev, const char *name,
 		return;
 	}
 
-	sdev_printk(KERN_INFO, sdev, "%s: Sense Key : %s %s%s\n", name,
+	sdev_printk(KERN_INFO, sdev, "[%s] Sense Key : %s %s%s\n", name,
 	       scsi_sense_key_string(sshdr.sense_key),
 	       scsi_sense_type_string(&sshdr),
 	       scsi_sense_format_string(&sshdr));

RE: [RFC PATCH 01/10] scsi/constants: Cleanup printk message in __scsi_print_sense()

[Elliott, Robert (Server Storage)]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 2162 bytes --]



> -----Original Message-----
> From: linux-scsi-owner@vger.kernel.org [mailto:linux-scsi-
> owner@vger.kernel.org] On Behalf Of Yoshihiro YUNOMAE
> Sent: Friday, 08 August, 2014 6:50 AM
...
> Subject: [RFC PATCH 01/10] scsi/constants: Cleanup printk message in
> __scsi_print_sense()
> 
> A device name is output like "sda: Sense Key : Medium Error [current]"
> in __scsi_print_sense(), but it should be "[sda] Sense Key : Medium Error
> [current]" because other printk messages output a device name like "[sda]
> foo."
> 
...
> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
> index c6a7a4a..a0e8159 100644
> --- a/drivers/scsi/constants.c
> +++ b/drivers/scsi/constants.c
> @@ -1470,7 +1470,7 @@ void __scsi_print_sense(struct scsi_device *sdev,
> const char *name,
>  		return;
>  	}
> 
> -	sdev_printk(KERN_INFO, sdev, "%s: Sense Key : %s %s%s\n", name,
> +	sdev_printk(KERN_INFO, sdev, "[%s] Sense Key : %s %s%s\n", name,
>  	       scsi_sense_key_string(sshdr.sense_key),
>  	       scsi_sense_type_string(&sshdr),
>  	       scsi_sense_format_string(&sshdr));
> 


The callers of __scsi_print_sense do not always pass in a name
like "sda".  In fact, sd.c doesn't even call that function; its
sd_print_sense_hdr calls sd_printk (which prints name as "[%s]")
and scsi_show_sense_hdr.

There are just 3 kernel files that call this function:
osst.c:                 __scsi_print_sense("osst ", SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
osst.c:                 __scsi_print_sense("osst ", SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
There is a separate call to printk just before each of those,
which prints out the name, without [].

sg.c:                   __scsi_print_sense(__func__, sense,
That's printing the C function name.

st.c:                    __scsi_print_sense(name, SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
st.c:                   __scsi_print_sense(name, SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
This is more like what you have in mind.


---
Rob Elliott    HP Server Storage


ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: [RFC PATCH 01/10] scsi/constants: Cleanup printk message in __scsi_print_sense()

[Yoshihiro YUNOMAE]

Hi Elliot,

Thank you for your comment.

(2014/08/12 23:51), Elliott, Robert (Server Storage) wrote:
>
>
>> -----Original Message-----
>> From: linux-scsi-owner@vger.kernel.org [mailto:linux-scsi-
>> owner@vger.kernel.org] On Behalf Of Yoshihiro YUNOMAE
>> Sent: Friday, 08 August, 2014 6:50 AM
> ...
>> Subject: [RFC PATCH 01/10] scsi/constants: Cleanup printk message in
>> __scsi_print_sense()
>>
>> A device name is output like "sda: Sense Key : Medium Error [current]"
>> in __scsi_print_sense(), but it should be "[sda] Sense Key : Medium Error
>> [current]" because other printk messages output a device name like "[sda]
>> foo."
>>
> ...
>> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
>> index c6a7a4a..a0e8159 100644
>> --- a/drivers/scsi/constants.c
>> +++ b/drivers/scsi/constants.c
>> @@ -1470,7 +1470,7 @@ void __scsi_print_sense(struct scsi_device *sdev,
>> const char *name,
>>   		return;
>>   	}
>>
>> -	sdev_printk(KERN_INFO, sdev, "%s: Sense Key : %s %s%s\n", name,
>> +	sdev_printk(KERN_INFO, sdev, "[%s] Sense Key : %s %s%s\n", name,
>>   	       scsi_sense_key_string(sshdr.sense_key),
>>   	       scsi_sense_type_string(&sshdr),
>>   	       scsi_sense_format_string(&sshdr));
>>
>
>
> The callers of __scsi_print_sense do not always pass in a name
> like "sda".  In fact, sd.c doesn't even call that function; its
> sd_print_sense_hdr calls sd_printk (which prints name as "[%s]")
> and scsi_show_sense_hdr.

OK, I understood.
Current Linux kernel also outputs "<name>:" in __scsi_print_sense(),
so we should not change this.

Thanks,
Yoshihiro YUNOMOAE

-- 
Yoshihiro YUNOMAE
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: yoshihiro.yunomae.ez@hitachi.com

Re: [RFC PATCH 01/10] scsi/constants: Cleanup printk message in __scsi_print_sense()

[Hannes Reinecke]

On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
> A device name is output like "sda: Sense Key : Medium Error [current]"
> in __scsi_print_sense(), but it should be "[sda] Sense Key : Medium Error
> [current]" because other printk messages output a device name like "[sda] foo."
>
> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Doug Gilbert <dgilbert@interlog.com>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>   drivers/scsi/constants.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
> index c6a7a4a..a0e8159 100644
> --- a/drivers/scsi/constants.c
> +++ b/drivers/scsi/constants.c
> @@ -1470,7 +1470,7 @@ void __scsi_print_sense(struct scsi_device *sdev, const char *name,
>   		return;
>   	}
>
> -	sdev_printk(KERN_INFO, sdev, "%s: Sense Key : %s %s%s\n", name,
> +	sdev_printk(KERN_INFO, sdev, "[%s] Sense Key : %s %s%s\n", name,
>   	       scsi_sense_key_string(sshdr.sense_key),
>   	       scsi_sense_type_string(&sshdr),
>   	       scsi_sense_format_string(&sshdr));
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
A similar fix is already present in my next version of the scsi 
logging patchset.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

[RFC PATCH 02/10] scsi/constants: Cleanup printk message in scsi_decode_sense_extras()

[Yoshihiro YUNOMAE]

If sense_flags and fixed_valid are zero, the kernel does not need to
output a printk message. So, if those conditions are met, it just returns.

Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Doug Gilbert <dgilbert@interlog.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
 drivers/scsi/constants.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index a0e8159..9c38b8d 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -1438,6 +1438,9 @@ scsi_decode_sense_extras(struct scsi_device *sdev, const char *name,
 			sense_flags |= ucp[3] & 0xe0;
 	}
 
+	if (!sense_flags && !fixed_valid)
+		return;
+
 	res = 0;
 	memset(buff, 0, sizeof(buff));
 	blen = sizeof(buff) - 1;

Re: [RFC PATCH 02/10] scsi/constants: Cleanup printk message in scsi_decode_sense_extras()

[Hannes Reinecke]

On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
> If sense_flags and fixed_valid are zero, the kernel does not need to
> output a printk message. So, if those conditions are met, it just returns.
>
> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Doug Gilbert <dgilbert@interlog.com>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>   drivers/scsi/constants.c |    3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
> index a0e8159..9c38b8d 100644
> --- a/drivers/scsi/constants.c
> +++ b/drivers/scsi/constants.c
> @@ -1438,6 +1438,9 @@ scsi_decode_sense_extras(struct scsi_device *sdev, const char *name,
>   			sense_flags |= ucp[3] & 0xe0;
>   	}
>
> +	if (!sense_flags && !fixed_valid)
> +		return;
> +
>   	res = 0;
>   	memset(buff, 0, sizeof(buff));
>   	blen = sizeof(buff) - 1;
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
scsi_decode_sense_extras() is utterly weird, as it only decodes 
tape-specific sense extras. Seeing that 'st' and 'osst' already 
contains code to handle those cases we should remove this function 
altogether, as it doesn't serve any purpose.

Has been removed with my next scsi logging update, so this patch is 
not applicable anymore.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

[RFC PATCH 03/10] scsi/constants: Cleanup printk message in __scsi_print_command()

[Yoshihiro YUNOMAE]

All bytes in CDB should be output after linebuf is filled because
"[%s] CDB: %s\n" message is output many times in loop.

Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Doug Gilbert <dgilbert@interlog.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
 drivers/scsi/constants.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 9c38b8d..5956d4d 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -413,9 +413,8 @@ void __scsi_print_command(struct scsi_device *sdev, const char *prefix,
 
 		hex_dump_to_buffer(cdb + i, linelen, 16, 1,
 				   linebuf, sizeof(linebuf), false);
-		sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s\n",
-			    prefix, linebuf);
 	}
+	sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s\n", prefix, linebuf);
 }
 EXPORT_SYMBOL(__scsi_print_command);
 

Re: [RFC PATCH 03/10] scsi/constants: Cleanup printk message in __scsi_print_command()

[Ewan Milne]

On Fri, 2014-08-08 at 11:50 +0000, Yoshihiro YUNOMAE wrote:
> All bytes in CDB should be output after linebuf is filled because
> "[%s] CDB: %s\n" message is output many times in loop.
> 
> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Doug Gilbert <dgilbert@interlog.com>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>  drivers/scsi/constants.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
> index 9c38b8d..5956d4d 100644
> --- a/drivers/scsi/constants.c
> +++ b/drivers/scsi/constants.c
> @@ -413,9 +413,8 @@ void __scsi_print_command(struct scsi_device *sdev, const char *prefix,
>  
>  		hex_dump_to_buffer(cdb + i, linelen, 16, 1,
>  				   linebuf, sizeof(linebuf), false);
> -		sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s\n",
> -			    prefix, linebuf);
>  	}
> +	sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s\n", prefix, linebuf);
>  }
>  EXPORT_SYMBOL(__scsi_print_command);

This doesn't look right -- In Hannes' tree what the code is doing is
printing out a separate line for each 16 bytes of the CDB.  You change
will cause only the last (partial?) 16 bytes to be printed.

-Ewan

Re: [RFC PATCH 03/10] scsi/constants: Cleanup printk message in __scsi_print_command()

[Yoshihiro YUNOMAE]

Hi Ewan,

Thank you for your review.

(2014/08/16 0:05), Ewan Milne wrote:
> On Fri, 2014-08-08 at 11:50 +0000, Yoshihiro YUNOMAE wrote:
>> All bytes in CDB should be output after linebuf is filled because
>> "[%s] CDB: %s\n" message is output many times in loop.
>>
>> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
>> Cc: Hannes Reinecke <hare@suse.de>
>> Cc: Doug Gilbert <dgilbert@interlog.com>
>> Cc: Martin K. Petersen <martin.petersen@oracle.com>
>> Cc: Christoph Hellwig <hch@lst.de>
>> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
>> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
>> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
>> ---
>>   drivers/scsi/constants.c |    3 +--
>>   1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
>> index 9c38b8d..5956d4d 100644
>> --- a/drivers/scsi/constants.c
>> +++ b/drivers/scsi/constants.c
>> @@ -413,9 +413,8 @@ void __scsi_print_command(struct scsi_device *sdev, const char *prefix,
>>
>>   		hex_dump_to_buffer(cdb + i, linelen, 16, 1,
>>   				   linebuf, sizeof(linebuf), false);
>> -		sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s\n",
>> -			    prefix, linebuf);
>>   	}
>> +	sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s\n", prefix, linebuf);
>>   }
>>   EXPORT_SYMBOL(__scsi_print_command);
>
> This doesn't look right -- In Hannes' tree what the code is doing is
> printing out a separate line for each 16 bytes of the CDB.  You change
> will cause only the last (partial?) 16 bytes to be printed.

Ah, that's true. We should not apply this patch.

Thanks,
Yoshihiro YUNOMAE

-- 
Yoshihiro YUNOMAE
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: yoshihiro.yunomae.ez@hitachi.com

Re: [RFC PATCH 03/10] scsi/constants: Cleanup printk message in __scsi_print_command()

[Hannes Reinecke]

On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
> All bytes in CDB should be output after linebuf is filled because
> "[%s] CDB: %s\n" message is output many times in loop.
>
> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Doug Gilbert <dgilbert@interlog.com>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>   drivers/scsi/constants.c |    3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
> index 9c38b8d..5956d4d 100644
> --- a/drivers/scsi/constants.c
> +++ b/drivers/scsi/constants.c
> @@ -413,9 +413,8 @@ void __scsi_print_command(struct scsi_device *sdev, const char *prefix,
>
>   		hex_dump_to_buffer(cdb + i, linelen, 16, 1,
>   				   linebuf, sizeof(linebuf), false);
> -		sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s\n",
> -			    prefix, linebuf);
>   	}
> +	sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s\n", prefix, linebuf);
>   }
>   EXPORT_SYMBOL(__scsi_print_command);
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
As discussed this patch is invalid.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

[RFC PATCH 04/10] scsi/constants: Cleanup printk message in scsi_dump_sense_buffer()

[Yoshihiro YUNOMAE]

Unrecognized sense data should be output after linebuf is filled because
"[%s] Unrecognized sense data (in hex): %s" message is output many times in
loop.

Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Doug Gilbert <dgilbert@interlog.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
 drivers/scsi/constants.c |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 5956d4d..6fad6b4 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -1385,16 +1385,13 @@ EXPORT_SYMBOL(scsi_print_sense_hdr);
 
 static void
 scsi_dump_sense_buffer(struct scsi_device *sdev, const char *prefix,
-		       const unsigned char *sense_buffer, int sense_len,
-		       struct scsi_sense_hdr *sshdr)
+		       const unsigned char *sense_buffer, int sense_len)
 {
 	char linebuf[128];
 	int i, linelen, remaining;
 
 	if (sense_len < 32)
 		sense_len = 32;
-	sdev_printk(KERN_INFO, sdev,
-		    "[%s] Unrecognized sense data (in hex):", prefix);
 
 	remaining = sense_len;
 	for (i = 0; i < sense_len; i += 16) {
@@ -1403,9 +1400,10 @@ scsi_dump_sense_buffer(struct scsi_device *sdev, const char *prefix,
 
 		hex_dump_to_buffer(sense_buffer + i, linelen, 16, 1,
 				   linebuf, sizeof(linebuf), false);
-		sdev_printk(KERN_INFO, sdev, "[%s] Sense: %s\n",
-			    prefix, linebuf);
 	}
+	sdev_printk(KERN_INFO, sdev,
+		    "[%s] Unrecognized sense data (in hex): %s",
+		    prefix, linebuf);
 }
 
 static void
@@ -1467,8 +1465,7 @@ void __scsi_print_sense(struct scsi_device *sdev, const char *name,
 
 	if (!scsi_normalize_sense(sense_buffer, sense_len, &sshdr)) {
 		/* this may be SCSI-1 sense data */
-		scsi_dump_sense_buffer(sdev, name, sense_buffer,
-				       sense_len, &sshdr);
+		scsi_dump_sense_buffer(sdev, name, sense_buffer, sense_len);
 		return;
 	}
 

Re: [RFC PATCH 04/10] scsi/constants: Cleanup printk message in scsi_dump_sense_buffer()

[Ewan Milne]

On Fri, 2014-08-08 at 11:50 +0000, Yoshihiro YUNOMAE wrote:
> Unrecognized sense data should be output after linebuf is filled because
> "[%s] Unrecognized sense data (in hex): %s" message is output many times in
> loop.
> 
> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Doug Gilbert <dgilbert@interlog.com>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>  drivers/scsi/constants.c |   13 +++++--------
>  1 file changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
> index 5956d4d..6fad6b4 100644
> --- a/drivers/scsi/constants.c
> +++ b/drivers/scsi/constants.c
> @@ -1385,16 +1385,13 @@ EXPORT_SYMBOL(scsi_print_sense_hdr);
>  
>  static void
>  scsi_dump_sense_buffer(struct scsi_device *sdev, const char *prefix,
> -		       const unsigned char *sense_buffer, int sense_len,
> -		       struct scsi_sense_hdr *sshdr)
> +		       const unsigned char *sense_buffer, int sense_len)
>  {
>  	char linebuf[128];
>  	int i, linelen, remaining;
>  
>  	if (sense_len < 32)
>  		sense_len = 32;
> -	sdev_printk(KERN_INFO, sdev,
> -		    "[%s] Unrecognized sense data (in hex):", prefix);
>  
>  	remaining = sense_len;
>  	for (i = 0; i < sense_len; i += 16) {
> @@ -1403,9 +1400,10 @@ scsi_dump_sense_buffer(struct scsi_device *sdev, const char *prefix,
>  
>  		hex_dump_to_buffer(sense_buffer + i, linelen, 16, 1,
>  				   linebuf, sizeof(linebuf), false);
> -		sdev_printk(KERN_INFO, sdev, "[%s] Sense: %s\n",
> -			    prefix, linebuf);
>  	}
> +	sdev_printk(KERN_INFO, sdev,
> +		    "[%s] Unrecognized sense data (in hex): %s",
> +		    prefix, linebuf);
>  }

See my earlier comment regarding PATCH 03/10.

This doesn't look right -- In Hannes' tree what the code is doing is
printing out a separate line for each 16 bytes of the sense data.
Your change will cause only the last (partial?) 16 bytes to be printed.

The removal of the unused sshdr argument is fine, though.

-Ewan

>  
>  static void
> @@ -1467,8 +1465,7 @@ void __scsi_print_sense(struct scsi_device *sdev, const char *name,
>  
>  	if (!scsi_normalize_sense(sense_buffer, sense_len, &sshdr)) {
>  		/* this may be SCSI-1 sense data */
> -		scsi_dump_sense_buffer(sdev, name, sense_buffer,
> -				       sense_len, &sshdr);
> +		scsi_dump_sense_buffer(sdev, name, sense_buffer, sense_len);
>  		return;
>  	}
>  
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: Re: [RFC PATCH 04/10] scsi/constants: Cleanup printk message in scsi_dump_sense_buffer()

[Yoshihiro YUNOMAE]

(2014/08/16 0:08), Ewan Milne wrote:
> On Fri, 2014-08-08 at 11:50 +0000, Yoshihiro YUNOMAE wrote:
>> Unrecognized sense data should be output after linebuf is filled because
>> "[%s] Unrecognized sense data (in hex): %s" message is output many times in
>> loop.
>>
>> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
>> Cc: Hannes Reinecke <hare@suse.de>
>> Cc: Doug Gilbert <dgilbert@interlog.com>
>> Cc: Martin K. Petersen <martin.petersen@oracle.com>
>> Cc: Christoph Hellwig <hch@lst.de>
>> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
>> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
>> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
>> ---
>>   drivers/scsi/constants.c |   13 +++++--------
>>   1 file changed, 5 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
>> index 5956d4d..6fad6b4 100644
>> --- a/drivers/scsi/constants.c
>> +++ b/drivers/scsi/constants.c
>> @@ -1385,16 +1385,13 @@ EXPORT_SYMBOL(scsi_print_sense_hdr);
>>
>>   static void
>>   scsi_dump_sense_buffer(struct scsi_device *sdev, const char *prefix,
>> -		       const unsigned char *sense_buffer, int sense_len,
>> -		       struct scsi_sense_hdr *sshdr)
>> +		       const unsigned char *sense_buffer, int sense_len)
>>   {
>>   	char linebuf[128];
>>   	int i, linelen, remaining;
>>
>>   	if (sense_len < 32)
>>   		sense_len = 32;
>> -	sdev_printk(KERN_INFO, sdev,
>> -		    "[%s] Unrecognized sense data (in hex):", prefix);
>>
>>   	remaining = sense_len;
>>   	for (i = 0; i < sense_len; i += 16) {
>> @@ -1403,9 +1400,10 @@ scsi_dump_sense_buffer(struct scsi_device *sdev, const char *prefix,
>>
>>   		hex_dump_to_buffer(sense_buffer + i, linelen, 16, 1,
>>   				   linebuf, sizeof(linebuf), false);
>> -		sdev_printk(KERN_INFO, sdev, "[%s] Sense: %s\n",
>> -			    prefix, linebuf);
>>   	}
>> +	sdev_printk(KERN_INFO, sdev,
>> +		    "[%s] Unrecognized sense data (in hex): %s",
>> +		    prefix, linebuf);
>>   }
>
> See my earlier comment regarding PATCH 03/10.
>
> This doesn't look right -- In Hannes' tree what the code is doing is
> printing out a separate line for each 16 bytes of the sense data.
> Your change will cause only the last (partial?) 16 bytes to be printed.

That's true. We should not apply this as well.

> The removal of the unused sshdr argument is fine, though.

Thanks!

Yoshihiro YUNOMAE

> -Ewan
>
>>
>>   static void
>> @@ -1467,8 +1465,7 @@ void __scsi_print_sense(struct scsi_device *sdev, const char *name,
>>
>>   	if (!scsi_normalize_sense(sense_buffer, sense_len, &sshdr)) {
>>   		/* this may be SCSI-1 sense data */
>> -		scsi_dump_sense_buffer(sdev, name, sense_buffer,
>> -				       sense_len, &sshdr);
>> +		scsi_dump_sense_buffer(sdev, name, sense_buffer, sense_len);
>>   		return;
>>   	}
>>
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/
>
>
>

-- 
Yoshihiro YUNOMAE
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: yoshihiro.yunomae.ez@hitachi.com

Re: [RFC PATCH 04/10] scsi/constants: Cleanup printk message in scsi_dump_sense_buffer()

[Hannes Reinecke]

On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
> Unrecognized sense data should be output after linebuf is filled because
> "[%s] Unrecognized sense data (in hex): %s" message is output many times in
> loop.
>
> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Doug Gilbert <dgilbert@interlog.com>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>   drivers/scsi/constants.c |   13 +++++--------
>   1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
> index 5956d4d..6fad6b4 100644
> --- a/drivers/scsi/constants.c
> +++ b/drivers/scsi/constants.c
> @@ -1385,16 +1385,13 @@ EXPORT_SYMBOL(scsi_print_sense_hdr);
>
>   static void
>   scsi_dump_sense_buffer(struct scsi_device *sdev, const char *prefix,
> -		       const unsigned char *sense_buffer, int sense_len,
> -		       struct scsi_sense_hdr *sshdr)
> +		       const unsigned char *sense_buffer, int sense_len)
>   {
>   	char linebuf[128];
>   	int i, linelen, remaining;
>
>   	if (sense_len < 32)
>   		sense_len = 32;
> -	sdev_printk(KERN_INFO, sdev,
> -		    "[%s] Unrecognized sense data (in hex):", prefix);
>
>   	remaining = sense_len;
>   	for (i = 0; i < sense_len; i += 16) {
> @@ -1403,9 +1400,10 @@ scsi_dump_sense_buffer(struct scsi_device *sdev, const char *prefix,
>
>   		hex_dump_to_buffer(sense_buffer + i, linelen, 16, 1,
>   				   linebuf, sizeof(linebuf), false);
> -		sdev_printk(KERN_INFO, sdev, "[%s] Sense: %s\n",
> -			    prefix, linebuf);
>   	}
> +	sdev_printk(KERN_INFO, sdev,
> +		    "[%s] Unrecognized sense data (in hex): %s",
> +		    prefix, linebuf);
>   }
>
>   static void
> @@ -1467,8 +1465,7 @@ void __scsi_print_sense(struct scsi_device *sdev, const char *name,
>
>   	if (!scsi_normalize_sense(sense_buffer, sense_len, &sshdr)) {
>   		/* this may be SCSI-1 sense data */
> -		scsi_dump_sense_buffer(sdev, name, sense_buffer,
> -				       sense_len, &sshdr);
> +		scsi_dump_sense_buffer(sdev, name, sense_buffer, sense_len);
>   		return;
>   	}
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
As discussed this patch is invalid.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

[RFC PATCH 05/10] scsi/trace: Use macros for getting driver byte, host byte, msg byte, and status byte

[Yoshihiro YUNOMAE]

For getting driver byte, host byte, msg byte, and status byte, macros are
implemented in scsi/scsi.h, so we use it.

Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Doug Gilbert <dgilbert@interlog.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
 include/trace/events/scsi.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
index db6c935..8aecdc2 100644
--- a/include/trace/events/scsi.h
+++ b/include/trace/events/scsi.h
@@ -328,10 +328,10 @@ DECLARE_EVENT_CLASS(scsi_cmd_done_timeout_template,
 		  show_opcode_name(__entry->opcode),
 		  __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len),
 		  __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len),
-		  show_driverbyte_name(((__entry->result) >> 24) & 0xff),
-		  show_hostbyte_name(((__entry->result) >> 16) & 0xff),
-		  show_msgbyte_name(((__entry->result) >> 8) & 0xff),
-		  show_statusbyte_name(__entry->result & 0xff))
+		  show_driverbyte_name(driver_byte(__entry->result)),
+		  show_hostbyte_name(host_byte(__entry->result)),
+		  show_msgbyte_name(msg_byte(__entry->result)),
+		  show_statusbyte_name(status_byte(__entry->result)))
 );
 
 DEFINE_EVENT(scsi_cmd_done_timeout_template, scsi_dispatch_cmd_done,

Re: [RFC PATCH 05/10] scsi/trace: Use macros for getting driver byte, host byte, msg byte, and status byte

[Ewan Milne]

On Fri, 2014-08-08 at 11:50 +0000, Yoshihiro YUNOMAE wrote:
> For getting driver byte, host byte, msg byte, and status byte, macros are
> implemented in scsi/scsi.h, so we use it.
> 
> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Doug Gilbert <dgilbert@interlog.com>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>  include/trace/events/scsi.h |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
> index db6c935..8aecdc2 100644
> --- a/include/trace/events/scsi.h
> +++ b/include/trace/events/scsi.h
> @@ -328,10 +328,10 @@ DECLARE_EVENT_CLASS(scsi_cmd_done_timeout_template,
>  		  show_opcode_name(__entry->opcode),
>  		  __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len),
>  		  __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len),
> -		  show_driverbyte_name(((__entry->result) >> 24) & 0xff),
> -		  show_hostbyte_name(((__entry->result) >> 16) & 0xff),
> -		  show_msgbyte_name(((__entry->result) >> 8) & 0xff),
> -		  show_statusbyte_name(__entry->result & 0xff))
> +		  show_driverbyte_name(driver_byte(__entry->result)),
> +		  show_hostbyte_name(host_byte(__entry->result)),
> +		  show_msgbyte_name(msg_byte(__entry->result)),
> +		  show_statusbyte_name(status_byte(__entry->result)))
>  );
>  
>  DEFINE_EVENT(scsi_cmd_done_timeout_template, scsi_dispatch_cmd_done,
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

(Based upon Hannes' logging tree...)

Hannes, you should probably just update your tree with this.

Reviewed-by: Ewan D. Milne <emilne@redhat.com>

Re: [RFC PATCH 05/10] scsi/trace: Use macros for getting driver byte, host byte, msg byte, and status byte

[Hannes Reinecke]

On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
> For getting driver byte, host byte, msg byte, and status byte, macros are
> implemented in scsi/scsi.h, so we use it.
>
> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Doug Gilbert <dgilbert@interlog.com>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>   include/trace/events/scsi.h |    8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
> index db6c935..8aecdc2 100644
> --- a/include/trace/events/scsi.h
> +++ b/include/trace/events/scsi.h
> @@ -328,10 +328,10 @@ DECLARE_EVENT_CLASS(scsi_cmd_done_timeout_template,
>   		  show_opcode_name(__entry->opcode),
>   		  __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len),
>   		  __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len),
> -		  show_driverbyte_name(((__entry->result) >> 24) & 0xff),
> -		  show_hostbyte_name(((__entry->result) >> 16) & 0xff),
> -		  show_msgbyte_name(((__entry->result) >> 8) & 0xff),
> -		  show_statusbyte_name(__entry->result & 0xff))
> +		  show_driverbyte_name(driver_byte(__entry->result)),
> +		  show_hostbyte_name(host_byte(__entry->result)),
> +		  show_msgbyte_name(msg_byte(__entry->result)),
> +		  show_statusbyte_name(status_byte(__entry->result)))
>   );
>
>   DEFINE_EVENT(scsi_cmd_done_timeout_template, scsi_dispatch_cmd_done,
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
Applied to my scsi logging tree.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

[RFC PATCH 06/10] scsi/sd: Delete extra scsi_show_extd_sense() in sd_print_sense_hdr()

[Yoshihiro YUNOMAE]

sd_print_sense_hdr() calls scsi_show_extd_sense(),
but scsi_print_sense_hdr() also calls scsi_show_extd_sense().
We can get same result, so we delete it.

Note:
Calling scsi_show_extd_sense() is introduced in fdd8b297.

Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Doug Gilbert <dgilbert@interlog.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
 drivers/scsi/sd.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 8d7204a..22dd214 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3286,8 +3286,6 @@ static void sd_print_sense_hdr(struct scsi_disk *sdkp,
 			       struct scsi_sense_hdr *sshdr)
 {
 	scsi_print_sense_hdr(sdkp->device, sdkp->disk->disk_name, sshdr);
-	scsi_show_extd_sense(sdkp->device, sdkp->disk->disk_name,
-			     sshdr->asc, sshdr->ascq);
 }
 
 static void sd_print_result(struct scsi_disk *sdkp, int result)

Re: [RFC PATCH 06/10] scsi/sd: Delete extra scsi_show_extd_sense() in sd_print_sense_hdr()

[Ewan Milne]

On Fri, 2014-08-08 at 11:50 +0000, Yoshihiro YUNOMAE wrote:
> sd_print_sense_hdr() calls scsi_show_extd_sense(),
> but scsi_print_sense_hdr() also calls scsi_show_extd_sense().
> We can get same result, so we delete it.
> 
> Note:
> Calling scsi_show_extd_sense() is introduced in fdd8b297.
> 
> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Doug Gilbert <dgilbert@interlog.com>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>  drivers/scsi/sd.c |    2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
> index 8d7204a..22dd214 100644
> --- a/drivers/scsi/sd.c
> +++ b/drivers/scsi/sd.c
> @@ -3286,8 +3286,6 @@ static void sd_print_sense_hdr(struct scsi_disk *sdkp,
>  			       struct scsi_sense_hdr *sshdr)
>  {
>  	scsi_print_sense_hdr(sdkp->device, sdkp->disk->disk_name, sshdr);
> -	scsi_show_extd_sense(sdkp->device, sdkp->disk->disk_name,
> -			     sshdr->asc, sshdr->ascq);
>  }
>  
>  static void sd_print_result(struct scsi_disk *sdkp, int result)
> 
> --

Looks fine, but again, Hannes should probably update his tree.

Reviewed-by: Ewan D. Milne <emilne@redhat.com>

Re: [RFC PATCH 06/10] scsi/sd: Delete extra scsi_show_extd_sense() in sd_print_sense_hdr()

[Hannes Reinecke]

On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
> sd_print_sense_hdr() calls scsi_show_extd_sense(),
> but scsi_print_sense_hdr() also calls scsi_show_extd_sense().
> We can get same result, so we delete it.
>
> Note:
> Calling scsi_show_extd_sense() is introduced in fdd8b297.
>
> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Doug Gilbert <dgilbert@interlog.com>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>   drivers/scsi/sd.c |    2 --
>   1 file changed, 2 deletions(-)
>
> diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
> index 8d7204a..22dd214 100644
> --- a/drivers/scsi/sd.c
> +++ b/drivers/scsi/sd.c
> @@ -3286,8 +3286,6 @@ static void sd_print_sense_hdr(struct scsi_disk *sdkp,
>   			       struct scsi_sense_hdr *sshdr)
>   {
>   	scsi_print_sense_hdr(sdkp->device, sdkp->disk->disk_name, sshdr);
> -	scsi_show_extd_sense(sdkp->device, sdkp->disk->disk_name,
> -			     sshdr->asc, sshdr->ascq);
>   }
>
>   static void sd_print_result(struct scsi_disk *sdkp, int result)
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
A similar patch has been applied to my scsi-logging tree.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

[RFC PATCH 07/10] scsi/trace: Use scsi_show_result trace point instead of printk

[Yoshihiro YUNOMAE]

Current SCSI trace has hostbyte table and driverbyte table, so we don't need to
have the same table in scsi/constants.c.

- Result examples

<Before> (printk)
sd 2:0:0:0: [sda] Result: hostbyte=DID_OK driverbyte=DRIVER_SENSE

<After> (ftrace)
scsi_show_result: host_no=2 channel=0 id=0 lun=0 [sda] result=(driver=DRIVER_SENSE host=DID_OK)

Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Doug Gilbert <dgilbert@interlog.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
 drivers/scsi/constants.c    |   52 -------------------------------------------
 drivers/scsi/scsi_trace.c   |   16 +++++++++++++
 include/trace/events/scsi.h |   38 +++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 6fad6b4..f7b7f32 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -1488,55 +1488,3 @@ void scsi_print_sense(struct scsi_cmnd *cmd)
 			   SCSI_SENSE_BUFFERSIZE);
 }
 EXPORT_SYMBOL(scsi_print_sense);
-
-#ifdef CONFIG_SCSI_CONSTANTS
-
-static const char * const hostbyte_table[]={
-"DID_OK", "DID_NO_CONNECT", "DID_BUS_BUSY", "DID_TIME_OUT", "DID_BAD_TARGET",
-"DID_ABORT", "DID_PARITY", "DID_ERROR", "DID_RESET", "DID_BAD_INTR",
-"DID_PASSTHROUGH", "DID_SOFT_ERROR", "DID_IMM_RETRY", "DID_REQUEUE",
-"DID_TRANSPORT_DISRUPTED", "DID_TRANSPORT_FAILFAST", "DID_TARGET_FAILURE",
-"DID_NEXUS_FAILURE" };
-#define NUM_HOSTBYTE_STRS ARRAY_SIZE(hostbyte_table)
-
-static const char * const driverbyte_table[]={
-"DRIVER_OK", "DRIVER_BUSY", "DRIVER_SOFT",  "DRIVER_MEDIA", "DRIVER_ERROR",
-"DRIVER_INVALID", "DRIVER_TIMEOUT", "DRIVER_HARD", "DRIVER_SENSE"};
-#define NUM_DRIVERBYTE_STRS ARRAY_SIZE(driverbyte_table)
-
-void scsi_show_result(struct scsi_device *sdev, const char *name, int result)
-{
-	int hb = host_byte(result);
-	int db = driver_byte(result);
-	const char *hb_string;
-	const char *db_string;
-
-	hb_string = (hb < NUM_HOSTBYTE_STRS) ? hostbyte_table[hb] : "invalid";
-	db_string = (db < NUM_DRIVERBYTE_STRS) ?
-		driverbyte_table[db] : "invalid";
-
-
-	sdev_printk(KERN_INFO, sdev,
-		    "[%s] Result: hostbyte=%s driverbyte=%s\n",
-		    name, hb_string, db_string);
-}
-
-#else
-
-void scsi_show_result(struct scsi_device *sdev, const char *name, int result)
-{
-	sdev_printk(KERN_INFO, sdev,
-		    "[%s] Result: hostbyte=0x%02x driverbyte=0x%02x\n",
-		    name, host_byte(result), driver_byte(result));
-}
-
-#endif
-EXPORT_SYMBOL(scsi_show_result);
-
-void scsi_print_result(struct scsi_cmnd *cmd)
-{
-	const char *devname = cmd->request->rq_disk ?
-		cmd->request->rq_disk->disk_name : "scsi";
-	scsi_show_result(cmd->device, devname, cmd->result);
-}
-EXPORT_SYMBOL(scsi_print_result);
diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
index 2bea4f0..6ffbc40 100644
--- a/drivers/scsi/scsi_trace.c
+++ b/drivers/scsi/scsi_trace.c
@@ -19,6 +19,8 @@
 #include <linux/trace_seq.h>
 #include <trace/events/scsi.h>
 
+#include <scsi/scsi_dbg.h>
+
 #define SERVICE_ACTION16(cdb) (cdb[1] & 0x1f)
 #define SERVICE_ACTION32(cdb) ((cdb[8] << 8) | cdb[9])
 
@@ -286,3 +288,17 @@ scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len)
 		return scsi_trace_misc(p, cdb, len);
 	}
 }
+
+void scsi_show_result(struct scsi_device *sdev, const char *name, int result)
+{
+	trace_scsi_show_result(sdev, name, result);
+}
+EXPORT_SYMBOL(scsi_show_result);
+
+void scsi_print_result(struct scsi_cmnd *cmd)
+{
+	const char *devname = cmd->request->rq_disk ?
+		cmd->request->rq_disk->disk_name : "scsi";
+	scsi_show_result(cmd->device, devname, cmd->result);
+}
+EXPORT_SYMBOL(scsi_print_result);
diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
index 8aecdc2..0675195 100644
--- a/include/trace/events/scsi.h
+++ b/include/trace/events/scsi.h
@@ -123,7 +123,11 @@
 		scsi_hostbyte_name(DID_IMM_RETRY),		\
 		scsi_hostbyte_name(DID_REQUEUE),		\
 		scsi_hostbyte_name(DID_TRANSPORT_DISRUPTED),	\
-		scsi_hostbyte_name(DID_TRANSPORT_FAILFAST))
+		scsi_hostbyte_name(DID_TRANSPORT_FAILFAST),	\
+		scsi_hostbyte_name(DID_TARGET_FAILURE),		\
+		scsi_hostbyte_name(DID_NEXUS_FAILURE),		\
+		scsi_hostbyte_name(DID_ALLOC_FAILURE),		\
+		scsi_hostbyte_name(DID_MEDIUM_ERROR))
 
 #define scsi_driverbyte_name(result)	{ result, #result }
 #define show_driverbyte_name(val)				\
@@ -359,6 +363,38 @@ TRACE_EVENT(scsi_eh_wakeup,
 	TP_printk("host_no=%u", __entry->host_no)
 );
 
+TRACE_EVENT(scsi_show_result,
+
+	TP_PROTO(struct scsi_device *sdev, const char *devname, int result),
+
+	TP_ARGS(sdev, devname, result),
+
+	TP_STRUCT__entry(
+		__field( unsigned int,	host_no	)
+		__field( unsigned int,	channel	)
+		__field( unsigned int,	id	)
+		__field( unsigned int,	lun	)
+		__string(devname,	devname	)
+		__field( int,		result	)
+	),
+
+	TP_fast_assign(
+		__entry->host_no	= sdev->host->host_no;
+		__entry->channel	= sdev->channel;
+		__entry->id		= sdev->id;
+		__entry->lun		= sdev->lun;
+		__assign_str(devname, devname);
+		__entry->result		= result;
+	),
+
+	TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] result=(driver=%s "\
+		  "host=%s)",
+		  __entry->host_no, __entry->channel, __entry->id, __entry->lun,
+		  __get_str(devname),
+		  show_driverbyte_name(driver_byte(__entry->result)),
+		  show_hostbyte_name(host_byte(__entry->result)))
+);
+
 #endif /*  _TRACE_SCSI_H */
 
 /* This part must be outside protection */

Re: [RFC PATCH 07/10] scsi/trace: Use scsi_show_result trace point instead of printk

[Hannes Reinecke]

On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
> Current SCSI trace has hostbyte table and driverbyte table, so we don't need to
> have the same table in scsi/constants.c.
>
> - Result examples
>
> <Before> (printk)
> sd 2:0:0:0: [sda] Result: hostbyte=DID_OK driverbyte=DRIVER_SENSE
>
> <After> (ftrace)
> scsi_show_result: host_no=2 channel=0 id=0 lun=0 [sda] result=(driver=DRIVER_SENSE host=DID_OK)
>
> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Doug Gilbert <dgilbert@interlog.com>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>   drivers/scsi/constants.c    |   52 -------------------------------------------
>   drivers/scsi/scsi_trace.c   |   16 +++++++++++++
>   include/trace/events/scsi.h |   38 +++++++++++++++++++++++++++++++
>   3 files changed, 53 insertions(+), 53 deletions(-)
>
> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
> index 6fad6b4..f7b7f32 100644
> --- a/drivers/scsi/constants.c
> +++ b/drivers/scsi/constants.c
> @@ -1488,55 +1488,3 @@ void scsi_print_sense(struct scsi_cmnd *cmd)
>   			   SCSI_SENSE_BUFFERSIZE);
>   }
>   EXPORT_SYMBOL(scsi_print_sense);
> -
> -#ifdef CONFIG_SCSI_CONSTANTS
> -
> -static const char * const hostbyte_table[]={
> -"DID_OK", "DID_NO_CONNECT", "DID_BUS_BUSY", "DID_TIME_OUT", "DID_BAD_TARGET",
> -"DID_ABORT", "DID_PARITY", "DID_ERROR", "DID_RESET", "DID_BAD_INTR",
> -"DID_PASSTHROUGH", "DID_SOFT_ERROR", "DID_IMM_RETRY", "DID_REQUEUE",
> -"DID_TRANSPORT_DISRUPTED", "DID_TRANSPORT_FAILFAST", "DID_TARGET_FAILURE",
> -"DID_NEXUS_FAILURE" };
> -#define NUM_HOSTBYTE_STRS ARRAY_SIZE(hostbyte_table)
> -
> -static const char * const driverbyte_table[]={
> -"DRIVER_OK", "DRIVER_BUSY", "DRIVER_SOFT",  "DRIVER_MEDIA", "DRIVER_ERROR",
> -"DRIVER_INVALID", "DRIVER_TIMEOUT", "DRIVER_HARD", "DRIVER_SENSE"};
> -#define NUM_DRIVERBYTE_STRS ARRAY_SIZE(driverbyte_table)
> -
> -void scsi_show_result(struct scsi_device *sdev, const char *name, int result)
> -{
> -	int hb = host_byte(result);
> -	int db = driver_byte(result);
> -	const char *hb_string;
> -	const char *db_string;
> -
> -	hb_string = (hb < NUM_HOSTBYTE_STRS) ? hostbyte_table[hb] : "invalid";
> -	db_string = (db < NUM_DRIVERBYTE_STRS) ?
> -		driverbyte_table[db] : "invalid";
> -
> -
> -	sdev_printk(KERN_INFO, sdev,
> -		    "[%s] Result: hostbyte=%s driverbyte=%s\n",
> -		    name, hb_string, db_string);
> -}
> -
> -#else
> -
> -void scsi_show_result(struct scsi_device *sdev, const char *name, int result)
> -{
> -	sdev_printk(KERN_INFO, sdev,
> -		    "[%s] Result: hostbyte=0x%02x driverbyte=0x%02x\n",
> -		    name, host_byte(result), driver_byte(result));
> -}
> -
> -#endif
> -EXPORT_SYMBOL(scsi_show_result);
> -
> -void scsi_print_result(struct scsi_cmnd *cmd)
> -{
> -	const char *devname = cmd->request->rq_disk ?
> -		cmd->request->rq_disk->disk_name : "scsi";
> -	scsi_show_result(cmd->device, devname, cmd->result);
> -}
> -EXPORT_SYMBOL(scsi_print_result);
> diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
> index 2bea4f0..6ffbc40 100644
> --- a/drivers/scsi/scsi_trace.c
> +++ b/drivers/scsi/scsi_trace.c
> @@ -19,6 +19,8 @@
>   #include <linux/trace_seq.h>
>   #include <trace/events/scsi.h>
>
> +#include <scsi/scsi_dbg.h>
> +
>   #define SERVICE_ACTION16(cdb) (cdb[1] & 0x1f)
>   #define SERVICE_ACTION32(cdb) ((cdb[8] << 8) | cdb[9])
>
> @@ -286,3 +288,17 @@ scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len)
>   		return scsi_trace_misc(p, cdb, len);
>   	}
>   }
> +
> +void scsi_show_result(struct scsi_device *sdev, const char *name, int result)
> +{
> +	trace_scsi_show_result(sdev, name, result);
> +}
> +EXPORT_SYMBOL(scsi_show_result);
> +
> +void scsi_print_result(struct scsi_cmnd *cmd)
> +{
> +	const char *devname = cmd->request->rq_disk ?
> +		cmd->request->rq_disk->disk_name : "scsi";
> +	scsi_show_result(cmd->device, devname, cmd->result);
> +}
> +EXPORT_SYMBOL(scsi_print_result);
> diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
> index 8aecdc2..0675195 100644
> --- a/include/trace/events/scsi.h
> +++ b/include/trace/events/scsi.h
> @@ -123,7 +123,11 @@
>   		scsi_hostbyte_name(DID_IMM_RETRY),		\
>   		scsi_hostbyte_name(DID_REQUEUE),		\
>   		scsi_hostbyte_name(DID_TRANSPORT_DISRUPTED),	\
> -		scsi_hostbyte_name(DID_TRANSPORT_FAILFAST))
> +		scsi_hostbyte_name(DID_TRANSPORT_FAILFAST),	\
> +		scsi_hostbyte_name(DID_TARGET_FAILURE),		\
> +		scsi_hostbyte_name(DID_NEXUS_FAILURE),		\
> +		scsi_hostbyte_name(DID_ALLOC_FAILURE),		\
> +		scsi_hostbyte_name(DID_MEDIUM_ERROR))
>
>   #define scsi_driverbyte_name(result)	{ result, #result }
>   #define show_driverbyte_name(val)				\
> @@ -359,6 +363,38 @@ TRACE_EVENT(scsi_eh_wakeup,
>   	TP_printk("host_no=%u", __entry->host_no)
>   );
>
> +TRACE_EVENT(scsi_show_result,
> +
> +	TP_PROTO(struct scsi_device *sdev, const char *devname, int result),
> +
> +	TP_ARGS(sdev, devname, result),
> +
> +	TP_STRUCT__entry(
> +		__field( unsigned int,	host_no	)
> +		__field( unsigned int,	channel	)
> +		__field( unsigned int,	id	)
> +		__field( unsigned int,	lun	)
> +		__string(devname,	devname	)
> +		__field( int,		result	)
> +	),
> +
> +	TP_fast_assign(
> +		__entry->host_no	= sdev->host->host_no;
> +		__entry->channel	= sdev->channel;
> +		__entry->id		= sdev->id;
> +		__entry->lun		= sdev->lun;
> +		__assign_str(devname, devname);
> +		__entry->result		= result;
> +	),
> +
> +	TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] result=(driver=%s "\
> +		  "host=%s)",
> +		  __entry->host_no, __entry->channel, __entry->id, __entry->lun,
> +		  __get_str(devname),
> +		  show_driverbyte_name(driver_byte(__entry->result)),
> +		  show_hostbyte_name(host_byte(__entry->result)))
> +);
> +
>   #endif /*  _TRACE_SCSI_H */
>
>   /* This part must be outside protection */
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
Hmm.
I'm not sure this is the correct way.
Currently we have quite some code duplication in scsi_trace.c and 
constants.c, correct.
So I definitely would like to see them both merged.

But constants.c is influenced by CONFIG_SCSI_CONSTANTS, whereas
scsi_trace isn't, and the functions in constants.c are used 
throughout the scsi stack.
So I'd rather see to have scsi_trace to be updated to use the 
functions from constants.c, and remove the duplicate code in
scsi_trace.

At a later step we should be working on removing/replacing existing 
logging code in the SCSI stack with trace points, but that should be
reserved for a separate patchset.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

Re: Re: [RFC PATCH 07/10] scsi/trace: Use scsi_show_result trace point instead of printk

[Yoshihiro YUNOMAE]

(2014/08/27 23:12), Hannes Reinecke wrote:
> On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
>> Current SCSI trace has hostbyte table and driverbyte table, so we
>> don't need to
>> have the same table in scsi/constants.c.
>>
>> - Result examples
>>
>> <Before> (printk)
>> sd 2:0:0:0: [sda] Result: hostbyte=DID_OK driverbyte=DRIVER_SENSE
>>
>> <After> (ftrace)
>> scsi_show_result: host_no=2 channel=0 id=0 lun=0 [sda]
>> result=(driver=DRIVER_SENSE host=DID_OK)
>>
>> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
>> Cc: Hannes Reinecke <hare@suse.de>
>> Cc: Doug Gilbert <dgilbert@interlog.com>
>> Cc: Martin K. Petersen <martin.petersen@oracle.com>
>> Cc: Christoph Hellwig <hch@lst.de>
>> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
>> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
>> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
>> ---
>>   drivers/scsi/constants.c    |   52
>> -------------------------------------------
>>   drivers/scsi/scsi_trace.c   |   16 +++++++++++++
>>   include/trace/events/scsi.h |   38 +++++++++++++++++++++++++++++++
>>   3 files changed, 53 insertions(+), 53 deletions(-)
>>
>> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
>> index 6fad6b4..f7b7f32 100644
>> --- a/drivers/scsi/constants.c
>> +++ b/drivers/scsi/constants.c
>> @@ -1488,55 +1488,3 @@ void scsi_print_sense(struct scsi_cmnd *cmd)
>>                  SCSI_SENSE_BUFFERSIZE);
>>   }
>>   EXPORT_SYMBOL(scsi_print_sense);
>> -
>> -#ifdef CONFIG_SCSI_CONSTANTS
>> -
>> -static const char * const hostbyte_table[]={
>> -"DID_OK", "DID_NO_CONNECT", "DID_BUS_BUSY", "DID_TIME_OUT",
>> "DID_BAD_TARGET",
>> -"DID_ABORT", "DID_PARITY", "DID_ERROR", "DID_RESET", "DID_BAD_INTR",
>> -"DID_PASSTHROUGH", "DID_SOFT_ERROR", "DID_IMM_RETRY", "DID_REQUEUE",
>> -"DID_TRANSPORT_DISRUPTED", "DID_TRANSPORT_FAILFAST",
>> "DID_TARGET_FAILURE",
>> -"DID_NEXUS_FAILURE" };
>> -#define NUM_HOSTBYTE_STRS ARRAY_SIZE(hostbyte_table)
>> -
>> -static const char * const driverbyte_table[]={
>> -"DRIVER_OK", "DRIVER_BUSY", "DRIVER_SOFT",  "DRIVER_MEDIA",
>> "DRIVER_ERROR",
>> -"DRIVER_INVALID", "DRIVER_TIMEOUT", "DRIVER_HARD", "DRIVER_SENSE"};
>> -#define NUM_DRIVERBYTE_STRS ARRAY_SIZE(driverbyte_table)
>> -
>> -void scsi_show_result(struct scsi_device *sdev, const char *name, int
>> result)
>> -{
>> -    int hb = host_byte(result);
>> -    int db = driver_byte(result);
>> -    const char *hb_string;
>> -    const char *db_string;
>> -
>> -    hb_string = (hb < NUM_HOSTBYTE_STRS) ? hostbyte_table[hb] :
>> "invalid";
>> -    db_string = (db < NUM_DRIVERBYTE_STRS) ?
>> -        driverbyte_table[db] : "invalid";
>> -
>> -
>> -    sdev_printk(KERN_INFO, sdev,
>> -            "[%s] Result: hostbyte=%s driverbyte=%s\n",
>> -            name, hb_string, db_string);
>> -}
>> -
>> -#else
>> -
>> -void scsi_show_result(struct scsi_device *sdev, const char *name, int
>> result)
>> -{
>> -    sdev_printk(KERN_INFO, sdev,
>> -            "[%s] Result: hostbyte=0x%02x driverbyte=0x%02x\n",
>> -            name, host_byte(result), driver_byte(result));
>> -}
>> -
>> -#endif
>> -EXPORT_SYMBOL(scsi_show_result);
>> -
>> -void scsi_print_result(struct scsi_cmnd *cmd)
>> -{
>> -    const char *devname = cmd->request->rq_disk ?
>> -        cmd->request->rq_disk->disk_name : "scsi";
>> -    scsi_show_result(cmd->device, devname, cmd->result);
>> -}
>> -EXPORT_SYMBOL(scsi_print_result);
>> diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
>> index 2bea4f0..6ffbc40 100644
>> --- a/drivers/scsi/scsi_trace.c
>> +++ b/drivers/scsi/scsi_trace.c
>> @@ -19,6 +19,8 @@
>>   #include <linux/trace_seq.h>
>>   #include <trace/events/scsi.h>
>>
>> +#include <scsi/scsi_dbg.h>
>> +
>>   #define SERVICE_ACTION16(cdb) (cdb[1] & 0x1f)
>>   #define SERVICE_ACTION32(cdb) ((cdb[8] << 8) | cdb[9])
>>
>> @@ -286,3 +288,17 @@ scsi_trace_parse_cdb(struct trace_seq *p,
>> unsigned char *cdb, int len)
>>           return scsi_trace_misc(p, cdb, len);
>>       }
>>   }
>> +
>> +void scsi_show_result(struct scsi_device *sdev, const char *name, int
>> result)
>> +{
>> +    trace_scsi_show_result(sdev, name, result);
>> +}
>> +EXPORT_SYMBOL(scsi_show_result);
>> +
>> +void scsi_print_result(struct scsi_cmnd *cmd)
>> +{
>> +    const char *devname = cmd->request->rq_disk ?
>> +        cmd->request->rq_disk->disk_name : "scsi";
>> +    scsi_show_result(cmd->device, devname, cmd->result);
>> +}
>> +EXPORT_SYMBOL(scsi_print_result);
>> diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
>> index 8aecdc2..0675195 100644
>> --- a/include/trace/events/scsi.h
>> +++ b/include/trace/events/scsi.h
>> @@ -123,7 +123,11 @@
>>           scsi_hostbyte_name(DID_IMM_RETRY),        \
>>           scsi_hostbyte_name(DID_REQUEUE),        \
>>           scsi_hostbyte_name(DID_TRANSPORT_DISRUPTED),    \
>> -        scsi_hostbyte_name(DID_TRANSPORT_FAILFAST))
>> +        scsi_hostbyte_name(DID_TRANSPORT_FAILFAST),    \
>> +        scsi_hostbyte_name(DID_TARGET_FAILURE),        \
>> +        scsi_hostbyte_name(DID_NEXUS_FAILURE),        \
>> +        scsi_hostbyte_name(DID_ALLOC_FAILURE),        \
>> +        scsi_hostbyte_name(DID_MEDIUM_ERROR))
>>
>>   #define scsi_driverbyte_name(result)    { result, #result }
>>   #define show_driverbyte_name(val)                \
>> @@ -359,6 +363,38 @@ TRACE_EVENT(scsi_eh_wakeup,
>>       TP_printk("host_no=%u", __entry->host_no)
>>   );
>>
>> +TRACE_EVENT(scsi_show_result,
>> +
>> +    TP_PROTO(struct scsi_device *sdev, const char *devname, int result),
>> +
>> +    TP_ARGS(sdev, devname, result),
>> +
>> +    TP_STRUCT__entry(
>> +        __field( unsigned int,    host_no    )
>> +        __field( unsigned int,    channel    )
>> +        __field( unsigned int,    id    )
>> +        __field( unsigned int,    lun    )
>> +        __string(devname,    devname    )
>> +        __field( int,        result    )
>> +    ),
>> +
>> +    TP_fast_assign(
>> +        __entry->host_no    = sdev->host->host_no;
>> +        __entry->channel    = sdev->channel;
>> +        __entry->id        = sdev->id;
>> +        __entry->lun        = sdev->lun;
>> +        __assign_str(devname, devname);
>> +        __entry->result        = result;
>> +    ),
>> +
>> +    TP_printk("host_no=%u channel=%u id=%u lun=%u [%s]
>> result=(driver=%s "\
>> +          "host=%s)",
>> +          __entry->host_no, __entry->channel, __entry->id, __entry->lun,
>> +          __get_str(devname),
>> +          show_driverbyte_name(driver_byte(__entry->result)),
>> +          show_hostbyte_name(host_byte(__entry->result)))
>> +);
>> +
>>   #endif /*  _TRACE_SCSI_H */
>>
>>   /* This part must be outside protection */
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>
> Hmm.
> I'm not sure this is the correct way.
> Currently we have quite some code duplication in scsi_trace.c and
> constants.c, correct.
> So I definitely would like to see them both merged.
>
> But constants.c is influenced by CONFIG_SCSI_CONSTANTS, whereas
> scsi_trace isn't, and the functions in constants.c are used throughout
> the scsi stack.
> So I'd rather see to have scsi_trace to be updated to use the functions
> from constants.c, and remove the duplicate code in
> scsi_trace.

Sure. We'll use decoder in constants.c.
We need to support raw output format for existing traceevents.

> At a later step we should be working on removing/replacing existing
> logging code in the SCSI stack with trace points, but that should be
> reserved for a separate patchset.

OK, I'll create a patch replacing existing decoder first, then
I'll add new traceevents.

Thanks,
Yoshihiro YUNOMAE

-- 
Yoshihiro YUNOMAE
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: yoshihiro.yunomae.ez@hitachi.com

Re: [RFC PATCH 07/10] scsi/trace: Use scsi_show_result trace point instead of printk

[Christoph Hellwig]

> I'm not sure this is the correct way.
> Currently we have quite some code duplication in scsi_trace.c and 
> constants.c, correct.
> So I definitely would like to see them both merged.
>
> But constants.c is influenced by CONFIG_SCSI_CONSTANTS, whereas
> scsi_trace isn't, and the functions in constants.c are used throughout the 
> scsi stack.
> So I'd rather see to have scsi_trace to be updated to use the functions 
> from constants.c, and remove the duplicate code in
> scsi_trace.

The tracepoints need to use the magic print_flags & co helpers so that
output works properly if using the binary tracebuffer and user space tools that
decoded it (e.g. trace-cmd or perf), so using a kernel function for decoding is
not an option.

But we can make these tracepoints dependent on CONFIG_SCSI_CONSTANTS to
still allow building lighter kernels if we really care about it.

Re: Re: [RFC PATCH 07/10] scsi/trace: Use scsi_show_result trace point instead of printk

[Yoshihiro YUNOMAE]

Hi Christoph,

Sorry for the late reply.

(2014/08/29 9:50), Christoph Hellwig wrote:
>> I'm not sure this is the correct way.
>> Currently we have quite some code duplication in scsi_trace.c and
>> constants.c, correct.
>> So I definitely would like to see them both merged.
>>
>> But constants.c is influenced by CONFIG_SCSI_CONSTANTS, whereas
>> scsi_trace isn't, and the functions in constants.c are used throughout the
>> scsi stack.
>> So I'd rather see to have scsi_trace to be updated to use the functions
>> from constants.c, and remove the duplicate code in
>> scsi_trace.
>
> The tracepoints need to use the magic print_flags & co helpers so that
> output works properly if using the binary tracebuffer and user space tools that
> decoded it (e.g. trace-cmd or perf), so using a kernel function for decoding is
> not an option.

Ah, I see.
The "format" files in SCSI traceevents output decoders, so we don't
need to implement own decoders in userland.

I think the current problem is duplicated decoders, so we'll
consolidate those. If we use decoders in constants.c, the decoders are
not output in format file, so user tools cannot decode the binary.
On the other hand, if we use decoders in scsi_trace.c, the output format
of command names is changed and there are unsupported command names.

We would use decoders in scsi_trace.c and add new command names to
decoders in scsi_trace.c, I think.
How do you think about this? Hannes?


As another topic, we found that we cannot decode SCSI traceevents by
using current decoder in format files. For example, format file of
scsi_dispatch_cmd_timeout outputs prot_op as follows:

__print_symbolic(REC->prot_op, { SCSI_PROT_NORMAL, "SCSI_PROT_NORMAL" }, 
{ SCSI_PROT_READ_INSERT, "SCSI_PROT_READ_INSERT" }, { 
SCSI_PROT_WRITE_STRIP, "SCSI_PROT_WRITE_STRIP" }, { 
SCSI_PROT_READ_STRIP, "SCSI_PROT_READ_STRIP" }, { 
SCSI_PROT_WRITE_INSERT, "SCSI_PROT_WRITE_INSERT" }, { 
SCSI_PROT_READ_PASS, "SCSI_PROT_READ_PASS" }, { SCSI_PROT_WRITE_PASS, 
"SCSI_PROT_WRITE_PASS" })

Decoding will fail to do macro expansion here, so we need to fix this.
(We don't use enum for traceevents.)

Thanks,
Yoshihiro YUNOMAE

> But we can make these tracepoints dependent on CONFIG_SCSI_CONSTANTS to
> still allow building lighter kernels if we really care about it.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

-- 
Yoshihiro YUNOMAE
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: yoshihiro.yunomae.ez@hitachi.com

[RFC PATCH 08/10] scsi/trace: Use scsi_print_sense trace point instead of printk

[Yoshihiro YUNOMAE]

Previous sense messages can be mixed into other sense messages,
because continuous printk (KERN_CONT) was used. To avoid the problem,
patch d87f3a6f51 introduced a local buffer in Hannes's baranch (*1).
But using local buffers can induce stack overflow, so we want to solve the
problem without local buffer if possible.

trace_seq_printf can add log messages without local buffer, so we use it.

(*1) http://git.kernel.org/cgit/linux/kernel/git/hare/scsi-devel.git/log/?h=logging

- Result examples

<Before> (printk)
sd 2:0:0:0: [sda] Sense Key : Medium Error [current]

<After> (ftrace)
scsi_print_sense: host_no=2 channel=0 id=0 lun=0 [sda] Sense Key (Medium Error [current])

Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Doug Gilbert <dgilbert@interlog.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
 drivers/scsi/constants.c    |  145 ++-----------------------------------------
 drivers/scsi/scsi_trace.c   |  140 ++++++++++++++++++++++++++++++++++++++++--
 include/scsi/scsi_eh.h      |    7 ++
 include/trace/events/scsi.h |   48 ++++++++++++++
 4 files changed, 195 insertions(+), 145 deletions(-)

diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index f7b7f32..85b75c8 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -19,7 +19,7 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_dbg.h>
 
-
+#include <trace/events/scsi.h>
 
 /* Commands with service actions that change the command name */
 #define SERVICE_ACTION_IN_12 0xab
@@ -1267,58 +1267,8 @@ static const struct error_info2 additional2[] =
 	{0x70, 0x00, 0xff, "Decompression exception short algorithm id of %x"},
 	{0, 0, 0, NULL}
 };
-
-/* description of the sense key values */
-static const char * const snstext[] = {
-	"No Sense",	    /* 0: There is no sense information */
-	"Recovered Error",  /* 1: The last command completed successfully
-				  but used error correction */
-	"Not Ready",	    /* 2: The addressed target is not ready */
-	"Medium Error",	    /* 3: Data error detected on the medium */
-	"Hardware Error",   /* 4: Controller or device failure */
-	"Illegal Request",  /* 5: Error in request */
-	"Unit Attention",   /* 6: Removable medium was changed, or
-				  the target has been reset, or ... */
-	"Data Protect",	    /* 7: Access to the data is blocked */
-	"Blank Check",	    /* 8: Reached unexpected written or unwritten
-				  region of the medium */
-	"Vendor Specific(9)",
-	"Copy Aborted",	    /* A: COPY or COMPARE was aborted */
-	"Aborted Command",  /* B: The target aborted the command */
-	"Equal",	    /* C: A SEARCH DATA command found data equal,
-				  reserved in SPC-4 rev 36 */
-	"Volume Overflow",  /* D: Medium full with still data to be written */
-	"Miscompare",	    /* E: Source data and data on the medium
-				  do not agree */
-	"Completed",	    /* F: command completed sense data reported,
-				  may occur for successful command */
-};
-#else
-static const char * const snstext[] = {
-	"0x0", "0x1", "0x2", "0x3", "0x4", "0x5", "0x6", "0x7",
-	"0x8", "0x9", "0xa", "0xb", "0xc", "0xd", "0xe", "0xf",
-};
 #endif
 
-/* Get sense key string or NULL if not available */
-const char *
-scsi_sense_key_string(unsigned char key) {
-	return snstext[key & 0xf];
-}
-EXPORT_SYMBOL(scsi_sense_key_string);
-
-const char *
-scsi_sense_type_string(struct scsi_sense_hdr *sshdr)
-{
-	return scsi_sense_is_deferred(sshdr) ? "[deferred]" : "[current]";
-}
-
-const char *
-scsi_sense_format_string(struct scsi_sense_hdr *sshdr)
-{
-	return sshdr->response_code >= 0x72 ? "[descriptor]" : "";
-}
-
 /*
  * Get additional sense code string or NULL if not available.
  * This string may contain a "%x" and should be printed with ascq as arg.
@@ -1375,105 +1325,22 @@ void
 scsi_print_sense_hdr(struct scsi_device *sdev, const char *name,
 		     struct scsi_sense_hdr *sshdr)
 {
-	sdev_printk(KERN_INFO, sdev, "[%s] Sense Key : %s %s%s\n", name,
-		    scsi_sense_key_string(sshdr->sense_key),
-		    scsi_sense_type_string(sshdr),
-		    scsi_sense_format_string(sshdr));
+	trace_scsi_print_sense(sdev, name, sshdr, NULL, 0, 0);
 	scsi_show_extd_sense(sdev, name, sshdr->asc, sshdr->ascq);
 }
 EXPORT_SYMBOL(scsi_print_sense_hdr);
 
-static void
-scsi_dump_sense_buffer(struct scsi_device *sdev, const char *prefix,
-		       const unsigned char *sense_buffer, int sense_len)
-{
-	char linebuf[128];
-	int i, linelen, remaining;
-
-	if (sense_len < 32)
-		sense_len = 32;
-
-	remaining = sense_len;
-	for (i = 0; i < sense_len; i += 16) {
-		linelen = min(remaining, 16);
-		remaining -= 16;
-
-		hex_dump_to_buffer(sense_buffer + i, linelen, 16, 1,
-				   linebuf, sizeof(linebuf), false);
-	}
-	sdev_printk(KERN_INFO, sdev,
-		    "[%s] Unrecognized sense data (in hex): %s",
-		    prefix, linebuf);
-}
-
-static void
-scsi_decode_sense_extras(struct scsi_device *sdev, const char *name,
-			 const unsigned char *sense_buffer, int sense_len)
-{
-	int res, sense_flags = 0, fixed_valid = 0;
-	u64 info = 0;
-	char buff[80];
-	int blen;
-
-	if ((sense_buffer[0] & 0x80) < 0x72) {
-		/* decode extras for "fixed" format */
-		fixed_valid = sense_buffer[0] & 0x80;
-		info = get_unaligned_be32(&sense_buffer[3]);
-		sense_flags = sense_buffer[2];
-	} else if (sense_buffer[7] > 0) {
-		const u8 *ucp;
-
-		/* descriptor format with sense descriptors */
-		ucp = scsi_sense_desc_find(sense_buffer, sense_len, 0);
-		if (ucp) {
-			fixed_valid = ucp[2] & 0x80;
-			if (fixed_valid)
-				info = get_unaligned_be64(&ucp[4]);
-		}
-		ucp = scsi_sense_desc_find(sense_buffer, sense_len, 4);
-		if (ucp)
-			sense_flags |= ucp[3] & 0xe0;
-	}
-
-	if (!sense_flags && !fixed_valid)
-		return;
-
-	res = 0;
-	memset(buff, 0, sizeof(buff));
-	blen = sizeof(buff) - 1;
-	if (fixed_valid)
-		res += snprintf(buff + res, blen - res,
-				"Info fld=0x%llx, ", info);
-	if (sense_flags)
-		res += snprintf(buff + res, blen - res, "%s%s%s",
-				sense_flags & SENSE_FMK ? "FMK, " : "",
-				sense_flags & SENSE_EOM ? "EOM, " : "",
-				sense_flags & SENSE_ILI ? "ILI, " : "");
-	if (res) {
-		res -= 2;
-		buff[res] = '\0';
-	}
-
-	sdev_printk(KERN_INFO, sdev, "[%s] %s\n", name, buff);
-}
-
 /* Normalize and print sense buffer with name prefix */
 void __scsi_print_sense(struct scsi_device *sdev, const char *name,
 			const unsigned char *sense_buffer, int sense_len)
 {
 	struct scsi_sense_hdr sshdr;
+	int raw;
 
-	if (!scsi_normalize_sense(sense_buffer, sense_len, &sshdr)) {
-		/* this may be SCSI-1 sense data */
-		scsi_dump_sense_buffer(sdev, name, sense_buffer, sense_len);
-		return;
-	}
+	raw = !scsi_normalize_sense(sense_buffer, sense_len, &sshdr);
 
-	sdev_printk(KERN_INFO, sdev, "[%s] Sense Key : %s %s%s\n", name,
-	       scsi_sense_key_string(sshdr.sense_key),
-	       scsi_sense_type_string(&sshdr),
-	       scsi_sense_format_string(&sshdr));
-	scsi_decode_sense_extras(sdev, name, sense_buffer, sense_len);
+	trace_scsi_print_sense(sdev, name, &sshdr, sense_buffer, sense_len,
+			       raw);
 	scsi_show_extd_sense(sdev, name, sshdr.asc, sshdr.ascq);
 }
 EXPORT_SYMBOL(__scsi_print_sense);
diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
index 6ffbc40..2ecb1dc 100644
--- a/drivers/scsi/scsi_trace.c
+++ b/drivers/scsi/scsi_trace.c
@@ -17,15 +17,16 @@
  */
 #include <linux/kernel.h>
 #include <linux/trace_seq.h>
+#include <asm/unaligned.h>
 #include <trace/events/scsi.h>
 
 #include <scsi/scsi_dbg.h>
+#include <scsi/scsi_eh.h>
 
 #define SERVICE_ACTION16(cdb) (cdb[1] & 0x1f)
 #define SERVICE_ACTION32(cdb) ((cdb[8] << 8) | cdb[9])
 
-static const char *
-scsi_trace_misc(struct trace_seq *, unsigned char *, int);
+static const char *scsi_trace_misc(struct trace_seq *);
 
 static const char *
 scsi_trace_rw6(struct trace_seq *p, unsigned char *cdb, int len)
@@ -242,12 +243,12 @@ scsi_trace_varlen(struct trace_seq *p, unsigned char *cdb, int len)
 	case WRITE_SAME_32:
 		return scsi_trace_rw32(p, cdb, len);
 	default:
-		return scsi_trace_misc(p, cdb, len);
+		return scsi_trace_misc(p);
 	}
 }
 
 static const char *
-scsi_trace_misc(struct trace_seq *p, unsigned char *cdb, int len)
+scsi_trace_misc(struct trace_seq *p)
 {
 	const char *ret = p->buffer + p->len;
 
@@ -285,10 +286,139 @@ scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len)
 	case VARIABLE_LENGTH_CMD:
 		return scsi_trace_varlen(p, cdb, len);
 	default:
-		return scsi_trace_misc(p, cdb, len);
+		return scsi_trace_misc(p);
 	}
 }
 
+#ifdef CONFIG_SCSI_CONSTANTS
+/* description of the sense key values */
+static const char * const snstext[] = {
+	"No Sense",	    /* 0: There is no sense information */
+	"Recovered Error",  /* 1: The last command completed successfully
+				  but used error correction */
+	"Not Ready",	    /* 2: The addressed target is not ready */
+	"Medium Error",	    /* 3: Data error detected on the medium */
+	"Hardware Error",   /* 4: Controller or device failure */
+	"Illegal Request",  /* 5: Error in request */
+	"Unit Attention",   /* 6: Removable medium was changed, or
+				  the target has been reset, or ... */
+	"Data Protect",	    /* 7: Access to the data is blocked */
+	"Blank Check",	    /* 8: Reached unexpected written or unwritten
+				  region of the medium */
+	"Vendor Specific(9)",
+	"Copy Aborted",	    /* A: COPY or COMPARE was aborted */
+	"Aborted Command",  /* B: The target aborted the command */
+	"Equal",	    /* C: A SEARCH DATA command found data equal,
+				  reserved in SPC-4 rev 36 */
+	"Volume Overflow",  /* D: Medium full with still data to be written */
+	"Miscompare",	    /* E: Source data and data on the medium
+				  do not agree */
+	"Completed",	    /* F: command completed sense data reported,
+				  may occur for successful command */
+};
+#else
+static const char * const snstext[] = {
+	"0x0", "0x1", "0x2", "0x3", "0x4", "0x5", "0x6", "0x7",
+	"0x8", "0x9", "0xa", "0xb", "0xc", "0xd", "0xe", "0xf",
+};
+#endif
+
+/* Get sense key string or NULL if not available */
+const char *
+scsi_sense_key_string(unsigned char key) {
+	return snstext[key & 0xf];
+}
+EXPORT_SYMBOL(scsi_sense_key_string);
+
+static const char *
+scsi_sense_type_string(u8 res_code)
+{
+	return __scsi_sense_is_deferred(res_code) ? "[deferred]" : "[current]";
+}
+
+static const char *
+scsi_sense_format_string(u8 res_code)
+{
+	return res_code >= 0x72 ? "[descriptor]" : "";
+}
+
+static const char *
+scsi_dump_sense_buffer(struct trace_seq *p, const unsigned char *buf, int len)
+{
+	const char *ret = p->buffer + p->len;
+	int i;
+
+	if (!buf || !len)
+		return scsi_trace_misc(p);
+
+	if (len < 32)
+		len = 32;
+
+	trace_seq_printf(p, "Unrecognized sense data (in hex)");
+	for (i = 0; i < len; i += 16)
+		trace_seq_printf(p, " %02x", buf[i]);
+
+	trace_seq_putc(p, 0);
+	return ret;
+}
+
+const char *
+scsi_trace_decode_sense_extras(struct trace_seq *p, u8 sense_key, u8 res_code,
+			       const unsigned char *buf, int len, int raw)
+{
+	const char *ret = p->buffer + p->len;
+	int sense_flags = 0, fixed_valid = 0;
+	u64 info = 0;
+
+	if (raw)
+		/* this may be SCSI-1 sense data */
+		return scsi_dump_sense_buffer(p, buf, len);
+
+	trace_seq_printf(p, "Sense Key (%s %s%s",
+			 scsi_sense_key_string(sense_key),
+			 scsi_sense_type_string(res_code),
+			 scsi_sense_format_string(res_code));
+
+	if (!buf || !len)
+		goto out;
+
+	if ((buf[0] & 0x80) < 0x72) {
+		/* decode extras for "fixed" format */
+		fixed_valid = buf[0] & 0x80;
+		info = get_unaligned_be32(&buf[3]);
+		sense_flags = buf[2];
+	} else if (buf[7] > 0) {
+		const u8 *ucp;
+
+		/* descriptor format with sense descriptors */
+		ucp = scsi_sense_desc_find(buf, len, 0);
+		if (ucp) {
+			fixed_valid = ucp[2] & 0x80;
+			if (fixed_valid)
+				info = get_unaligned_be64(&ucp[4]);
+		}
+		ucp = scsi_sense_desc_find(buf, len, 4);
+		if (ucp)
+			sense_flags |= ucp[3] & 0xe0;
+	}
+
+	if (!sense_flags && !fixed_valid)
+		goto out;
+
+	if (fixed_valid)
+		trace_seq_printf(p, " Info fld=0x%llx", info);
+	if (sense_flags)
+		trace_seq_printf(p, " %s%s%s",
+				sense_flags & SENSE_FMK ? "FMK" : "",
+				sense_flags & SENSE_EOM ? "EOM" : "",
+				sense_flags & SENSE_ILI ? "ILI" : "");
+
+out:
+	trace_seq_printf(p, ")");
+	trace_seq_putc(p, 0);
+	return ret;
+}
+
 void scsi_show_result(struct scsi_device *sdev, const char *name, int result)
 {
 	trace_scsi_show_result(sdev, name, result);
diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h
index 06a8790..0e6d28c 100644
--- a/include/scsi/scsi_eh.h
+++ b/include/scsi/scsi_eh.h
@@ -47,9 +47,14 @@ extern int scsi_normalize_sense(const u8 *sense_buffer, int sb_len,
 extern int scsi_command_normalize_sense(struct scsi_cmnd *cmd,
 		struct scsi_sense_hdr *sshdr);
 
+static inline int __scsi_sense_is_deferred(u8 response_code)
+{
+	return ((response_code >= 0x70) && (response_code & 1));
+}
+
 static inline int scsi_sense_is_deferred(struct scsi_sense_hdr *sshdr)
 {
-	return ((sshdr->response_code >= 0x70) && (sshdr->response_code & 1));
+	return __scsi_sense_is_deferred(sshdr->response_code);
 }
 
 extern const u8 * scsi_sense_desc_find(const u8 * sense_buffer, int sb_len,
diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
index 0675195..572aa65 100644
--- a/include/trace/events/scsi.h
+++ b/include/trace/events/scsi.h
@@ -395,6 +395,54 @@ TRACE_EVENT(scsi_show_result,
 		  show_hostbyte_name(host_byte(__entry->result)))
 );
 
+const char *scsi_trace_decode_sense_extras(struct trace_seq*, u8, u8,
+					   const unsigned char*, int, int);
+#define __decode_extras(sense_key, res_code, buf, len, raw) \
+	scsi_trace_decode_sense_extras(p, sense_key, res_code, buf, len, raw)
+
+TRACE_EVENT(scsi_print_sense,
+
+	TP_PROTO(struct scsi_device *sdev, const char *devname,
+		 struct scsi_sense_hdr *sshdr,
+		 const unsigned char *sense_buffer, int sense_len, int raw),
+
+	TP_ARGS(sdev, devname, sshdr, sense_buffer, sense_len, raw),
+
+	TP_STRUCT__entry(
+		__field( unsigned int,		host_no		)
+		__field( unsigned int,		channel		)
+		__field( unsigned int,		id		)
+		__field( unsigned int,		lun		)
+		__string(devname,		devname		)
+		__field( u8,			sense_key	)
+		__field( u8,			res_code	)
+		__dynamic_array(unsigned char,	sense_buffer, sense_len)
+		__field( u8,			asc		)
+		__field( u8,			ascq		)
+		__field( int,			sense_len	)
+		__field( int,			raw		)
+	),
+
+	TP_fast_assign(
+		__entry->host_no	= sdev->host->host_no;
+		__entry->channel	= sdev->channel;
+		__entry->id		= sdev->id;
+		__entry->lun		= sdev->lun;
+		__assign_str(devname, devname);
+		__entry->sense_key	= sshdr->sense_key;
+		__entry->res_code	= sshdr->response_code;
+		memcpy(__get_dynamic_array(sense_buffer), sense_buffer,
+		       sense_len);
+		__entry->sense_len	= sense_len;
+		__entry->raw		= raw;
+	),
+
+	TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] %s",
+		  __entry->host_no, __entry->channel, __entry->id, __entry->lun,
+		  __get_str(devname), __decode_extras(__entry->sense_key,
+		  __entry->res_code, __get_dynamic_array(sense_buffer),
+		  __entry->sense_len,  __entry->raw))
+);
 #endif /*  _TRACE_SCSI_H */
 
 /* This part must be outside protection */

Re: [RFC PATCH 08/10] scsi/trace: Use scsi_print_sense trace point instead of printk

[Hannes Reinecke]

On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
> Previous sense messages can be mixed into other sense messages,
> because continuous printk (KERN_CONT) was used. To avoid the problem,
> patch d87f3a6f51 introduced a local buffer in Hannes's baranch (*1).
> But using local buffers can induce stack overflow, so we want to solve the
> problem without local buffer if possible.
>
> trace_seq_printf can add log messages without local buffer, so we use it.
>
> (*1) http://git.kernel.org/cgit/linux/kernel/git/hare/scsi-devel.git/log/?h=logging
>
> - Result examples
>
> <Before> (printk)
> sd 2:0:0:0: [sda] Sense Key : Medium Error [current]
>
> <After> (ftrace)
> scsi_print_sense: host_no=2 channel=0 id=0 lun=0 [sda] Sense Key (Medium Error [current])
>
> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Doug Gilbert <dgilbert@interlog.com>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>   drivers/scsi/constants.c    |  145 ++-----------------------------------------
>   drivers/scsi/scsi_trace.c   |  140 ++++++++++++++++++++++++++++++++++++++++--
>   include/scsi/scsi_eh.h      |    7 ++
>   include/trace/events/scsi.h |   48 ++++++++++++++
>   4 files changed, 195 insertions(+), 145 deletions(-)
>
> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
> index f7b7f32..85b75c8 100644
> --- a/drivers/scsi/constants.c
> +++ b/drivers/scsi/constants.c
> @@ -19,7 +19,7 @@
>   #include <scsi/scsi_eh.h>
>   #include <scsi/scsi_dbg.h>
>
> -
> +#include <trace/events/scsi.h>
>
>   /* Commands with service actions that change the command name */
>   #define SERVICE_ACTION_IN_12 0xab
> @@ -1267,58 +1267,8 @@ static const struct error_info2 additional2[] =
>   	{0x70, 0x00, 0xff, "Decompression exception short algorithm id of %x"},
>   	{0, 0, 0, NULL}
>   };
> -
> -/* description of the sense key values */
> -static const char * const snstext[] = {
> -	"No Sense",	    /* 0: There is no sense information */
> -	"Recovered Error",  /* 1: The last command completed successfully
> -				  but used error correction */
> -	"Not Ready",	    /* 2: The addressed target is not ready */
> -	"Medium Error",	    /* 3: Data error detected on the medium */
> -	"Hardware Error",   /* 4: Controller or device failure */
> -	"Illegal Request",  /* 5: Error in request */
> -	"Unit Attention",   /* 6: Removable medium was changed, or
> -				  the target has been reset, or ... */
> -	"Data Protect",	    /* 7: Access to the data is blocked */
> -	"Blank Check",	    /* 8: Reached unexpected written or unwritten
> -				  region of the medium */
> -	"Vendor Specific(9)",
> -	"Copy Aborted",	    /* A: COPY or COMPARE was aborted */
> -	"Aborted Command",  /* B: The target aborted the command */
> -	"Equal",	    /* C: A SEARCH DATA command found data equal,
> -				  reserved in SPC-4 rev 36 */
> -	"Volume Overflow",  /* D: Medium full with still data to be written */
> -	"Miscompare",	    /* E: Source data and data on the medium
> -				  do not agree */
> -	"Completed",	    /* F: command completed sense data reported,
> -				  may occur for successful command */
> -};
> -#else
> -static const char * const snstext[] = {
> -	"0x0", "0x1", "0x2", "0x3", "0x4", "0x5", "0x6", "0x7",
> -	"0x8", "0x9", "0xa", "0xb", "0xc", "0xd", "0xe", "0xf",
> -};
>   #endif
>
> -/* Get sense key string or NULL if not available */
> -const char *
> -scsi_sense_key_string(unsigned char key) {
> -	return snstext[key & 0xf];
> -}
> -EXPORT_SYMBOL(scsi_sense_key_string);
> -
> -const char *
> -scsi_sense_type_string(struct scsi_sense_hdr *sshdr)
> -{
> -	return scsi_sense_is_deferred(sshdr) ? "[deferred]" : "[current]";
> -}
> -
> -const char *
> -scsi_sense_format_string(struct scsi_sense_hdr *sshdr)
> -{
> -	return sshdr->response_code >= 0x72 ? "[descriptor]" : "";
> -}
> -
>   /*
>    * Get additional sense code string or NULL if not available.
>    * This string may contain a "%x" and should be printed with ascq as arg.
> @@ -1375,105 +1325,22 @@ void
>   scsi_print_sense_hdr(struct scsi_device *sdev, const char *name,
>   		     struct scsi_sense_hdr *sshdr)
>   {
> -	sdev_printk(KERN_INFO, sdev, "[%s] Sense Key : %s %s%s\n", name,
> -		    scsi_sense_key_string(sshdr->sense_key),
> -		    scsi_sense_type_string(sshdr),
> -		    scsi_sense_format_string(sshdr));
> +	trace_scsi_print_sense(sdev, name, sshdr, NULL, 0, 0);
>   	scsi_show_extd_sense(sdev, name, sshdr->asc, sshdr->ascq);
>   }
>   EXPORT_SYMBOL(scsi_print_sense_hdr);
>
> -static void
> -scsi_dump_sense_buffer(struct scsi_device *sdev, const char *prefix,
> -		       const unsigned char *sense_buffer, int sense_len)
> -{
> -	char linebuf[128];
> -	int i, linelen, remaining;
> -
> -	if (sense_len < 32)
> -		sense_len = 32;
> -
> -	remaining = sense_len;
> -	for (i = 0; i < sense_len; i += 16) {
> -		linelen = min(remaining, 16);
> -		remaining -= 16;
> -
> -		hex_dump_to_buffer(sense_buffer + i, linelen, 16, 1,
> -				   linebuf, sizeof(linebuf), false);
> -	}
> -	sdev_printk(KERN_INFO, sdev,
> -		    "[%s] Unrecognized sense data (in hex): %s",
> -		    prefix, linebuf);
> -}
> -
> -static void
> -scsi_decode_sense_extras(struct scsi_device *sdev, const char *name,
> -			 const unsigned char *sense_buffer, int sense_len)
> -{
> -	int res, sense_flags = 0, fixed_valid = 0;
> -	u64 info = 0;
> -	char buff[80];
> -	int blen;
> -
> -	if ((sense_buffer[0] & 0x80) < 0x72) {
> -		/* decode extras for "fixed" format */
> -		fixed_valid = sense_buffer[0] & 0x80;
> -		info = get_unaligned_be32(&sense_buffer[3]);
> -		sense_flags = sense_buffer[2];
> -	} else if (sense_buffer[7] > 0) {
> -		const u8 *ucp;
> -
> -		/* descriptor format with sense descriptors */
> -		ucp = scsi_sense_desc_find(sense_buffer, sense_len, 0);
> -		if (ucp) {
> -			fixed_valid = ucp[2] & 0x80;
> -			if (fixed_valid)
> -				info = get_unaligned_be64(&ucp[4]);
> -		}
> -		ucp = scsi_sense_desc_find(sense_buffer, sense_len, 4);
> -		if (ucp)
> -			sense_flags |= ucp[3] & 0xe0;
> -	}
> -
> -	if (!sense_flags && !fixed_valid)
> -		return;
> -
> -	res = 0;
> -	memset(buff, 0, sizeof(buff));
> -	blen = sizeof(buff) - 1;
> -	if (fixed_valid)
> -		res += snprintf(buff + res, blen - res,
> -				"Info fld=0x%llx, ", info);
> -	if (sense_flags)
> -		res += snprintf(buff + res, blen - res, "%s%s%s",
> -				sense_flags & SENSE_FMK ? "FMK, " : "",
> -				sense_flags & SENSE_EOM ? "EOM, " : "",
> -				sense_flags & SENSE_ILI ? "ILI, " : "");
> -	if (res) {
> -		res -= 2;
> -		buff[res] = '\0';
> -	}
> -
> -	sdev_printk(KERN_INFO, sdev, "[%s] %s\n", name, buff);
> -}
> -
>   /* Normalize and print sense buffer with name prefix */
>   void __scsi_print_sense(struct scsi_device *sdev, const char *name,
>   			const unsigned char *sense_buffer, int sense_len)
>   {
>   	struct scsi_sense_hdr sshdr;
> +	int raw;
>
> -	if (!scsi_normalize_sense(sense_buffer, sense_len, &sshdr)) {
> -		/* this may be SCSI-1 sense data */
> -		scsi_dump_sense_buffer(sdev, name, sense_buffer, sense_len);
> -		return;
> -	}
> +	raw = !scsi_normalize_sense(sense_buffer, sense_len, &sshdr);
>
> -	sdev_printk(KERN_INFO, sdev, "[%s] Sense Key : %s %s%s\n", name,
> -	       scsi_sense_key_string(sshdr.sense_key),
> -	       scsi_sense_type_string(&sshdr),
> -	       scsi_sense_format_string(&sshdr));
> -	scsi_decode_sense_extras(sdev, name, sense_buffer, sense_len);
> +	trace_scsi_print_sense(sdev, name, &sshdr, sense_buffer, sense_len,
> +			       raw);
>   	scsi_show_extd_sense(sdev, name, sshdr.asc, sshdr.ascq);
>   }
>   EXPORT_SYMBOL(__scsi_print_sense);
> diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
> index 6ffbc40..2ecb1dc 100644
> --- a/drivers/scsi/scsi_trace.c
> +++ b/drivers/scsi/scsi_trace.c
> @@ -17,15 +17,16 @@
>    */
>   #include <linux/kernel.h>
>   #include <linux/trace_seq.h>
> +#include <asm/unaligned.h>
>   #include <trace/events/scsi.h>
>
>   #include <scsi/scsi_dbg.h>
> +#include <scsi/scsi_eh.h>
>
>   #define SERVICE_ACTION16(cdb) (cdb[1] & 0x1f)
>   #define SERVICE_ACTION32(cdb) ((cdb[8] << 8) | cdb[9])
>
> -static const char *
> -scsi_trace_misc(struct trace_seq *, unsigned char *, int);
> +static const char *scsi_trace_misc(struct trace_seq *);
>
>   static const char *
>   scsi_trace_rw6(struct trace_seq *p, unsigned char *cdb, int len)
> @@ -242,12 +243,12 @@ scsi_trace_varlen(struct trace_seq *p, unsigned char *cdb, int len)
>   	case WRITE_SAME_32:
>   		return scsi_trace_rw32(p, cdb, len);
>   	default:
> -		return scsi_trace_misc(p, cdb, len);
> +		return scsi_trace_misc(p);
>   	}
>   }
>
>   static const char *
> -scsi_trace_misc(struct trace_seq *p, unsigned char *cdb, int len)
> +scsi_trace_misc(struct trace_seq *p)
>   {
>   	const char *ret = p->buffer + p->len;
>
> @@ -285,10 +286,139 @@ scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len)
>   	case VARIABLE_LENGTH_CMD:
>   		return scsi_trace_varlen(p, cdb, len);
>   	default:
> -		return scsi_trace_misc(p, cdb, len);
> +		return scsi_trace_misc(p);
>   	}
>   }
>
> +#ifdef CONFIG_SCSI_CONSTANTS
> +/* description of the sense key values */
> +static const char * const snstext[] = {
> +	"No Sense",	    /* 0: There is no sense information */
> +	"Recovered Error",  /* 1: The last command completed successfully
> +				  but used error correction */
> +	"Not Ready",	    /* 2: The addressed target is not ready */
> +	"Medium Error",	    /* 3: Data error detected on the medium */
> +	"Hardware Error",   /* 4: Controller or device failure */
> +	"Illegal Request",  /* 5: Error in request */
> +	"Unit Attention",   /* 6: Removable medium was changed, or
> +				  the target has been reset, or ... */
> +	"Data Protect",	    /* 7: Access to the data is blocked */
> +	"Blank Check",	    /* 8: Reached unexpected written or unwritten
> +				  region of the medium */
> +	"Vendor Specific(9)",
> +	"Copy Aborted",	    /* A: COPY or COMPARE was aborted */
> +	"Aborted Command",  /* B: The target aborted the command */
> +	"Equal",	    /* C: A SEARCH DATA command found data equal,
> +				  reserved in SPC-4 rev 36 */
> +	"Volume Overflow",  /* D: Medium full with still data to be written */
> +	"Miscompare",	    /* E: Source data and data on the medium
> +				  do not agree */
> +	"Completed",	    /* F: command completed sense data reported,
> +				  may occur for successful command */
> +};
> +#else
> +static const char * const snstext[] = {
> +	"0x0", "0x1", "0x2", "0x3", "0x4", "0x5", "0x6", "0x7",
> +	"0x8", "0x9", "0xa", "0xb", "0xc", "0xd", "0xe", "0xf",
> +};
> +#endif
> +
> +/* Get sense key string or NULL if not available */
> +const char *
> +scsi_sense_key_string(unsigned char key) {
> +	return snstext[key & 0xf];
> +}
> +EXPORT_SYMBOL(scsi_sense_key_string);
> +
> +static const char *
> +scsi_sense_type_string(u8 res_code)
> +{
> +	return __scsi_sense_is_deferred(res_code) ? "[deferred]" : "[current]";
> +}
> +
> +static const char *
> +scsi_sense_format_string(u8 res_code)
> +{
> +	return res_code >= 0x72 ? "[descriptor]" : "";
> +}
> +
> +static const char *
> +scsi_dump_sense_buffer(struct trace_seq *p, const unsigned char *buf, int len)
> +{
> +	const char *ret = p->buffer + p->len;
> +	int i;
> +
> +	if (!buf || !len)
> +		return scsi_trace_misc(p);
> +
> +	if (len < 32)
> +		len = 32;
> +
> +	trace_seq_printf(p, "Unrecognized sense data (in hex)");
> +	for (i = 0; i < len; i += 16)
> +		trace_seq_printf(p, " %02x", buf[i]);
> +
> +	trace_seq_putc(p, 0);
> +	return ret;
> +}
> +
> +const char *
> +scsi_trace_decode_sense_extras(struct trace_seq *p, u8 sense_key, u8 res_code,
> +			       const unsigned char *buf, int len, int raw)
> +{
> +	const char *ret = p->buffer + p->len;
> +	int sense_flags = 0, fixed_valid = 0;
> +	u64 info = 0;
> +
> +	if (raw)
> +		/* this may be SCSI-1 sense data */
> +		return scsi_dump_sense_buffer(p, buf, len);
> +
> +	trace_seq_printf(p, "Sense Key (%s %s%s",
> +			 scsi_sense_key_string(sense_key),
> +			 scsi_sense_type_string(res_code),
> +			 scsi_sense_format_string(res_code));
> +
> +	if (!buf || !len)
> +		goto out;
> +
> +	if ((buf[0] & 0x80) < 0x72) {
> +		/* decode extras for "fixed" format */
> +		fixed_valid = buf[0] & 0x80;
> +		info = get_unaligned_be32(&buf[3]);
> +		sense_flags = buf[2];
> +	} else if (buf[7] > 0) {
> +		const u8 *ucp;
> +
> +		/* descriptor format with sense descriptors */
> +		ucp = scsi_sense_desc_find(buf, len, 0);
> +		if (ucp) {
> +			fixed_valid = ucp[2] & 0x80;
> +			if (fixed_valid)
> +				info = get_unaligned_be64(&ucp[4]);
> +		}
> +		ucp = scsi_sense_desc_find(buf, len, 4);
> +		if (ucp)
> +			sense_flags |= ucp[3] & 0xe0;
> +	}
> +
> +	if (!sense_flags && !fixed_valid)
> +		goto out;
> +
> +	if (fixed_valid)
> +		trace_seq_printf(p, " Info fld=0x%llx", info);
> +	if (sense_flags)
> +		trace_seq_printf(p, " %s%s%s",
> +				sense_flags & SENSE_FMK ? "FMK" : "",
> +				sense_flags & SENSE_EOM ? "EOM" : "",
> +				sense_flags & SENSE_ILI ? "ILI" : "");
> +
> +out:
> +	trace_seq_printf(p, ")");
> +	trace_seq_putc(p, 0);
> +	return ret;
> +}
> +
>   void scsi_show_result(struct scsi_device *sdev, const char *name, int result)
>   {
>   	trace_scsi_show_result(sdev, name, result);
> diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h
> index 06a8790..0e6d28c 100644
> --- a/include/scsi/scsi_eh.h
> +++ b/include/scsi/scsi_eh.h
> @@ -47,9 +47,14 @@ extern int scsi_normalize_sense(const u8 *sense_buffer, int sb_len,
>   extern int scsi_command_normalize_sense(struct scsi_cmnd *cmd,
>   		struct scsi_sense_hdr *sshdr);
>
> +static inline int __scsi_sense_is_deferred(u8 response_code)
> +{
> +	return ((response_code >= 0x70) && (response_code & 1));
> +}
> +
>   static inline int scsi_sense_is_deferred(struct scsi_sense_hdr *sshdr)
>   {
> -	return ((sshdr->response_code >= 0x70) && (sshdr->response_code & 1));
> +	return __scsi_sense_is_deferred(sshdr->response_code);
>   }
>
>   extern const u8 * scsi_sense_desc_find(const u8 * sense_buffer, int sb_len,
> diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
> index 0675195..572aa65 100644
> --- a/include/trace/events/scsi.h
> +++ b/include/trace/events/scsi.h
> @@ -395,6 +395,54 @@ TRACE_EVENT(scsi_show_result,
>   		  show_hostbyte_name(host_byte(__entry->result)))
>   );
>
> +const char *scsi_trace_decode_sense_extras(struct trace_seq*, u8, u8,
> +					   const unsigned char*, int, int);
> +#define __decode_extras(sense_key, res_code, buf, len, raw) \
> +	scsi_trace_decode_sense_extras(p, sense_key, res_code, buf, len, raw)
> +
> +TRACE_EVENT(scsi_print_sense,
> +
> +	TP_PROTO(struct scsi_device *sdev, const char *devname,
> +		 struct scsi_sense_hdr *sshdr,
> +		 const unsigned char *sense_buffer, int sense_len, int raw),
> +
> +	TP_ARGS(sdev, devname, sshdr, sense_buffer, sense_len, raw),
> +
> +	TP_STRUCT__entry(
> +		__field( unsigned int,		host_no		)
> +		__field( unsigned int,		channel		)
> +		__field( unsigned int,		id		)
> +		__field( unsigned int,		lun		)
> +		__string(devname,		devname		)
> +		__field( u8,			sense_key	)
> +		__field( u8,			res_code	)
> +		__dynamic_array(unsigned char,	sense_buffer, sense_len)
> +		__field( u8,			asc		)
> +		__field( u8,			ascq		)
> +		__field( int,			sense_len	)
> +		__field( int,			raw		)
> +	),
> +
> +	TP_fast_assign(
> +		__entry->host_no	= sdev->host->host_no;
> +		__entry->channel	= sdev->channel;
> +		__entry->id		= sdev->id;
> +		__entry->lun		= sdev->lun;
> +		__assign_str(devname, devname);
> +		__entry->sense_key	= sshdr->sense_key;
> +		__entry->res_code	= sshdr->response_code;
> +		memcpy(__get_dynamic_array(sense_buffer), sense_buffer,
> +		       sense_len);
> +		__entry->sense_len	= sense_len;
> +		__entry->raw		= raw;
> +	),
> +
> +	TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] %s",
> +		  __entry->host_no, __entry->channel, __entry->id, __entry->lun,
> +		  __get_str(devname), __decode_extras(__entry->sense_key,
> +		  __entry->res_code, __get_dynamic_array(sense_buffer),
> +		  __entry->sense_len,  __entry->raw))
> +);
>   #endif /*  _TRACE_SCSI_H */
>
>   /* This part must be outside protection */
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
Same here:
Please use the functions from constants.c and delete the 
functionality from scsi_trace.

And we should remove the code to interpret any sense code extras.
But other than that having trace points for sense code printing is a 
really good idea.
Care to send this as a separate patch?

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

Re: Re: [RFC PATCH 08/10] scsi/trace: Use scsi_print_sense trace point instead of printk

[Yoshihiro YUNOMAE]

(2014/08/27 23:15), Hannes Reinecke wrote:
> On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
>> Previous sense messages can be mixed into other sense messages,
>> because continuous printk (KERN_CONT) was used. To avoid the problem,
>> patch d87f3a6f51 introduced a local buffer in Hannes's baranch (*1).
>> But using local buffers can induce stack overflow, so we want to solve
>> the
>> problem without local buffer if possible.
>>
>> trace_seq_printf can add log messages without local buffer, so we use it.
>>
>> (*1)
>> http://git.kernel.org/cgit/linux/kernel/git/hare/scsi-devel.git/log/?h=logging
>>
>>
>> - Result examples
>>
>> <Before> (printk)
>> sd 2:0:0:0: [sda] Sense Key : Medium Error [current]
>>
>> <After> (ftrace)
>> scsi_print_sense: host_no=2 channel=0 id=0 lun=0 [sda] Sense Key
>> (Medium Error [current])
>>
>> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
>> Cc: Hannes Reinecke <hare@suse.de>
>> Cc: Doug Gilbert <dgilbert@interlog.com>
>> Cc: Martin K. Petersen <martin.petersen@oracle.com>
>> Cc: Christoph Hellwig <hch@lst.de>
>> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
>> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
>> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
>> ---
>>   drivers/scsi/constants.c    |  145
>> ++-----------------------------------------
>>   drivers/scsi/scsi_trace.c   |  140
>> ++++++++++++++++++++++++++++++++++++++++--
>>   include/scsi/scsi_eh.h      |    7 ++
>>   include/trace/events/scsi.h |   48 ++++++++++++++
>>   4 files changed, 195 insertions(+), 145 deletions(-)
>>
>> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
>> index f7b7f32..85b75c8 100644
>> --- a/drivers/scsi/constants.c
>> +++ b/drivers/scsi/constants.c
>> @@ -19,7 +19,7 @@
>>   #include <scsi/scsi_eh.h>
>>   #include <scsi/scsi_dbg.h>
>>
>> -
>> +#include <trace/events/scsi.h>
>>
>>   /* Commands with service actions that change the command name */
>>   #define SERVICE_ACTION_IN_12 0xab
>> @@ -1267,58 +1267,8 @@ static const struct error_info2 additional2[] =
>>       {0x70, 0x00, 0xff, "Decompression exception short algorithm id
>> of %x"},
>>       {0, 0, 0, NULL}
>>   };
>> -
>> -/* description of the sense key values */
>> -static const char * const snstext[] = {
>> -    "No Sense",        /* 0: There is no sense information */
>> -    "Recovered Error",  /* 1: The last command completed successfully
>> -                  but used error correction */
>> -    "Not Ready",        /* 2: The addressed target is not ready */
>> -    "Medium Error",        /* 3: Data error detected on the medium */
>> -    "Hardware Error",   /* 4: Controller or device failure */
>> -    "Illegal Request",  /* 5: Error in request */
>> -    "Unit Attention",   /* 6: Removable medium was changed, or
>> -                  the target has been reset, or ... */
>> -    "Data Protect",        /* 7: Access to the data is blocked */
>> -    "Blank Check",        /* 8: Reached unexpected written or unwritten
>> -                  region of the medium */
>> -    "Vendor Specific(9)",
>> -    "Copy Aborted",        /* A: COPY or COMPARE was aborted */
>> -    "Aborted Command",  /* B: The target aborted the command */
>> -    "Equal",        /* C: A SEARCH DATA command found data equal,
>> -                  reserved in SPC-4 rev 36 */
>> -    "Volume Overflow",  /* D: Medium full with still data to be
>> written */
>> -    "Miscompare",        /* E: Source data and data on the medium
>> -                  do not agree */
>> -    "Completed",        /* F: command completed sense data reported,
>> -                  may occur for successful command */
>> -};
>> -#else
>> -static const char * const snstext[] = {
>> -    "0x0", "0x1", "0x2", "0x3", "0x4", "0x5", "0x6", "0x7",
>> -    "0x8", "0x9", "0xa", "0xb", "0xc", "0xd", "0xe", "0xf",
>> -};
>>   #endif
>>
>> -/* Get sense key string or NULL if not available */
>> -const char *
>> -scsi_sense_key_string(unsigned char key) {
>> -    return snstext[key & 0xf];
>> -}
>> -EXPORT_SYMBOL(scsi_sense_key_string);
>> -
>> -const char *
>> -scsi_sense_type_string(struct scsi_sense_hdr *sshdr)
>> -{
>> -    return scsi_sense_is_deferred(sshdr) ? "[deferred]" : "[current]";
>> -}
>> -
>> -const char *
>> -scsi_sense_format_string(struct scsi_sense_hdr *sshdr)
>> -{
>> -    return sshdr->response_code >= 0x72 ? "[descriptor]" : "";
>> -}
>> -
>>   /*
>>    * Get additional sense code string or NULL if not available.
>>    * This string may contain a "%x" and should be printed with ascq as
>> arg.
>> @@ -1375,105 +1325,22 @@ void
>>   scsi_print_sense_hdr(struct scsi_device *sdev, const char *name,
>>                struct scsi_sense_hdr *sshdr)
>>   {
>> -    sdev_printk(KERN_INFO, sdev, "[%s] Sense Key : %s %s%s\n", name,
>> -            scsi_sense_key_string(sshdr->sense_key),
>> -            scsi_sense_type_string(sshdr),
>> -            scsi_sense_format_string(sshdr));
>> +    trace_scsi_print_sense(sdev, name, sshdr, NULL, 0, 0);
>>       scsi_show_extd_sense(sdev, name, sshdr->asc, sshdr->ascq);
>>   }
>>   EXPORT_SYMBOL(scsi_print_sense_hdr);
>>
>> -static void
>> -scsi_dump_sense_buffer(struct scsi_device *sdev, const char *prefix,
>> -               const unsigned char *sense_buffer, int sense_len)
>> -{
>> -    char linebuf[128];
>> -    int i, linelen, remaining;
>> -
>> -    if (sense_len < 32)
>> -        sense_len = 32;
>> -
>> -    remaining = sense_len;
>> -    for (i = 0; i < sense_len; i += 16) {
>> -        linelen = min(remaining, 16);
>> -        remaining -= 16;
>> -
>> -        hex_dump_to_buffer(sense_buffer + i, linelen, 16, 1,
>> -                   linebuf, sizeof(linebuf), false);
>> -    }
>> -    sdev_printk(KERN_INFO, sdev,
>> -            "[%s] Unrecognized sense data (in hex): %s",
>> -            prefix, linebuf);
>> -}
>> -
>> -static void
>> -scsi_decode_sense_extras(struct scsi_device *sdev, const char *name,
>> -             const unsigned char *sense_buffer, int sense_len)
>> -{
>> -    int res, sense_flags = 0, fixed_valid = 0;
>> -    u64 info = 0;
>> -    char buff[80];
>> -    int blen;
>> -
>> -    if ((sense_buffer[0] & 0x80) < 0x72) {
>> -        /* decode extras for "fixed" format */
>> -        fixed_valid = sense_buffer[0] & 0x80;
>> -        info = get_unaligned_be32(&sense_buffer[3]);
>> -        sense_flags = sense_buffer[2];
>> -    } else if (sense_buffer[7] > 0) {
>> -        const u8 *ucp;
>> -
>> -        /* descriptor format with sense descriptors */
>> -        ucp = scsi_sense_desc_find(sense_buffer, sense_len, 0);
>> -        if (ucp) {
>> -            fixed_valid = ucp[2] & 0x80;
>> -            if (fixed_valid)
>> -                info = get_unaligned_be64(&ucp[4]);
>> -        }
>> -        ucp = scsi_sense_desc_find(sense_buffer, sense_len, 4);
>> -        if (ucp)
>> -            sense_flags |= ucp[3] & 0xe0;
>> -    }
>> -
>> -    if (!sense_flags && !fixed_valid)
>> -        return;
>> -
>> -    res = 0;
>> -    memset(buff, 0, sizeof(buff));
>> -    blen = sizeof(buff) - 1;
>> -    if (fixed_valid)
>> -        res += snprintf(buff + res, blen - res,
>> -                "Info fld=0x%llx, ", info);
>> -    if (sense_flags)
>> -        res += snprintf(buff + res, blen - res, "%s%s%s",
>> -                sense_flags & SENSE_FMK ? "FMK, " : "",
>> -                sense_flags & SENSE_EOM ? "EOM, " : "",
>> -                sense_flags & SENSE_ILI ? "ILI, " : "");
>> -    if (res) {
>> -        res -= 2;
>> -        buff[res] = '\0';
>> -    }
>> -
>> -    sdev_printk(KERN_INFO, sdev, "[%s] %s\n", name, buff);
>> -}
>> -
>>   /* Normalize and print sense buffer with name prefix */
>>   void __scsi_print_sense(struct scsi_device *sdev, const char *name,
>>               const unsigned char *sense_buffer, int sense_len)
>>   {
>>       struct scsi_sense_hdr sshdr;
>> +    int raw;
>>
>> -    if (!scsi_normalize_sense(sense_buffer, sense_len, &sshdr)) {
>> -        /* this may be SCSI-1 sense data */
>> -        scsi_dump_sense_buffer(sdev, name, sense_buffer, sense_len);
>> -        return;
>> -    }
>> +    raw = !scsi_normalize_sense(sense_buffer, sense_len, &sshdr);
>>
>> -    sdev_printk(KERN_INFO, sdev, "[%s] Sense Key : %s %s%s\n", name,
>> -           scsi_sense_key_string(sshdr.sense_key),
>> -           scsi_sense_type_string(&sshdr),
>> -           scsi_sense_format_string(&sshdr));
>> -    scsi_decode_sense_extras(sdev, name, sense_buffer, sense_len);
>> +    trace_scsi_print_sense(sdev, name, &sshdr, sense_buffer, sense_len,
>> +                   raw);
>>       scsi_show_extd_sense(sdev, name, sshdr.asc, sshdr.ascq);
>>   }
>>   EXPORT_SYMBOL(__scsi_print_sense);
>> diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
>> index 6ffbc40..2ecb1dc 100644
>> --- a/drivers/scsi/scsi_trace.c
>> +++ b/drivers/scsi/scsi_trace.c
>> @@ -17,15 +17,16 @@
>>    */
>>   #include <linux/kernel.h>
>>   #include <linux/trace_seq.h>
>> +#include <asm/unaligned.h>
>>   #include <trace/events/scsi.h>
>>
>>   #include <scsi/scsi_dbg.h>
>> +#include <scsi/scsi_eh.h>
>>
>>   #define SERVICE_ACTION16(cdb) (cdb[1] & 0x1f)
>>   #define SERVICE_ACTION32(cdb) ((cdb[8] << 8) | cdb[9])
>>
>> -static const char *
>> -scsi_trace_misc(struct trace_seq *, unsigned char *, int);
>> +static const char *scsi_trace_misc(struct trace_seq *);
>>
>>   static const char *
>>   scsi_trace_rw6(struct trace_seq *p, unsigned char *cdb, int len)
>> @@ -242,12 +243,12 @@ scsi_trace_varlen(struct trace_seq *p, unsigned
>> char *cdb, int len)
>>       case WRITE_SAME_32:
>>           return scsi_trace_rw32(p, cdb, len);
>>       default:
>> -        return scsi_trace_misc(p, cdb, len);
>> +        return scsi_trace_misc(p);
>>       }
>>   }
>>
>>   static const char *
>> -scsi_trace_misc(struct trace_seq *p, unsigned char *cdb, int len)
>> +scsi_trace_misc(struct trace_seq *p)
>>   {
>>       const char *ret = p->buffer + p->len;
>>
>> @@ -285,10 +286,139 @@ scsi_trace_parse_cdb(struct trace_seq *p,
>> unsigned char *cdb, int len)
>>       case VARIABLE_LENGTH_CMD:
>>           return scsi_trace_varlen(p, cdb, len);
>>       default:
>> -        return scsi_trace_misc(p, cdb, len);
>> +        return scsi_trace_misc(p);
>>       }
>>   }
>>
>> +#ifdef CONFIG_SCSI_CONSTANTS
>> +/* description of the sense key values */
>> +static const char * const snstext[] = {
>> +    "No Sense",        /* 0: There is no sense information */
>> +    "Recovered Error",  /* 1: The last command completed successfully
>> +                  but used error correction */
>> +    "Not Ready",        /* 2: The addressed target is not ready */
>> +    "Medium Error",        /* 3: Data error detected on the medium */
>> +    "Hardware Error",   /* 4: Controller or device failure */
>> +    "Illegal Request",  /* 5: Error in request */
>> +    "Unit Attention",   /* 6: Removable medium was changed, or
>> +                  the target has been reset, or ... */
>> +    "Data Protect",        /* 7: Access to the data is blocked */
>> +    "Blank Check",        /* 8: Reached unexpected written or unwritten
>> +                  region of the medium */
>> +    "Vendor Specific(9)",
>> +    "Copy Aborted",        /* A: COPY or COMPARE was aborted */
>> +    "Aborted Command",  /* B: The target aborted the command */
>> +    "Equal",        /* C: A SEARCH DATA command found data equal,
>> +                  reserved in SPC-4 rev 36 */
>> +    "Volume Overflow",  /* D: Medium full with still data to be
>> written */
>> +    "Miscompare",        /* E: Source data and data on the medium
>> +                  do not agree */
>> +    "Completed",        /* F: command completed sense data reported,
>> +                  may occur for successful command */
>> +};
>> +#else
>> +static const char * const snstext[] = {
>> +    "0x0", "0x1", "0x2", "0x3", "0x4", "0x5", "0x6", "0x7",
>> +    "0x8", "0x9", "0xa", "0xb", "0xc", "0xd", "0xe", "0xf",
>> +};
>> +#endif
>> +
>> +/* Get sense key string or NULL if not available */
>> +const char *
>> +scsi_sense_key_string(unsigned char key) {
>> +    return snstext[key & 0xf];
>> +}
>> +EXPORT_SYMBOL(scsi_sense_key_string);
>> +
>> +static const char *
>> +scsi_sense_type_string(u8 res_code)
>> +{
>> +    return __scsi_sense_is_deferred(res_code) ? "[deferred]" :
>> "[current]";
>> +}
>> +
>> +static const char *
>> +scsi_sense_format_string(u8 res_code)
>> +{
>> +    return res_code >= 0x72 ? "[descriptor]" : "";
>> +}
>> +
>> +static const char *
>> +scsi_dump_sense_buffer(struct trace_seq *p, const unsigned char *buf,
>> int len)
>> +{
>> +    const char *ret = p->buffer + p->len;
>> +    int i;
>> +
>> +    if (!buf || !len)
>> +        return scsi_trace_misc(p);
>> +
>> +    if (len < 32)
>> +        len = 32;
>> +
>> +    trace_seq_printf(p, "Unrecognized sense data (in hex)");
>> +    for (i = 0; i < len; i += 16)
>> +        trace_seq_printf(p, " %02x", buf[i]);
>> +
>> +    trace_seq_putc(p, 0);
>> +    return ret;
>> +}
>> +
>> +const char *
>> +scsi_trace_decode_sense_extras(struct trace_seq *p, u8 sense_key, u8
>> res_code,
>> +                   const unsigned char *buf, int len, int raw)
>> +{
>> +    const char *ret = p->buffer + p->len;
>> +    int sense_flags = 0, fixed_valid = 0;
>> +    u64 info = 0;
>> +
>> +    if (raw)
>> +        /* this may be SCSI-1 sense data */
>> +        return scsi_dump_sense_buffer(p, buf, len);
>> +
>> +    trace_seq_printf(p, "Sense Key (%s %s%s",
>> +             scsi_sense_key_string(sense_key),
>> +             scsi_sense_type_string(res_code),
>> +             scsi_sense_format_string(res_code));
>> +
>> +    if (!buf || !len)
>> +        goto out;
>> +
>> +    if ((buf[0] & 0x80) < 0x72) {
>> +        /* decode extras for "fixed" format */
>> +        fixed_valid = buf[0] & 0x80;
>> +        info = get_unaligned_be32(&buf[3]);
>> +        sense_flags = buf[2];
>> +    } else if (buf[7] > 0) {
>> +        const u8 *ucp;
>> +
>> +        /* descriptor format with sense descriptors */
>> +        ucp = scsi_sense_desc_find(buf, len, 0);
>> +        if (ucp) {
>> +            fixed_valid = ucp[2] & 0x80;
>> +            if (fixed_valid)
>> +                info = get_unaligned_be64(&ucp[4]);
>> +        }
>> +        ucp = scsi_sense_desc_find(buf, len, 4);
>> +        if (ucp)
>> +            sense_flags |= ucp[3] & 0xe0;
>> +    }
>> +
>> +    if (!sense_flags && !fixed_valid)
>> +        goto out;
>> +
>> +    if (fixed_valid)
>> +        trace_seq_printf(p, " Info fld=0x%llx", info);
>> +    if (sense_flags)
>> +        trace_seq_printf(p, " %s%s%s",
>> +                sense_flags & SENSE_FMK ? "FMK" : "",
>> +                sense_flags & SENSE_EOM ? "EOM" : "",
>> +                sense_flags & SENSE_ILI ? "ILI" : "");
>> +
>> +out:
>> +    trace_seq_printf(p, ")");
>> +    trace_seq_putc(p, 0);
>> +    return ret;
>> +}
>> +
>>   void scsi_show_result(struct scsi_device *sdev, const char *name,
>> int result)
>>   {
>>       trace_scsi_show_result(sdev, name, result);
>> diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h
>> index 06a8790..0e6d28c 100644
>> --- a/include/scsi/scsi_eh.h
>> +++ b/include/scsi/scsi_eh.h
>> @@ -47,9 +47,14 @@ extern int scsi_normalize_sense(const u8
>> *sense_buffer, int sb_len,
>>   extern int scsi_command_normalize_sense(struct scsi_cmnd *cmd,
>>           struct scsi_sense_hdr *sshdr);
>>
>> +static inline int __scsi_sense_is_deferred(u8 response_code)
>> +{
>> +    return ((response_code >= 0x70) && (response_code & 1));
>> +}
>> +
>>   static inline int scsi_sense_is_deferred(struct scsi_sense_hdr *sshdr)
>>   {
>> -    return ((sshdr->response_code >= 0x70) && (sshdr->response_code &
>> 1));
>> +    return __scsi_sense_is_deferred(sshdr->response_code);
>>   }
>>
>>   extern const u8 * scsi_sense_desc_find(const u8 * sense_buffer, int
>> sb_len,
>> diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
>> index 0675195..572aa65 100644
>> --- a/include/trace/events/scsi.h
>> +++ b/include/trace/events/scsi.h
>> @@ -395,6 +395,54 @@ TRACE_EVENT(scsi_show_result,
>>             show_hostbyte_name(host_byte(__entry->result)))
>>   );
>>
>> +const char *scsi_trace_decode_sense_extras(struct trace_seq*, u8, u8,
>> +                       const unsigned char*, int, int);
>> +#define __decode_extras(sense_key, res_code, buf, len, raw) \
>> +    scsi_trace_decode_sense_extras(p, sense_key, res_code, buf, len,
>> raw)
>> +
>> +TRACE_EVENT(scsi_print_sense,
>> +
>> +    TP_PROTO(struct scsi_device *sdev, const char *devname,
>> +         struct scsi_sense_hdr *sshdr,
>> +         const unsigned char *sense_buffer, int sense_len, int raw),
>> +
>> +    TP_ARGS(sdev, devname, sshdr, sense_buffer, sense_len, raw),
>> +
>> +    TP_STRUCT__entry(
>> +        __field( unsigned int,        host_no        )
>> +        __field( unsigned int,        channel        )
>> +        __field( unsigned int,        id        )
>> +        __field( unsigned int,        lun        )
>> +        __string(devname,        devname        )
>> +        __field( u8,            sense_key    )
>> +        __field( u8,            res_code    )
>> +        __dynamic_array(unsigned char,    sense_buffer, sense_len)
>> +        __field( u8,            asc        )
>> +        __field( u8,            ascq        )
>> +        __field( int,            sense_len    )
>> +        __field( int,            raw        )
>> +    ),
>> +
>> +    TP_fast_assign(
>> +        __entry->host_no    = sdev->host->host_no;
>> +        __entry->channel    = sdev->channel;
>> +        __entry->id        = sdev->id;
>> +        __entry->lun        = sdev->lun;
>> +        __assign_str(devname, devname);
>> +        __entry->sense_key    = sshdr->sense_key;
>> +        __entry->res_code    = sshdr->response_code;
>> +        memcpy(__get_dynamic_array(sense_buffer), sense_buffer,
>> +               sense_len);
>> +        __entry->sense_len    = sense_len;
>> +        __entry->raw        = raw;
>> +    ),
>> +
>> +    TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] %s",
>> +          __entry->host_no, __entry->channel, __entry->id, __entry->lun,
>> +          __get_str(devname), __decode_extras(__entry->sense_key,
>> +          __entry->res_code, __get_dynamic_array(sense_buffer),
>> +          __entry->sense_len,  __entry->raw))
>> +);
>>   #endif /*  _TRACE_SCSI_H */
>>
>>   /* This part must be outside protection */
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>
> Same here:
> Please use the functions from constants.c and delete the functionality
> from scsi_trace.

Sure. I'll use existing decoder in constants.c.

> And we should remove the code to interpret any sense code extras.

OK. Sense extra decoder is only for st or osst, and those can handle it
as you said. So, we can remove it.

> But other than that having trace points for sense code printing is a
> really good idea.
> Care to send this as a separate patch?

Sure.

Thanks,
Yoshihiro YUNOMAE

-- 
Yoshihiro YUNOMAE
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: yoshihiro.yunomae.ez@hitachi.com

[RFC PATCH 09/10] scsi/trace: Add additional sense code and additional sense code qualifier to scsi_print_sense trace point

[Yoshihiro YUNOMAE]

There are no mean that additional sense code and additional sense code qualifier
are output as different messages of sense key, so those information are added.

Note:
scsi_show_extd_sense() is changed from export symbol to non-export symbol.

 - Result examples

<Before> (printk)
sd 2:0:0:0: [sda] Add. Sense: Unrecovered read error

<After> (ftrace, merged into scsi_print_sense traceevent)
scsi_print_sense: host_no=2 channel=0 id=0 lun=0 [sda] Sense Key (Medium Error [current])  Add. Sense (Unrecovered read error)

Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Doug Gilbert <dgilbert@interlog.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
 drivers/scsi/constants.c    |  932 -------------------------------------------
 drivers/scsi/scsi_trace.c   |  920 ++++++++++++++++++++++++++++++++++++++++++
 include/scsi/scsi_dbg.h     |    2 
 include/trace/events/scsi.h |   10 
 4 files changed, 928 insertions(+), 936 deletions(-)

diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 85b75c8..ce9ceb8 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -14,12 +14,6 @@
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
-#include <scsi/scsi_device.h>
-#include <scsi/scsi_host.h>
-#include <scsi/scsi_eh.h>
-#include <scsi/scsi_dbg.h>
-
-#include <trace/events/scsi.h>
 
 /* Commands with service actions that change the command name */
 #define SERVICE_ACTION_IN_12 0xab
@@ -429,929 +423,3 @@ void scsi_print_command(struct scsi_cmnd *cmd)
 	print_opcode_name(cmd->device, devname, cmd->cmnd, cmd->cmd_len);
 }
 EXPORT_SYMBOL(scsi_print_command);
-
-#ifdef CONFIG_SCSI_CONSTANTS
-
-struct error_info {
-	unsigned short code12;	/* 0x0302 looks better than 0x03,0x02 */
-	const char * text;
-};
-
-/*
- * The canonical list of T10 Additional Sense Codes is available at:
- * http://www.t10.org/lists/asc-num.txt [most recent: 20130605]
- */
-
-static const struct error_info additional[] =
-{
-	{0x0000, "No additional sense information"},
-	{0x0001, "Filemark detected"},
-	{0x0002, "End-of-partition/medium detected"},
-	{0x0003, "Setmark detected"},
-	{0x0004, "Beginning-of-partition/medium detected"},
-	{0x0005, "End-of-data detected"},
-	{0x0006, "I/O process terminated"},
-	{0x0007, "Programmable early warning detected"},
-	{0x0011, "Audio play operation in progress"},
-	{0x0012, "Audio play operation paused"},
-	{0x0013, "Audio play operation successfully completed"},
-	{0x0014, "Audio play operation stopped due to error"},
-	{0x0015, "No current audio status to return"},
-	{0x0016, "Operation in progress"},
-	{0x0017, "Cleaning requested"},
-	{0x0018, "Erase operation in progress"},
-	{0x0019, "Locate operation in progress"},
-	{0x001A, "Rewind operation in progress"},
-	{0x001B, "Set capacity operation in progress"},
-	{0x001C, "Verify operation in progress"},
-	{0x001D, "ATA pass through information available"},
-	{0x001E, "Conflicting SA creation request"},
-	{0x001F, "Logical unit transitioning to another power condition"},
-	{0x0020, "Extended copy information available"},
-
-	{0x0100, "No index/sector signal"},
-
-	{0x0200, "No seek complete"},
-
-	{0x0300, "Peripheral device write fault"},
-	{0x0301, "No write current"},
-	{0x0302, "Excessive write errors"},
-
-	{0x0400, "Logical unit not ready, cause not reportable"},
-	{0x0401, "Logical unit is in process of becoming ready"},
-	{0x0402, "Logical unit not ready, initializing command required"},
-	{0x0403, "Logical unit not ready, manual intervention required"},
-	{0x0404, "Logical unit not ready, format in progress"},
-	{0x0405, "Logical unit not ready, rebuild in progress"},
-	{0x0406, "Logical unit not ready, recalculation in progress"},
-	{0x0407, "Logical unit not ready, operation in progress"},
-	{0x0408, "Logical unit not ready, long write in progress"},
-	{0x0409, "Logical unit not ready, self-test in progress"},
-	{0x040A, "Logical unit not accessible, asymmetric access state "
-	 "transition"},
-	{0x040B, "Logical unit not accessible, target port in standby state"},
-	{0x040C, "Logical unit not accessible, target port in unavailable "
-	 "state"},
-	{0x040D, "Logical unit not ready, structure check required"},
-	{0x0410, "Logical unit not ready, auxiliary memory not accessible"},
-	{0x0411, "Logical unit not ready, notify (enable spinup) required"},
-	{0x0412, "Logical unit not ready, offline"},
-	{0x0413, "Logical unit not ready, SA creation in progress"},
-	{0x0414, "Logical unit not ready, space allocation in progress"},
-	{0x0415, "Logical unit not ready, robotics disabled"},
-	{0x0416, "Logical unit not ready, configuration required"},
-	{0x0417, "Logical unit not ready, calibration required"},
-	{0x0418, "Logical unit not ready, a door is open"},
-	{0x0419, "Logical unit not ready, operating in sequential mode"},
-	{0x041A, "Logical unit not ready, start stop unit command in "
-	 "progress"},
-	{0x041B, "Logical unit not ready, sanitize in progress"},
-	{0x041C, "Logical unit not ready, additional power use not yet "
-	 "granted"},
-	{0x041D, "Logical unit not ready, configuration in progress"},
-
-	{0x0500, "Logical unit does not respond to selection"},
-
-	{0x0600, "No reference position found"},
-
-	{0x0700, "Multiple peripheral devices selected"},
-
-	{0x0800, "Logical unit communication failure"},
-	{0x0801, "Logical unit communication time-out"},
-	{0x0802, "Logical unit communication parity error"},
-	{0x0803, "Logical unit communication CRC error (Ultra-DMA/32)"},
-	{0x0804, "Unreachable copy target"},
-
-	{0x0900, "Track following error"},
-	{0x0901, "Tracking servo failure"},
-	{0x0902, "Focus servo failure"},
-	{0x0903, "Spindle servo failure"},
-	{0x0904, "Head select fault"},
-
-	{0x0A00, "Error log overflow"},
-
-	{0x0B00, "Warning"},
-	{0x0B01, "Warning - specified temperature exceeded"},
-	{0x0B02, "Warning - enclosure degraded"},
-	{0x0B03, "Warning - background self-test failed"},
-	{0x0B04, "Warning - background pre-scan detected medium error"},
-	{0x0B05, "Warning - background medium scan detected medium error"},
-	{0x0B06, "Warning - non-volatile cache now volatile"},
-	{0x0B07, "Warning - degraded power to non-volatile cache"},
-	{0x0B08, "Warning - power loss expected"},
-	{0x0B09, "Warning - device statistics notification active"},
-
-	{0x0C00, "Write error"},
-	{0x0C01, "Write error - recovered with auto reallocation"},
-	{0x0C02, "Write error - auto reallocation failed"},
-	{0x0C03, "Write error - recommend reassignment"},
-	{0x0C04, "Compression check miscompare error"},
-	{0x0C05, "Data expansion occurred during compression"},
-	{0x0C06, "Block not compressible"},
-	{0x0C07, "Write error - recovery needed"},
-	{0x0C08, "Write error - recovery failed"},
-	{0x0C09, "Write error - loss of streaming"},
-	{0x0C0A, "Write error - padding blocks added"},
-	{0x0C0B, "Auxiliary memory write error"},
-	{0x0C0C, "Write error - unexpected unsolicited data"},
-	{0x0C0D, "Write error - not enough unsolicited data"},
-	{0x0C0E, "Multiple write errors"},
-	{0x0C0F, "Defects in error window"},
-
-	{0x0D00, "Error detected by third party temporary initiator"},
-	{0x0D01, "Third party device failure"},
-	{0x0D02, "Copy target device not reachable"},
-	{0x0D03, "Incorrect copy target device type"},
-	{0x0D04, "Copy target device data underrun"},
-	{0x0D05, "Copy target device data overrun"},
-
-	{0x0E00, "Invalid information unit"},
-	{0x0E01, "Information unit too short"},
-	{0x0E02, "Information unit too long"},
-	{0x0E03, "Invalid field in command information unit"},
-
-	{0x1000, "Id CRC or ECC error"},
-	{0x1001, "Logical block guard check failed"},
-	{0x1002, "Logical block application tag check failed"},
-	{0x1003, "Logical block reference tag check failed"},
-	{0x1004, "Logical block protection error on recover buffered data"},
-	{0x1005, "Logical block protection method error"},
-
-	{0x1100, "Unrecovered read error"},
-	{0x1101, "Read retries exhausted"},
-	{0x1102, "Error too long to correct"},
-	{0x1103, "Multiple read errors"},
-	{0x1104, "Unrecovered read error - auto reallocate failed"},
-	{0x1105, "L-EC uncorrectable error"},
-	{0x1106, "CIRC unrecovered error"},
-	{0x1107, "Data re-synchronization error"},
-	{0x1108, "Incomplete block read"},
-	{0x1109, "No gap found"},
-	{0x110A, "Miscorrected error"},
-	{0x110B, "Unrecovered read error - recommend reassignment"},
-	{0x110C, "Unrecovered read error - recommend rewrite the data"},
-	{0x110D, "De-compression CRC error"},
-	{0x110E, "Cannot decompress using declared algorithm"},
-	{0x110F, "Error reading UPC/EAN number"},
-	{0x1110, "Error reading ISRC number"},
-	{0x1111, "Read error - loss of streaming"},
-	{0x1112, "Auxiliary memory read error"},
-	{0x1113, "Read error - failed retransmission request"},
-	{0x1114, "Read error - lba marked bad by application client"},
-	{0x1115, "Write after sanitize required"},
-
-	{0x1200, "Address mark not found for id field"},
-
-	{0x1300, "Address mark not found for data field"},
-
-	{0x1400, "Recorded entity not found"},
-	{0x1401, "Record not found"},
-	{0x1402, "Filemark or setmark not found"},
-	{0x1403, "End-of-data not found"},
-	{0x1404, "Block sequence error"},
-	{0x1405, "Record not found - recommend reassignment"},
-	{0x1406, "Record not found - data auto-reallocated"},
-	{0x1407, "Locate operation failure"},
-
-	{0x1500, "Random positioning error"},
-	{0x1501, "Mechanical positioning error"},
-	{0x1502, "Positioning error detected by read of medium"},
-
-	{0x1600, "Data synchronization mark error"},
-	{0x1601, "Data sync error - data rewritten"},
-	{0x1602, "Data sync error - recommend rewrite"},
-	{0x1603, "Data sync error - data auto-reallocated"},
-	{0x1604, "Data sync error - recommend reassignment"},
-
-	{0x1700, "Recovered data with no error correction applied"},
-	{0x1701, "Recovered data with retries"},
-	{0x1702, "Recovered data with positive head offset"},
-	{0x1703, "Recovered data with negative head offset"},
-	{0x1704, "Recovered data with retries and/or circ applied"},
-	{0x1705, "Recovered data using previous sector id"},
-	{0x1706, "Recovered data without ECC - data auto-reallocated"},
-	{0x1707, "Recovered data without ECC - recommend reassignment"},
-	{0x1708, "Recovered data without ECC - recommend rewrite"},
-	{0x1709, "Recovered data without ECC - data rewritten"},
-
-	{0x1800, "Recovered data with error correction applied"},
-	{0x1801, "Recovered data with error corr. & retries applied"},
-	{0x1802, "Recovered data - data auto-reallocated"},
-	{0x1803, "Recovered data with CIRC"},
-	{0x1804, "Recovered data with L-EC"},
-	{0x1805, "Recovered data - recommend reassignment"},
-	{0x1806, "Recovered data - recommend rewrite"},
-	{0x1807, "Recovered data with ECC - data rewritten"},
-	{0x1808, "Recovered data with linking"},
-
-	{0x1900, "Defect list error"},
-	{0x1901, "Defect list not available"},
-	{0x1902, "Defect list error in primary list"},
-	{0x1903, "Defect list error in grown list"},
-
-	{0x1A00, "Parameter list length error"},
-
-	{0x1B00, "Synchronous data transfer error"},
-
-	{0x1C00, "Defect list not found"},
-	{0x1C01, "Primary defect list not found"},
-	{0x1C02, "Grown defect list not found"},
-
-	{0x1D00, "Miscompare during verify operation"},
-	{0x1D01, "Miscompare verify of unmapped LBA"},
-
-	{0x1E00, "Recovered id with ECC correction"},
-
-	{0x1F00, "Partial defect list transfer"},
-
-	{0x2000, "Invalid command operation code"},
-	{0x2001, "Access denied - initiator pending-enrolled"},
-	{0x2002, "Access denied - no access rights"},
-	{0x2003, "Access denied - invalid mgmt id key"},
-	{0x2004, "Illegal command while in write capable state"},
-	{0x2005, "Obsolete"},
-	{0x2006, "Illegal command while in explicit address mode"},
-	{0x2007, "Illegal command while in implicit address mode"},
-	{0x2008, "Access denied - enrollment conflict"},
-	{0x2009, "Access denied - invalid LU identifier"},
-	{0x200A, "Access denied - invalid proxy token"},
-	{0x200B, "Access denied - ACL LUN conflict"},
-	{0x200C, "Illegal command when not in append-only mode"},
-
-	{0x2100, "Logical block address out of range"},
-	{0x2101, "Invalid element address"},
-	{0x2102, "Invalid address for write"},
-	{0x2103, "Invalid write crossing layer jump"},
-
-	{0x2200, "Illegal function (use 20 00, 24 00, or 26 00)"},
-
-	{0x2300, "Invalid token operation, cause not reportable"},
-	{0x2301, "Invalid token operation, unsupported token type"},
-	{0x2302, "Invalid token operation, remote token usage not supported"},
-	{0x2303, "Invalid token operation, remote rod token creation not "
-	 "supported"},
-	{0x2304, "Invalid token operation, token unknown"},
-	{0x2305, "Invalid token operation, token corrupt"},
-	{0x2306, "Invalid token operation, token revoked"},
-	{0x2307, "Invalid token operation, token expired"},
-	{0x2308, "Invalid token operation, token cancelled"},
-	{0x2309, "Invalid token operation, token deleted"},
-	{0x230A, "Invalid token operation, invalid token length"},
-
-	{0x2400, "Invalid field in cdb"},
-	{0x2401, "CDB decryption error"},
-	{0x2402, "Obsolete"},
-	{0x2403, "Obsolete"},
-	{0x2404, "Security audit value frozen"},
-	{0x2405, "Security working key frozen"},
-	{0x2406, "Nonce not unique"},
-	{0x2407, "Nonce timestamp out of range"},
-	{0x2408, "Invalid XCDB"},
-
-	{0x2500, "Logical unit not supported"},
-
-	{0x2600, "Invalid field in parameter list"},
-	{0x2601, "Parameter not supported"},
-	{0x2602, "Parameter value invalid"},
-	{0x2603, "Threshold parameters not supported"},
-	{0x2604, "Invalid release of persistent reservation"},
-	{0x2605, "Data decryption error"},
-	{0x2606, "Too many target descriptors"},
-	{0x2607, "Unsupported target descriptor type code"},
-	{0x2608, "Too many segment descriptors"},
-	{0x2609, "Unsupported segment descriptor type code"},
-	{0x260A, "Unexpected inexact segment"},
-	{0x260B, "Inline data length exceeded"},
-	{0x260C, "Invalid operation for copy source or destination"},
-	{0x260D, "Copy segment granularity violation"},
-	{0x260E, "Invalid parameter while port is enabled"},
-	{0x260F, "Invalid data-out buffer integrity check value"},
-	{0x2610, "Data decryption key fail limit reached"},
-	{0x2611, "Incomplete key-associated data set"},
-	{0x2612, "Vendor specific key reference not found"},
-
-	{0x2700, "Write protected"},
-	{0x2701, "Hardware write protected"},
-	{0x2702, "Logical unit software write protected"},
-	{0x2703, "Associated write protect"},
-	{0x2704, "Persistent write protect"},
-	{0x2705, "Permanent write protect"},
-	{0x2706, "Conditional write protect"},
-	{0x2707, "Space allocation failed write protect"},
-
-	{0x2800, "Not ready to ready change, medium may have changed"},
-	{0x2801, "Import or export element accessed"},
-	{0x2802, "Format-layer may have changed"},
-	{0x2803, "Import/export element accessed, medium changed"},
-
-	{0x2900, "Power on, reset, or bus device reset occurred"},
-	{0x2901, "Power on occurred"},
-	{0x2902, "Scsi bus reset occurred"},
-	{0x2903, "Bus device reset function occurred"},
-	{0x2904, "Device internal reset"},
-	{0x2905, "Transceiver mode changed to single-ended"},
-	{0x2906, "Transceiver mode changed to lvd"},
-	{0x2907, "I_T nexus loss occurred"},
-
-	{0x2A00, "Parameters changed"},
-	{0x2A01, "Mode parameters changed"},
-	{0x2A02, "Log parameters changed"},
-	{0x2A03, "Reservations preempted"},
-	{0x2A04, "Reservations released"},
-	{0x2A05, "Registrations preempted"},
-	{0x2A06, "Asymmetric access state changed"},
-	{0x2A07, "Implicit asymmetric access state transition failed"},
-	{0x2A08, "Priority changed"},
-	{0x2A09, "Capacity data has changed"},
-	{0x2A0A, "Error history I_T nexus cleared"},
-	{0x2A0B, "Error history snapshot released"},
-	{0x2A0C, "Error recovery attributes have changed"},
-	{0x2A0D, "Data encryption capabilities changed"},
-	{0x2A10, "Timestamp changed"},
-	{0x2A11, "Data encryption parameters changed by another i_t nexus"},
-	{0x2A12, "Data encryption parameters changed by vendor specific "
-		 "event"},
-	{0x2A13, "Data encryption key instance counter has changed"},
-	{0x2A14, "SA creation capabilities data has changed"},
-	{0x2A15, "Medium removal prevention preempted"},
-
-	{0x2B00, "Copy cannot execute since host cannot disconnect"},
-
-	{0x2C00, "Command sequence error"},
-	{0x2C01, "Too many windows specified"},
-	{0x2C02, "Invalid combination of windows specified"},
-	{0x2C03, "Current program area is not empty"},
-	{0x2C04, "Current program area is empty"},
-	{0x2C05, "Illegal power condition request"},
-	{0x2C06, "Persistent prevent conflict"},
-	{0x2C07, "Previous busy status"},
-	{0x2C08, "Previous task set full status"},
-	{0x2C09, "Previous reservation conflict status"},
-	{0x2C0A, "Partition or collection contains user objects"},
-	{0x2C0B, "Not reserved"},
-	{0x2C0C, "Orwrite generation does not match"},
-
-	{0x2D00, "Overwrite error on update in place"},
-
-	{0x2E00, "Insufficient time for operation"},
-
-	{0x2F00, "Commands cleared by another initiator"},
-	{0x2F01, "Commands cleared by power loss notification"},
-	{0x2F02, "Commands cleared by device server"},
-	{0x2F03, "Some commands cleared by queuing layer event"},
-
-	{0x3000, "Incompatible medium installed"},
-	{0x3001, "Cannot read medium - unknown format"},
-	{0x3002, "Cannot read medium - incompatible format"},
-	{0x3003, "Cleaning cartridge installed"},
-	{0x3004, "Cannot write medium - unknown format"},
-	{0x3005, "Cannot write medium - incompatible format"},
-	{0x3006, "Cannot format medium - incompatible medium"},
-	{0x3007, "Cleaning failure"},
-	{0x3008, "Cannot write - application code mismatch"},
-	{0x3009, "Current session not fixated for append"},
-	{0x300A, "Cleaning request rejected"},
-	{0x300C, "WORM medium - overwrite attempted"},
-	{0x300D, "WORM medium - integrity check"},
-	{0x3010, "Medium not formatted"},
-	{0x3011, "Incompatible volume type"},
-	{0x3012, "Incompatible volume qualifier"},
-	{0x3013, "Cleaning volume expired"},
-
-	{0x3100, "Medium format corrupted"},
-	{0x3101, "Format command failed"},
-	{0x3102, "Zoned formatting failed due to spare linking"},
-	{0x3103, "Sanitize command failed"},
-
-	{0x3200, "No defect spare location available"},
-	{0x3201, "Defect list update failure"},
-
-	{0x3300, "Tape length error"},
-
-	{0x3400, "Enclosure failure"},
-
-	{0x3500, "Enclosure services failure"},
-	{0x3501, "Unsupported enclosure function"},
-	{0x3502, "Enclosure services unavailable"},
-	{0x3503, "Enclosure services transfer failure"},
-	{0x3504, "Enclosure services transfer refused"},
-	{0x3505, "Enclosure services checksum error"},
-
-	{0x3600, "Ribbon, ink, or toner failure"},
-
-	{0x3700, "Rounded parameter"},
-
-	{0x3800, "Event status notification"},
-	{0x3802, "Esn - power management class event"},
-	{0x3804, "Esn - media class event"},
-	{0x3806, "Esn - device busy class event"},
-	{0x3807, "Thin Provisioning soft threshold reached"},
-
-	{0x3900, "Saving parameters not supported"},
-
-	{0x3A00, "Medium not present"},
-	{0x3A01, "Medium not present - tray closed"},
-	{0x3A02, "Medium not present - tray open"},
-	{0x3A03, "Medium not present - loadable"},
-	{0x3A04, "Medium not present - medium auxiliary memory accessible"},
-
-	{0x3B00, "Sequential positioning error"},
-	{0x3B01, "Tape position error at beginning-of-medium"},
-	{0x3B02, "Tape position error at end-of-medium"},
-	{0x3B03, "Tape or electronic vertical forms unit not ready"},
-	{0x3B04, "Slew failure"},
-	{0x3B05, "Paper jam"},
-	{0x3B06, "Failed to sense top-of-form"},
-	{0x3B07, "Failed to sense bottom-of-form"},
-	{0x3B08, "Reposition error"},
-	{0x3B09, "Read past end of medium"},
-	{0x3B0A, "Read past beginning of medium"},
-	{0x3B0B, "Position past end of medium"},
-	{0x3B0C, "Position past beginning of medium"},
-	{0x3B0D, "Medium destination element full"},
-	{0x3B0E, "Medium source element empty"},
-	{0x3B0F, "End of medium reached"},
-	{0x3B11, "Medium magazine not accessible"},
-	{0x3B12, "Medium magazine removed"},
-	{0x3B13, "Medium magazine inserted"},
-	{0x3B14, "Medium magazine locked"},
-	{0x3B15, "Medium magazine unlocked"},
-	{0x3B16, "Mechanical positioning or changer error"},
-	{0x3B17, "Read past end of user object"},
-	{0x3B18, "Element disabled"},
-	{0x3B19, "Element enabled"},
-	{0x3B1A, "Data transfer device removed"},
-	{0x3B1B, "Data transfer device inserted"},
-	{0x3B1C, "Too many logical objects on partition to support "
-	 "operation"},
-
-	{0x3D00, "Invalid bits in identify message"},
-
-	{0x3E00, "Logical unit has not self-configured yet"},
-	{0x3E01, "Logical unit failure"},
-	{0x3E02, "Timeout on logical unit"},
-	{0x3E03, "Logical unit failed self-test"},
-	{0x3E04, "Logical unit unable to update self-test log"},
-
-	{0x3F00, "Target operating conditions have changed"},
-	{0x3F01, "Microcode has been changed"},
-	{0x3F02, "Changed operating definition"},
-	{0x3F03, "Inquiry data has changed"},
-	{0x3F04, "Component device attached"},
-	{0x3F05, "Device identifier changed"},
-	{0x3F06, "Redundancy group created or modified"},
-	{0x3F07, "Redundancy group deleted"},
-	{0x3F08, "Spare created or modified"},
-	{0x3F09, "Spare deleted"},
-	{0x3F0A, "Volume set created or modified"},
-	{0x3F0B, "Volume set deleted"},
-	{0x3F0C, "Volume set deassigned"},
-	{0x3F0D, "Volume set reassigned"},
-	{0x3F0E, "Reported luns data has changed"},
-	{0x3F0F, "Echo buffer overwritten"},
-	{0x3F10, "Medium loadable"},
-	{0x3F11, "Medium auxiliary memory accessible"},
-	{0x3F12, "iSCSI IP address added"},
-	{0x3F13, "iSCSI IP address removed"},
-	{0x3F14, "iSCSI IP address changed"},
-	{0x3F15, "Inspect referrals sense descriptors"},
-/*
- *	{0x40NN, "Ram failure"},
- *	{0x40NN, "Diagnostic failure on component nn"},
- *	{0x41NN, "Data path failure"},
- *	{0x42NN, "Power-on or self-test failure"},
- */
-	{0x4300, "Message error"},
-
-	{0x4400, "Internal target failure"},
-	{0x4401, "Persistent reservation information lost"},
-	{0x4471, "ATA device failed set features"},
-
-	{0x4500, "Select or reselect failure"},
-
-	{0x4600, "Unsuccessful soft reset"},
-
-	{0x4700, "Scsi parity error"},
-	{0x4701, "Data phase CRC error detected"},
-	{0x4702, "Scsi parity error detected during st data phase"},
-	{0x4703, "Information unit iuCRC error detected"},
-	{0x4704, "Asynchronous information protection error detected"},
-	{0x4705, "Protocol service CRC error"},
-	{0x4706, "Phy test function in progress"},
-	{0x477f, "Some commands cleared by iSCSI Protocol event"},
-
-	{0x4800, "Initiator detected error message received"},
-
-	{0x4900, "Invalid message error"},
-
-	{0x4A00, "Command phase error"},
-
-	{0x4B00, "Data phase error"},
-	{0x4B01, "Invalid target port transfer tag received"},
-	{0x4B02, "Too much write data"},
-	{0x4B03, "Ack/nak timeout"},
-	{0x4B04, "Nak received"},
-	{0x4B05, "Data offset error"},
-	{0x4B06, "Initiator response timeout"},
-	{0x4B07, "Connection lost"},
-	{0x4B08, "Data-in buffer overflow - data buffer size"},
-	{0x4B09, "Data-in buffer overflow - data buffer descriptor area"},
-	{0x4B0A, "Data-in buffer error"},
-	{0x4B0B, "Data-out buffer overflow - data buffer size"},
-	{0x4B0C, "Data-out buffer overflow - data buffer descriptor area"},
-	{0x4B0D, "Data-out buffer error"},
-	{0x4B0E, "PCIe fabric error"},
-	{0x4B0F, "PCIe completion timeout"},
-	{0x4B10, "PCIe completer abort"},
-	{0x4B11, "PCIe poisoned tlp received"},
-	{0x4B12, "PCIe eCRC check failed"},
-	{0x4B13, "PCIe unsupported request"},
-	{0x4B14, "PCIe acs violation"},
-	{0x4B15, "PCIe tlp prefix blocked"},
-
-	{0x4C00, "Logical unit failed self-configuration"},
-/*
- *	{0x4DNN, "Tagged overlapped commands (nn = queue tag)"},
- */
-	{0x4E00, "Overlapped commands attempted"},
-
-	{0x5000, "Write append error"},
-	{0x5001, "Write append position error"},
-	{0x5002, "Position error related to timing"},
-
-	{0x5100, "Erase failure"},
-	{0x5101, "Erase failure - incomplete erase operation detected"},
-
-	{0x5200, "Cartridge fault"},
-
-	{0x5300, "Media load or eject failed"},
-	{0x5301, "Unload tape failure"},
-	{0x5302, "Medium removal prevented"},
-	{0x5303, "Medium removal prevented by data transfer element"},
-	{0x5304, "Medium thread or unthread failure"},
-	{0x5305, "Volume identifier invalid"},
-	{0x5306, "Volume identifier missing"},
-	{0x5307, "Duplicate volume identifier"},
-	{0x5308, "Element status unknown"},
-
-	{0x5400, "Scsi to host system interface failure"},
-
-	{0x5500, "System resource failure"},
-	{0x5501, "System buffer full"},
-	{0x5502, "Insufficient reservation resources"},
-	{0x5503, "Insufficient resources"},
-	{0x5504, "Insufficient registration resources"},
-	{0x5505, "Insufficient access control resources"},
-	{0x5506, "Auxiliary memory out of space"},
-	{0x5507, "Quota error"},
-	{0x5508, "Maximum number of supplemental decryption keys exceeded"},
-	{0x5509, "Medium auxiliary memory not accessible"},
-	{0x550A, "Data currently unavailable"},
-	{0x550B, "Insufficient power for operation"},
-	{0x550C, "Insufficient resources to create rod"},
-	{0x550D, "Insufficient resources to create rod token"},
-
-	{0x5700, "Unable to recover table-of-contents"},
-
-	{0x5800, "Generation does not exist"},
-
-	{0x5900, "Updated block read"},
-
-	{0x5A00, "Operator request or state change input"},
-	{0x5A01, "Operator medium removal request"},
-	{0x5A02, "Operator selected write protect"},
-	{0x5A03, "Operator selected write permit"},
-
-	{0x5B00, "Log exception"},
-	{0x5B01, "Threshold condition met"},
-	{0x5B02, "Log counter at maximum"},
-	{0x5B03, "Log list codes exhausted"},
-
-	{0x5C00, "Rpl status change"},
-	{0x5C01, "Spindles synchronized"},
-	{0x5C02, "Spindles not synchronized"},
-
-	{0x5D00, "Failure prediction threshold exceeded"},
-	{0x5D01, "Media failure prediction threshold exceeded"},
-	{0x5D02, "Logical unit failure prediction threshold exceeded"},
-	{0x5D03, "Spare area exhaustion prediction threshold exceeded"},
-	{0x5D10, "Hardware impending failure general hard drive failure"},
-	{0x5D11, "Hardware impending failure drive error rate too high"},
-	{0x5D12, "Hardware impending failure data error rate too high"},
-	{0x5D13, "Hardware impending failure seek error rate too high"},
-	{0x5D14, "Hardware impending failure too many block reassigns"},
-	{0x5D15, "Hardware impending failure access times too high"},
-	{0x5D16, "Hardware impending failure start unit times too high"},
-	{0x5D17, "Hardware impending failure channel parametrics"},
-	{0x5D18, "Hardware impending failure controller detected"},
-	{0x5D19, "Hardware impending failure throughput performance"},
-	{0x5D1A, "Hardware impending failure seek time performance"},
-	{0x5D1B, "Hardware impending failure spin-up retry count"},
-	{0x5D1C, "Hardware impending failure drive calibration retry count"},
-	{0x5D20, "Controller impending failure general hard drive failure"},
-	{0x5D21, "Controller impending failure drive error rate too high"},
-	{0x5D22, "Controller impending failure data error rate too high"},
-	{0x5D23, "Controller impending failure seek error rate too high"},
-	{0x5D24, "Controller impending failure too many block reassigns"},
-	{0x5D25, "Controller impending failure access times too high"},
-	{0x5D26, "Controller impending failure start unit times too high"},
-	{0x5D27, "Controller impending failure channel parametrics"},
-	{0x5D28, "Controller impending failure controller detected"},
-	{0x5D29, "Controller impending failure throughput performance"},
-	{0x5D2A, "Controller impending failure seek time performance"},
-	{0x5D2B, "Controller impending failure spin-up retry count"},
-	{0x5D2C, "Controller impending failure drive calibration retry count"},
-	{0x5D30, "Data channel impending failure general hard drive failure"},
-	{0x5D31, "Data channel impending failure drive error rate too high"},
-	{0x5D32, "Data channel impending failure data error rate too high"},
-	{0x5D33, "Data channel impending failure seek error rate too high"},
-	{0x5D34, "Data channel impending failure too many block reassigns"},
-	{0x5D35, "Data channel impending failure access times too high"},
-	{0x5D36, "Data channel impending failure start unit times too high"},
-	{0x5D37, "Data channel impending failure channel parametrics"},
-	{0x5D38, "Data channel impending failure controller detected"},
-	{0x5D39, "Data channel impending failure throughput performance"},
-	{0x5D3A, "Data channel impending failure seek time performance"},
-	{0x5D3B, "Data channel impending failure spin-up retry count"},
-	{0x5D3C, "Data channel impending failure drive calibration retry "
-	 "count"},
-	{0x5D40, "Servo impending failure general hard drive failure"},
-	{0x5D41, "Servo impending failure drive error rate too high"},
-	{0x5D42, "Servo impending failure data error rate too high"},
-	{0x5D43, "Servo impending failure seek error rate too high"},
-	{0x5D44, "Servo impending failure too many block reassigns"},
-	{0x5D45, "Servo impending failure access times too high"},
-	{0x5D46, "Servo impending failure start unit times too high"},
-	{0x5D47, "Servo impending failure channel parametrics"},
-	{0x5D48, "Servo impending failure controller detected"},
-	{0x5D49, "Servo impending failure throughput performance"},
-	{0x5D4A, "Servo impending failure seek time performance"},
-	{0x5D4B, "Servo impending failure spin-up retry count"},
-	{0x5D4C, "Servo impending failure drive calibration retry count"},
-	{0x5D50, "Spindle impending failure general hard drive failure"},
-	{0x5D51, "Spindle impending failure drive error rate too high"},
-	{0x5D52, "Spindle impending failure data error rate too high"},
-	{0x5D53, "Spindle impending failure seek error rate too high"},
-	{0x5D54, "Spindle impending failure too many block reassigns"},
-	{0x5D55, "Spindle impending failure access times too high"},
-	{0x5D56, "Spindle impending failure start unit times too high"},
-	{0x5D57, "Spindle impending failure channel parametrics"},
-	{0x5D58, "Spindle impending failure controller detected"},
-	{0x5D59, "Spindle impending failure throughput performance"},
-	{0x5D5A, "Spindle impending failure seek time performance"},
-	{0x5D5B, "Spindle impending failure spin-up retry count"},
-	{0x5D5C, "Spindle impending failure drive calibration retry count"},
-	{0x5D60, "Firmware impending failure general hard drive failure"},
-	{0x5D61, "Firmware impending failure drive error rate too high"},
-	{0x5D62, "Firmware impending failure data error rate too high"},
-	{0x5D63, "Firmware impending failure seek error rate too high"},
-	{0x5D64, "Firmware impending failure too many block reassigns"},
-	{0x5D65, "Firmware impending failure access times too high"},
-	{0x5D66, "Firmware impending failure start unit times too high"},
-	{0x5D67, "Firmware impending failure channel parametrics"},
-	{0x5D68, "Firmware impending failure controller detected"},
-	{0x5D69, "Firmware impending failure throughput performance"},
-	{0x5D6A, "Firmware impending failure seek time performance"},
-	{0x5D6B, "Firmware impending failure spin-up retry count"},
-	{0x5D6C, "Firmware impending failure drive calibration retry count"},
-	{0x5DFF, "Failure prediction threshold exceeded (false)"},
-
-	{0x5E00, "Low power condition on"},
-	{0x5E01, "Idle condition activated by timer"},
-	{0x5E02, "Standby condition activated by timer"},
-	{0x5E03, "Idle condition activated by command"},
-	{0x5E04, "Standby condition activated by command"},
-	{0x5E05, "Idle_b condition activated by timer"},
-	{0x5E06, "Idle_b condition activated by command"},
-	{0x5E07, "Idle_c condition activated by timer"},
-	{0x5E08, "Idle_c condition activated by command"},
-	{0x5E09, "Standby_y condition activated by timer"},
-	{0x5E0A, "Standby_y condition activated by command"},
-	{0x5E41, "Power state change to active"},
-	{0x5E42, "Power state change to idle"},
-	{0x5E43, "Power state change to standby"},
-	{0x5E45, "Power state change to sleep"},
-	{0x5E47, "Power state change to device control"},
-
-	{0x6000, "Lamp failure"},
-
-	{0x6100, "Video acquisition error"},
-	{0x6101, "Unable to acquire video"},
-	{0x6102, "Out of focus"},
-
-	{0x6200, "Scan head positioning error"},
-
-	{0x6300, "End of user area encountered on this track"},
-	{0x6301, "Packet does not fit in available space"},
-
-	{0x6400, "Illegal mode for this track"},
-	{0x6401, "Invalid packet size"},
-
-	{0x6500, "Voltage fault"},
-
-	{0x6600, "Automatic document feeder cover up"},
-	{0x6601, "Automatic document feeder lift up"},
-	{0x6602, "Document jam in automatic document feeder"},
-	{0x6603, "Document miss feed automatic in document feeder"},
-
-	{0x6700, "Configuration failure"},
-	{0x6701, "Configuration of incapable logical units failed"},
-	{0x6702, "Add logical unit failed"},
-	{0x6703, "Modification of logical unit failed"},
-	{0x6704, "Exchange of logical unit failed"},
-	{0x6705, "Remove of logical unit failed"},
-	{0x6706, "Attachment of logical unit failed"},
-	{0x6707, "Creation of logical unit failed"},
-	{0x6708, "Assign failure occurred"},
-	{0x6709, "Multiply assigned logical unit"},
-	{0x670A, "Set target port groups command failed"},
-	{0x670B, "ATA device feature not enabled"},
-
-	{0x6800, "Logical unit not configured"},
-	{0x6801, "Subsidiary logical unit not configured"},
-
-	{0x6900, "Data loss on logical unit"},
-	{0x6901, "Multiple logical unit failures"},
-	{0x6902, "Parity/data mismatch"},
-
-	{0x6A00, "Informational, refer to log"},
-
-	{0x6B00, "State change has occurred"},
-	{0x6B01, "Redundancy level got better"},
-	{0x6B02, "Redundancy level got worse"},
-
-	{0x6C00, "Rebuild failure occurred"},
-
-	{0x6D00, "Recalculate failure occurred"},
-
-	{0x6E00, "Command to logical unit failed"},
-
-	{0x6F00, "Copy protection key exchange failure - authentication "
-	 "failure"},
-	{0x6F01, "Copy protection key exchange failure - key not present"},
-	{0x6F02, "Copy protection key exchange failure - key not established"},
-	{0x6F03, "Read of scrambled sector without authentication"},
-	{0x6F04, "Media region code is mismatched to logical unit region"},
-	{0x6F05, "Drive region must be permanent/region reset count error"},
-	{0x6F06, "Insufficient block count for binding nonce recording"},
-	{0x6F07, "Conflict in binding nonce recording"},
-/*
- *	{0x70NN, "Decompression exception short algorithm id of nn"},
- */
-	{0x7100, "Decompression exception long algorithm id"},
-
-	{0x7200, "Session fixation error"},
-	{0x7201, "Session fixation error writing lead-in"},
-	{0x7202, "Session fixation error writing lead-out"},
-	{0x7203, "Session fixation error - incomplete track in session"},
-	{0x7204, "Empty or partially written reserved track"},
-	{0x7205, "No more track reservations allowed"},
-	{0x7206, "RMZ extension is not allowed"},
-	{0x7207, "No more test zone extensions are allowed"},
-
-	{0x7300, "Cd control error"},
-	{0x7301, "Power calibration area almost full"},
-	{0x7302, "Power calibration area is full"},
-	{0x7303, "Power calibration area error"},
-	{0x7304, "Program memory area update failure"},
-	{0x7305, "Program memory area is full"},
-	{0x7306, "RMA/PMA is almost full"},
-	{0x7310, "Current power calibration area almost full"},
-	{0x7311, "Current power calibration area is full"},
-	{0x7317, "RDZ is full"},
-
-	{0x7400, "Security error"},
-	{0x7401, "Unable to decrypt data"},
-	{0x7402, "Unencrypted data encountered while decrypting"},
-	{0x7403, "Incorrect data encryption key"},
-	{0x7404, "Cryptographic integrity validation failed"},
-	{0x7405, "Error decrypting data"},
-	{0x7406, "Unknown signature verification key"},
-	{0x7407, "Encryption parameters not useable"},
-	{0x7408, "Digital signature validation failure"},
-	{0x7409, "Encryption mode mismatch on read"},
-	{0x740A, "Encrypted block not raw read enabled"},
-	{0x740B, "Incorrect Encryption parameters"},
-	{0x740C, "Unable to decrypt parameter list"},
-	{0x740D, "Encryption algorithm disabled"},
-	{0x7410, "SA creation parameter value invalid"},
-	{0x7411, "SA creation parameter value rejected"},
-	{0x7412, "Invalid SA usage"},
-	{0x7421, "Data Encryption configuration prevented"},
-	{0x7430, "SA creation parameter not supported"},
-	{0x7440, "Authentication failed"},
-	{0x7461, "External data encryption key manager access error"},
-	{0x7462, "External data encryption key manager error"},
-	{0x7463, "External data encryption key not found"},
-	{0x7464, "External data encryption request not authorized"},
-	{0x746E, "External data encryption control timeout"},
-	{0x746F, "External data encryption control error"},
-	{0x7471, "Logical unit access not authorized"},
-	{0x7479, "Security conflict in translated device"},
-
-	{0, NULL}
-};
-
-struct error_info2 {
-	unsigned char code1, code2_min, code2_max;
-	const char * fmt;
-};
-
-static const struct error_info2 additional2[] =
-{
-	{0x40, 0x00, 0x7f, "Ram failure (%x)"},
-	{0x40, 0x80, 0xff, "Diagnostic failure on component (%x)"},
-	{0x41, 0x00, 0xff, "Data path failure (%x)"},
-	{0x42, 0x00, 0xff, "Power-on or self-test failure (%x)"},
-	{0x4D, 0x00, 0xff, "Tagged overlapped commands (task tag %x)"},
-	{0x70, 0x00, 0xff, "Decompression exception short algorithm id of %x"},
-	{0, 0, 0, NULL}
-};
-#endif
-
-/*
- * Get additional sense code string or NULL if not available.
- * This string may contain a "%x" and should be printed with ascq as arg.
- */
-const char *
-scsi_extd_sense_format(unsigned char asc, unsigned char ascq) {
-#ifdef CONFIG_SCSI_CONSTANTS
-	int i;
-	unsigned short code = ((asc << 8) | ascq);
-
-	for (i = 0; additional[i].text; i++)
-		if (additional[i].code12 == code)
-			return additional[i].text;
-	for (i = 0; additional2[i].fmt; i++) {
-		if (additional2[i].code1 == asc &&
-		    ascq >= additional2[i].code2_min &&
-		    ascq <= additional2[i].code2_max)
-			return additional2[i].fmt;
-	}
-#endif
-	return NULL;
-}
-EXPORT_SYMBOL(scsi_extd_sense_format);
-
-void
-scsi_show_extd_sense(struct scsi_device *sdev, const char *name,
-		     unsigned char asc, unsigned char ascq)
-{
-	const char *extd_sense_fmt = scsi_extd_sense_format(asc, ascq);
-
-	if (extd_sense_fmt) {
-		if (strstr(extd_sense_fmt, "%x")) {
-			char sense_buf[50];
-			sprintf(sense_buf, extd_sense_fmt, ascq);
-			sdev_printk(KERN_INFO, sdev,
-				    "[%s] Add. Sense: %s", name, sense_buf);
-		} else
-			sdev_printk(KERN_INFO, sdev,
-				    "[%s] Add. Sense: %s\n",
-				    name, extd_sense_fmt);
-	} else
-		sdev_printk(KERN_INFO, sdev,
-			    "[%s] %sASC=0x%x %sASCQ=0x%x\n",
-			    name, asc >= 0x80 ? "<<vendor>> " : "", asc,
-			    asc < 0 && ascq >= 0x80 ? "<<vendor>> ": "",
-			    ascq);
-}
-EXPORT_SYMBOL(scsi_show_extd_sense);
-
-/*
- * Print normalized SCSI sense header with a prefix.
- */
-void
-scsi_print_sense_hdr(struct scsi_device *sdev, const char *name,
-		     struct scsi_sense_hdr *sshdr)
-{
-	trace_scsi_print_sense(sdev, name, sshdr, NULL, 0, 0);
-	scsi_show_extd_sense(sdev, name, sshdr->asc, sshdr->ascq);
-}
-EXPORT_SYMBOL(scsi_print_sense_hdr);
-
-/* Normalize and print sense buffer with name prefix */
-void __scsi_print_sense(struct scsi_device *sdev, const char *name,
-			const unsigned char *sense_buffer, int sense_len)
-{
-	struct scsi_sense_hdr sshdr;
-	int raw;
-
-	raw = !scsi_normalize_sense(sense_buffer, sense_len, &sshdr);
-
-	trace_scsi_print_sense(sdev, name, &sshdr, sense_buffer, sense_len,
-			       raw);
-	scsi_show_extd_sense(sdev, name, sshdr.asc, sshdr.ascq);
-}
-EXPORT_SYMBOL(__scsi_print_sense);
-
-/* Normalize and print sense buffer in SCSI command */
-void scsi_print_sense(struct scsi_cmnd *cmd)
-{
-	const char *devname = cmd->request->rq_disk ?
-		cmd->request->rq_disk->disk_name : "scsi";
-
-	__scsi_print_sense(cmd->device, devname, cmd->sense_buffer,
-			   SCSI_SENSE_BUFFERSIZE);
-}
-EXPORT_SYMBOL(scsi_print_sense);
diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
index 2ecb1dc..60678d8 100644
--- a/drivers/scsi/scsi_trace.c
+++ b/drivers/scsi/scsi_trace.c
@@ -22,6 +22,7 @@
 
 #include <scsi/scsi_dbg.h>
 #include <scsi/scsi_eh.h>
+#include <scsi/scsi_dbg.h>
 
 #define SERVICE_ACTION16(cdb) (cdb[1] & 0x1f)
 #define SERVICE_ACTION32(cdb) ((cdb[8] << 8) | cdb[9])
@@ -291,6 +292,841 @@ scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len)
 }
 
 #ifdef CONFIG_SCSI_CONSTANTS
+
+struct error_info {
+	unsigned short code12;	/* 0x0302 looks better than 0x03,0x02 */
+	const char *text;
+};
+
+/*
+ * The canonical list of T10 Additional Sense Codes is available at:
+ * http://www.t10.org/lists/asc-num.txt [most recent: 20130605]
+ */
+
+static const struct error_info additional[] =
+{
+	{0x0000, "No additional sense information"},
+	{0x0001, "Filemark detected"},
+	{0x0002, "End-of-partition/medium detected"},
+	{0x0003, "Setmark detected"},
+	{0x0004, "Beginning-of-partition/medium detected"},
+	{0x0005, "End-of-data detected"},
+	{0x0006, "I/O process terminated"},
+	{0x0007, "Programmable early warning detected"},
+	{0x0011, "Audio play operation in progress"},
+	{0x0012, "Audio play operation paused"},
+	{0x0013, "Audio play operation successfully completed"},
+	{0x0014, "Audio play operation stopped due to error"},
+	{0x0015, "No current audio status to return"},
+	{0x0016, "Operation in progress"},
+	{0x0017, "Cleaning requested"},
+	{0x0018, "Erase operation in progress"},
+	{0x0019, "Locate operation in progress"},
+	{0x001A, "Rewind operation in progress"},
+	{0x001B, "Set capacity operation in progress"},
+	{0x001C, "Verify operation in progress"},
+	{0x001D, "ATA pass through information available"},
+	{0x001E, "Conflicting SA creation request"},
+	{0x001F, "Logical unit transitioning to another power condition"},
+	{0x0020, "Extended copy information available"},
+
+	{0x0100, "No index/sector signal"},
+
+	{0x0200, "No seek complete"},
+
+	{0x0300, "Peripheral device write fault"},
+	{0x0301, "No write current"},
+	{0x0302, "Excessive write errors"},
+
+	{0x0400, "Logical unit not ready, cause not reportable"},
+	{0x0401, "Logical unit is in process of becoming ready"},
+	{0x0402, "Logical unit not ready, initializing command required"},
+	{0x0403, "Logical unit not ready, manual intervention required"},
+	{0x0404, "Logical unit not ready, format in progress"},
+	{0x0405, "Logical unit not ready, rebuild in progress"},
+	{0x0406, "Logical unit not ready, recalculation in progress"},
+	{0x0407, "Logical unit not ready, operation in progress"},
+	{0x0408, "Logical unit not ready, long write in progress"},
+	{0x0409, "Logical unit not ready, self-test in progress"},
+	{0x040A, "Logical unit not accessible, asymmetric access state "
+	 "transition"},
+	{0x040B, "Logical unit not accessible, target port in standby state"},
+	{0x040C, "Logical unit not accessible, target port in unavailable "
+	 "state"},
+	{0x040D, "Logical unit not ready, structure check required"},
+	{0x0410, "Logical unit not ready, auxiliary memory not accessible"},
+	{0x0411, "Logical unit not ready, notify (enable spinup) required"},
+	{0x0412, "Logical unit not ready, offline"},
+	{0x0413, "Logical unit not ready, SA creation in progress"},
+	{0x0414, "Logical unit not ready, space allocation in progress"},
+	{0x0415, "Logical unit not ready, robotics disabled"},
+	{0x0416, "Logical unit not ready, configuration required"},
+	{0x0417, "Logical unit not ready, calibration required"},
+	{0x0418, "Logical unit not ready, a door is open"},
+	{0x0419, "Logical unit not ready, operating in sequential mode"},
+	{0x041A, "Logical unit not ready, start stop unit command in "
+	 "progress"},
+	{0x041B, "Logical unit not ready, sanitize in progress"},
+	{0x041C, "Logical unit not ready, additional power use not yet "
+	 "granted"},
+	{0x041D, "Logical unit not ready, configuration in progress"},
+
+	{0x0500, "Logical unit does not respond to selection"},
+
+	{0x0600, "No reference position found"},
+
+	{0x0700, "Multiple peripheral devices selected"},
+
+	{0x0800, "Logical unit communication failure"},
+	{0x0801, "Logical unit communication time-out"},
+	{0x0802, "Logical unit communication parity error"},
+	{0x0803, "Logical unit communication CRC error (Ultra-DMA/32)"},
+	{0x0804, "Unreachable copy target"},
+
+	{0x0900, "Track following error"},
+	{0x0901, "Tracking servo failure"},
+	{0x0902, "Focus servo failure"},
+	{0x0903, "Spindle servo failure"},
+	{0x0904, "Head select fault"},
+
+	{0x0A00, "Error log overflow"},
+
+	{0x0B00, "Warning"},
+	{0x0B01, "Warning - specified temperature exceeded"},
+	{0x0B02, "Warning - enclosure degraded"},
+	{0x0B03, "Warning - background self-test failed"},
+	{0x0B04, "Warning - background pre-scan detected medium error"},
+	{0x0B05, "Warning - background medium scan detected medium error"},
+	{0x0B06, "Warning - non-volatile cache now volatile"},
+	{0x0B07, "Warning - degraded power to non-volatile cache"},
+	{0x0B08, "Warning - power loss expected"},
+	{0x0B09, "Warning - device statistics notification active"},
+
+	{0x0C00, "Write error"},
+	{0x0C01, "Write error - recovered with auto reallocation"},
+	{0x0C02, "Write error - auto reallocation failed"},
+	{0x0C03, "Write error - recommend reassignment"},
+	{0x0C04, "Compression check miscompare error"},
+	{0x0C05, "Data expansion occurred during compression"},
+	{0x0C06, "Block not compressible"},
+	{0x0C07, "Write error - recovery needed"},
+	{0x0C08, "Write error - recovery failed"},
+	{0x0C09, "Write error - loss of streaming"},
+	{0x0C0A, "Write error - padding blocks added"},
+	{0x0C0B, "Auxiliary memory write error"},
+	{0x0C0C, "Write error - unexpected unsolicited data"},
+	{0x0C0D, "Write error - not enough unsolicited data"},
+	{0x0C0E, "Multiple write errors"},
+	{0x0C0F, "Defects in error window"},
+
+	{0x0D00, "Error detected by third party temporary initiator"},
+	{0x0D01, "Third party device failure"},
+	{0x0D02, "Copy target device not reachable"},
+	{0x0D03, "Incorrect copy target device type"},
+	{0x0D04, "Copy target device data underrun"},
+	{0x0D05, "Copy target device data overrun"},
+
+	{0x0E00, "Invalid information unit"},
+	{0x0E01, "Information unit too short"},
+	{0x0E02, "Information unit too long"},
+	{0x0E03, "Invalid field in command information unit"},
+
+	{0x1000, "Id CRC or ECC error"},
+	{0x1001, "Logical block guard check failed"},
+	{0x1002, "Logical block application tag check failed"},
+	{0x1003, "Logical block reference tag check failed"},
+	{0x1004, "Logical block protection error on recover buffered data"},
+	{0x1005, "Logical block protection method error"},
+
+	{0x1100, "Unrecovered read error"},
+	{0x1101, "Read retries exhausted"},
+	{0x1102, "Error too long to correct"},
+	{0x1103, "Multiple read errors"},
+	{0x1104, "Unrecovered read error - auto reallocate failed"},
+	{0x1105, "L-EC uncorrectable error"},
+	{0x1106, "CIRC unrecovered error"},
+	{0x1107, "Data re-synchronization error"},
+	{0x1108, "Incomplete block read"},
+	{0x1109, "No gap found"},
+	{0x110A, "Miscorrected error"},
+	{0x110B, "Unrecovered read error - recommend reassignment"},
+	{0x110C, "Unrecovered read error - recommend rewrite the data"},
+	{0x110D, "De-compression CRC error"},
+	{0x110E, "Cannot decompress using declared algorithm"},
+	{0x110F, "Error reading UPC/EAN number"},
+	{0x1110, "Error reading ISRC number"},
+	{0x1111, "Read error - loss of streaming"},
+	{0x1112, "Auxiliary memory read error"},
+	{0x1113, "Read error - failed retransmission request"},
+	{0x1114, "Read error - lba marked bad by application client"},
+	{0x1115, "Write after sanitize required"},
+
+	{0x1200, "Address mark not found for id field"},
+
+	{0x1300, "Address mark not found for data field"},
+
+	{0x1400, "Recorded entity not found"},
+	{0x1401, "Record not found"},
+	{0x1402, "Filemark or setmark not found"},
+	{0x1403, "End-of-data not found"},
+	{0x1404, "Block sequence error"},
+	{0x1405, "Record not found - recommend reassignment"},
+	{0x1406, "Record not found - data auto-reallocated"},
+	{0x1407, "Locate operation failure"},
+
+	{0x1500, "Random positioning error"},
+	{0x1501, "Mechanical positioning error"},
+	{0x1502, "Positioning error detected by read of medium"},
+
+	{0x1600, "Data synchronization mark error"},
+	{0x1601, "Data sync error - data rewritten"},
+	{0x1602, "Data sync error - recommend rewrite"},
+	{0x1603, "Data sync error - data auto-reallocated"},
+	{0x1604, "Data sync error - recommend reassignment"},
+
+	{0x1700, "Recovered data with no error correction applied"},
+	{0x1701, "Recovered data with retries"},
+	{0x1702, "Recovered data with positive head offset"},
+	{0x1703, "Recovered data with negative head offset"},
+	{0x1704, "Recovered data with retries and/or circ applied"},
+	{0x1705, "Recovered data using previous sector id"},
+	{0x1706, "Recovered data without ECC - data auto-reallocated"},
+	{0x1707, "Recovered data without ECC - recommend reassignment"},
+	{0x1708, "Recovered data without ECC - recommend rewrite"},
+	{0x1709, "Recovered data without ECC - data rewritten"},
+
+	{0x1800, "Recovered data with error correction applied"},
+	{0x1801, "Recovered data with error corr. & retries applied"},
+	{0x1802, "Recovered data - data auto-reallocated"},
+	{0x1803, "Recovered data with CIRC"},
+	{0x1804, "Recovered data with L-EC"},
+	{0x1805, "Recovered data - recommend reassignment"},
+	{0x1806, "Recovered data - recommend rewrite"},
+	{0x1807, "Recovered data with ECC - data rewritten"},
+	{0x1808, "Recovered data with linking"},
+
+	{0x1900, "Defect list error"},
+	{0x1901, "Defect list not available"},
+	{0x1902, "Defect list error in primary list"},
+	{0x1903, "Defect list error in grown list"},
+
+	{0x1A00, "Parameter list length error"},
+
+	{0x1B00, "Synchronous data transfer error"},
+
+	{0x1C00, "Defect list not found"},
+	{0x1C01, "Primary defect list not found"},
+	{0x1C02, "Grown defect list not found"},
+
+	{0x1D00, "Miscompare during verify operation"},
+	{0x1D01, "Miscompare verify of unmapped LBA"},
+
+	{0x1E00, "Recovered id with ECC correction"},
+
+	{0x1F00, "Partial defect list transfer"},
+
+	{0x2000, "Invalid command operation code"},
+	{0x2001, "Access denied - initiator pending-enrolled"},
+	{0x2002, "Access denied - no access rights"},
+	{0x2003, "Access denied - invalid mgmt id key"},
+	{0x2004, "Illegal command while in write capable state"},
+	{0x2005, "Obsolete"},
+	{0x2006, "Illegal command while in explicit address mode"},
+	{0x2007, "Illegal command while in implicit address mode"},
+	{0x2008, "Access denied - enrollment conflict"},
+	{0x2009, "Access denied - invalid LU identifier"},
+	{0x200A, "Access denied - invalid proxy token"},
+	{0x200B, "Access denied - ACL LUN conflict"},
+	{0x200C, "Illegal command when not in append-only mode"},
+
+	{0x2100, "Logical block address out of range"},
+	{0x2101, "Invalid element address"},
+	{0x2102, "Invalid address for write"},
+	{0x2103, "Invalid write crossing layer jump"},
+
+	{0x2200, "Illegal function (use 20 00, 24 00, or 26 00)"},
+
+	{0x2300, "Invalid token operation, cause not reportable"},
+	{0x2301, "Invalid token operation, unsupported token type"},
+	{0x2302, "Invalid token operation, remote token usage not supported"},
+	{0x2303, "Invalid token operation, remote rod token creation not "
+	 "supported"},
+	{0x2304, "Invalid token operation, token unknown"},
+	{0x2305, "Invalid token operation, token corrupt"},
+	{0x2306, "Invalid token operation, token revoked"},
+	{0x2307, "Invalid token operation, token expired"},
+	{0x2308, "Invalid token operation, token cancelled"},
+	{0x2309, "Invalid token operation, token deleted"},
+	{0x230A, "Invalid token operation, invalid token length"},
+
+	{0x2400, "Invalid field in cdb"},
+	{0x2401, "CDB decryption error"},
+	{0x2402, "Obsolete"},
+	{0x2403, "Obsolete"},
+	{0x2404, "Security audit value frozen"},
+	{0x2405, "Security working key frozen"},
+	{0x2406, "Nonce not unique"},
+	{0x2407, "Nonce timestamp out of range"},
+	{0x2408, "Invalid XCDB"},
+
+	{0x2500, "Logical unit not supported"},
+
+	{0x2600, "Invalid field in parameter list"},
+	{0x2601, "Parameter not supported"},
+	{0x2602, "Parameter value invalid"},
+	{0x2603, "Threshold parameters not supported"},
+	{0x2604, "Invalid release of persistent reservation"},
+	{0x2605, "Data decryption error"},
+	{0x2606, "Too many target descriptors"},
+	{0x2607, "Unsupported target descriptor type code"},
+	{0x2608, "Too many segment descriptors"},
+	{0x2609, "Unsupported segment descriptor type code"},
+	{0x260A, "Unexpected inexact segment"},
+	{0x260B, "Inline data length exceeded"},
+	{0x260C, "Invalid operation for copy source or destination"},
+	{0x260D, "Copy segment granularity violation"},
+	{0x260E, "Invalid parameter while port is enabled"},
+	{0x260F, "Invalid data-out buffer integrity check value"},
+	{0x2610, "Data decryption key fail limit reached"},
+	{0x2611, "Incomplete key-associated data set"},
+	{0x2612, "Vendor specific key reference not found"},
+
+	{0x2700, "Write protected"},
+	{0x2701, "Hardware write protected"},
+	{0x2702, "Logical unit software write protected"},
+	{0x2703, "Associated write protect"},
+	{0x2704, "Persistent write protect"},
+	{0x2705, "Permanent write protect"},
+	{0x2706, "Conditional write protect"},
+	{0x2707, "Space allocation failed write protect"},
+
+	{0x2800, "Not ready to ready change, medium may have changed"},
+	{0x2801, "Import or export element accessed"},
+	{0x2802, "Format-layer may have changed"},
+	{0x2803, "Import/export element accessed, medium changed"},
+
+	{0x2900, "Power on, reset, or bus device reset occurred"},
+	{0x2901, "Power on occurred"},
+	{0x2902, "Scsi bus reset occurred"},
+	{0x2903, "Bus device reset function occurred"},
+	{0x2904, "Device internal reset"},
+	{0x2905, "Transceiver mode changed to single-ended"},
+	{0x2906, "Transceiver mode changed to lvd"},
+	{0x2907, "I_T nexus loss occurred"},
+
+	{0x2A00, "Parameters changed"},
+	{0x2A01, "Mode parameters changed"},
+	{0x2A02, "Log parameters changed"},
+	{0x2A03, "Reservations preempted"},
+	{0x2A04, "Reservations released"},
+	{0x2A05, "Registrations preempted"},
+	{0x2A06, "Asymmetric access state changed"},
+	{0x2A07, "Implicit asymmetric access state transition failed"},
+	{0x2A08, "Priority changed"},
+	{0x2A09, "Capacity data has changed"},
+	{0x2A0A, "Error history I_T nexus cleared"},
+	{0x2A0B, "Error history snapshot released"},
+	{0x2A0C, "Error recovery attributes have changed"},
+	{0x2A0D, "Data encryption capabilities changed"},
+	{0x2A10, "Timestamp changed"},
+	{0x2A11, "Data encryption parameters changed by another i_t nexus"},
+	{0x2A12, "Data encryption parameters changed by vendor specific "
+		 "event"},
+	{0x2A13, "Data encryption key instance counter has changed"},
+	{0x2A14, "SA creation capabilities data has changed"},
+	{0x2A15, "Medium removal prevention preempted"},
+
+	{0x2B00, "Copy cannot execute since host cannot disconnect"},
+
+	{0x2C00, "Command sequence error"},
+	{0x2C01, "Too many windows specified"},
+	{0x2C02, "Invalid combination of windows specified"},
+	{0x2C03, "Current program area is not empty"},
+	{0x2C04, "Current program area is empty"},
+	{0x2C05, "Illegal power condition request"},
+	{0x2C06, "Persistent prevent conflict"},
+	{0x2C07, "Previous busy status"},
+	{0x2C08, "Previous task set full status"},
+	{0x2C09, "Previous reservation conflict status"},
+	{0x2C0A, "Partition or collection contains user objects"},
+	{0x2C0B, "Not reserved"},
+	{0x2C0C, "Orwrite generation does not match"},
+
+	{0x2D00, "Overwrite error on update in place"},
+
+	{0x2E00, "Insufficient time for operation"},
+
+	{0x2F00, "Commands cleared by another initiator"},
+	{0x2F01, "Commands cleared by power loss notification"},
+	{0x2F02, "Commands cleared by device server"},
+	{0x2F03, "Some commands cleared by queuing layer event"},
+
+	{0x3000, "Incompatible medium installed"},
+	{0x3001, "Cannot read medium - unknown format"},
+	{0x3002, "Cannot read medium - incompatible format"},
+	{0x3003, "Cleaning cartridge installed"},
+	{0x3004, "Cannot write medium - unknown format"},
+	{0x3005, "Cannot write medium - incompatible format"},
+	{0x3006, "Cannot format medium - incompatible medium"},
+	{0x3007, "Cleaning failure"},
+	{0x3008, "Cannot write - application code mismatch"},
+	{0x3009, "Current session not fixated for append"},
+	{0x300A, "Cleaning request rejected"},
+	{0x300C, "WORM medium - overwrite attempted"},
+	{0x300D, "WORM medium - integrity check"},
+	{0x3010, "Medium not formatted"},
+	{0x3011, "Incompatible volume type"},
+	{0x3012, "Incompatible volume qualifier"},
+	{0x3013, "Cleaning volume expired"},
+
+	{0x3100, "Medium format corrupted"},
+	{0x3101, "Format command failed"},
+	{0x3102, "Zoned formatting failed due to spare linking"},
+	{0x3103, "Sanitize command failed"},
+
+	{0x3200, "No defect spare location available"},
+	{0x3201, "Defect list update failure"},
+
+	{0x3300, "Tape length error"},
+
+	{0x3400, "Enclosure failure"},
+
+	{0x3500, "Enclosure services failure"},
+	{0x3501, "Unsupported enclosure function"},
+	{0x3502, "Enclosure services unavailable"},
+	{0x3503, "Enclosure services transfer failure"},
+	{0x3504, "Enclosure services transfer refused"},
+	{0x3505, "Enclosure services checksum error"},
+
+	{0x3600, "Ribbon, ink, or toner failure"},
+
+	{0x3700, "Rounded parameter"},
+
+	{0x3800, "Event status notification"},
+	{0x3802, "Esn - power management class event"},
+	{0x3804, "Esn - media class event"},
+	{0x3806, "Esn - device busy class event"},
+	{0x3807, "Thin Provisioning soft threshold reached"},
+
+	{0x3900, "Saving parameters not supported"},
+
+	{0x3A00, "Medium not present"},
+	{0x3A01, "Medium not present - tray closed"},
+	{0x3A02, "Medium not present - tray open"},
+	{0x3A03, "Medium not present - loadable"},
+	{0x3A04, "Medium not present - medium auxiliary memory accessible"},
+
+	{0x3B00, "Sequential positioning error"},
+	{0x3B01, "Tape position error at beginning-of-medium"},
+	{0x3B02, "Tape position error at end-of-medium"},
+	{0x3B03, "Tape or electronic vertical forms unit not ready"},
+	{0x3B04, "Slew failure"},
+	{0x3B05, "Paper jam"},
+	{0x3B06, "Failed to sense top-of-form"},
+	{0x3B07, "Failed to sense bottom-of-form"},
+	{0x3B08, "Reposition error"},
+	{0x3B09, "Read past end of medium"},
+	{0x3B0A, "Read past beginning of medium"},
+	{0x3B0B, "Position past end of medium"},
+	{0x3B0C, "Position past beginning of medium"},
+	{0x3B0D, "Medium destination element full"},
+	{0x3B0E, "Medium source element empty"},
+	{0x3B0F, "End of medium reached"},
+	{0x3B11, "Medium magazine not accessible"},
+	{0x3B12, "Medium magazine removed"},
+	{0x3B13, "Medium magazine inserted"},
+	{0x3B14, "Medium magazine locked"},
+	{0x3B15, "Medium magazine unlocked"},
+	{0x3B16, "Mechanical positioning or changer error"},
+	{0x3B17, "Read past end of user object"},
+	{0x3B18, "Element disabled"},
+	{0x3B19, "Element enabled"},
+	{0x3B1A, "Data transfer device removed"},
+	{0x3B1B, "Data transfer device inserted"},
+	{0x3B1C, "Too many logical objects on partition to support "
+	 "operation"},
+
+	{0x3D00, "Invalid bits in identify message"},
+
+	{0x3E00, "Logical unit has not self-configured yet"},
+	{0x3E01, "Logical unit failure"},
+	{0x3E02, "Timeout on logical unit"},
+	{0x3E03, "Logical unit failed self-test"},
+	{0x3E04, "Logical unit unable to update self-test log"},
+
+	{0x3F00, "Target operating conditions have changed"},
+	{0x3F01, "Microcode has been changed"},
+	{0x3F02, "Changed operating definition"},
+	{0x3F03, "Inquiry data has changed"},
+	{0x3F04, "Component device attached"},
+	{0x3F05, "Device identifier changed"},
+	{0x3F06, "Redundancy group created or modified"},
+	{0x3F07, "Redundancy group deleted"},
+	{0x3F08, "Spare created or modified"},
+	{0x3F09, "Spare deleted"},
+	{0x3F0A, "Volume set created or modified"},
+	{0x3F0B, "Volume set deleted"},
+	{0x3F0C, "Volume set deassigned"},
+	{0x3F0D, "Volume set reassigned"},
+	{0x3F0E, "Reported luns data has changed"},
+	{0x3F0F, "Echo buffer overwritten"},
+	{0x3F10, "Medium loadable"},
+	{0x3F11, "Medium auxiliary memory accessible"},
+	{0x3F12, "iSCSI IP address added"},
+	{0x3F13, "iSCSI IP address removed"},
+	{0x3F14, "iSCSI IP address changed"},
+	{0x3F15, "Inspect referrals sense descriptors"},
+/*
+ *	{0x40NN, "Ram failure"},
+ *	{0x40NN, "Diagnostic failure on component nn"},
+ *	{0x41NN, "Data path failure"},
+ *	{0x42NN, "Power-on or self-test failure"},
+ */
+	{0x4300, "Message error"},
+
+	{0x4400, "Internal target failure"},
+	{0x4401, "Persistent reservation information lost"},
+	{0x4471, "ATA device failed set features"},
+
+	{0x4500, "Select or reselect failure"},
+
+	{0x4600, "Unsuccessful soft reset"},
+
+	{0x4700, "Scsi parity error"},
+	{0x4701, "Data phase CRC error detected"},
+	{0x4702, "Scsi parity error detected during st data phase"},
+	{0x4703, "Information unit iuCRC error detected"},
+	{0x4704, "Asynchronous information protection error detected"},
+	{0x4705, "Protocol service CRC error"},
+	{0x4706, "Phy test function in progress"},
+	{0x477f, "Some commands cleared by iSCSI Protocol event"},
+
+	{0x4800, "Initiator detected error message received"},
+
+	{0x4900, "Invalid message error"},
+
+	{0x4A00, "Command phase error"},
+
+	{0x4B00, "Data phase error"},
+	{0x4B01, "Invalid target port transfer tag received"},
+	{0x4B02, "Too much write data"},
+	{0x4B03, "Ack/nak timeout"},
+	{0x4B04, "Nak received"},
+	{0x4B05, "Data offset error"},
+	{0x4B06, "Initiator response timeout"},
+	{0x4B07, "Connection lost"},
+	{0x4B08, "Data-in buffer overflow - data buffer size"},
+	{0x4B09, "Data-in buffer overflow - data buffer descriptor area"},
+	{0x4B0A, "Data-in buffer error"},
+	{0x4B0B, "Data-out buffer overflow - data buffer size"},
+	{0x4B0C, "Data-out buffer overflow - data buffer descriptor area"},
+	{0x4B0D, "Data-out buffer error"},
+	{0x4B0E, "PCIe fabric error"},
+	{0x4B0F, "PCIe completion timeout"},
+	{0x4B10, "PCIe completer abort"},
+	{0x4B11, "PCIe poisoned tlp received"},
+	{0x4B12, "PCIe eCRC check failed"},
+	{0x4B13, "PCIe unsupported request"},
+	{0x4B14, "PCIe acs violation"},
+	{0x4B15, "PCIe tlp prefix blocked"},
+
+	{0x4C00, "Logical unit failed self-configuration"},
+/*
+ *	{0x4DNN, "Tagged overlapped commands (nn = queue tag)"},
+ */
+	{0x4E00, "Overlapped commands attempted"},
+
+	{0x5000, "Write append error"},
+	{0x5001, "Write append position error"},
+	{0x5002, "Position error related to timing"},
+
+	{0x5100, "Erase failure"},
+	{0x5101, "Erase failure - incomplete erase operation detected"},
+
+	{0x5200, "Cartridge fault"},
+
+	{0x5300, "Media load or eject failed"},
+	{0x5301, "Unload tape failure"},
+	{0x5302, "Medium removal prevented"},
+	{0x5303, "Medium removal prevented by data transfer element"},
+	{0x5304, "Medium thread or unthread failure"},
+	{0x5305, "Volume identifier invalid"},
+	{0x5306, "Volume identifier missing"},
+	{0x5307, "Duplicate volume identifier"},
+	{0x5308, "Element status unknown"},
+
+	{0x5400, "Scsi to host system interface failure"},
+
+	{0x5500, "System resource failure"},
+	{0x5501, "System buffer full"},
+	{0x5502, "Insufficient reservation resources"},
+	{0x5503, "Insufficient resources"},
+	{0x5504, "Insufficient registration resources"},
+	{0x5505, "Insufficient access control resources"},
+	{0x5506, "Auxiliary memory out of space"},
+	{0x5507, "Quota error"},
+	{0x5508, "Maximum number of supplemental decryption keys exceeded"},
+	{0x5509, "Medium auxiliary memory not accessible"},
+	{0x550A, "Data currently unavailable"},
+	{0x550B, "Insufficient power for operation"},
+	{0x550C, "Insufficient resources to create rod"},
+	{0x550D, "Insufficient resources to create rod token"},
+
+	{0x5700, "Unable to recover table-of-contents"},
+
+	{0x5800, "Generation does not exist"},
+
+	{0x5900, "Updated block read"},
+
+	{0x5A00, "Operator request or state change input"},
+	{0x5A01, "Operator medium removal request"},
+	{0x5A02, "Operator selected write protect"},
+	{0x5A03, "Operator selected write permit"},
+
+	{0x5B00, "Log exception"},
+	{0x5B01, "Threshold condition met"},
+	{0x5B02, "Log counter at maximum"},
+	{0x5B03, "Log list codes exhausted"},
+
+	{0x5C00, "Rpl status change"},
+	{0x5C01, "Spindles synchronized"},
+	{0x5C02, "Spindles not synchronized"},
+
+	{0x5D00, "Failure prediction threshold exceeded"},
+	{0x5D01, "Media failure prediction threshold exceeded"},
+	{0x5D02, "Logical unit failure prediction threshold exceeded"},
+	{0x5D03, "Spare area exhaustion prediction threshold exceeded"},
+	{0x5D10, "Hardware impending failure general hard drive failure"},
+	{0x5D11, "Hardware impending failure drive error rate too high"},
+	{0x5D12, "Hardware impending failure data error rate too high"},
+	{0x5D13, "Hardware impending failure seek error rate too high"},
+	{0x5D14, "Hardware impending failure too many block reassigns"},
+	{0x5D15, "Hardware impending failure access times too high"},
+	{0x5D16, "Hardware impending failure start unit times too high"},
+	{0x5D17, "Hardware impending failure channel parametrics"},
+	{0x5D18, "Hardware impending failure controller detected"},
+	{0x5D19, "Hardware impending failure throughput performance"},
+	{0x5D1A, "Hardware impending failure seek time performance"},
+	{0x5D1B, "Hardware impending failure spin-up retry count"},
+	{0x5D1C, "Hardware impending failure drive calibration retry count"},
+	{0x5D20, "Controller impending failure general hard drive failure"},
+	{0x5D21, "Controller impending failure drive error rate too high"},
+	{0x5D22, "Controller impending failure data error rate too high"},
+	{0x5D23, "Controller impending failure seek error rate too high"},
+	{0x5D24, "Controller impending failure too many block reassigns"},
+	{0x5D25, "Controller impending failure access times too high"},
+	{0x5D26, "Controller impending failure start unit times too high"},
+	{0x5D27, "Controller impending failure channel parametrics"},
+	{0x5D28, "Controller impending failure controller detected"},
+	{0x5D29, "Controller impending failure throughput performance"},
+	{0x5D2A, "Controller impending failure seek time performance"},
+	{0x5D2B, "Controller impending failure spin-up retry count"},
+	{0x5D2C, "Controller impending failure drive calibration retry count"},
+	{0x5D30, "Data channel impending failure general hard drive failure"},
+	{0x5D31, "Data channel impending failure drive error rate too high"},
+	{0x5D32, "Data channel impending failure data error rate too high"},
+	{0x5D33, "Data channel impending failure seek error rate too high"},
+	{0x5D34, "Data channel impending failure too many block reassigns"},
+	{0x5D35, "Data channel impending failure access times too high"},
+	{0x5D36, "Data channel impending failure start unit times too high"},
+	{0x5D37, "Data channel impending failure channel parametrics"},
+	{0x5D38, "Data channel impending failure controller detected"},
+	{0x5D39, "Data channel impending failure throughput performance"},
+	{0x5D3A, "Data channel impending failure seek time performance"},
+	{0x5D3B, "Data channel impending failure spin-up retry count"},
+	{0x5D3C, "Data channel impending failure drive calibration retry "
+	 "count"},
+	{0x5D40, "Servo impending failure general hard drive failure"},
+	{0x5D41, "Servo impending failure drive error rate too high"},
+	{0x5D42, "Servo impending failure data error rate too high"},
+	{0x5D43, "Servo impending failure seek error rate too high"},
+	{0x5D44, "Servo impending failure too many block reassigns"},
+	{0x5D45, "Servo impending failure access times too high"},
+	{0x5D46, "Servo impending failure start unit times too high"},
+	{0x5D47, "Servo impending failure channel parametrics"},
+	{0x5D48, "Servo impending failure controller detected"},
+	{0x5D49, "Servo impending failure throughput performance"},
+	{0x5D4A, "Servo impending failure seek time performance"},
+	{0x5D4B, "Servo impending failure spin-up retry count"},
+	{0x5D4C, "Servo impending failure drive calibration retry count"},
+	{0x5D50, "Spindle impending failure general hard drive failure"},
+	{0x5D51, "Spindle impending failure drive error rate too high"},
+	{0x5D52, "Spindle impending failure data error rate too high"},
+	{0x5D53, "Spindle impending failure seek error rate too high"},
+	{0x5D54, "Spindle impending failure too many block reassigns"},
+	{0x5D55, "Spindle impending failure access times too high"},
+	{0x5D56, "Spindle impending failure start unit times too high"},
+	{0x5D57, "Spindle impending failure channel parametrics"},
+	{0x5D58, "Spindle impending failure controller detected"},
+	{0x5D59, "Spindle impending failure throughput performance"},
+	{0x5D5A, "Spindle impending failure seek time performance"},
+	{0x5D5B, "Spindle impending failure spin-up retry count"},
+	{0x5D5C, "Spindle impending failure drive calibration retry count"},
+	{0x5D60, "Firmware impending failure general hard drive failure"},
+	{0x5D61, "Firmware impending failure drive error rate too high"},
+	{0x5D62, "Firmware impending failure data error rate too high"},
+	{0x5D63, "Firmware impending failure seek error rate too high"},
+	{0x5D64, "Firmware impending failure too many block reassigns"},
+	{0x5D65, "Firmware impending failure access times too high"},
+	{0x5D66, "Firmware impending failure start unit times too high"},
+	{0x5D67, "Firmware impending failure channel parametrics"},
+	{0x5D68, "Firmware impending failure controller detected"},
+	{0x5D69, "Firmware impending failure throughput performance"},
+	{0x5D6A, "Firmware impending failure seek time performance"},
+	{0x5D6B, "Firmware impending failure spin-up retry count"},
+	{0x5D6C, "Firmware impending failure drive calibration retry count"},
+	{0x5DFF, "Failure prediction threshold exceeded (false)"},
+
+	{0x5E00, "Low power condition on"},
+	{0x5E01, "Idle condition activated by timer"},
+	{0x5E02, "Standby condition activated by timer"},
+	{0x5E03, "Idle condition activated by command"},
+	{0x5E04, "Standby condition activated by command"},
+	{0x5E05, "Idle_b condition activated by timer"},
+	{0x5E06, "Idle_b condition activated by command"},
+	{0x5E07, "Idle_c condition activated by timer"},
+	{0x5E08, "Idle_c condition activated by command"},
+	{0x5E09, "Standby_y condition activated by timer"},
+	{0x5E0A, "Standby_y condition activated by command"},
+	{0x5E41, "Power state change to active"},
+	{0x5E42, "Power state change to idle"},
+	{0x5E43, "Power state change to standby"},
+	{0x5E45, "Power state change to sleep"},
+	{0x5E47, "Power state change to device control"},
+
+	{0x6000, "Lamp failure"},
+
+	{0x6100, "Video acquisition error"},
+	{0x6101, "Unable to acquire video"},
+	{0x6102, "Out of focus"},
+
+	{0x6200, "Scan head positioning error"},
+
+	{0x6300, "End of user area encountered on this track"},
+	{0x6301, "Packet does not fit in available space"},
+
+	{0x6400, "Illegal mode for this track"},
+	{0x6401, "Invalid packet size"},
+
+	{0x6500, "Voltage fault"},
+
+	{0x6600, "Automatic document feeder cover up"},
+	{0x6601, "Automatic document feeder lift up"},
+	{0x6602, "Document jam in automatic document feeder"},
+	{0x6603, "Document miss feed automatic in document feeder"},
+
+	{0x6700, "Configuration failure"},
+	{0x6701, "Configuration of incapable logical units failed"},
+	{0x6702, "Add logical unit failed"},
+	{0x6703, "Modification of logical unit failed"},
+	{0x6704, "Exchange of logical unit failed"},
+	{0x6705, "Remove of logical unit failed"},
+	{0x6706, "Attachment of logical unit failed"},
+	{0x6707, "Creation of logical unit failed"},
+	{0x6708, "Assign failure occurred"},
+	{0x6709, "Multiply assigned logical unit"},
+	{0x670A, "Set target port groups command failed"},
+	{0x670B, "ATA device feature not enabled"},
+
+	{0x6800, "Logical unit not configured"},
+	{0x6801, "Subsidiary logical unit not configured"},
+
+	{0x6900, "Data loss on logical unit"},
+	{0x6901, "Multiple logical unit failures"},
+	{0x6902, "Parity/data mismatch"},
+
+	{0x6A00, "Informational, refer to log"},
+
+	{0x6B00, "State change has occurred"},
+	{0x6B01, "Redundancy level got better"},
+	{0x6B02, "Redundancy level got worse"},
+	{0x6C00, "Rebuild failure occurred"},
+
+	{0x6D00, "Recalculate failure occurred"},
+
+	{0x6E00, "Command to logical unit failed"},
+
+	{0x6F00, "Copy protection key exchange failure - authentication "
+	 "failure"},
+	{0x6F01, "Copy protection key exchange failure - key not present"},
+	{0x6F02, "Copy protection key exchange failure - key not established"},
+	{0x6F03, "Read of scrambled sector without authentication"},
+	{0x6F04, "Media region code is mismatched to logical unit region"},
+	{0x6F05, "Drive region must be permanent/region reset count error"},
+	{0x6F06, "Insufficient block count for binding nonce recording"},
+	{0x6F07, "Conflict in binding nonce recording"},
+/*
+ *	{0x70NN, "Decompression exception short algorithm id of nn"},
+ */
+	{0x7100, "Decompression exception long algorithm id"},
+
+	{0x7200, "Session fixation error"},
+	{0x7201, "Session fixation error writing lead-in"},
+	{0x7202, "Session fixation error writing lead-out"},
+	{0x7203, "Session fixation error - incomplete track in session"},
+	{0x7204, "Empty or partially written reserved track"},
+	{0x7205, "No more track reservations allowed"},
+	{0x7206, "RMZ extension is not allowed"},
+	{0x7207, "No more test zone extensions are allowed"},
+
+	{0x7300, "Cd control error"},
+	{0x7301, "Power calibration area almost full"},
+	{0x7302, "Power calibration area is full"},
+	{0x7303, "Power calibration area error"},
+	{0x7304, "Program memory area update failure"},
+	{0x7305, "Program memory area is full"},
+	{0x7306, "RMA/PMA is almost full"},
+	{0x7310, "Current power calibration area almost full"},
+	{0x7311, "Current power calibration area is full"},
+	{0x7317, "RDZ is full"},
+
+	{0x7400, "Security error"},
+	{0x7401, "Unable to decrypt data"},
+	{0x7402, "Unencrypted data encountered while decrypting"},
+	{0x7403, "Incorrect data encryption key"},
+	{0x7404, "Cryptographic integrity validation failed"},
+	{0x7405, "Error decrypting data"},
+	{0x7406, "Unknown signature verification key"},
+	{0x7407, "Encryption parameters not useable"},
+	{0x7408, "Digital signature validation failure"},
+	{0x7409, "Encryption mode mismatch on read"},
+	{0x740A, "Encrypted block not raw read enabled"},
+	{0x740B, "Incorrect Encryption parameters"},
+	{0x740C, "Unable to decrypt parameter list"},
+	{0x740D, "Encryption algorithm disabled"},
+	{0x7410, "SA creation parameter value invalid"},
+	{0x7411, "SA creation parameter value rejected"},
+	{0x7412, "Invalid SA usage"},
+	{0x7421, "Data Encryption configuration prevented"},
+	{0x7430, "SA creation parameter not supported"},
+	{0x7440, "Authentication failed"},
+	{0x7461, "External data encryption key manager access error"},
+	{0x7462, "External data encryption key manager error"},
+	{0x7463, "External data encryption key not found"},
+	{0x7464, "External data encryption request not authorized"},
+	{0x746E, "External data encryption control timeout"},
+	{0x746F, "External data encryption control error"},
+	{0x7471, "Logical unit access not authorized"},
+	{0x7479, "Security conflict in translated device"},
+
+	{0, NULL}
+};
+
+struct error_info2 {
+	unsigned char code1, code2_min, code2_max;
+	const char * fmt;
+};
+
+static const struct error_info2 additional2[] = {
+	{0x40, 0x00, 0x7f, "Ram failure (%x)"},
+	{0x40, 0x80, 0xff, "Diagnostic failure on component (%x)"},
+	{0x41, 0x00, 0xff, "Data path failure (%x)"},
+	{0x42, 0x00, 0xff, "Power-on or self-test failure (%x)"},
+	{0x4D, 0x00, 0xff, "Tagged overlapped commands (task tag %x)"},
+	{0x70, 0x00, 0xff, "Decompression exception short algorithm id of %x"},
+	{0, 0, 0, NULL}
+};
+
 /* description of the sense key values */
 static const char * const snstext[] = {
 	"No Sense",	    /* 0: There is no sense information */
@@ -342,6 +1178,65 @@ scsi_sense_format_string(u8 res_code)
 	return res_code >= 0x72 ? "[descriptor]" : "";
 }
 
+/*
+ * Get additional sense code string or NULL if not available.
+ * This string may contain a "%x" and should be printed with ascq as arg.
+ */
+const char *
+scsi_extd_sense_format(u8 asc, u8 ascq) {
+#ifdef CONFIG_SCSI_CONSTANTS
+	int i;
+	unsigned short code = ((asc << 8) | ascq);
+
+	for (i = 0; additional[i].text; i++)
+		if (additional[i].code12 == code)
+			return additional[i].text;
+	for (i = 0; additional2[i].fmt; i++) {
+		if (additional2[i].code1 == asc &&
+		    ascq >= additional2[i].code2_min &&
+		    ascq <= additional2[i].code2_max)
+			return additional2[i].fmt;
+	}
+#endif
+	return NULL;
+}
+EXPORT_SYMBOL(scsi_extd_sense_format);
+
+const char *
+scsi_show_extd_sense(struct trace_seq *p, u8 asc, u8 ascq)
+{
+	const char *ret = p->buffer + p->len;
+	const char *extd_sense_fmt = scsi_extd_sense_format(asc, ascq);
+
+	if (extd_sense_fmt) {
+		if (strstr(extd_sense_fmt, "%x")) {
+			char sense_buf[50];
+
+			sprintf(sense_buf, extd_sense_fmt, ascq);
+			trace_seq_printf(p, " Add. Sense (%s)", sense_buf);
+		} else
+			trace_seq_printf(p, " Add. Sense (%s)", extd_sense_fmt);
+	} else
+		trace_seq_printf(p, " %sASC=0x%x %sASCQ=0x%x",
+				 asc >= 0x80 ? "<<vendor>> " : "", asc,
+				 asc < 0 && ascq >= 0x80 ? "<<vendor>> " : "",
+				 ascq);
+
+	trace_seq_putc(p, 0);
+	return ret;
+}
+
+/*
+ * Print normalized SCSI sense header with a prefix.
+ */
+void
+scsi_print_sense_hdr(struct scsi_device *sdev, const char *name,
+		     struct scsi_sense_hdr *sshdr)
+{
+	trace_scsi_print_sense(sdev, name, sshdr, NULL, 0, 0);
+}
+EXPORT_SYMBOL(scsi_print_sense_hdr);
+
 static const char *
 scsi_dump_sense_buffer(struct trace_seq *p, const unsigned char *buf, int len)
 {
@@ -419,6 +1314,31 @@ out:
 	return ret;
 }
 
+/* Normalize and print sense buffer with name prefix */
+void __scsi_print_sense(struct scsi_device *sdev, const char *name,
+			const unsigned char *sense_buffer, int sense_len)
+{
+	struct scsi_sense_hdr sshdr;
+	int raw;
+
+	raw = !scsi_normalize_sense(sense_buffer, sense_len, &sshdr);
+
+	trace_scsi_print_sense(sdev, name, &sshdr, sense_buffer, sense_len,
+			       raw);
+}
+EXPORT_SYMBOL(__scsi_print_sense);
+
+/* Normalize and print sense buffer in SCSI command */
+void scsi_print_sense(struct scsi_cmnd *cmd)
+{
+	const char *devname = cmd->request->rq_disk ?
+		cmd->request->rq_disk->disk_name : "scsi";
+
+	__scsi_print_sense(cmd->device, devname, cmd->sense_buffer,
+			   SCSI_SENSE_BUFFERSIZE);
+}
+EXPORT_SYMBOL(scsi_print_sense);
+
 void scsi_show_result(struct scsi_device *sdev, const char *name, int result)
 {
 	trace_scsi_show_result(sdev, name, result);
diff --git a/include/scsi/scsi_dbg.h b/include/scsi/scsi_dbg.h
index 68a29e4..67e6a89 100644
--- a/include/scsi/scsi_dbg.h
+++ b/include/scsi/scsi_dbg.h
@@ -8,8 +8,6 @@ struct scsi_device;
 extern void scsi_print_command(struct scsi_cmnd *);
 extern void __scsi_print_command(struct scsi_device *, const char *,
 				 unsigned char *, int);
-extern void scsi_show_extd_sense(struct scsi_device *, const char *,
-				 unsigned char, unsigned char);
 extern void scsi_print_sense_hdr(struct scsi_device *, const char *,
 				 struct scsi_sense_hdr *);
 extern void scsi_print_sense(struct scsi_cmnd *);
diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
index 572aa65..6d3543f 100644
--- a/include/trace/events/scsi.h
+++ b/include/trace/events/scsi.h
@@ -400,6 +400,9 @@ const char *scsi_trace_decode_sense_extras(struct trace_seq*, u8, u8,
 #define __decode_extras(sense_key, res_code, buf, len, raw) \
 	scsi_trace_decode_sense_extras(p, sense_key, res_code, buf, len, raw)
 
+const char *scsi_show_extd_sense(struct trace_seq*, u8, u8);
+#define __extd_sense(asc, ascq) scsi_show_extd_sense(p, asc, ascq)
+
 TRACE_EVENT(scsi_print_sense,
 
 	TP_PROTO(struct scsi_device *sdev, const char *devname,
@@ -433,15 +436,18 @@ TRACE_EVENT(scsi_print_sense,
 		__entry->res_code	= sshdr->response_code;
 		memcpy(__get_dynamic_array(sense_buffer), sense_buffer,
 		       sense_len);
+		__entry->asc		= sshdr->asc;
+		__entry->ascq		= sshdr->ascq;
 		__entry->sense_len	= sense_len;
 		__entry->raw		= raw;
 	),
 
-	TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] %s",
+	TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] %s %s",
 		  __entry->host_no, __entry->channel, __entry->id, __entry->lun,
 		  __get_str(devname), __decode_extras(__entry->sense_key,
 		  __entry->res_code, __get_dynamic_array(sense_buffer),
-		  __entry->sense_len,  __entry->raw))
+		  __entry->sense_len,  __entry->raw),
+		  __extd_sense(__entry->asc, __entry->ascq))
 );
 #endif /*  _TRACE_SCSI_H */
 

Re: [RFC PATCH 09/10] scsi/trace: Add additional sense code and additional sense code qualifier to scsi_print_sense trace point

[Hannes Reinecke]

On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
> There are no mean that additional sense code and additional sense code qualifier
> are output as different messages of sense key, so those information are added.
>
> Note:
> scsi_show_extd_sense() is changed from export symbol to non-export symbol.
>
>   - Result examples
>
> <Before> (printk)
> sd 2:0:0:0: [sda] Add. Sense: Unrecovered read error
>
> <After> (ftrace, merged into scsi_print_sense traceevent)
> scsi_print_sense: host_no=2 channel=0 id=0 lun=0 [sda] Sense Key (Medium Error [current])  Add. Sense (Unrecovered read error)
>
> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Doug Gilbert <dgilbert@interlog.com>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>   drivers/scsi/constants.c    |  932 -------------------------------------------
>   drivers/scsi/scsi_trace.c   |  920 ++++++++++++++++++++++++++++++++++++++++++
>   include/scsi/scsi_dbg.h     |    2
>   include/trace/events/scsi.h |   10
>   4 files changed, 928 insertions(+), 936 deletions(-)
>
> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
> index 85b75c8..ce9ceb8 100644
> --- a/drivers/scsi/constants.c
> +++ b/drivers/scsi/constants.c
> @@ -14,12 +14,6 @@
>
>   #include <scsi/scsi.h>
>   #include <scsi/scsi_cmnd.h>
> -#include <scsi/scsi_device.h>
> -#include <scsi/scsi_host.h>
> -#include <scsi/scsi_eh.h>
> -#include <scsi/scsi_dbg.h>
> -
> -#include <trace/events/scsi.h>
>
>   /* Commands with service actions that change the command name */
>   #define SERVICE_ACTION_IN_12 0xab
> @@ -429,929 +423,3 @@ void scsi_print_command(struct scsi_cmnd *cmd)
>   	print_opcode_name(cmd->device, devname, cmd->cmnd, cmd->cmd_len);
>   }
>   EXPORT_SYMBOL(scsi_print_command);
> -
> -#ifdef CONFIG_SCSI_CONSTANTS
> -
> -struct error_info {
> -	unsigned short code12;	/* 0x0302 looks better than 0x03,0x02 */
> -	const char * text;
> -};
> -
> -/*
> - * The canonical list of T10 Additional Sense Codes is available at:
> - * http://www.t10.org/lists/asc-num.txt [most recent: 20130605]
> - */
> -
> -static const struct error_info additional[] =
> -{
> -	{0x0000, "No additional sense information"},
> -	{0x0001, "Filemark detected"},
> -	{0x0002, "End-of-partition/medium detected"},
> -	{0x0003, "Setmark detected"},
> -	{0x0004, "Beginning-of-partition/medium detected"},
> -	{0x0005, "End-of-data detected"},
> -	{0x0006, "I/O process terminated"},
> -	{0x0007, "Programmable early warning detected"},
> -	{0x0011, "Audio play operation in progress"},
> -	{0x0012, "Audio play operation paused"},
> -	{0x0013, "Audio play operation successfully completed"},
> -	{0x0014, "Audio play operation stopped due to error"},
> -	{0x0015, "No current audio status to return"},
> -	{0x0016, "Operation in progress"},
> -	{0x0017, "Cleaning requested"},
> -	{0x0018, "Erase operation in progress"},
> -	{0x0019, "Locate operation in progress"},
> -	{0x001A, "Rewind operation in progress"},
> -	{0x001B, "Set capacity operation in progress"},
> -	{0x001C, "Verify operation in progress"},
> -	{0x001D, "ATA pass through information available"},
> -	{0x001E, "Conflicting SA creation request"},
> -	{0x001F, "Logical unit transitioning to another power condition"},
> -	{0x0020, "Extended copy information available"},
> -
> -	{0x0100, "No index/sector signal"},
> -
> -	{0x0200, "No seek complete"},
> -
> -	{0x0300, "Peripheral device write fault"},
> -	{0x0301, "No write current"},
> -	{0x0302, "Excessive write errors"},
> -
> -	{0x0400, "Logical unit not ready, cause not reportable"},
> -	{0x0401, "Logical unit is in process of becoming ready"},
> -	{0x0402, "Logical unit not ready, initializing command required"},
> -	{0x0403, "Logical unit not ready, manual intervention required"},
> -	{0x0404, "Logical unit not ready, format in progress"},
> -	{0x0405, "Logical unit not ready, rebuild in progress"},
> -	{0x0406, "Logical unit not ready, recalculation in progress"},
> -	{0x0407, "Logical unit not ready, operation in progress"},
> -	{0x0408, "Logical unit not ready, long write in progress"},
> -	{0x0409, "Logical unit not ready, self-test in progress"},
> -	{0x040A, "Logical unit not accessible, asymmetric access state "
> -	 "transition"},
> -	{0x040B, "Logical unit not accessible, target port in standby state"},
> -	{0x040C, "Logical unit not accessible, target port in unavailable "
> -	 "state"},
> -	{0x040D, "Logical unit not ready, structure check required"},
> -	{0x0410, "Logical unit not ready, auxiliary memory not accessible"},
> -	{0x0411, "Logical unit not ready, notify (enable spinup) required"},
> -	{0x0412, "Logical unit not ready, offline"},
> -	{0x0413, "Logical unit not ready, SA creation in progress"},
> -	{0x0414, "Logical unit not ready, space allocation in progress"},
> -	{0x0415, "Logical unit not ready, robotics disabled"},
> -	{0x0416, "Logical unit not ready, configuration required"},
> -	{0x0417, "Logical unit not ready, calibration required"},
> -	{0x0418, "Logical unit not ready, a door is open"},
> -	{0x0419, "Logical unit not ready, operating in sequential mode"},
> -	{0x041A, "Logical unit not ready, start stop unit command in "
> -	 "progress"},
> -	{0x041B, "Logical unit not ready, sanitize in progress"},
> -	{0x041C, "Logical unit not ready, additional power use not yet "
> -	 "granted"},
> -	{0x041D, "Logical unit not ready, configuration in progress"},
> -
> -	{0x0500, "Logical unit does not respond to selection"},
> -
> -	{0x0600, "No reference position found"},
> -
> -	{0x0700, "Multiple peripheral devices selected"},
> -
> -	{0x0800, "Logical unit communication failure"},
> -	{0x0801, "Logical unit communication time-out"},
> -	{0x0802, "Logical unit communication parity error"},
> -	{0x0803, "Logical unit communication CRC error (Ultra-DMA/32)"},
> -	{0x0804, "Unreachable copy target"},
> -
> -	{0x0900, "Track following error"},
> -	{0x0901, "Tracking servo failure"},
> -	{0x0902, "Focus servo failure"},
> -	{0x0903, "Spindle servo failure"},
> -	{0x0904, "Head select fault"},
> -
> -	{0x0A00, "Error log overflow"},
> -
> -	{0x0B00, "Warning"},
> -	{0x0B01, "Warning - specified temperature exceeded"},
> -	{0x0B02, "Warning - enclosure degraded"},
> -	{0x0B03, "Warning - background self-test failed"},
> -	{0x0B04, "Warning - background pre-scan detected medium error"},
> -	{0x0B05, "Warning - background medium scan detected medium error"},
> -	{0x0B06, "Warning - non-volatile cache now volatile"},
> -	{0x0B07, "Warning - degraded power to non-volatile cache"},
> -	{0x0B08, "Warning - power loss expected"},
> -	{0x0B09, "Warning - device statistics notification active"},
> -
> -	{0x0C00, "Write error"},
> -	{0x0C01, "Write error - recovered with auto reallocation"},
> -	{0x0C02, "Write error - auto reallocation failed"},
> -	{0x0C03, "Write error - recommend reassignment"},
> -	{0x0C04, "Compression check miscompare error"},
> -	{0x0C05, "Data expansion occurred during compression"},
> -	{0x0C06, "Block not compressible"},
> -	{0x0C07, "Write error - recovery needed"},
> -	{0x0C08, "Write error - recovery failed"},
> -	{0x0C09, "Write error - loss of streaming"},
> -	{0x0C0A, "Write error - padding blocks added"},
> -	{0x0C0B, "Auxiliary memory write error"},
> -	{0x0C0C, "Write error - unexpected unsolicited data"},
> -	{0x0C0D, "Write error - not enough unsolicited data"},
> -	{0x0C0E, "Multiple write errors"},
> -	{0x0C0F, "Defects in error window"},
> -
> -	{0x0D00, "Error detected by third party temporary initiator"},
> -	{0x0D01, "Third party device failure"},
> -	{0x0D02, "Copy target device not reachable"},
> -	{0x0D03, "Incorrect copy target device type"},
> -	{0x0D04, "Copy target device data underrun"},
> -	{0x0D05, "Copy target device data overrun"},
> -
> -	{0x0E00, "Invalid information unit"},
> -	{0x0E01, "Information unit too short"},
> -	{0x0E02, "Information unit too long"},
> -	{0x0E03, "Invalid field in command information unit"},
> -
> -	{0x1000, "Id CRC or ECC error"},
> -	{0x1001, "Logical block guard check failed"},
> -	{0x1002, "Logical block application tag check failed"},
> -	{0x1003, "Logical block reference tag check failed"},
> -	{0x1004, "Logical block protection error on recover buffered data"},
> -	{0x1005, "Logical block protection method error"},
> -
> -	{0x1100, "Unrecovered read error"},
> -	{0x1101, "Read retries exhausted"},
> -	{0x1102, "Error too long to correct"},
> -	{0x1103, "Multiple read errors"},
> -	{0x1104, "Unrecovered read error - auto reallocate failed"},
> -	{0x1105, "L-EC uncorrectable error"},
> -	{0x1106, "CIRC unrecovered error"},
> -	{0x1107, "Data re-synchronization error"},
> -	{0x1108, "Incomplete block read"},
> -	{0x1109, "No gap found"},
> -	{0x110A, "Miscorrected error"},
> -	{0x110B, "Unrecovered read error - recommend reassignment"},
> -	{0x110C, "Unrecovered read error - recommend rewrite the data"},
> -	{0x110D, "De-compression CRC error"},
> -	{0x110E, "Cannot decompress using declared algorithm"},
> -	{0x110F, "Error reading UPC/EAN number"},
> -	{0x1110, "Error reading ISRC number"},
> -	{0x1111, "Read error - loss of streaming"},
> -	{0x1112, "Auxiliary memory read error"},
> -	{0x1113, "Read error - failed retransmission request"},
> -	{0x1114, "Read error - lba marked bad by application client"},
> -	{0x1115, "Write after sanitize required"},
> -
> -	{0x1200, "Address mark not found for id field"},
> -
> -	{0x1300, "Address mark not found for data field"},
> -
> -	{0x1400, "Recorded entity not found"},
> -	{0x1401, "Record not found"},
> -	{0x1402, "Filemark or setmark not found"},
> -	{0x1403, "End-of-data not found"},
> -	{0x1404, "Block sequence error"},
> -	{0x1405, "Record not found - recommend reassignment"},
> -	{0x1406, "Record not found - data auto-reallocated"},
> -	{0x1407, "Locate operation failure"},
> -
> -	{0x1500, "Random positioning error"},
> -	{0x1501, "Mechanical positioning error"},
> -	{0x1502, "Positioning error detected by read of medium"},
> -
> -	{0x1600, "Data synchronization mark error"},
> -	{0x1601, "Data sync error - data rewritten"},
> -	{0x1602, "Data sync error - recommend rewrite"},
> -	{0x1603, "Data sync error - data auto-reallocated"},
> -	{0x1604, "Data sync error - recommend reassignment"},
> -
> -	{0x1700, "Recovered data with no error correction applied"},
> -	{0x1701, "Recovered data with retries"},
> -	{0x1702, "Recovered data with positive head offset"},
> -	{0x1703, "Recovered data with negative head offset"},
> -	{0x1704, "Recovered data with retries and/or circ applied"},
> -	{0x1705, "Recovered data using previous sector id"},
> -	{0x1706, "Recovered data without ECC - data auto-reallocated"},
> -	{0x1707, "Recovered data without ECC - recommend reassignment"},
> -	{0x1708, "Recovered data without ECC - recommend rewrite"},
> -	{0x1709, "Recovered data without ECC - data rewritten"},
> -
> -	{0x1800, "Recovered data with error correction applied"},
> -	{0x1801, "Recovered data with error corr. & retries applied"},
> -	{0x1802, "Recovered data - data auto-reallocated"},
> -	{0x1803, "Recovered data with CIRC"},
> -	{0x1804, "Recovered data with L-EC"},
> -	{0x1805, "Recovered data - recommend reassignment"},
> -	{0x1806, "Recovered data - recommend rewrite"},
> -	{0x1807, "Recovered data with ECC - data rewritten"},
> -	{0x1808, "Recovered data with linking"},
> -
> -	{0x1900, "Defect list error"},
> -	{0x1901, "Defect list not available"},
> -	{0x1902, "Defect list error in primary list"},
> -	{0x1903, "Defect list error in grown list"},
> -
> -	{0x1A00, "Parameter list length error"},
> -
> -	{0x1B00, "Synchronous data transfer error"},
> -
> -	{0x1C00, "Defect list not found"},
> -	{0x1C01, "Primary defect list not found"},
> -	{0x1C02, "Grown defect list not found"},
> -
> -	{0x1D00, "Miscompare during verify operation"},
> -	{0x1D01, "Miscompare verify of unmapped LBA"},
> -
> -	{0x1E00, "Recovered id with ECC correction"},
> -
> -	{0x1F00, "Partial defect list transfer"},
> -
> -	{0x2000, "Invalid command operation code"},
> -	{0x2001, "Access denied - initiator pending-enrolled"},
> -	{0x2002, "Access denied - no access rights"},
> -	{0x2003, "Access denied - invalid mgmt id key"},
> -	{0x2004, "Illegal command while in write capable state"},
> -	{0x2005, "Obsolete"},
> -	{0x2006, "Illegal command while in explicit address mode"},
> -	{0x2007, "Illegal command while in implicit address mode"},
> -	{0x2008, "Access denied - enrollment conflict"},
> -	{0x2009, "Access denied - invalid LU identifier"},
> -	{0x200A, "Access denied - invalid proxy token"},
> -	{0x200B, "Access denied - ACL LUN conflict"},
> -	{0x200C, "Illegal command when not in append-only mode"},
> -
> -	{0x2100, "Logical block address out of range"},
> -	{0x2101, "Invalid element address"},
> -	{0x2102, "Invalid address for write"},
> -	{0x2103, "Invalid write crossing layer jump"},
> -
> -	{0x2200, "Illegal function (use 20 00, 24 00, or 26 00)"},
> -
> -	{0x2300, "Invalid token operation, cause not reportable"},
> -	{0x2301, "Invalid token operation, unsupported token type"},
> -	{0x2302, "Invalid token operation, remote token usage not supported"},
> -	{0x2303, "Invalid token operation, remote rod token creation not "
> -	 "supported"},
> -	{0x2304, "Invalid token operation, token unknown"},
> -	{0x2305, "Invalid token operation, token corrupt"},
> -	{0x2306, "Invalid token operation, token revoked"},
> -	{0x2307, "Invalid token operation, token expired"},
> -	{0x2308, "Invalid token operation, token cancelled"},
> -	{0x2309, "Invalid token operation, token deleted"},
> -	{0x230A, "Invalid token operation, invalid token length"},
> -
> -	{0x2400, "Invalid field in cdb"},
> -	{0x2401, "CDB decryption error"},
> -	{0x2402, "Obsolete"},
> -	{0x2403, "Obsolete"},
> -	{0x2404, "Security audit value frozen"},
> -	{0x2405, "Security working key frozen"},
> -	{0x2406, "Nonce not unique"},
> -	{0x2407, "Nonce timestamp out of range"},
> -	{0x2408, "Invalid XCDB"},
> -
> -	{0x2500, "Logical unit not supported"},
> -
> -	{0x2600, "Invalid field in parameter list"},
> -	{0x2601, "Parameter not supported"},
> -	{0x2602, "Parameter value invalid"},
> -	{0x2603, "Threshold parameters not supported"},
> -	{0x2604, "Invalid release of persistent reservation"},
> -	{0x2605, "Data decryption error"},
> -	{0x2606, "Too many target descriptors"},
> -	{0x2607, "Unsupported target descriptor type code"},
> -	{0x2608, "Too many segment descriptors"},
> -	{0x2609, "Unsupported segment descriptor type code"},
> -	{0x260A, "Unexpected inexact segment"},
> -	{0x260B, "Inline data length exceeded"},
> -	{0x260C, "Invalid operation for copy source or destination"},
> -	{0x260D, "Copy segment granularity violation"},
> -	{0x260E, "Invalid parameter while port is enabled"},
> -	{0x260F, "Invalid data-out buffer integrity check value"},
> -	{0x2610, "Data decryption key fail limit reached"},
> -	{0x2611, "Incomplete key-associated data set"},
> -	{0x2612, "Vendor specific key reference not found"},
> -
> -	{0x2700, "Write protected"},
> -	{0x2701, "Hardware write protected"},
> -	{0x2702, "Logical unit software write protected"},
> -	{0x2703, "Associated write protect"},
> -	{0x2704, "Persistent write protect"},
> -	{0x2705, "Permanent write protect"},
> -	{0x2706, "Conditional write protect"},
> -	{0x2707, "Space allocation failed write protect"},
> -
> -	{0x2800, "Not ready to ready change, medium may have changed"},
> -	{0x2801, "Import or export element accessed"},
> -	{0x2802, "Format-layer may have changed"},
> -	{0x2803, "Import/export element accessed, medium changed"},
> -
> -	{0x2900, "Power on, reset, or bus device reset occurred"},
> -	{0x2901, "Power on occurred"},
> -	{0x2902, "Scsi bus reset occurred"},
> -	{0x2903, "Bus device reset function occurred"},
> -	{0x2904, "Device internal reset"},
> -	{0x2905, "Transceiver mode changed to single-ended"},
> -	{0x2906, "Transceiver mode changed to lvd"},
> -	{0x2907, "I_T nexus loss occurred"},
> -
> -	{0x2A00, "Parameters changed"},
> -	{0x2A01, "Mode parameters changed"},
> -	{0x2A02, "Log parameters changed"},
> -	{0x2A03, "Reservations preempted"},
> -	{0x2A04, "Reservations released"},
> -	{0x2A05, "Registrations preempted"},
> -	{0x2A06, "Asymmetric access state changed"},
> -	{0x2A07, "Implicit asymmetric access state transition failed"},
> -	{0x2A08, "Priority changed"},
> -	{0x2A09, "Capacity data has changed"},
> -	{0x2A0A, "Error history I_T nexus cleared"},
> -	{0x2A0B, "Error history snapshot released"},
> -	{0x2A0C, "Error recovery attributes have changed"},
> -	{0x2A0D, "Data encryption capabilities changed"},
> -	{0x2A10, "Timestamp changed"},
> -	{0x2A11, "Data encryption parameters changed by another i_t nexus"},
> -	{0x2A12, "Data encryption parameters changed by vendor specific "
> -		 "event"},
> -	{0x2A13, "Data encryption key instance counter has changed"},
> -	{0x2A14, "SA creation capabilities data has changed"},
> -	{0x2A15, "Medium removal prevention preempted"},
> -
> -	{0x2B00, "Copy cannot execute since host cannot disconnect"},
> -
> -	{0x2C00, "Command sequence error"},
> -	{0x2C01, "Too many windows specified"},
> -	{0x2C02, "Invalid combination of windows specified"},
> -	{0x2C03, "Current program area is not empty"},
> -	{0x2C04, "Current program area is empty"},
> -	{0x2C05, "Illegal power condition request"},
> -	{0x2C06, "Persistent prevent conflict"},
> -	{0x2C07, "Previous busy status"},
> -	{0x2C08, "Previous task set full status"},
> -	{0x2C09, "Previous reservation conflict status"},
> -	{0x2C0A, "Partition or collection contains user objects"},
> -	{0x2C0B, "Not reserved"},
> -	{0x2C0C, "Orwrite generation does not match"},
> -
> -	{0x2D00, "Overwrite error on update in place"},
> -
> -	{0x2E00, "Insufficient time for operation"},
> -
> -	{0x2F00, "Commands cleared by another initiator"},
> -	{0x2F01, "Commands cleared by power loss notification"},
> -	{0x2F02, "Commands cleared by device server"},
> -	{0x2F03, "Some commands cleared by queuing layer event"},
> -
> -	{0x3000, "Incompatible medium installed"},
> -	{0x3001, "Cannot read medium - unknown format"},
> -	{0x3002, "Cannot read medium - incompatible format"},
> -	{0x3003, "Cleaning cartridge installed"},
> -	{0x3004, "Cannot write medium - unknown format"},
> -	{0x3005, "Cannot write medium - incompatible format"},
> -	{0x3006, "Cannot format medium - incompatible medium"},
> -	{0x3007, "Cleaning failure"},
> -	{0x3008, "Cannot write - application code mismatch"},
> -	{0x3009, "Current session not fixated for append"},
> -	{0x300A, "Cleaning request rejected"},
> -	{0x300C, "WORM medium - overwrite attempted"},
> -	{0x300D, "WORM medium - integrity check"},
> -	{0x3010, "Medium not formatted"},
> -	{0x3011, "Incompatible volume type"},
> -	{0x3012, "Incompatible volume qualifier"},
> -	{0x3013, "Cleaning volume expired"},
> -
> -	{0x3100, "Medium format corrupted"},
> -	{0x3101, "Format command failed"},
> -	{0x3102, "Zoned formatting failed due to spare linking"},
> -	{0x3103, "Sanitize command failed"},
> -
> -	{0x3200, "No defect spare location available"},
> -	{0x3201, "Defect list update failure"},
> -
> -	{0x3300, "Tape length error"},
> -
> -	{0x3400, "Enclosure failure"},
> -
> -	{0x3500, "Enclosure services failure"},
> -	{0x3501, "Unsupported enclosure function"},
> -	{0x3502, "Enclosure services unavailable"},
> -	{0x3503, "Enclosure services transfer failure"},
> -	{0x3504, "Enclosure services transfer refused"},
> -	{0x3505, "Enclosure services checksum error"},
> -
> -	{0x3600, "Ribbon, ink, or toner failure"},
> -
> -	{0x3700, "Rounded parameter"},
> -
> -	{0x3800, "Event status notification"},
> -	{0x3802, "Esn - power management class event"},
> -	{0x3804, "Esn - media class event"},
> -	{0x3806, "Esn - device busy class event"},
> -	{0x3807, "Thin Provisioning soft threshold reached"},
> -
> -	{0x3900, "Saving parameters not supported"},
> -
> -	{0x3A00, "Medium not present"},
> -	{0x3A01, "Medium not present - tray closed"},
> -	{0x3A02, "Medium not present - tray open"},
> -	{0x3A03, "Medium not present - loadable"},
> -	{0x3A04, "Medium not present - medium auxiliary memory accessible"},
> -
> -	{0x3B00, "Sequential positioning error"},
> -	{0x3B01, "Tape position error at beginning-of-medium"},
> -	{0x3B02, "Tape position error at end-of-medium"},
> -	{0x3B03, "Tape or electronic vertical forms unit not ready"},
> -	{0x3B04, "Slew failure"},
> -	{0x3B05, "Paper jam"},
> -	{0x3B06, "Failed to sense top-of-form"},
> -	{0x3B07, "Failed to sense bottom-of-form"},
> -	{0x3B08, "Reposition error"},
> -	{0x3B09, "Read past end of medium"},
> -	{0x3B0A, "Read past beginning of medium"},
> -	{0x3B0B, "Position past end of medium"},
> -	{0x3B0C, "Position past beginning of medium"},
> -	{0x3B0D, "Medium destination element full"},
> -	{0x3B0E, "Medium source element empty"},
> -	{0x3B0F, "End of medium reached"},
> -	{0x3B11, "Medium magazine not accessible"},
> -	{0x3B12, "Medium magazine removed"},
> -	{0x3B13, "Medium magazine inserted"},
> -	{0x3B14, "Medium magazine locked"},
> -	{0x3B15, "Medium magazine unlocked"},
> -	{0x3B16, "Mechanical positioning or changer error"},
> -	{0x3B17, "Read past end of user object"},
> -	{0x3B18, "Element disabled"},
> -	{0x3B19, "Element enabled"},
> -	{0x3B1A, "Data transfer device removed"},
> -	{0x3B1B, "Data transfer device inserted"},
> -	{0x3B1C, "Too many logical objects on partition to support "
> -	 "operation"},
> -
> -	{0x3D00, "Invalid bits in identify message"},
> -
> -	{0x3E00, "Logical unit has not self-configured yet"},
> -	{0x3E01, "Logical unit failure"},
> -	{0x3E02, "Timeout on logical unit"},
> -	{0x3E03, "Logical unit failed self-test"},
> -	{0x3E04, "Logical unit unable to update self-test log"},
> -
> -	{0x3F00, "Target operating conditions have changed"},
> -	{0x3F01, "Microcode has been changed"},
> -	{0x3F02, "Changed operating definition"},
> -	{0x3F03, "Inquiry data has changed"},
> -	{0x3F04, "Component device attached"},
> -	{0x3F05, "Device identifier changed"},
> -	{0x3F06, "Redundancy group created or modified"},
> -	{0x3F07, "Redundancy group deleted"},
> -	{0x3F08, "Spare created or modified"},
> -	{0x3F09, "Spare deleted"},
> -	{0x3F0A, "Volume set created or modified"},
> -	{0x3F0B, "Volume set deleted"},
> -	{0x3F0C, "Volume set deassigned"},
> -	{0x3F0D, "Volume set reassigned"},
> -	{0x3F0E, "Reported luns data has changed"},
> -	{0x3F0F, "Echo buffer overwritten"},
> -	{0x3F10, "Medium loadable"},
> -	{0x3F11, "Medium auxiliary memory accessible"},
> -	{0x3F12, "iSCSI IP address added"},
> -	{0x3F13, "iSCSI IP address removed"},
> -	{0x3F14, "iSCSI IP address changed"},
> -	{0x3F15, "Inspect referrals sense descriptors"},
> -/*
> - *	{0x40NN, "Ram failure"},
> - *	{0x40NN, "Diagnostic failure on component nn"},
> - *	{0x41NN, "Data path failure"},
> - *	{0x42NN, "Power-on or self-test failure"},
> - */
> -	{0x4300, "Message error"},
> -
> -	{0x4400, "Internal target failure"},
> -	{0x4401, "Persistent reservation information lost"},
> -	{0x4471, "ATA device failed set features"},
> -
> -	{0x4500, "Select or reselect failure"},
> -
> -	{0x4600, "Unsuccessful soft reset"},
> -
> -	{0x4700, "Scsi parity error"},
> -	{0x4701, "Data phase CRC error detected"},
> -	{0x4702, "Scsi parity error detected during st data phase"},
> -	{0x4703, "Information unit iuCRC error detected"},
> -	{0x4704, "Asynchronous information protection error detected"},
> -	{0x4705, "Protocol service CRC error"},
> -	{0x4706, "Phy test function in progress"},
> -	{0x477f, "Some commands cleared by iSCSI Protocol event"},
> -
> -	{0x4800, "Initiator detected error message received"},
> -
> -	{0x4900, "Invalid message error"},
> -
> -	{0x4A00, "Command phase error"},
> -
> -	{0x4B00, "Data phase error"},
> -	{0x4B01, "Invalid target port transfer tag received"},
> -	{0x4B02, "Too much write data"},
> -	{0x4B03, "Ack/nak timeout"},
> -	{0x4B04, "Nak received"},
> -	{0x4B05, "Data offset error"},
> -	{0x4B06, "Initiator response timeout"},
> -	{0x4B07, "Connection lost"},
> -	{0x4B08, "Data-in buffer overflow - data buffer size"},
> -	{0x4B09, "Data-in buffer overflow - data buffer descriptor area"},
> -	{0x4B0A, "Data-in buffer error"},
> -	{0x4B0B, "Data-out buffer overflow - data buffer size"},
> -	{0x4B0C, "Data-out buffer overflow - data buffer descriptor area"},
> -	{0x4B0D, "Data-out buffer error"},
> -	{0x4B0E, "PCIe fabric error"},
> -	{0x4B0F, "PCIe completion timeout"},
> -	{0x4B10, "PCIe completer abort"},
> -	{0x4B11, "PCIe poisoned tlp received"},
> -	{0x4B12, "PCIe eCRC check failed"},
> -	{0x4B13, "PCIe unsupported request"},
> -	{0x4B14, "PCIe acs violation"},
> -	{0x4B15, "PCIe tlp prefix blocked"},
> -
> -	{0x4C00, "Logical unit failed self-configuration"},
> -/*
> - *	{0x4DNN, "Tagged overlapped commands (nn = queue tag)"},
> - */
> -	{0x4E00, "Overlapped commands attempted"},
> -
> -	{0x5000, "Write append error"},
> -	{0x5001, "Write append position error"},
> -	{0x5002, "Position error related to timing"},
> -
> -	{0x5100, "Erase failure"},
> -	{0x5101, "Erase failure - incomplete erase operation detected"},
> -
> -	{0x5200, "Cartridge fault"},
> -
> -	{0x5300, "Media load or eject failed"},
> -	{0x5301, "Unload tape failure"},
> -	{0x5302, "Medium removal prevented"},
> -	{0x5303, "Medium removal prevented by data transfer element"},
> -	{0x5304, "Medium thread or unthread failure"},
> -	{0x5305, "Volume identifier invalid"},
> -	{0x5306, "Volume identifier missing"},
> -	{0x5307, "Duplicate volume identifier"},
> -	{0x5308, "Element status unknown"},
> -
> -	{0x5400, "Scsi to host system interface failure"},
> -
> -	{0x5500, "System resource failure"},
> -	{0x5501, "System buffer full"},
> -	{0x5502, "Insufficient reservation resources"},
> -	{0x5503, "Insufficient resources"},
> -	{0x5504, "Insufficient registration resources"},
> -	{0x5505, "Insufficient access control resources"},
> -	{0x5506, "Auxiliary memory out of space"},
> -	{0x5507, "Quota error"},
> -	{0x5508, "Maximum number of supplemental decryption keys exceeded"},
> -	{0x5509, "Medium auxiliary memory not accessible"},
> -	{0x550A, "Data currently unavailable"},
> -	{0x550B, "Insufficient power for operation"},
> -	{0x550C, "Insufficient resources to create rod"},
> -	{0x550D, "Insufficient resources to create rod token"},
> -
> -	{0x5700, "Unable to recover table-of-contents"},
> -
> -	{0x5800, "Generation does not exist"},
> -
> -	{0x5900, "Updated block read"},
> -
> -	{0x5A00, "Operator request or state change input"},
> -	{0x5A01, "Operator medium removal request"},
> -	{0x5A02, "Operator selected write protect"},
> -	{0x5A03, "Operator selected write permit"},
> -
> -	{0x5B00, "Log exception"},
> -	{0x5B01, "Threshold condition met"},
> -	{0x5B02, "Log counter at maximum"},
> -	{0x5B03, "Log list codes exhausted"},
> -
> -	{0x5C00, "Rpl status change"},
> -	{0x5C01, "Spindles synchronized"},
> -	{0x5C02, "Spindles not synchronized"},
> -
> -	{0x5D00, "Failure prediction threshold exceeded"},
> -	{0x5D01, "Media failure prediction threshold exceeded"},
> -	{0x5D02, "Logical unit failure prediction threshold exceeded"},
> -	{0x5D03, "Spare area exhaustion prediction threshold exceeded"},
> -	{0x5D10, "Hardware impending failure general hard drive failure"},
> -	{0x5D11, "Hardware impending failure drive error rate too high"},
> -	{0x5D12, "Hardware impending failure data error rate too high"},
> -	{0x5D13, "Hardware impending failure seek error rate too high"},
> -	{0x5D14, "Hardware impending failure too many block reassigns"},
> -	{0x5D15, "Hardware impending failure access times too high"},
> -	{0x5D16, "Hardware impending failure start unit times too high"},
> -	{0x5D17, "Hardware impending failure channel parametrics"},
> -	{0x5D18, "Hardware impending failure controller detected"},
> -	{0x5D19, "Hardware impending failure throughput performance"},
> -	{0x5D1A, "Hardware impending failure seek time performance"},
> -	{0x5D1B, "Hardware impending failure spin-up retry count"},
> -	{0x5D1C, "Hardware impending failure drive calibration retry count"},
> -	{0x5D20, "Controller impending failure general hard drive failure"},
> -	{0x5D21, "Controller impending failure drive error rate too high"},
> -	{0x5D22, "Controller impending failure data error rate too high"},
> -	{0x5D23, "Controller impending failure seek error rate too high"},
> -	{0x5D24, "Controller impending failure too many block reassigns"},
> -	{0x5D25, "Controller impending failure access times too high"},
> -	{0x5D26, "Controller impending failure start unit times too high"},
> -	{0x5D27, "Controller impending failure channel parametrics"},
> -	{0x5D28, "Controller impending failure controller detected"},
> -	{0x5D29, "Controller impending failure throughput performance"},
> -	{0x5D2A, "Controller impending failure seek time performance"},
> -	{0x5D2B, "Controller impending failure spin-up retry count"},
> -	{0x5D2C, "Controller impending failure drive calibration retry count"},
> -	{0x5D30, "Data channel impending failure general hard drive failure"},
> -	{0x5D31, "Data channel impending failure drive error rate too high"},
> -	{0x5D32, "Data channel impending failure data error rate too high"},
> -	{0x5D33, "Data channel impending failure seek error rate too high"},
> -	{0x5D34, "Data channel impending failure too many block reassigns"},
> -	{0x5D35, "Data channel impending failure access times too high"},
> -	{0x5D36, "Data channel impending failure start unit times too high"},
> -	{0x5D37, "Data channel impending failure channel parametrics"},
> -	{0x5D38, "Data channel impending failure controller detected"},
> -	{0x5D39, "Data channel impending failure throughput performance"},
> -	{0x5D3A, "Data channel impending failure seek time performance"},
> -	{0x5D3B, "Data channel impending failure spin-up retry count"},
> -	{0x5D3C, "Data channel impending failure drive calibration retry "
> -	 "count"},
> -	{0x5D40, "Servo impending failure general hard drive failure"},
> -	{0x5D41, "Servo impending failure drive error rate too high"},
> -	{0x5D42, "Servo impending failure data error rate too high"},
> -	{0x5D43, "Servo impending failure seek error rate too high"},
> -	{0x5D44, "Servo impending failure too many block reassigns"},
> -	{0x5D45, "Servo impending failure access times too high"},
> -	{0x5D46, "Servo impending failure start unit times too high"},
> -	{0x5D47, "Servo impending failure channel parametrics"},
> -	{0x5D48, "Servo impending failure controller detected"},
> -	{0x5D49, "Servo impending failure throughput performance"},
> -	{0x5D4A, "Servo impending failure seek time performance"},
> -	{0x5D4B, "Servo impending failure spin-up retry count"},
> -	{0x5D4C, "Servo impending failure drive calibration retry count"},
> -	{0x5D50, "Spindle impending failure general hard drive failure"},
> -	{0x5D51, "Spindle impending failure drive error rate too high"},
> -	{0x5D52, "Spindle impending failure data error rate too high"},
> -	{0x5D53, "Spindle impending failure seek error rate too high"},
> -	{0x5D54, "Spindle impending failure too many block reassigns"},
> -	{0x5D55, "Spindle impending failure access times too high"},
> -	{0x5D56, "Spindle impending failure start unit times too high"},
> -	{0x5D57, "Spindle impending failure channel parametrics"},
> -	{0x5D58, "Spindle impending failure controller detected"},
> -	{0x5D59, "Spindle impending failure throughput performance"},
> -	{0x5D5A, "Spindle impending failure seek time performance"},
> -	{0x5D5B, "Spindle impending failure spin-up retry count"},
> -	{0x5D5C, "Spindle impending failure drive calibration retry count"},
> -	{0x5D60, "Firmware impending failure general hard drive failure"},
> -	{0x5D61, "Firmware impending failure drive error rate too high"},
> -	{0x5D62, "Firmware impending failure data error rate too high"},
> -	{0x5D63, "Firmware impending failure seek error rate too high"},
> -	{0x5D64, "Firmware impending failure too many block reassigns"},
> -	{0x5D65, "Firmware impending failure access times too high"},
> -	{0x5D66, "Firmware impending failure start unit times too high"},
> -	{0x5D67, "Firmware impending failure channel parametrics"},
> -	{0x5D68, "Firmware impending failure controller detected"},
> -	{0x5D69, "Firmware impending failure throughput performance"},
> -	{0x5D6A, "Firmware impending failure seek time performance"},
> -	{0x5D6B, "Firmware impending failure spin-up retry count"},
> -	{0x5D6C, "Firmware impending failure drive calibration retry count"},
> -	{0x5DFF, "Failure prediction threshold exceeded (false)"},
> -
> -	{0x5E00, "Low power condition on"},
> -	{0x5E01, "Idle condition activated by timer"},
> -	{0x5E02, "Standby condition activated by timer"},
> -	{0x5E03, "Idle condition activated by command"},
> -	{0x5E04, "Standby condition activated by command"},
> -	{0x5E05, "Idle_b condition activated by timer"},
> -	{0x5E06, "Idle_b condition activated by command"},
> -	{0x5E07, "Idle_c condition activated by timer"},
> -	{0x5E08, "Idle_c condition activated by command"},
> -	{0x5E09, "Standby_y condition activated by timer"},
> -	{0x5E0A, "Standby_y condition activated by command"},
> -	{0x5E41, "Power state change to active"},
> -	{0x5E42, "Power state change to idle"},
> -	{0x5E43, "Power state change to standby"},
> -	{0x5E45, "Power state change to sleep"},
> -	{0x5E47, "Power state change to device control"},
> -
> -	{0x6000, "Lamp failure"},
> -
> -	{0x6100, "Video acquisition error"},
> -	{0x6101, "Unable to acquire video"},
> -	{0x6102, "Out of focus"},
> -
> -	{0x6200, "Scan head positioning error"},
> -
> -	{0x6300, "End of user area encountered on this track"},
> -	{0x6301, "Packet does not fit in available space"},
> -
> -	{0x6400, "Illegal mode for this track"},
> -	{0x6401, "Invalid packet size"},
> -
> -	{0x6500, "Voltage fault"},
> -
> -	{0x6600, "Automatic document feeder cover up"},
> -	{0x6601, "Automatic document feeder lift up"},
> -	{0x6602, "Document jam in automatic document feeder"},
> -	{0x6603, "Document miss feed automatic in document feeder"},
> -
> -	{0x6700, "Configuration failure"},
> -	{0x6701, "Configuration of incapable logical units failed"},
> -	{0x6702, "Add logical unit failed"},
> -	{0x6703, "Modification of logical unit failed"},
> -	{0x6704, "Exchange of logical unit failed"},
> -	{0x6705, "Remove of logical unit failed"},
> -	{0x6706, "Attachment of logical unit failed"},
> -	{0x6707, "Creation of logical unit failed"},
> -	{0x6708, "Assign failure occurred"},
> -	{0x6709, "Multiply assigned logical unit"},
> -	{0x670A, "Set target port groups command failed"},
> -	{0x670B, "ATA device feature not enabled"},
> -
> -	{0x6800, "Logical unit not configured"},
> -	{0x6801, "Subsidiary logical unit not configured"},
> -
> -	{0x6900, "Data loss on logical unit"},
> -	{0x6901, "Multiple logical unit failures"},
> -	{0x6902, "Parity/data mismatch"},
> -
> -	{0x6A00, "Informational, refer to log"},
> -
> -	{0x6B00, "State change has occurred"},
> -	{0x6B01, "Redundancy level got better"},
> -	{0x6B02, "Redundancy level got worse"},
> -
> -	{0x6C00, "Rebuild failure occurred"},
> -
> -	{0x6D00, "Recalculate failure occurred"},
> -
> -	{0x6E00, "Command to logical unit failed"},
> -
> -	{0x6F00, "Copy protection key exchange failure - authentication "
> -	 "failure"},
> -	{0x6F01, "Copy protection key exchange failure - key not present"},
> -	{0x6F02, "Copy protection key exchange failure - key not established"},
> -	{0x6F03, "Read of scrambled sector without authentication"},
> -	{0x6F04, "Media region code is mismatched to logical unit region"},
> -	{0x6F05, "Drive region must be permanent/region reset count error"},
> -	{0x6F06, "Insufficient block count for binding nonce recording"},
> -	{0x6F07, "Conflict in binding nonce recording"},
> -/*
> - *	{0x70NN, "Decompression exception short algorithm id of nn"},
> - */
> -	{0x7100, "Decompression exception long algorithm id"},
> -
> -	{0x7200, "Session fixation error"},
> -	{0x7201, "Session fixation error writing lead-in"},
> -	{0x7202, "Session fixation error writing lead-out"},
> -	{0x7203, "Session fixation error - incomplete track in session"},
> -	{0x7204, "Empty or partially written reserved track"},
> -	{0x7205, "No more track reservations allowed"},
> -	{0x7206, "RMZ extension is not allowed"},
> -	{0x7207, "No more test zone extensions are allowed"},
> -
> -	{0x7300, "Cd control error"},
> -	{0x7301, "Power calibration area almost full"},
> -	{0x7302, "Power calibration area is full"},
> -	{0x7303, "Power calibration area error"},
> -	{0x7304, "Program memory area update failure"},
> -	{0x7305, "Program memory area is full"},
> -	{0x7306, "RMA/PMA is almost full"},
> -	{0x7310, "Current power calibration area almost full"},
> -	{0x7311, "Current power calibration area is full"},
> -	{0x7317, "RDZ is full"},
> -
> -	{0x7400, "Security error"},
> -	{0x7401, "Unable to decrypt data"},
> -	{0x7402, "Unencrypted data encountered while decrypting"},
> -	{0x7403, "Incorrect data encryption key"},
> -	{0x7404, "Cryptographic integrity validation failed"},
> -	{0x7405, "Error decrypting data"},
> -	{0x7406, "Unknown signature verification key"},
> -	{0x7407, "Encryption parameters not useable"},
> -	{0x7408, "Digital signature validation failure"},
> -	{0x7409, "Encryption mode mismatch on read"},
> -	{0x740A, "Encrypted block not raw read enabled"},
> -	{0x740B, "Incorrect Encryption parameters"},
> -	{0x740C, "Unable to decrypt parameter list"},
> -	{0x740D, "Encryption algorithm disabled"},
> -	{0x7410, "SA creation parameter value invalid"},
> -	{0x7411, "SA creation parameter value rejected"},
> -	{0x7412, "Invalid SA usage"},
> -	{0x7421, "Data Encryption configuration prevented"},
> -	{0x7430, "SA creation parameter not supported"},
> -	{0x7440, "Authentication failed"},
> -	{0x7461, "External data encryption key manager access error"},
> -	{0x7462, "External data encryption key manager error"},
> -	{0x7463, "External data encryption key not found"},
> -	{0x7464, "External data encryption request not authorized"},
> -	{0x746E, "External data encryption control timeout"},
> -	{0x746F, "External data encryption control error"},
> -	{0x7471, "Logical unit access not authorized"},
> -	{0x7479, "Security conflict in translated device"},
> -
> -	{0, NULL}
> -};
> -
> -struct error_info2 {
> -	unsigned char code1, code2_min, code2_max;
> -	const char * fmt;
> -};
> -
> -static const struct error_info2 additional2[] =
> -{
> -	{0x40, 0x00, 0x7f, "Ram failure (%x)"},
> -	{0x40, 0x80, 0xff, "Diagnostic failure on component (%x)"},
> -	{0x41, 0x00, 0xff, "Data path failure (%x)"},
> -	{0x42, 0x00, 0xff, "Power-on or self-test failure (%x)"},
> -	{0x4D, 0x00, 0xff, "Tagged overlapped commands (task tag %x)"},
> -	{0x70, 0x00, 0xff, "Decompression exception short algorithm id of %x"},
> -	{0, 0, 0, NULL}
> -};
> -#endif
> -
> -/*
> - * Get additional sense code string or NULL if not available.
> - * This string may contain a "%x" and should be printed with ascq as arg.
> - */
> -const char *
> -scsi_extd_sense_format(unsigned char asc, unsigned char ascq) {
> -#ifdef CONFIG_SCSI_CONSTANTS
> -	int i;
> -	unsigned short code = ((asc << 8) | ascq);
> -
> -	for (i = 0; additional[i].text; i++)
> -		if (additional[i].code12 == code)
> -			return additional[i].text;
> -	for (i = 0; additional2[i].fmt; i++) {
> -		if (additional2[i].code1 == asc &&
> -		    ascq >= additional2[i].code2_min &&
> -		    ascq <= additional2[i].code2_max)
> -			return additional2[i].fmt;
> -	}
> -#endif
> -	return NULL;
> -}
> -EXPORT_SYMBOL(scsi_extd_sense_format);
> -
> -void
> -scsi_show_extd_sense(struct scsi_device *sdev, const char *name,
> -		     unsigned char asc, unsigned char ascq)
> -{
> -	const char *extd_sense_fmt = scsi_extd_sense_format(asc, ascq);
> -
> -	if (extd_sense_fmt) {
> -		if (strstr(extd_sense_fmt, "%x")) {
> -			char sense_buf[50];
> -			sprintf(sense_buf, extd_sense_fmt, ascq);
> -			sdev_printk(KERN_INFO, sdev,
> -				    "[%s] Add. Sense: %s", name, sense_buf);
> -		} else
> -			sdev_printk(KERN_INFO, sdev,
> -				    "[%s] Add. Sense: %s\n",
> -				    name, extd_sense_fmt);
> -	} else
> -		sdev_printk(KERN_INFO, sdev,
> -			    "[%s] %sASC=0x%x %sASCQ=0x%x\n",
> -			    name, asc >= 0x80 ? "<<vendor>> " : "", asc,
> -			    asc < 0 && ascq >= 0x80 ? "<<vendor>> ": "",
> -			    ascq);
> -}
> -EXPORT_SYMBOL(scsi_show_extd_sense);
> -
> -/*
> - * Print normalized SCSI sense header with a prefix.
> - */
> -void
> -scsi_print_sense_hdr(struct scsi_device *sdev, const char *name,
> -		     struct scsi_sense_hdr *sshdr)
> -{
> -	trace_scsi_print_sense(sdev, name, sshdr, NULL, 0, 0);
> -	scsi_show_extd_sense(sdev, name, sshdr->asc, sshdr->ascq);
> -}
> -EXPORT_SYMBOL(scsi_print_sense_hdr);
> -
> -/* Normalize and print sense buffer with name prefix */
> -void __scsi_print_sense(struct scsi_device *sdev, const char *name,
> -			const unsigned char *sense_buffer, int sense_len)
> -{
> -	struct scsi_sense_hdr sshdr;
> -	int raw;
> -
> -	raw = !scsi_normalize_sense(sense_buffer, sense_len, &sshdr);
> -
> -	trace_scsi_print_sense(sdev, name, &sshdr, sense_buffer, sense_len,
> -			       raw);
> -	scsi_show_extd_sense(sdev, name, sshdr.asc, sshdr.ascq);
> -}
> -EXPORT_SYMBOL(__scsi_print_sense);
> -
> -/* Normalize and print sense buffer in SCSI command */
> -void scsi_print_sense(struct scsi_cmnd *cmd)
> -{
> -	const char *devname = cmd->request->rq_disk ?
> -		cmd->request->rq_disk->disk_name : "scsi";
> -
> -	__scsi_print_sense(cmd->device, devname, cmd->sense_buffer,
> -			   SCSI_SENSE_BUFFERSIZE);
> -}
> -EXPORT_SYMBOL(scsi_print_sense);
> diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
> index 2ecb1dc..60678d8 100644
> --- a/drivers/scsi/scsi_trace.c
> +++ b/drivers/scsi/scsi_trace.c
> @@ -22,6 +22,7 @@
>
>   #include <scsi/scsi_dbg.h>
>   #include <scsi/scsi_eh.h>
> +#include <scsi/scsi_dbg.h>
>
>   #define SERVICE_ACTION16(cdb) (cdb[1] & 0x1f)
>   #define SERVICE_ACTION32(cdb) ((cdb[8] << 8) | cdb[9])
> @@ -291,6 +292,841 @@ scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len)
>   }
>
>   #ifdef CONFIG_SCSI_CONSTANTS
> +
> +struct error_info {
> +	unsigned short code12;	/* 0x0302 looks better than 0x03,0x02 */
> +	const char *text;
> +};
> +
> +/*
> + * The canonical list of T10 Additional Sense Codes is available at:
> + * http://www.t10.org/lists/asc-num.txt [most recent: 20130605]
> + */
> +
> +static const struct error_info additional[] =
> +{
> +	{0x0000, "No additional sense information"},
> +	{0x0001, "Filemark detected"},
> +	{0x0002, "End-of-partition/medium detected"},
> +	{0x0003, "Setmark detected"},
> +	{0x0004, "Beginning-of-partition/medium detected"},
> +	{0x0005, "End-of-data detected"},
> +	{0x0006, "I/O process terminated"},
> +	{0x0007, "Programmable early warning detected"},
> +	{0x0011, "Audio play operation in progress"},
> +	{0x0012, "Audio play operation paused"},
> +	{0x0013, "Audio play operation successfully completed"},
> +	{0x0014, "Audio play operation stopped due to error"},
> +	{0x0015, "No current audio status to return"},
> +	{0x0016, "Operation in progress"},
> +	{0x0017, "Cleaning requested"},
> +	{0x0018, "Erase operation in progress"},
> +	{0x0019, "Locate operation in progress"},
> +	{0x001A, "Rewind operation in progress"},
> +	{0x001B, "Set capacity operation in progress"},
> +	{0x001C, "Verify operation in progress"},
> +	{0x001D, "ATA pass through information available"},
> +	{0x001E, "Conflicting SA creation request"},
> +	{0x001F, "Logical unit transitioning to another power condition"},
> +	{0x0020, "Extended copy information available"},
> +
> +	{0x0100, "No index/sector signal"},
> +
> +	{0x0200, "No seek complete"},
> +
> +	{0x0300, "Peripheral device write fault"},
> +	{0x0301, "No write current"},
> +	{0x0302, "Excessive write errors"},
> +
> +	{0x0400, "Logical unit not ready, cause not reportable"},
> +	{0x0401, "Logical unit is in process of becoming ready"},
> +	{0x0402, "Logical unit not ready, initializing command required"},
> +	{0x0403, "Logical unit not ready, manual intervention required"},
> +	{0x0404, "Logical unit not ready, format in progress"},
> +	{0x0405, "Logical unit not ready, rebuild in progress"},
> +	{0x0406, "Logical unit not ready, recalculation in progress"},
> +	{0x0407, "Logical unit not ready, operation in progress"},
> +	{0x0408, "Logical unit not ready, long write in progress"},
> +	{0x0409, "Logical unit not ready, self-test in progress"},
> +	{0x040A, "Logical unit not accessible, asymmetric access state "
> +	 "transition"},
> +	{0x040B, "Logical unit not accessible, target port in standby state"},
> +	{0x040C, "Logical unit not accessible, target port in unavailable "
> +	 "state"},
> +	{0x040D, "Logical unit not ready, structure check required"},
> +	{0x0410, "Logical unit not ready, auxiliary memory not accessible"},
> +	{0x0411, "Logical unit not ready, notify (enable spinup) required"},
> +	{0x0412, "Logical unit not ready, offline"},
> +	{0x0413, "Logical unit not ready, SA creation in progress"},
> +	{0x0414, "Logical unit not ready, space allocation in progress"},
> +	{0x0415, "Logical unit not ready, robotics disabled"},
> +	{0x0416, "Logical unit not ready, configuration required"},
> +	{0x0417, "Logical unit not ready, calibration required"},
> +	{0x0418, "Logical unit not ready, a door is open"},
> +	{0x0419, "Logical unit not ready, operating in sequential mode"},
> +	{0x041A, "Logical unit not ready, start stop unit command in "
> +	 "progress"},
> +	{0x041B, "Logical unit not ready, sanitize in progress"},
> +	{0x041C, "Logical unit not ready, additional power use not yet "
> +	 "granted"},
> +	{0x041D, "Logical unit not ready, configuration in progress"},
> +
> +	{0x0500, "Logical unit does not respond to selection"},
> +
> +	{0x0600, "No reference position found"},
> +
> +	{0x0700, "Multiple peripheral devices selected"},
> +
> +	{0x0800, "Logical unit communication failure"},
> +	{0x0801, "Logical unit communication time-out"},
> +	{0x0802, "Logical unit communication parity error"},
> +	{0x0803, "Logical unit communication CRC error (Ultra-DMA/32)"},
> +	{0x0804, "Unreachable copy target"},
> +
> +	{0x0900, "Track following error"},
> +	{0x0901, "Tracking servo failure"},
> +	{0x0902, "Focus servo failure"},
> +	{0x0903, "Spindle servo failure"},
> +	{0x0904, "Head select fault"},
> +
> +	{0x0A00, "Error log overflow"},
> +
> +	{0x0B00, "Warning"},
> +	{0x0B01, "Warning - specified temperature exceeded"},
> +	{0x0B02, "Warning - enclosure degraded"},
> +	{0x0B03, "Warning - background self-test failed"},
> +	{0x0B04, "Warning - background pre-scan detected medium error"},
> +	{0x0B05, "Warning - background medium scan detected medium error"},
> +	{0x0B06, "Warning - non-volatile cache now volatile"},
> +	{0x0B07, "Warning - degraded power to non-volatile cache"},
> +	{0x0B08, "Warning - power loss expected"},
> +	{0x0B09, "Warning - device statistics notification active"},
> +
> +	{0x0C00, "Write error"},
> +	{0x0C01, "Write error - recovered with auto reallocation"},
> +	{0x0C02, "Write error - auto reallocation failed"},
> +	{0x0C03, "Write error - recommend reassignment"},
> +	{0x0C04, "Compression check miscompare error"},
> +	{0x0C05, "Data expansion occurred during compression"},
> +	{0x0C06, "Block not compressible"},
> +	{0x0C07, "Write error - recovery needed"},
> +	{0x0C08, "Write error - recovery failed"},
> +	{0x0C09, "Write error - loss of streaming"},
> +	{0x0C0A, "Write error - padding blocks added"},
> +	{0x0C0B, "Auxiliary memory write error"},
> +	{0x0C0C, "Write error - unexpected unsolicited data"},
> +	{0x0C0D, "Write error - not enough unsolicited data"},
> +	{0x0C0E, "Multiple write errors"},
> +	{0x0C0F, "Defects in error window"},
> +
> +	{0x0D00, "Error detected by third party temporary initiator"},
> +	{0x0D01, "Third party device failure"},
> +	{0x0D02, "Copy target device not reachable"},
> +	{0x0D03, "Incorrect copy target device type"},
> +	{0x0D04, "Copy target device data underrun"},
> +	{0x0D05, "Copy target device data overrun"},
> +
> +	{0x0E00, "Invalid information unit"},
> +	{0x0E01, "Information unit too short"},
> +	{0x0E02, "Information unit too long"},
> +	{0x0E03, "Invalid field in command information unit"},
> +
> +	{0x1000, "Id CRC or ECC error"},
> +	{0x1001, "Logical block guard check failed"},
> +	{0x1002, "Logical block application tag check failed"},
> +	{0x1003, "Logical block reference tag check failed"},
> +	{0x1004, "Logical block protection error on recover buffered data"},
> +	{0x1005, "Logical block protection method error"},
> +
> +	{0x1100, "Unrecovered read error"},
> +	{0x1101, "Read retries exhausted"},
> +	{0x1102, "Error too long to correct"},
> +	{0x1103, "Multiple read errors"},
> +	{0x1104, "Unrecovered read error - auto reallocate failed"},
> +	{0x1105, "L-EC uncorrectable error"},
> +	{0x1106, "CIRC unrecovered error"},
> +	{0x1107, "Data re-synchronization error"},
> +	{0x1108, "Incomplete block read"},
> +	{0x1109, "No gap found"},
> +	{0x110A, "Miscorrected error"},
> +	{0x110B, "Unrecovered read error - recommend reassignment"},
> +	{0x110C, "Unrecovered read error - recommend rewrite the data"},
> +	{0x110D, "De-compression CRC error"},
> +	{0x110E, "Cannot decompress using declared algorithm"},
> +	{0x110F, "Error reading UPC/EAN number"},
> +	{0x1110, "Error reading ISRC number"},
> +	{0x1111, "Read error - loss of streaming"},
> +	{0x1112, "Auxiliary memory read error"},
> +	{0x1113, "Read error - failed retransmission request"},
> +	{0x1114, "Read error - lba marked bad by application client"},
> +	{0x1115, "Write after sanitize required"},
> +
> +	{0x1200, "Address mark not found for id field"},
> +
> +	{0x1300, "Address mark not found for data field"},
> +
> +	{0x1400, "Recorded entity not found"},
> +	{0x1401, "Record not found"},
> +	{0x1402, "Filemark or setmark not found"},
> +	{0x1403, "End-of-data not found"},
> +	{0x1404, "Block sequence error"},
> +	{0x1405, "Record not found - recommend reassignment"},
> +	{0x1406, "Record not found - data auto-reallocated"},
> +	{0x1407, "Locate operation failure"},
> +
> +	{0x1500, "Random positioning error"},
> +	{0x1501, "Mechanical positioning error"},
> +	{0x1502, "Positioning error detected by read of medium"},
> +
> +	{0x1600, "Data synchronization mark error"},
> +	{0x1601, "Data sync error - data rewritten"},
> +	{0x1602, "Data sync error - recommend rewrite"},
> +	{0x1603, "Data sync error - data auto-reallocated"},
> +	{0x1604, "Data sync error - recommend reassignment"},
> +
> +	{0x1700, "Recovered data with no error correction applied"},
> +	{0x1701, "Recovered data with retries"},
> +	{0x1702, "Recovered data with positive head offset"},
> +	{0x1703, "Recovered data with negative head offset"},
> +	{0x1704, "Recovered data with retries and/or circ applied"},
> +	{0x1705, "Recovered data using previous sector id"},
> +	{0x1706, "Recovered data without ECC - data auto-reallocated"},
> +	{0x1707, "Recovered data without ECC - recommend reassignment"},
> +	{0x1708, "Recovered data without ECC - recommend rewrite"},
> +	{0x1709, "Recovered data without ECC - data rewritten"},
> +
> +	{0x1800, "Recovered data with error correction applied"},
> +	{0x1801, "Recovered data with error corr. & retries applied"},
> +	{0x1802, "Recovered data - data auto-reallocated"},
> +	{0x1803, "Recovered data with CIRC"},
> +	{0x1804, "Recovered data with L-EC"},
> +	{0x1805, "Recovered data - recommend reassignment"},
> +	{0x1806, "Recovered data - recommend rewrite"},
> +	{0x1807, "Recovered data with ECC - data rewritten"},
> +	{0x1808, "Recovered data with linking"},
> +
> +	{0x1900, "Defect list error"},
> +	{0x1901, "Defect list not available"},
> +	{0x1902, "Defect list error in primary list"},
> +	{0x1903, "Defect list error in grown list"},
> +
> +	{0x1A00, "Parameter list length error"},
> +
> +	{0x1B00, "Synchronous data transfer error"},
> +
> +	{0x1C00, "Defect list not found"},
> +	{0x1C01, "Primary defect list not found"},
> +	{0x1C02, "Grown defect list not found"},
> +
> +	{0x1D00, "Miscompare during verify operation"},
> +	{0x1D01, "Miscompare verify of unmapped LBA"},
> +
> +	{0x1E00, "Recovered id with ECC correction"},
> +
> +	{0x1F00, "Partial defect list transfer"},
> +
> +	{0x2000, "Invalid command operation code"},
> +	{0x2001, "Access denied - initiator pending-enrolled"},
> +	{0x2002, "Access denied - no access rights"},
> +	{0x2003, "Access denied - invalid mgmt id key"},
> +	{0x2004, "Illegal command while in write capable state"},
> +	{0x2005, "Obsolete"},
> +	{0x2006, "Illegal command while in explicit address mode"},
> +	{0x2007, "Illegal command while in implicit address mode"},
> +	{0x2008, "Access denied - enrollment conflict"},
> +	{0x2009, "Access denied - invalid LU identifier"},
> +	{0x200A, "Access denied - invalid proxy token"},
> +	{0x200B, "Access denied - ACL LUN conflict"},
> +	{0x200C, "Illegal command when not in append-only mode"},
> +
> +	{0x2100, "Logical block address out of range"},
> +	{0x2101, "Invalid element address"},
> +	{0x2102, "Invalid address for write"},
> +	{0x2103, "Invalid write crossing layer jump"},
> +
> +	{0x2200, "Illegal function (use 20 00, 24 00, or 26 00)"},
> +
> +	{0x2300, "Invalid token operation, cause not reportable"},
> +	{0x2301, "Invalid token operation, unsupported token type"},
> +	{0x2302, "Invalid token operation, remote token usage not supported"},
> +	{0x2303, "Invalid token operation, remote rod token creation not "
> +	 "supported"},
> +	{0x2304, "Invalid token operation, token unknown"},
> +	{0x2305, "Invalid token operation, token corrupt"},
> +	{0x2306, "Invalid token operation, token revoked"},
> +	{0x2307, "Invalid token operation, token expired"},
> +	{0x2308, "Invalid token operation, token cancelled"},
> +	{0x2309, "Invalid token operation, token deleted"},
> +	{0x230A, "Invalid token operation, invalid token length"},
> +
> +	{0x2400, "Invalid field in cdb"},
> +	{0x2401, "CDB decryption error"},
> +	{0x2402, "Obsolete"},
> +	{0x2403, "Obsolete"},
> +	{0x2404, "Security audit value frozen"},
> +	{0x2405, "Security working key frozen"},
> +	{0x2406, "Nonce not unique"},
> +	{0x2407, "Nonce timestamp out of range"},
> +	{0x2408, "Invalid XCDB"},
> +
> +	{0x2500, "Logical unit not supported"},
> +
> +	{0x2600, "Invalid field in parameter list"},
> +	{0x2601, "Parameter not supported"},
> +	{0x2602, "Parameter value invalid"},
> +	{0x2603, "Threshold parameters not supported"},
> +	{0x2604, "Invalid release of persistent reservation"},
> +	{0x2605, "Data decryption error"},
> +	{0x2606, "Too many target descriptors"},
> +	{0x2607, "Unsupported target descriptor type code"},
> +	{0x2608, "Too many segment descriptors"},
> +	{0x2609, "Unsupported segment descriptor type code"},
> +	{0x260A, "Unexpected inexact segment"},
> +	{0x260B, "Inline data length exceeded"},
> +	{0x260C, "Invalid operation for copy source or destination"},
> +	{0x260D, "Copy segment granularity violation"},
> +	{0x260E, "Invalid parameter while port is enabled"},
> +	{0x260F, "Invalid data-out buffer integrity check value"},
> +	{0x2610, "Data decryption key fail limit reached"},
> +	{0x2611, "Incomplete key-associated data set"},
> +	{0x2612, "Vendor specific key reference not found"},
> +
> +	{0x2700, "Write protected"},
> +	{0x2701, "Hardware write protected"},
> +	{0x2702, "Logical unit software write protected"},
> +	{0x2703, "Associated write protect"},
> +	{0x2704, "Persistent write protect"},
> +	{0x2705, "Permanent write protect"},
> +	{0x2706, "Conditional write protect"},
> +	{0x2707, "Space allocation failed write protect"},
> +
> +	{0x2800, "Not ready to ready change, medium may have changed"},
> +	{0x2801, "Import or export element accessed"},
> +	{0x2802, "Format-layer may have changed"},
> +	{0x2803, "Import/export element accessed, medium changed"},
> +
> +	{0x2900, "Power on, reset, or bus device reset occurred"},
> +	{0x2901, "Power on occurred"},
> +	{0x2902, "Scsi bus reset occurred"},
> +	{0x2903, "Bus device reset function occurred"},
> +	{0x2904, "Device internal reset"},
> +	{0x2905, "Transceiver mode changed to single-ended"},
> +	{0x2906, "Transceiver mode changed to lvd"},
> +	{0x2907, "I_T nexus loss occurred"},
> +
> +	{0x2A00, "Parameters changed"},
> +	{0x2A01, "Mode parameters changed"},
> +	{0x2A02, "Log parameters changed"},
> +	{0x2A03, "Reservations preempted"},
> +	{0x2A04, "Reservations released"},
> +	{0x2A05, "Registrations preempted"},
> +	{0x2A06, "Asymmetric access state changed"},
> +	{0x2A07, "Implicit asymmetric access state transition failed"},
> +	{0x2A08, "Priority changed"},
> +	{0x2A09, "Capacity data has changed"},
> +	{0x2A0A, "Error history I_T nexus cleared"},
> +	{0x2A0B, "Error history snapshot released"},
> +	{0x2A0C, "Error recovery attributes have changed"},
> +	{0x2A0D, "Data encryption capabilities changed"},
> +	{0x2A10, "Timestamp changed"},
> +	{0x2A11, "Data encryption parameters changed by another i_t nexus"},
> +	{0x2A12, "Data encryption parameters changed by vendor specific "
> +		 "event"},
> +	{0x2A13, "Data encryption key instance counter has changed"},
> +	{0x2A14, "SA creation capabilities data has changed"},
> +	{0x2A15, "Medium removal prevention preempted"},
> +
> +	{0x2B00, "Copy cannot execute since host cannot disconnect"},
> +
> +	{0x2C00, "Command sequence error"},
> +	{0x2C01, "Too many windows specified"},
> +	{0x2C02, "Invalid combination of windows specified"},
> +	{0x2C03, "Current program area is not empty"},
> +	{0x2C04, "Current program area is empty"},
> +	{0x2C05, "Illegal power condition request"},
> +	{0x2C06, "Persistent prevent conflict"},
> +	{0x2C07, "Previous busy status"},
> +	{0x2C08, "Previous task set full status"},
> +	{0x2C09, "Previous reservation conflict status"},
> +	{0x2C0A, "Partition or collection contains user objects"},
> +	{0x2C0B, "Not reserved"},
> +	{0x2C0C, "Orwrite generation does not match"},
> +
> +	{0x2D00, "Overwrite error on update in place"},
> +
> +	{0x2E00, "Insufficient time for operation"},
> +
> +	{0x2F00, "Commands cleared by another initiator"},
> +	{0x2F01, "Commands cleared by power loss notification"},
> +	{0x2F02, "Commands cleared by device server"},
> +	{0x2F03, "Some commands cleared by queuing layer event"},
> +
> +	{0x3000, "Incompatible medium installed"},
> +	{0x3001, "Cannot read medium - unknown format"},
> +	{0x3002, "Cannot read medium - incompatible format"},
> +	{0x3003, "Cleaning cartridge installed"},
> +	{0x3004, "Cannot write medium - unknown format"},
> +	{0x3005, "Cannot write medium - incompatible format"},
> +	{0x3006, "Cannot format medium - incompatible medium"},
> +	{0x3007, "Cleaning failure"},
> +	{0x3008, "Cannot write - application code mismatch"},
> +	{0x3009, "Current session not fixated for append"},
> +	{0x300A, "Cleaning request rejected"},
> +	{0x300C, "WORM medium - overwrite attempted"},
> +	{0x300D, "WORM medium - integrity check"},
> +	{0x3010, "Medium not formatted"},
> +	{0x3011, "Incompatible volume type"},
> +	{0x3012, "Incompatible volume qualifier"},
> +	{0x3013, "Cleaning volume expired"},
> +
> +	{0x3100, "Medium format corrupted"},
> +	{0x3101, "Format command failed"},
> +	{0x3102, "Zoned formatting failed due to spare linking"},
> +	{0x3103, "Sanitize command failed"},
> +
> +	{0x3200, "No defect spare location available"},
> +	{0x3201, "Defect list update failure"},
> +
> +	{0x3300, "Tape length error"},
> +
> +	{0x3400, "Enclosure failure"},
> +
> +	{0x3500, "Enclosure services failure"},
> +	{0x3501, "Unsupported enclosure function"},
> +	{0x3502, "Enclosure services unavailable"},
> +	{0x3503, "Enclosure services transfer failure"},
> +	{0x3504, "Enclosure services transfer refused"},
> +	{0x3505, "Enclosure services checksum error"},
> +
> +	{0x3600, "Ribbon, ink, or toner failure"},
> +
> +	{0x3700, "Rounded parameter"},
> +
> +	{0x3800, "Event status notification"},
> +	{0x3802, "Esn - power management class event"},
> +	{0x3804, "Esn - media class event"},
> +	{0x3806, "Esn - device busy class event"},
> +	{0x3807, "Thin Provisioning soft threshold reached"},
> +
> +	{0x3900, "Saving parameters not supported"},
> +
> +	{0x3A00, "Medium not present"},
> +	{0x3A01, "Medium not present - tray closed"},
> +	{0x3A02, "Medium not present - tray open"},
> +	{0x3A03, "Medium not present - loadable"},
> +	{0x3A04, "Medium not present - medium auxiliary memory accessible"},
> +
> +	{0x3B00, "Sequential positioning error"},
> +	{0x3B01, "Tape position error at beginning-of-medium"},
> +	{0x3B02, "Tape position error at end-of-medium"},
> +	{0x3B03, "Tape or electronic vertical forms unit not ready"},
> +	{0x3B04, "Slew failure"},
> +	{0x3B05, "Paper jam"},
> +	{0x3B06, "Failed to sense top-of-form"},
> +	{0x3B07, "Failed to sense bottom-of-form"},
> +	{0x3B08, "Reposition error"},
> +	{0x3B09, "Read past end of medium"},
> +	{0x3B0A, "Read past beginning of medium"},
> +	{0x3B0B, "Position past end of medium"},
> +	{0x3B0C, "Position past beginning of medium"},
> +	{0x3B0D, "Medium destination element full"},
> +	{0x3B0E, "Medium source element empty"},
> +	{0x3B0F, "End of medium reached"},
> +	{0x3B11, "Medium magazine not accessible"},
> +	{0x3B12, "Medium magazine removed"},
> +	{0x3B13, "Medium magazine inserted"},
> +	{0x3B14, "Medium magazine locked"},
> +	{0x3B15, "Medium magazine unlocked"},
> +	{0x3B16, "Mechanical positioning or changer error"},
> +	{0x3B17, "Read past end of user object"},
> +	{0x3B18, "Element disabled"},
> +	{0x3B19, "Element enabled"},
> +	{0x3B1A, "Data transfer device removed"},
> +	{0x3B1B, "Data transfer device inserted"},
> +	{0x3B1C, "Too many logical objects on partition to support "
> +	 "operation"},
> +
> +	{0x3D00, "Invalid bits in identify message"},
> +
> +	{0x3E00, "Logical unit has not self-configured yet"},
> +	{0x3E01, "Logical unit failure"},
> +	{0x3E02, "Timeout on logical unit"},
> +	{0x3E03, "Logical unit failed self-test"},
> +	{0x3E04, "Logical unit unable to update self-test log"},
> +
> +	{0x3F00, "Target operating conditions have changed"},
> +	{0x3F01, "Microcode has been changed"},
> +	{0x3F02, "Changed operating definition"},
> +	{0x3F03, "Inquiry data has changed"},
> +	{0x3F04, "Component device attached"},
> +	{0x3F05, "Device identifier changed"},
> +	{0x3F06, "Redundancy group created or modified"},
> +	{0x3F07, "Redundancy group deleted"},
> +	{0x3F08, "Spare created or modified"},
> +	{0x3F09, "Spare deleted"},
> +	{0x3F0A, "Volume set created or modified"},
> +	{0x3F0B, "Volume set deleted"},
> +	{0x3F0C, "Volume set deassigned"},
> +	{0x3F0D, "Volume set reassigned"},
> +	{0x3F0E, "Reported luns data has changed"},
> +	{0x3F0F, "Echo buffer overwritten"},
> +	{0x3F10, "Medium loadable"},
> +	{0x3F11, "Medium auxiliary memory accessible"},
> +	{0x3F12, "iSCSI IP address added"},
> +	{0x3F13, "iSCSI IP address removed"},
> +	{0x3F14, "iSCSI IP address changed"},
> +	{0x3F15, "Inspect referrals sense descriptors"},
> +/*
> + *	{0x40NN, "Ram failure"},
> + *	{0x40NN, "Diagnostic failure on component nn"},
> + *	{0x41NN, "Data path failure"},
> + *	{0x42NN, "Power-on or self-test failure"},
> + */
> +	{0x4300, "Message error"},
> +
> +	{0x4400, "Internal target failure"},
> +	{0x4401, "Persistent reservation information lost"},
> +	{0x4471, "ATA device failed set features"},
> +
> +	{0x4500, "Select or reselect failure"},
> +
> +	{0x4600, "Unsuccessful soft reset"},
> +
> +	{0x4700, "Scsi parity error"},
> +	{0x4701, "Data phase CRC error detected"},
> +	{0x4702, "Scsi parity error detected during st data phase"},
> +	{0x4703, "Information unit iuCRC error detected"},
> +	{0x4704, "Asynchronous information protection error detected"},
> +	{0x4705, "Protocol service CRC error"},
> +	{0x4706, "Phy test function in progress"},
> +	{0x477f, "Some commands cleared by iSCSI Protocol event"},
> +
> +	{0x4800, "Initiator detected error message received"},
> +
> +	{0x4900, "Invalid message error"},
> +
> +	{0x4A00, "Command phase error"},
> +
> +	{0x4B00, "Data phase error"},
> +	{0x4B01, "Invalid target port transfer tag received"},
> +	{0x4B02, "Too much write data"},
> +	{0x4B03, "Ack/nak timeout"},
> +	{0x4B04, "Nak received"},
> +	{0x4B05, "Data offset error"},
> +	{0x4B06, "Initiator response timeout"},
> +	{0x4B07, "Connection lost"},
> +	{0x4B08, "Data-in buffer overflow - data buffer size"},
> +	{0x4B09, "Data-in buffer overflow - data buffer descriptor area"},
> +	{0x4B0A, "Data-in buffer error"},
> +	{0x4B0B, "Data-out buffer overflow - data buffer size"},
> +	{0x4B0C, "Data-out buffer overflow - data buffer descriptor area"},
> +	{0x4B0D, "Data-out buffer error"},
> +	{0x4B0E, "PCIe fabric error"},
> +	{0x4B0F, "PCIe completion timeout"},
> +	{0x4B10, "PCIe completer abort"},
> +	{0x4B11, "PCIe poisoned tlp received"},
> +	{0x4B12, "PCIe eCRC check failed"},
> +	{0x4B13, "PCIe unsupported request"},
> +	{0x4B14, "PCIe acs violation"},
> +	{0x4B15, "PCIe tlp prefix blocked"},
> +
> +	{0x4C00, "Logical unit failed self-configuration"},
> +/*
> + *	{0x4DNN, "Tagged overlapped commands (nn = queue tag)"},
> + */
> +	{0x4E00, "Overlapped commands attempted"},
> +
> +	{0x5000, "Write append error"},
> +	{0x5001, "Write append position error"},
> +	{0x5002, "Position error related to timing"},
> +
> +	{0x5100, "Erase failure"},
> +	{0x5101, "Erase failure - incomplete erase operation detected"},
> +
> +	{0x5200, "Cartridge fault"},
> +
> +	{0x5300, "Media load or eject failed"},
> +	{0x5301, "Unload tape failure"},
> +	{0x5302, "Medium removal prevented"},
> +	{0x5303, "Medium removal prevented by data transfer element"},
> +	{0x5304, "Medium thread or unthread failure"},
> +	{0x5305, "Volume identifier invalid"},
> +	{0x5306, "Volume identifier missing"},
> +	{0x5307, "Duplicate volume identifier"},
> +	{0x5308, "Element status unknown"},
> +
> +	{0x5400, "Scsi to host system interface failure"},
> +
> +	{0x5500, "System resource failure"},
> +	{0x5501, "System buffer full"},
> +	{0x5502, "Insufficient reservation resources"},
> +	{0x5503, "Insufficient resources"},
> +	{0x5504, "Insufficient registration resources"},
> +	{0x5505, "Insufficient access control resources"},
> +	{0x5506, "Auxiliary memory out of space"},
> +	{0x5507, "Quota error"},
> +	{0x5508, "Maximum number of supplemental decryption keys exceeded"},
> +	{0x5509, "Medium auxiliary memory not accessible"},
> +	{0x550A, "Data currently unavailable"},
> +	{0x550B, "Insufficient power for operation"},
> +	{0x550C, "Insufficient resources to create rod"},
> +	{0x550D, "Insufficient resources to create rod token"},
> +
> +	{0x5700, "Unable to recover table-of-contents"},
> +
> +	{0x5800, "Generation does not exist"},
> +
> +	{0x5900, "Updated block read"},
> +
> +	{0x5A00, "Operator request or state change input"},
> +	{0x5A01, "Operator medium removal request"},
> +	{0x5A02, "Operator selected write protect"},
> +	{0x5A03, "Operator selected write permit"},
> +
> +	{0x5B00, "Log exception"},
> +	{0x5B01, "Threshold condition met"},
> +	{0x5B02, "Log counter at maximum"},
> +	{0x5B03, "Log list codes exhausted"},
> +
> +	{0x5C00, "Rpl status change"},
> +	{0x5C01, "Spindles synchronized"},
> +	{0x5C02, "Spindles not synchronized"},
> +
> +	{0x5D00, "Failure prediction threshold exceeded"},
> +	{0x5D01, "Media failure prediction threshold exceeded"},
> +	{0x5D02, "Logical unit failure prediction threshold exceeded"},
> +	{0x5D03, "Spare area exhaustion prediction threshold exceeded"},
> +	{0x5D10, "Hardware impending failure general hard drive failure"},
> +	{0x5D11, "Hardware impending failure drive error rate too high"},
> +	{0x5D12, "Hardware impending failure data error rate too high"},
> +	{0x5D13, "Hardware impending failure seek error rate too high"},
> +	{0x5D14, "Hardware impending failure too many block reassigns"},
> +	{0x5D15, "Hardware impending failure access times too high"},
> +	{0x5D16, "Hardware impending failure start unit times too high"},
> +	{0x5D17, "Hardware impending failure channel parametrics"},
> +	{0x5D18, "Hardware impending failure controller detected"},
> +	{0x5D19, "Hardware impending failure throughput performance"},
> +	{0x5D1A, "Hardware impending failure seek time performance"},
> +	{0x5D1B, "Hardware impending failure spin-up retry count"},
> +	{0x5D1C, "Hardware impending failure drive calibration retry count"},
> +	{0x5D20, "Controller impending failure general hard drive failure"},
> +	{0x5D21, "Controller impending failure drive error rate too high"},
> +	{0x5D22, "Controller impending failure data error rate too high"},
> +	{0x5D23, "Controller impending failure seek error rate too high"},
> +	{0x5D24, "Controller impending failure too many block reassigns"},
> +	{0x5D25, "Controller impending failure access times too high"},
> +	{0x5D26, "Controller impending failure start unit times too high"},
> +	{0x5D27, "Controller impending failure channel parametrics"},
> +	{0x5D28, "Controller impending failure controller detected"},
> +	{0x5D29, "Controller impending failure throughput performance"},
> +	{0x5D2A, "Controller impending failure seek time performance"},
> +	{0x5D2B, "Controller impending failure spin-up retry count"},
> +	{0x5D2C, "Controller impending failure drive calibration retry count"},
> +	{0x5D30, "Data channel impending failure general hard drive failure"},
> +	{0x5D31, "Data channel impending failure drive error rate too high"},
> +	{0x5D32, "Data channel impending failure data error rate too high"},
> +	{0x5D33, "Data channel impending failure seek error rate too high"},
> +	{0x5D34, "Data channel impending failure too many block reassigns"},
> +	{0x5D35, "Data channel impending failure access times too high"},
> +	{0x5D36, "Data channel impending failure start unit times too high"},
> +	{0x5D37, "Data channel impending failure channel parametrics"},
> +	{0x5D38, "Data channel impending failure controller detected"},
> +	{0x5D39, "Data channel impending failure throughput performance"},
> +	{0x5D3A, "Data channel impending failure seek time performance"},
> +	{0x5D3B, "Data channel impending failure spin-up retry count"},
> +	{0x5D3C, "Data channel impending failure drive calibration retry "
> +	 "count"},
> +	{0x5D40, "Servo impending failure general hard drive failure"},
> +	{0x5D41, "Servo impending failure drive error rate too high"},
> +	{0x5D42, "Servo impending failure data error rate too high"},
> +	{0x5D43, "Servo impending failure seek error rate too high"},
> +	{0x5D44, "Servo impending failure too many block reassigns"},
> +	{0x5D45, "Servo impending failure access times too high"},
> +	{0x5D46, "Servo impending failure start unit times too high"},
> +	{0x5D47, "Servo impending failure channel parametrics"},
> +	{0x5D48, "Servo impending failure controller detected"},
> +	{0x5D49, "Servo impending failure throughput performance"},
> +	{0x5D4A, "Servo impending failure seek time performance"},
> +	{0x5D4B, "Servo impending failure spin-up retry count"},
> +	{0x5D4C, "Servo impending failure drive calibration retry count"},
> +	{0x5D50, "Spindle impending failure general hard drive failure"},
> +	{0x5D51, "Spindle impending failure drive error rate too high"},
> +	{0x5D52, "Spindle impending failure data error rate too high"},
> +	{0x5D53, "Spindle impending failure seek error rate too high"},
> +	{0x5D54, "Spindle impending failure too many block reassigns"},
> +	{0x5D55, "Spindle impending failure access times too high"},
> +	{0x5D56, "Spindle impending failure start unit times too high"},
> +	{0x5D57, "Spindle impending failure channel parametrics"},
> +	{0x5D58, "Spindle impending failure controller detected"},
> +	{0x5D59, "Spindle impending failure throughput performance"},
> +	{0x5D5A, "Spindle impending failure seek time performance"},
> +	{0x5D5B, "Spindle impending failure spin-up retry count"},
> +	{0x5D5C, "Spindle impending failure drive calibration retry count"},
> +	{0x5D60, "Firmware impending failure general hard drive failure"},
> +	{0x5D61, "Firmware impending failure drive error rate too high"},
> +	{0x5D62, "Firmware impending failure data error rate too high"},
> +	{0x5D63, "Firmware impending failure seek error rate too high"},
> +	{0x5D64, "Firmware impending failure too many block reassigns"},
> +	{0x5D65, "Firmware impending failure access times too high"},
> +	{0x5D66, "Firmware impending failure start unit times too high"},
> +	{0x5D67, "Firmware impending failure channel parametrics"},
> +	{0x5D68, "Firmware impending failure controller detected"},
> +	{0x5D69, "Firmware impending failure throughput performance"},
> +	{0x5D6A, "Firmware impending failure seek time performance"},
> +	{0x5D6B, "Firmware impending failure spin-up retry count"},
> +	{0x5D6C, "Firmware impending failure drive calibration retry count"},
> +	{0x5DFF, "Failure prediction threshold exceeded (false)"},
> +
> +	{0x5E00, "Low power condition on"},
> +	{0x5E01, "Idle condition activated by timer"},
> +	{0x5E02, "Standby condition activated by timer"},
> +	{0x5E03, "Idle condition activated by command"},
> +	{0x5E04, "Standby condition activated by command"},
> +	{0x5E05, "Idle_b condition activated by timer"},
> +	{0x5E06, "Idle_b condition activated by command"},
> +	{0x5E07, "Idle_c condition activated by timer"},
> +	{0x5E08, "Idle_c condition activated by command"},
> +	{0x5E09, "Standby_y condition activated by timer"},
> +	{0x5E0A, "Standby_y condition activated by command"},
> +	{0x5E41, "Power state change to active"},
> +	{0x5E42, "Power state change to idle"},
> +	{0x5E43, "Power state change to standby"},
> +	{0x5E45, "Power state change to sleep"},
> +	{0x5E47, "Power state change to device control"},
> +
> +	{0x6000, "Lamp failure"},
> +
> +	{0x6100, "Video acquisition error"},
> +	{0x6101, "Unable to acquire video"},
> +	{0x6102, "Out of focus"},
> +
> +	{0x6200, "Scan head positioning error"},
> +
> +	{0x6300, "End of user area encountered on this track"},
> +	{0x6301, "Packet does not fit in available space"},
> +
> +	{0x6400, "Illegal mode for this track"},
> +	{0x6401, "Invalid packet size"},
> +
> +	{0x6500, "Voltage fault"},
> +
> +	{0x6600, "Automatic document feeder cover up"},
> +	{0x6601, "Automatic document feeder lift up"},
> +	{0x6602, "Document jam in automatic document feeder"},
> +	{0x6603, "Document miss feed automatic in document feeder"},
> +
> +	{0x6700, "Configuration failure"},
> +	{0x6701, "Configuration of incapable logical units failed"},
> +	{0x6702, "Add logical unit failed"},
> +	{0x6703, "Modification of logical unit failed"},
> +	{0x6704, "Exchange of logical unit failed"},
> +	{0x6705, "Remove of logical unit failed"},
> +	{0x6706, "Attachment of logical unit failed"},
> +	{0x6707, "Creation of logical unit failed"},
> +	{0x6708, "Assign failure occurred"},
> +	{0x6709, "Multiply assigned logical unit"},
> +	{0x670A, "Set target port groups command failed"},
> +	{0x670B, "ATA device feature not enabled"},
> +
> +	{0x6800, "Logical unit not configured"},
> +	{0x6801, "Subsidiary logical unit not configured"},
> +
> +	{0x6900, "Data loss on logical unit"},
> +	{0x6901, "Multiple logical unit failures"},
> +	{0x6902, "Parity/data mismatch"},
> +
> +	{0x6A00, "Informational, refer to log"},
> +
> +	{0x6B00, "State change has occurred"},
> +	{0x6B01, "Redundancy level got better"},
> +	{0x6B02, "Redundancy level got worse"},
> +	{0x6C00, "Rebuild failure occurred"},
> +
> +	{0x6D00, "Recalculate failure occurred"},
> +
> +	{0x6E00, "Command to logical unit failed"},
> +
> +	{0x6F00, "Copy protection key exchange failure - authentication "
> +	 "failure"},
> +	{0x6F01, "Copy protection key exchange failure - key not present"},
> +	{0x6F02, "Copy protection key exchange failure - key not established"},
> +	{0x6F03, "Read of scrambled sector without authentication"},
> +	{0x6F04, "Media region code is mismatched to logical unit region"},
> +	{0x6F05, "Drive region must be permanent/region reset count error"},
> +	{0x6F06, "Insufficient block count for binding nonce recording"},
> +	{0x6F07, "Conflict in binding nonce recording"},
> +/*
> + *	{0x70NN, "Decompression exception short algorithm id of nn"},
> + */
> +	{0x7100, "Decompression exception long algorithm id"},
> +
> +	{0x7200, "Session fixation error"},
> +	{0x7201, "Session fixation error writing lead-in"},
> +	{0x7202, "Session fixation error writing lead-out"},
> +	{0x7203, "Session fixation error - incomplete track in session"},
> +	{0x7204, "Empty or partially written reserved track"},
> +	{0x7205, "No more track reservations allowed"},
> +	{0x7206, "RMZ extension is not allowed"},
> +	{0x7207, "No more test zone extensions are allowed"},
> +
> +	{0x7300, "Cd control error"},
> +	{0x7301, "Power calibration area almost full"},
> +	{0x7302, "Power calibration area is full"},
> +	{0x7303, "Power calibration area error"},
> +	{0x7304, "Program memory area update failure"},
> +	{0x7305, "Program memory area is full"},
> +	{0x7306, "RMA/PMA is almost full"},
> +	{0x7310, "Current power calibration area almost full"},
> +	{0x7311, "Current power calibration area is full"},
> +	{0x7317, "RDZ is full"},
> +
> +	{0x7400, "Security error"},
> +	{0x7401, "Unable to decrypt data"},
> +	{0x7402, "Unencrypted data encountered while decrypting"},
> +	{0x7403, "Incorrect data encryption key"},
> +	{0x7404, "Cryptographic integrity validation failed"},
> +	{0x7405, "Error decrypting data"},
> +	{0x7406, "Unknown signature verification key"},
> +	{0x7407, "Encryption parameters not useable"},
> +	{0x7408, "Digital signature validation failure"},
> +	{0x7409, "Encryption mode mismatch on read"},
> +	{0x740A, "Encrypted block not raw read enabled"},
> +	{0x740B, "Incorrect Encryption parameters"},
> +	{0x740C, "Unable to decrypt parameter list"},
> +	{0x740D, "Encryption algorithm disabled"},
> +	{0x7410, "SA creation parameter value invalid"},
> +	{0x7411, "SA creation parameter value rejected"},
> +	{0x7412, "Invalid SA usage"},
> +	{0x7421, "Data Encryption configuration prevented"},
> +	{0x7430, "SA creation parameter not supported"},
> +	{0x7440, "Authentication failed"},
> +	{0x7461, "External data encryption key manager access error"},
> +	{0x7462, "External data encryption key manager error"},
> +	{0x7463, "External data encryption key not found"},
> +	{0x7464, "External data encryption request not authorized"},
> +	{0x746E, "External data encryption control timeout"},
> +	{0x746F, "External data encryption control error"},
> +	{0x7471, "Logical unit access not authorized"},
> +	{0x7479, "Security conflict in translated device"},
> +
> +	{0, NULL}
> +};
> +
> +struct error_info2 {
> +	unsigned char code1, code2_min, code2_max;
> +	const char * fmt;
> +};
> +
> +static const struct error_info2 additional2[] = {
> +	{0x40, 0x00, 0x7f, "Ram failure (%x)"},
> +	{0x40, 0x80, 0xff, "Diagnostic failure on component (%x)"},
> +	{0x41, 0x00, 0xff, "Data path failure (%x)"},
> +	{0x42, 0x00, 0xff, "Power-on or self-test failure (%x)"},
> +	{0x4D, 0x00, 0xff, "Tagged overlapped commands (task tag %x)"},
> +	{0x70, 0x00, 0xff, "Decompression exception short algorithm id of %x"},
> +	{0, 0, 0, NULL}
> +};
> +
>   /* description of the sense key values */
>   static const char * const snstext[] = {
>   	"No Sense",	    /* 0: There is no sense information */
> @@ -342,6 +1178,65 @@ scsi_sense_format_string(u8 res_code)
>   	return res_code >= 0x72 ? "[descriptor]" : "";
>   }
>
> +/*
> + * Get additional sense code string or NULL if not available.
> + * This string may contain a "%x" and should be printed with ascq as arg.
> + */
> +const char *
> +scsi_extd_sense_format(u8 asc, u8 ascq) {
> +#ifdef CONFIG_SCSI_CONSTANTS
> +	int i;
> +	unsigned short code = ((asc << 8) | ascq);
> +
> +	for (i = 0; additional[i].text; i++)
> +		if (additional[i].code12 == code)
> +			return additional[i].text;
> +	for (i = 0; additional2[i].fmt; i++) {
> +		if (additional2[i].code1 == asc &&
> +		    ascq >= additional2[i].code2_min &&
> +		    ascq <= additional2[i].code2_max)
> +			return additional2[i].fmt;
> +	}
> +#endif
> +	return NULL;
> +}
> +EXPORT_SYMBOL(scsi_extd_sense_format);
> +
> +const char *
> +scsi_show_extd_sense(struct trace_seq *p, u8 asc, u8 ascq)
> +{
> +	const char *ret = p->buffer + p->len;
> +	const char *extd_sense_fmt = scsi_extd_sense_format(asc, ascq);
> +
> +	if (extd_sense_fmt) {
> +		if (strstr(extd_sense_fmt, "%x")) {
> +			char sense_buf[50];
> +
> +			sprintf(sense_buf, extd_sense_fmt, ascq);
> +			trace_seq_printf(p, " Add. Sense (%s)", sense_buf);
> +		} else
> +			trace_seq_printf(p, " Add. Sense (%s)", extd_sense_fmt);
> +	} else
> +		trace_seq_printf(p, " %sASC=0x%x %sASCQ=0x%x",
> +				 asc >= 0x80 ? "<<vendor>> " : "", asc,
> +				 asc < 0 && ascq >= 0x80 ? "<<vendor>> " : "",
> +				 ascq);
> +
> +	trace_seq_putc(p, 0);
> +	return ret;
> +}
> +
> +/*
> + * Print normalized SCSI sense header with a prefix.
> + */
> +void
> +scsi_print_sense_hdr(struct scsi_device *sdev, const char *name,
> +		     struct scsi_sense_hdr *sshdr)
> +{
> +	trace_scsi_print_sense(sdev, name, sshdr, NULL, 0, 0);
> +}
> +EXPORT_SYMBOL(scsi_print_sense_hdr);
> +
>   static const char *
>   scsi_dump_sense_buffer(struct trace_seq *p, const unsigned char *buf, int len)
>   {
> @@ -419,6 +1314,31 @@ out:
>   	return ret;
>   }
>
> +/* Normalize and print sense buffer with name prefix */
> +void __scsi_print_sense(struct scsi_device *sdev, const char *name,
> +			const unsigned char *sense_buffer, int sense_len)
> +{
> +	struct scsi_sense_hdr sshdr;
> +	int raw;
> +
> +	raw = !scsi_normalize_sense(sense_buffer, sense_len, &sshdr);
> +
> +	trace_scsi_print_sense(sdev, name, &sshdr, sense_buffer, sense_len,
> +			       raw);
> +}
> +EXPORT_SYMBOL(__scsi_print_sense);
> +
> +/* Normalize and print sense buffer in SCSI command */
> +void scsi_print_sense(struct scsi_cmnd *cmd)
> +{
> +	const char *devname = cmd->request->rq_disk ?
> +		cmd->request->rq_disk->disk_name : "scsi";
> +
> +	__scsi_print_sense(cmd->device, devname, cmd->sense_buffer,
> +			   SCSI_SENSE_BUFFERSIZE);
> +}
> +EXPORT_SYMBOL(scsi_print_sense);
> +
>   void scsi_show_result(struct scsi_device *sdev, const char *name, int result)
>   {
>   	trace_scsi_show_result(sdev, name, result);
> diff --git a/include/scsi/scsi_dbg.h b/include/scsi/scsi_dbg.h
> index 68a29e4..67e6a89 100644
> --- a/include/scsi/scsi_dbg.h
> +++ b/include/scsi/scsi_dbg.h
> @@ -8,8 +8,6 @@ struct scsi_device;
>   extern void scsi_print_command(struct scsi_cmnd *);
>   extern void __scsi_print_command(struct scsi_device *, const char *,
>   				 unsigned char *, int);
> -extern void scsi_show_extd_sense(struct scsi_device *, const char *,
> -				 unsigned char, unsigned char);
>   extern void scsi_print_sense_hdr(struct scsi_device *, const char *,
>   				 struct scsi_sense_hdr *);
>   extern void scsi_print_sense(struct scsi_cmnd *);
> diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
> index 572aa65..6d3543f 100644
> --- a/include/trace/events/scsi.h
> +++ b/include/trace/events/scsi.h
> @@ -400,6 +400,9 @@ const char *scsi_trace_decode_sense_extras(struct trace_seq*, u8, u8,
>   #define __decode_extras(sense_key, res_code, buf, len, raw) \
>   	scsi_trace_decode_sense_extras(p, sense_key, res_code, buf, len, raw)
>
> +const char *scsi_show_extd_sense(struct trace_seq*, u8, u8);
> +#define __extd_sense(asc, ascq) scsi_show_extd_sense(p, asc, ascq)
> +
>   TRACE_EVENT(scsi_print_sense,
>
>   	TP_PROTO(struct scsi_device *sdev, const char *devname,
> @@ -433,15 +436,18 @@ TRACE_EVENT(scsi_print_sense,
>   		__entry->res_code	= sshdr->response_code;
>   		memcpy(__get_dynamic_array(sense_buffer), sense_buffer,
>   		       sense_len);
> +		__entry->asc		= sshdr->asc;
> +		__entry->ascq		= sshdr->ascq;
>   		__entry->sense_len	= sense_len;
>   		__entry->raw		= raw;
>   	),
>
> -	TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] %s",
> +	TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] %s %s",
>   		  __entry->host_no, __entry->channel, __entry->id, __entry->lun,
>   		  __get_str(devname), __decode_extras(__entry->sense_key,
>   		  __entry->res_code, __get_dynamic_array(sense_buffer),
> -		  __entry->sense_len,  __entry->raw))
> +		  __entry->sense_len,  __entry->raw),
> +		  __extd_sense(__entry->asc, __entry->ascq))
>   );
>   #endif /*  _TRACE_SCSI_H */
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
As discussed above, please use the existing functions from 
constants.c here.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

Re: Re: [RFC PATCH 09/10] scsi/trace: Add additional sense code and additional sense code qualifier to scsi_print_sense trace point

[Yoshihiro YUNOMAE]

(2014/08/27 23:16), Hannes Reinecke wrote:
> On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
>> There are no mean that additional sense code and additional sense code
>> qualifier
>> are output as different messages of sense key, so those information
>> are added.
>>
>> Note:
>> scsi_show_extd_sense() is changed from export symbol to non-export
>> symbol.
>>
>>   - Result examples
>>
>> <Before> (printk)
>> sd 2:0:0:0: [sda] Add. Sense: Unrecovered read error
>>
>> <After> (ftrace, merged into scsi_print_sense traceevent)
>> scsi_print_sense: host_no=2 channel=0 id=0 lun=0 [sda] Sense Key
>> (Medium Error [current])  Add. Sense (Unrecovered read error)
>>
>> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
>> Cc: Hannes Reinecke <hare@suse.de>
>> Cc: Doug Gilbert <dgilbert@interlog.com>
>> Cc: Martin K. Petersen <martin.petersen@oracle.com>
>> Cc: Christoph Hellwig <hch@lst.de>
>> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
>> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
>> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
>> ---
>>   drivers/scsi/constants.c    |  932
>> -------------------------------------------
>>   drivers/scsi/scsi_trace.c   |  920
>> ++++++++++++++++++++++++++++++++++++++++++
>>   include/scsi/scsi_dbg.h     |    2
>>   include/trace/events/scsi.h |   10
>>   4 files changed, 928 insertions(+), 936 deletions(-)
>>
>> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
>> index 85b75c8..ce9ceb8 100644
>> --- a/drivers/scsi/constants.c
>> +++ b/drivers/scsi/constants.c
>> @@ -14,12 +14,6 @@
>>
>>   #include <scsi/scsi.h>
>>   #include <scsi/scsi_cmnd.h>
>> -#include <scsi/scsi_device.h>
>> -#include <scsi/scsi_host.h>
>> -#include <scsi/scsi_eh.h>
>> -#include <scsi/scsi_dbg.h>
>> -
>> -#include <trace/events/scsi.h>
>>
>>   /* Commands with service actions that change the command name */
>>   #define SERVICE_ACTION_IN_12 0xab
>> @@ -429,929 +423,3 @@ void scsi_print_command(struct scsi_cmnd *cmd)
>>       print_opcode_name(cmd->device, devname, cmd->cmnd, cmd->cmd_len);
>>   }
>>   EXPORT_SYMBOL(scsi_print_command);
>> -
>> -#ifdef CONFIG_SCSI_CONSTANTS
>> -
>> -struct error_info {
>> -    unsigned short code12;    /* 0x0302 looks better than 0x03,0x02 */
>> -    const char * text;
>> -};
>> -
>> -/*
>> - * The canonical list of T10 Additional Sense Codes is available at:
>> - * http://www.t10.org/lists/asc-num.txt [most recent: 20130605]
>> - */
>> -
>> -static const struct error_info additional[] =
>> -{
>> -    {0x0000, "No additional sense information"},
>> -    {0x0001, "Filemark detected"},
>> -    {0x0002, "End-of-partition/medium detected"},
>> -    {0x0003, "Setmark detected"},
>> -    {0x0004, "Beginning-of-partition/medium detected"},
>> -    {0x0005, "End-of-data detected"},
>> -    {0x0006, "I/O process terminated"},
>> -    {0x0007, "Programmable early warning detected"},
>> -    {0x0011, "Audio play operation in progress"},
>> -    {0x0012, "Audio play operation paused"},
>> -    {0x0013, "Audio play operation successfully completed"},
>> -    {0x0014, "Audio play operation stopped due to error"},
>> -    {0x0015, "No current audio status to return"},
>> -    {0x0016, "Operation in progress"},
>> -    {0x0017, "Cleaning requested"},
>> -    {0x0018, "Erase operation in progress"},
>> -    {0x0019, "Locate operation in progress"},
>> -    {0x001A, "Rewind operation in progress"},
>> -    {0x001B, "Set capacity operation in progress"},
>> -    {0x001C, "Verify operation in progress"},
>> -    {0x001D, "ATA pass through information available"},
>> -    {0x001E, "Conflicting SA creation request"},
>> -    {0x001F, "Logical unit transitioning to another power condition"},
>> -    {0x0020, "Extended copy information available"},
>> -
>> -    {0x0100, "No index/sector signal"},
>> -
>> -    {0x0200, "No seek complete"},
>> -
>> -    {0x0300, "Peripheral device write fault"},
>> -    {0x0301, "No write current"},
>> -    {0x0302, "Excessive write errors"},
>> -
>> -    {0x0400, "Logical unit not ready, cause not reportable"},
>> -    {0x0401, "Logical unit is in process of becoming ready"},
>> -    {0x0402, "Logical unit not ready, initializing command required"},
>> -    {0x0403, "Logical unit not ready, manual intervention required"},
>> -    {0x0404, "Logical unit not ready, format in progress"},
>> -    {0x0405, "Logical unit not ready, rebuild in progress"},
>> -    {0x0406, "Logical unit not ready, recalculation in progress"},
>> -    {0x0407, "Logical unit not ready, operation in progress"},
>> -    {0x0408, "Logical unit not ready, long write in progress"},
>> -    {0x0409, "Logical unit not ready, self-test in progress"},
>> -    {0x040A, "Logical unit not accessible, asymmetric access state "
>> -     "transition"},
>> -    {0x040B, "Logical unit not accessible, target port in standby
>> state"},
>> -    {0x040C, "Logical unit not accessible, target port in unavailable "
>> -     "state"},
>> -    {0x040D, "Logical unit not ready, structure check required"},
>> -    {0x0410, "Logical unit not ready, auxiliary memory not accessible"},
>> -    {0x0411, "Logical unit not ready, notify (enable spinup) required"},
>> -    {0x0412, "Logical unit not ready, offline"},
>> -    {0x0413, "Logical unit not ready, SA creation in progress"},
>> -    {0x0414, "Logical unit not ready, space allocation in progress"},
>> -    {0x0415, "Logical unit not ready, robotics disabled"},
>> -    {0x0416, "Logical unit not ready, configuration required"},
>> -    {0x0417, "Logical unit not ready, calibration required"},
>> -    {0x0418, "Logical unit not ready, a door is open"},
>> -    {0x0419, "Logical unit not ready, operating in sequential mode"},
>> -    {0x041A, "Logical unit not ready, start stop unit command in "
>> -     "progress"},
>> -    {0x041B, "Logical unit not ready, sanitize in progress"},
>> -    {0x041C, "Logical unit not ready, additional power use not yet "
>> -     "granted"},
>> -    {0x041D, "Logical unit not ready, configuration in progress"},
>> -
>> -    {0x0500, "Logical unit does not respond to selection"},
>> -
>> -    {0x0600, "No reference position found"},
>> -
>> -    {0x0700, "Multiple peripheral devices selected"},
>> -
>> -    {0x0800, "Logical unit communication failure"},
>> -    {0x0801, "Logical unit communication time-out"},
>> -    {0x0802, "Logical unit communication parity error"},
>> -    {0x0803, "Logical unit communication CRC error (Ultra-DMA/32)"},
>> -    {0x0804, "Unreachable copy target"},
>> -
>> -    {0x0900, "Track following error"},
>> -    {0x0901, "Tracking servo failure"},
>> -    {0x0902, "Focus servo failure"},
>> -    {0x0903, "Spindle servo failure"},
>> -    {0x0904, "Head select fault"},
>> -
>> -    {0x0A00, "Error log overflow"},
>> -
>> -    {0x0B00, "Warning"},
>> -    {0x0B01, "Warning - specified temperature exceeded"},
>> -    {0x0B02, "Warning - enclosure degraded"},
>> -    {0x0B03, "Warning - background self-test failed"},
>> -    {0x0B04, "Warning - background pre-scan detected medium error"},
>> -    {0x0B05, "Warning - background medium scan detected medium error"},
>> -    {0x0B06, "Warning - non-volatile cache now volatile"},
>> -    {0x0B07, "Warning - degraded power to non-volatile cache"},
>> -    {0x0B08, "Warning - power loss expected"},
>> -    {0x0B09, "Warning - device statistics notification active"},
>> -
>> -    {0x0C00, "Write error"},
>> -    {0x0C01, "Write error - recovered with auto reallocation"},
>> -    {0x0C02, "Write error - auto reallocation failed"},
>> -    {0x0C03, "Write error - recommend reassignment"},
>> -    {0x0C04, "Compression check miscompare error"},
>> -    {0x0C05, "Data expansion occurred during compression"},
>> -    {0x0C06, "Block not compressible"},
>> -    {0x0C07, "Write error - recovery needed"},
>> -    {0x0C08, "Write error - recovery failed"},
>> -    {0x0C09, "Write error - loss of streaming"},
>> -    {0x0C0A, "Write error - padding blocks added"},
>> -    {0x0C0B, "Auxiliary memory write error"},
>> -    {0x0C0C, "Write error - unexpected unsolicited data"},
>> -    {0x0C0D, "Write error - not enough unsolicited data"},
>> -    {0x0C0E, "Multiple write errors"},
>> -    {0x0C0F, "Defects in error window"},
>> -
>> -    {0x0D00, "Error detected by third party temporary initiator"},
>> -    {0x0D01, "Third party device failure"},
>> -    {0x0D02, "Copy target device not reachable"},
>> -    {0x0D03, "Incorrect copy target device type"},
>> -    {0x0D04, "Copy target device data underrun"},
>> -    {0x0D05, "Copy target device data overrun"},
>> -
>> -    {0x0E00, "Invalid information unit"},
>> -    {0x0E01, "Information unit too short"},
>> -    {0x0E02, "Information unit too long"},
>> -    {0x0E03, "Invalid field in command information unit"},
>> -
>> -    {0x1000, "Id CRC or ECC error"},
>> -    {0x1001, "Logical block guard check failed"},
>> -    {0x1002, "Logical block application tag check failed"},
>> -    {0x1003, "Logical block reference tag check failed"},
>> -    {0x1004, "Logical block protection error on recover buffered data"},
>> -    {0x1005, "Logical block protection method error"},
>> -
>> -    {0x1100, "Unrecovered read error"},
>> -    {0x1101, "Read retries exhausted"},
>> -    {0x1102, "Error too long to correct"},
>> -    {0x1103, "Multiple read errors"},
>> -    {0x1104, "Unrecovered read error - auto reallocate failed"},
>> -    {0x1105, "L-EC uncorrectable error"},
>> -    {0x1106, "CIRC unrecovered error"},
>> -    {0x1107, "Data re-synchronization error"},
>> -    {0x1108, "Incomplete block read"},
>> -    {0x1109, "No gap found"},
>> -    {0x110A, "Miscorrected error"},
>> -    {0x110B, "Unrecovered read error - recommend reassignment"},
>> -    {0x110C, "Unrecovered read error - recommend rewrite the data"},
>> -    {0x110D, "De-compression CRC error"},
>> -    {0x110E, "Cannot decompress using declared algorithm"},
>> -    {0x110F, "Error reading UPC/EAN number"},
>> -    {0x1110, "Error reading ISRC number"},
>> -    {0x1111, "Read error - loss of streaming"},
>> -    {0x1112, "Auxiliary memory read error"},
>> -    {0x1113, "Read error - failed retransmission request"},
>> -    {0x1114, "Read error - lba marked bad by application client"},
>> -    {0x1115, "Write after sanitize required"},
>> -
>> -    {0x1200, "Address mark not found for id field"},
>> -
>> -    {0x1300, "Address mark not found for data field"},
>> -
>> -    {0x1400, "Recorded entity not found"},
>> -    {0x1401, "Record not found"},
>> -    {0x1402, "Filemark or setmark not found"},
>> -    {0x1403, "End-of-data not found"},
>> -    {0x1404, "Block sequence error"},
>> -    {0x1405, "Record not found - recommend reassignment"},
>> -    {0x1406, "Record not found - data auto-reallocated"},
>> -    {0x1407, "Locate operation failure"},
>> -
>> -    {0x1500, "Random positioning error"},
>> -    {0x1501, "Mechanical positioning error"},
>> -    {0x1502, "Positioning error detected by read of medium"},
>> -
>> -    {0x1600, "Data synchronization mark error"},
>> -    {0x1601, "Data sync error - data rewritten"},
>> -    {0x1602, "Data sync error - recommend rewrite"},
>> -    {0x1603, "Data sync error - data auto-reallocated"},
>> -    {0x1604, "Data sync error - recommend reassignment"},
>> -
>> -    {0x1700, "Recovered data with no error correction applied"},
>> -    {0x1701, "Recovered data with retries"},
>> -    {0x1702, "Recovered data with positive head offset"},
>> -    {0x1703, "Recovered data with negative head offset"},
>> -    {0x1704, "Recovered data with retries and/or circ applied"},
>> -    {0x1705, "Recovered data using previous sector id"},
>> -    {0x1706, "Recovered data without ECC - data auto-reallocated"},
>> -    {0x1707, "Recovered data without ECC - recommend reassignment"},
>> -    {0x1708, "Recovered data without ECC - recommend rewrite"},
>> -    {0x1709, "Recovered data without ECC - data rewritten"},
>> -
>> -    {0x1800, "Recovered data with error correction applied"},
>> -    {0x1801, "Recovered data with error corr. & retries applied"},
>> -    {0x1802, "Recovered data - data auto-reallocated"},
>> -    {0x1803, "Recovered data with CIRC"},
>> -    {0x1804, "Recovered data with L-EC"},
>> -    {0x1805, "Recovered data - recommend reassignment"},
>> -    {0x1806, "Recovered data - recommend rewrite"},
>> -    {0x1807, "Recovered data with ECC - data rewritten"},
>> -    {0x1808, "Recovered data with linking"},
>> -
>> -    {0x1900, "Defect list error"},
>> -    {0x1901, "Defect list not available"},
>> -    {0x1902, "Defect list error in primary list"},
>> -    {0x1903, "Defect list error in grown list"},
>> -
>> -    {0x1A00, "Parameter list length error"},
>> -
>> -    {0x1B00, "Synchronous data transfer error"},
>> -
>> -    {0x1C00, "Defect list not found"},
>> -    {0x1C01, "Primary defect list not found"},
>> -    {0x1C02, "Grown defect list not found"},
>> -
>> -    {0x1D00, "Miscompare during verify operation"},
>> -    {0x1D01, "Miscompare verify of unmapped LBA"},
>> -
>> -    {0x1E00, "Recovered id with ECC correction"},
>> -
>> -    {0x1F00, "Partial defect list transfer"},
>> -
>> -    {0x2000, "Invalid command operation code"},
>> -    {0x2001, "Access denied - initiator pending-enrolled"},
>> -    {0x2002, "Access denied - no access rights"},
>> -    {0x2003, "Access denied - invalid mgmt id key"},
>> -    {0x2004, "Illegal command while in write capable state"},
>> -    {0x2005, "Obsolete"},
>> -    {0x2006, "Illegal command while in explicit address mode"},
>> -    {0x2007, "Illegal command while in implicit address mode"},
>> -    {0x2008, "Access denied - enrollment conflict"},
>> -    {0x2009, "Access denied - invalid LU identifier"},
>> -    {0x200A, "Access denied - invalid proxy token"},
>> -    {0x200B, "Access denied - ACL LUN conflict"},
>> -    {0x200C, "Illegal command when not in append-only mode"},
>> -
>> -    {0x2100, "Logical block address out of range"},
>> -    {0x2101, "Invalid element address"},
>> -    {0x2102, "Invalid address for write"},
>> -    {0x2103, "Invalid write crossing layer jump"},
>> -
>> -    {0x2200, "Illegal function (use 20 00, 24 00, or 26 00)"},
>> -
>> -    {0x2300, "Invalid token operation, cause not reportable"},
>> -    {0x2301, "Invalid token operation, unsupported token type"},
>> -    {0x2302, "Invalid token operation, remote token usage not
>> supported"},
>> -    {0x2303, "Invalid token operation, remote rod token creation not "
>> -     "supported"},
>> -    {0x2304, "Invalid token operation, token unknown"},
>> -    {0x2305, "Invalid token operation, token corrupt"},
>> -    {0x2306, "Invalid token operation, token revoked"},
>> -    {0x2307, "Invalid token operation, token expired"},
>> -    {0x2308, "Invalid token operation, token cancelled"},
>> -    {0x2309, "Invalid token operation, token deleted"},
>> -    {0x230A, "Invalid token operation, invalid token length"},
>> -
>> -    {0x2400, "Invalid field in cdb"},
>> -    {0x2401, "CDB decryption error"},
>> -    {0x2402, "Obsolete"},
>> -    {0x2403, "Obsolete"},
>> -    {0x2404, "Security audit value frozen"},
>> -    {0x2405, "Security working key frozen"},
>> -    {0x2406, "Nonce not unique"},
>> -    {0x2407, "Nonce timestamp out of range"},
>> -    {0x2408, "Invalid XCDB"},
>> -
>> -    {0x2500, "Logical unit not supported"},
>> -
>> -    {0x2600, "Invalid field in parameter list"},
>> -    {0x2601, "Parameter not supported"},
>> -    {0x2602, "Parameter value invalid"},
>> -    {0x2603, "Threshold parameters not supported"},
>> -    {0x2604, "Invalid release of persistent reservation"},
>> -    {0x2605, "Data decryption error"},
>> -    {0x2606, "Too many target descriptors"},
>> -    {0x2607, "Unsupported target descriptor type code"},
>> -    {0x2608, "Too many segment descriptors"},
>> -    {0x2609, "Unsupported segment descriptor type code"},
>> -    {0x260A, "Unexpected inexact segment"},
>> -    {0x260B, "Inline data length exceeded"},
>> -    {0x260C, "Invalid operation for copy source or destination"},
>> -    {0x260D, "Copy segment granularity violation"},
>> -    {0x260E, "Invalid parameter while port is enabled"},
>> -    {0x260F, "Invalid data-out buffer integrity check value"},
>> -    {0x2610, "Data decryption key fail limit reached"},
>> -    {0x2611, "Incomplete key-associated data set"},
>> -    {0x2612, "Vendor specific key reference not found"},
>> -
>> -    {0x2700, "Write protected"},
>> -    {0x2701, "Hardware write protected"},
>> -    {0x2702, "Logical unit software write protected"},
>> -    {0x2703, "Associated write protect"},
>> -    {0x2704, "Persistent write protect"},
>> -    {0x2705, "Permanent write protect"},
>> -    {0x2706, "Conditional write protect"},
>> -    {0x2707, "Space allocation failed write protect"},
>> -
>> -    {0x2800, "Not ready to ready change, medium may have changed"},
>> -    {0x2801, "Import or export element accessed"},
>> -    {0x2802, "Format-layer may have changed"},
>> -    {0x2803, "Import/export element accessed, medium changed"},
>> -
>> -    {0x2900, "Power on, reset, or bus device reset occurred"},
>> -    {0x2901, "Power on occurred"},
>> -    {0x2902, "Scsi bus reset occurred"},
>> -    {0x2903, "Bus device reset function occurred"},
>> -    {0x2904, "Device internal reset"},
>> -    {0x2905, "Transceiver mode changed to single-ended"},
>> -    {0x2906, "Transceiver mode changed to lvd"},
>> -    {0x2907, "I_T nexus loss occurred"},
>> -
>> -    {0x2A00, "Parameters changed"},
>> -    {0x2A01, "Mode parameters changed"},
>> -    {0x2A02, "Log parameters changed"},
>> -    {0x2A03, "Reservations preempted"},
>> -    {0x2A04, "Reservations released"},
>> -    {0x2A05, "Registrations preempted"},
>> -    {0x2A06, "Asymmetric access state changed"},
>> -    {0x2A07, "Implicit asymmetric access state transition failed"},
>> -    {0x2A08, "Priority changed"},
>> -    {0x2A09, "Capacity data has changed"},
>> -    {0x2A0A, "Error history I_T nexus cleared"},
>> -    {0x2A0B, "Error history snapshot released"},
>> -    {0x2A0C, "Error recovery attributes have changed"},
>> -    {0x2A0D, "Data encryption capabilities changed"},
>> -    {0x2A10, "Timestamp changed"},
>> -    {0x2A11, "Data encryption parameters changed by another i_t nexus"},
>> -    {0x2A12, "Data encryption parameters changed by vendor specific "
>> -         "event"},
>> -    {0x2A13, "Data encryption key instance counter has changed"},
>> -    {0x2A14, "SA creation capabilities data has changed"},
>> -    {0x2A15, "Medium removal prevention preempted"},
>> -
>> -    {0x2B00, "Copy cannot execute since host cannot disconnect"},
>> -
>> -    {0x2C00, "Command sequence error"},
>> -    {0x2C01, "Too many windows specified"},
>> -    {0x2C02, "Invalid combination of windows specified"},
>> -    {0x2C03, "Current program area is not empty"},
>> -    {0x2C04, "Current program area is empty"},
>> -    {0x2C05, "Illegal power condition request"},
>> -    {0x2C06, "Persistent prevent conflict"},
>> -    {0x2C07, "Previous busy status"},
>> -    {0x2C08, "Previous task set full status"},
>> -    {0x2C09, "Previous reservation conflict status"},
>> -    {0x2C0A, "Partition or collection contains user objects"},
>> -    {0x2C0B, "Not reserved"},
>> -    {0x2C0C, "Orwrite generation does not match"},
>> -
>> -    {0x2D00, "Overwrite error on update in place"},
>> -
>> -    {0x2E00, "Insufficient time for operation"},
>> -
>> -    {0x2F00, "Commands cleared by another initiator"},
>> -    {0x2F01, "Commands cleared by power loss notification"},
>> -    {0x2F02, "Commands cleared by device server"},
>> -    {0x2F03, "Some commands cleared by queuing layer event"},
>> -
>> -    {0x3000, "Incompatible medium installed"},
>> -    {0x3001, "Cannot read medium - unknown format"},
>> -    {0x3002, "Cannot read medium - incompatible format"},
>> -    {0x3003, "Cleaning cartridge installed"},
>> -    {0x3004, "Cannot write medium - unknown format"},
>> -    {0x3005, "Cannot write medium - incompatible format"},
>> -    {0x3006, "Cannot format medium - incompatible medium"},
>> -    {0x3007, "Cleaning failure"},
>> -    {0x3008, "Cannot write - application code mismatch"},
>> -    {0x3009, "Current session not fixated for append"},
>> -    {0x300A, "Cleaning request rejected"},
>> -    {0x300C, "WORM medium - overwrite attempted"},
>> -    {0x300D, "WORM medium - integrity check"},
>> -    {0x3010, "Medium not formatted"},
>> -    {0x3011, "Incompatible volume type"},
>> -    {0x3012, "Incompatible volume qualifier"},
>> -    {0x3013, "Cleaning volume expired"},
>> -
>> -    {0x3100, "Medium format corrupted"},
>> -    {0x3101, "Format command failed"},
>> -    {0x3102, "Zoned formatting failed due to spare linking"},
>> -    {0x3103, "Sanitize command failed"},
>> -
>> -    {0x3200, "No defect spare location available"},
>> -    {0x3201, "Defect list update failure"},
>> -
>> -    {0x3300, "Tape length error"},
>> -
>> -    {0x3400, "Enclosure failure"},
>> -
>> -    {0x3500, "Enclosure services failure"},
>> -    {0x3501, "Unsupported enclosure function"},
>> -    {0x3502, "Enclosure services unavailable"},
>> -    {0x3503, "Enclosure services transfer failure"},
>> -    {0x3504, "Enclosure services transfer refused"},
>> -    {0x3505, "Enclosure services checksum error"},
>> -
>> -    {0x3600, "Ribbon, ink, or toner failure"},
>> -
>> -    {0x3700, "Rounded parameter"},
>> -
>> -    {0x3800, "Event status notification"},
>> -    {0x3802, "Esn - power management class event"},
>> -    {0x3804, "Esn - media class event"},
>> -    {0x3806, "Esn - device busy class event"},
>> -    {0x3807, "Thin Provisioning soft threshold reached"},
>> -
>> -    {0x3900, "Saving parameters not supported"},
>> -
>> -    {0x3A00, "Medium not present"},
>> -    {0x3A01, "Medium not present - tray closed"},
>> -    {0x3A02, "Medium not present - tray open"},
>> -    {0x3A03, "Medium not present - loadable"},
>> -    {0x3A04, "Medium not present - medium auxiliary memory accessible"},
>> -
>> -    {0x3B00, "Sequential positioning error"},
>> -    {0x3B01, "Tape position error at beginning-of-medium"},
>> -    {0x3B02, "Tape position error at end-of-medium"},
>> -    {0x3B03, "Tape or electronic vertical forms unit not ready"},
>> -    {0x3B04, "Slew failure"},
>> -    {0x3B05, "Paper jam"},
>> -    {0x3B06, "Failed to sense top-of-form"},
>> -    {0x3B07, "Failed to sense bottom-of-form"},
>> -    {0x3B08, "Reposition error"},
>> -    {0x3B09, "Read past end of medium"},
>> -    {0x3B0A, "Read past beginning of medium"},
>> -    {0x3B0B, "Position past end of medium"},
>> -    {0x3B0C, "Position past beginning of medium"},
>> -    {0x3B0D, "Medium destination element full"},
>> -    {0x3B0E, "Medium source element empty"},
>> -    {0x3B0F, "End of medium reached"},
>> -    {0x3B11, "Medium magazine not accessible"},
>> -    {0x3B12, "Medium magazine removed"},
>> -    {0x3B13, "Medium magazine inserted"},
>> -    {0x3B14, "Medium magazine locked"},
>> -    {0x3B15, "Medium magazine unlocked"},
>> -    {0x3B16, "Mechanical positioning or changer error"},
>> -    {0x3B17, "Read past end of user object"},
>> -    {0x3B18, "Element disabled"},
>> -    {0x3B19, "Element enabled"},
>> -    {0x3B1A, "Data transfer device removed"},
>> -    {0x3B1B, "Data transfer device inserted"},
>> -    {0x3B1C, "Too many logical objects on partition to support "
>> -     "operation"},
>> -
>> -    {0x3D00, "Invalid bits in identify message"},
>> -
>> -    {0x3E00, "Logical unit has not self-configured yet"},
>> -    {0x3E01, "Logical unit failure"},
>> -    {0x3E02, "Timeout on logical unit"},
>> -    {0x3E03, "Logical unit failed self-test"},
>> -    {0x3E04, "Logical unit unable to update self-test log"},
>> -
>> -    {0x3F00, "Target operating conditions have changed"},
>> -    {0x3F01, "Microcode has been changed"},
>> -    {0x3F02, "Changed operating definition"},
>> -    {0x3F03, "Inquiry data has changed"},
>> -    {0x3F04, "Component device attached"},
>> -    {0x3F05, "Device identifier changed"},
>> -    {0x3F06, "Redundancy group created or modified"},
>> -    {0x3F07, "Redundancy group deleted"},
>> -    {0x3F08, "Spare created or modified"},
>> -    {0x3F09, "Spare deleted"},
>> -    {0x3F0A, "Volume set created or modified"},
>> -    {0x3F0B, "Volume set deleted"},
>> -    {0x3F0C, "Volume set deassigned"},
>> -    {0x3F0D, "Volume set reassigned"},
>> -    {0x3F0E, "Reported luns data has changed"},
>> -    {0x3F0F, "Echo buffer overwritten"},
>> -    {0x3F10, "Medium loadable"},
>> -    {0x3F11, "Medium auxiliary memory accessible"},
>> -    {0x3F12, "iSCSI IP address added"},
>> -    {0x3F13, "iSCSI IP address removed"},
>> -    {0x3F14, "iSCSI IP address changed"},
>> -    {0x3F15, "Inspect referrals sense descriptors"},
>> -/*
>> - *    {0x40NN, "Ram failure"},
>> - *    {0x40NN, "Diagnostic failure on component nn"},
>> - *    {0x41NN, "Data path failure"},
>> - *    {0x42NN, "Power-on or self-test failure"},
>> - */
>> -    {0x4300, "Message error"},
>> -
>> -    {0x4400, "Internal target failure"},
>> -    {0x4401, "Persistent reservation information lost"},
>> -    {0x4471, "ATA device failed set features"},
>> -
>> -    {0x4500, "Select or reselect failure"},
>> -
>> -    {0x4600, "Unsuccessful soft reset"},
>> -
>> -    {0x4700, "Scsi parity error"},
>> -    {0x4701, "Data phase CRC error detected"},
>> -    {0x4702, "Scsi parity error detected during st data phase"},
>> -    {0x4703, "Information unit iuCRC error detected"},
>> -    {0x4704, "Asynchronous information protection error detected"},
>> -    {0x4705, "Protocol service CRC error"},
>> -    {0x4706, "Phy test function in progress"},
>> -    {0x477f, "Some commands cleared by iSCSI Protocol event"},
>> -
>> -    {0x4800, "Initiator detected error message received"},
>> -
>> -    {0x4900, "Invalid message error"},
>> -
>> -    {0x4A00, "Command phase error"},
>> -
>> -    {0x4B00, "Data phase error"},
>> -    {0x4B01, "Invalid target port transfer tag received"},
>> -    {0x4B02, "Too much write data"},
>> -    {0x4B03, "Ack/nak timeout"},
>> -    {0x4B04, "Nak received"},
>> -    {0x4B05, "Data offset error"},
>> -    {0x4B06, "Initiator response timeout"},
>> -    {0x4B07, "Connection lost"},
>> -    {0x4B08, "Data-in buffer overflow - data buffer size"},
>> -    {0x4B09, "Data-in buffer overflow - data buffer descriptor area"},
>> -    {0x4B0A, "Data-in buffer error"},
>> -    {0x4B0B, "Data-out buffer overflow - data buffer size"},
>> -    {0x4B0C, "Data-out buffer overflow - data buffer descriptor area"},
>> -    {0x4B0D, "Data-out buffer error"},
>> -    {0x4B0E, "PCIe fabric error"},
>> -    {0x4B0F, "PCIe completion timeout"},
>> -    {0x4B10, "PCIe completer abort"},
>> -    {0x4B11, "PCIe poisoned tlp received"},
>> -    {0x4B12, "PCIe eCRC check failed"},
>> -    {0x4B13, "PCIe unsupported request"},
>> -    {0x4B14, "PCIe acs violation"},
>> -    {0x4B15, "PCIe tlp prefix blocked"},
>> -
>> -    {0x4C00, "Logical unit failed self-configuration"},
>> -/*
>> - *    {0x4DNN, "Tagged overlapped commands (nn = queue tag)"},
>> - */
>> -    {0x4E00, "Overlapped commands attempted"},
>> -
>> -    {0x5000, "Write append error"},
>> -    {0x5001, "Write append position error"},
>> -    {0x5002, "Position error related to timing"},
>> -
>> -    {0x5100, "Erase failure"},
>> -    {0x5101, "Erase failure - incomplete erase operation detected"},
>> -
>> -    {0x5200, "Cartridge fault"},
>> -
>> -    {0x5300, "Media load or eject failed"},
>> -    {0x5301, "Unload tape failure"},
>> -    {0x5302, "Medium removal prevented"},
>> -    {0x5303, "Medium removal prevented by data transfer element"},
>> -    {0x5304, "Medium thread or unthread failure"},
>> -    {0x5305, "Volume identifier invalid"},
>> -    {0x5306, "Volume identifier missing"},
>> -    {0x5307, "Duplicate volume identifier"},
>> -    {0x5308, "Element status unknown"},
>> -
>> -    {0x5400, "Scsi to host system interface failure"},
>> -
>> -    {0x5500, "System resource failure"},
>> -    {0x5501, "System buffer full"},
>> -    {0x5502, "Insufficient reservation resources"},
>> -    {0x5503, "Insufficient resources"},
>> -    {0x5504, "Insufficient registration resources"},
>> -    {0x5505, "Insufficient access control resources"},
>> -    {0x5506, "Auxiliary memory out of space"},
>> -    {0x5507, "Quota error"},
>> -    {0x5508, "Maximum number of supplemental decryption keys exceeded"},
>> -    {0x5509, "Medium auxiliary memory not accessible"},
>> -    {0x550A, "Data currently unavailable"},
>> -    {0x550B, "Insufficient power for operation"},
>> -    {0x550C, "Insufficient resources to create rod"},
>> -    {0x550D, "Insufficient resources to create rod token"},
>> -
>> -    {0x5700, "Unable to recover table-of-contents"},
>> -
>> -    {0x5800, "Generation does not exist"},
>> -
>> -    {0x5900, "Updated block read"},
>> -
>> -    {0x5A00, "Operator request or state change input"},
>> -    {0x5A01, "Operator medium removal request"},
>> -    {0x5A02, "Operator selected write protect"},
>> -    {0x5A03, "Operator selected write permit"},
>> -
>> -    {0x5B00, "Log exception"},
>> -    {0x5B01, "Threshold condition met"},
>> -    {0x5B02, "Log counter at maximum"},
>> -    {0x5B03, "Log list codes exhausted"},
>> -
>> -    {0x5C00, "Rpl status change"},
>> -    {0x5C01, "Spindles synchronized"},
>> -    {0x5C02, "Spindles not synchronized"},
>> -
>> -    {0x5D00, "Failure prediction threshold exceeded"},
>> -    {0x5D01, "Media failure prediction threshold exceeded"},
>> -    {0x5D02, "Logical unit failure prediction threshold exceeded"},
>> -    {0x5D03, "Spare area exhaustion prediction threshold exceeded"},
>> -    {0x5D10, "Hardware impending failure general hard drive failure"},
>> -    {0x5D11, "Hardware impending failure drive error rate too high"},
>> -    {0x5D12, "Hardware impending failure data error rate too high"},
>> -    {0x5D13, "Hardware impending failure seek error rate too high"},
>> -    {0x5D14, "Hardware impending failure too many block reassigns"},
>> -    {0x5D15, "Hardware impending failure access times too high"},
>> -    {0x5D16, "Hardware impending failure start unit times too high"},
>> -    {0x5D17, "Hardware impending failure channel parametrics"},
>> -    {0x5D18, "Hardware impending failure controller detected"},
>> -    {0x5D19, "Hardware impending failure throughput performance"},
>> -    {0x5D1A, "Hardware impending failure seek time performance"},
>> -    {0x5D1B, "Hardware impending failure spin-up retry count"},
>> -    {0x5D1C, "Hardware impending failure drive calibration retry
>> count"},
>> -    {0x5D20, "Controller impending failure general hard drive failure"},
>> -    {0x5D21, "Controller impending failure drive error rate too high"},
>> -    {0x5D22, "Controller impending failure data error rate too high"},
>> -    {0x5D23, "Controller impending failure seek error rate too high"},
>> -    {0x5D24, "Controller impending failure too many block reassigns"},
>> -    {0x5D25, "Controller impending failure access times too high"},
>> -    {0x5D26, "Controller impending failure start unit times too high"},
>> -    {0x5D27, "Controller impending failure channel parametrics"},
>> -    {0x5D28, "Controller impending failure controller detected"},
>> -    {0x5D29, "Controller impending failure throughput performance"},
>> -    {0x5D2A, "Controller impending failure seek time performance"},
>> -    {0x5D2B, "Controller impending failure spin-up retry count"},
>> -    {0x5D2C, "Controller impending failure drive calibration retry
>> count"},
>> -    {0x5D30, "Data channel impending failure general hard drive
>> failure"},
>> -    {0x5D31, "Data channel impending failure drive error rate too
>> high"},
>> -    {0x5D32, "Data channel impending failure data error rate too high"},
>> -    {0x5D33, "Data channel impending failure seek error rate too high"},
>> -    {0x5D34, "Data channel impending failure too many block reassigns"},
>> -    {0x5D35, "Data channel impending failure access times too high"},
>> -    {0x5D36, "Data channel impending failure start unit times too
>> high"},
>> -    {0x5D37, "Data channel impending failure channel parametrics"},
>> -    {0x5D38, "Data channel impending failure controller detected"},
>> -    {0x5D39, "Data channel impending failure throughput performance"},
>> -    {0x5D3A, "Data channel impending failure seek time performance"},
>> -    {0x5D3B, "Data channel impending failure spin-up retry count"},
>> -    {0x5D3C, "Data channel impending failure drive calibration retry "
>> -     "count"},
>> -    {0x5D40, "Servo impending failure general hard drive failure"},
>> -    {0x5D41, "Servo impending failure drive error rate too high"},
>> -    {0x5D42, "Servo impending failure data error rate too high"},
>> -    {0x5D43, "Servo impending failure seek error rate too high"},
>> -    {0x5D44, "Servo impending failure too many block reassigns"},
>> -    {0x5D45, "Servo impending failure access times too high"},
>> -    {0x5D46, "Servo impending failure start unit times too high"},
>> -    {0x5D47, "Servo impending failure channel parametrics"},
>> -    {0x5D48, "Servo impending failure controller detected"},
>> -    {0x5D49, "Servo impending failure throughput performance"},
>> -    {0x5D4A, "Servo impending failure seek time performance"},
>> -    {0x5D4B, "Servo impending failure spin-up retry count"},
>> -    {0x5D4C, "Servo impending failure drive calibration retry count"},
>> -    {0x5D50, "Spindle impending failure general hard drive failure"},
>> -    {0x5D51, "Spindle impending failure drive error rate too high"},
>> -    {0x5D52, "Spindle impending failure data error rate too high"},
>> -    {0x5D53, "Spindle impending failure seek error rate too high"},
>> -    {0x5D54, "Spindle impending failure too many block reassigns"},
>> -    {0x5D55, "Spindle impending failure access times too high"},
>> -    {0x5D56, "Spindle impending failure start unit times too high"},
>> -    {0x5D57, "Spindle impending failure channel parametrics"},
>> -    {0x5D58, "Spindle impending failure controller detected"},
>> -    {0x5D59, "Spindle impending failure throughput performance"},
>> -    {0x5D5A, "Spindle impending failure seek time performance"},
>> -    {0x5D5B, "Spindle impending failure spin-up retry count"},
>> -    {0x5D5C, "Spindle impending failure drive calibration retry count"},
>> -    {0x5D60, "Firmware impending failure general hard drive failure"},
>> -    {0x5D61, "Firmware impending failure drive error rate too high"},
>> -    {0x5D62, "Firmware impending failure data error rate too high"},
>> -    {0x5D63, "Firmware impending failure seek error rate too high"},
>> -    {0x5D64, "Firmware impending failure too many block reassigns"},
>> -    {0x5D65, "Firmware impending failure access times too high"},
>> -    {0x5D66, "Firmware impending failure start unit times too high"},
>> -    {0x5D67, "Firmware impending failure channel parametrics"},
>> -    {0x5D68, "Firmware impending failure controller detected"},
>> -    {0x5D69, "Firmware impending failure throughput performance"},
>> -    {0x5D6A, "Firmware impending failure seek time performance"},
>> -    {0x5D6B, "Firmware impending failure spin-up retry count"},
>> -    {0x5D6C, "Firmware impending failure drive calibration retry
>> count"},
>> -    {0x5DFF, "Failure prediction threshold exceeded (false)"},
>> -
>> -    {0x5E00, "Low power condition on"},
>> -    {0x5E01, "Idle condition activated by timer"},
>> -    {0x5E02, "Standby condition activated by timer"},
>> -    {0x5E03, "Idle condition activated by command"},
>> -    {0x5E04, "Standby condition activated by command"},
>> -    {0x5E05, "Idle_b condition activated by timer"},
>> -    {0x5E06, "Idle_b condition activated by command"},
>> -    {0x5E07, "Idle_c condition activated by timer"},
>> -    {0x5E08, "Idle_c condition activated by command"},
>> -    {0x5E09, "Standby_y condition activated by timer"},
>> -    {0x5E0A, "Standby_y condition activated by command"},
>> -    {0x5E41, "Power state change to active"},
>> -    {0x5E42, "Power state change to idle"},
>> -    {0x5E43, "Power state change to standby"},
>> -    {0x5E45, "Power state change to sleep"},
>> -    {0x5E47, "Power state change to device control"},
>> -
>> -    {0x6000, "Lamp failure"},
>> -
>> -    {0x6100, "Video acquisition error"},
>> -    {0x6101, "Unable to acquire video"},
>> -    {0x6102, "Out of focus"},
>> -
>> -    {0x6200, "Scan head positioning error"},
>> -
>> -    {0x6300, "End of user area encountered on this track"},
>> -    {0x6301, "Packet does not fit in available space"},
>> -
>> -    {0x6400, "Illegal mode for this track"},
>> -    {0x6401, "Invalid packet size"},
>> -
>> -    {0x6500, "Voltage fault"},
>> -
>> -    {0x6600, "Automatic document feeder cover up"},
>> -    {0x6601, "Automatic document feeder lift up"},
>> -    {0x6602, "Document jam in automatic document feeder"},
>> -    {0x6603, "Document miss feed automatic in document feeder"},
>> -
>> -    {0x6700, "Configuration failure"},
>> -    {0x6701, "Configuration of incapable logical units failed"},
>> -    {0x6702, "Add logical unit failed"},
>> -    {0x6703, "Modification of logical unit failed"},
>> -    {0x6704, "Exchange of logical unit failed"},
>> -    {0x6705, "Remove of logical unit failed"},
>> -    {0x6706, "Attachment of logical unit failed"},
>> -    {0x6707, "Creation of logical unit failed"},
>> -    {0x6708, "Assign failure occurred"},
>> -    {0x6709, "Multiply assigned logical unit"},
>> -    {0x670A, "Set target port groups command failed"},
>> -    {0x670B, "ATA device feature not enabled"},
>> -
>> -    {0x6800, "Logical unit not configured"},
>> -    {0x6801, "Subsidiary logical unit not configured"},
>> -
>> -    {0x6900, "Data loss on logical unit"},
>> -    {0x6901, "Multiple logical unit failures"},
>> -    {0x6902, "Parity/data mismatch"},
>> -
>> -    {0x6A00, "Informational, refer to log"},
>> -
>> -    {0x6B00, "State change has occurred"},
>> -    {0x6B01, "Redundancy level got better"},
>> -    {0x6B02, "Redundancy level got worse"},
>> -
>> -    {0x6C00, "Rebuild failure occurred"},
>> -
>> -    {0x6D00, "Recalculate failure occurred"},
>> -
>> -    {0x6E00, "Command to logical unit failed"},
>> -
>> -    {0x6F00, "Copy protection key exchange failure - authentication "
>> -     "failure"},
>> -    {0x6F01, "Copy protection key exchange failure - key not present"},
>> -    {0x6F02, "Copy protection key exchange failure - key not
>> established"},
>> -    {0x6F03, "Read of scrambled sector without authentication"},
>> -    {0x6F04, "Media region code is mismatched to logical unit region"},
>> -    {0x6F05, "Drive region must be permanent/region reset count error"},
>> -    {0x6F06, "Insufficient block count for binding nonce recording"},
>> -    {0x6F07, "Conflict in binding nonce recording"},
>> -/*
>> - *    {0x70NN, "Decompression exception short algorithm id of nn"},
>> - */
>> -    {0x7100, "Decompression exception long algorithm id"},
>> -
>> -    {0x7200, "Session fixation error"},
>> -    {0x7201, "Session fixation error writing lead-in"},
>> -    {0x7202, "Session fixation error writing lead-out"},
>> -    {0x7203, "Session fixation error - incomplete track in session"},
>> -    {0x7204, "Empty or partially written reserved track"},
>> -    {0x7205, "No more track reservations allowed"},
>> -    {0x7206, "RMZ extension is not allowed"},
>> -    {0x7207, "No more test zone extensions are allowed"},
>> -
>> -    {0x7300, "Cd control error"},
>> -    {0x7301, "Power calibration area almost full"},
>> -    {0x7302, "Power calibration area is full"},
>> -    {0x7303, "Power calibration area error"},
>> -    {0x7304, "Program memory area update failure"},
>> -    {0x7305, "Program memory area is full"},
>> -    {0x7306, "RMA/PMA is almost full"},
>> -    {0x7310, "Current power calibration area almost full"},
>> -    {0x7311, "Current power calibration area is full"},
>> -    {0x7317, "RDZ is full"},
>> -
>> -    {0x7400, "Security error"},
>> -    {0x7401, "Unable to decrypt data"},
>> -    {0x7402, "Unencrypted data encountered while decrypting"},
>> -    {0x7403, "Incorrect data encryption key"},
>> -    {0x7404, "Cryptographic integrity validation failed"},
>> -    {0x7405, "Error decrypting data"},
>> -    {0x7406, "Unknown signature verification key"},
>> -    {0x7407, "Encryption parameters not useable"},
>> -    {0x7408, "Digital signature validation failure"},
>> -    {0x7409, "Encryption mode mismatch on read"},
>> -    {0x740A, "Encrypted block not raw read enabled"},
>> -    {0x740B, "Incorrect Encryption parameters"},
>> -    {0x740C, "Unable to decrypt parameter list"},
>> -    {0x740D, "Encryption algorithm disabled"},
>> -    {0x7410, "SA creation parameter value invalid"},
>> -    {0x7411, "SA creation parameter value rejected"},
>> -    {0x7412, "Invalid SA usage"},
>> -    {0x7421, "Data Encryption configuration prevented"},
>> -    {0x7430, "SA creation parameter not supported"},
>> -    {0x7440, "Authentication failed"},
>> -    {0x7461, "External data encryption key manager access error"},
>> -    {0x7462, "External data encryption key manager error"},
>> -    {0x7463, "External data encryption key not found"},
>> -    {0x7464, "External data encryption request not authorized"},
>> -    {0x746E, "External data encryption control timeout"},
>> -    {0x746F, "External data encryption control error"},
>> -    {0x7471, "Logical unit access not authorized"},
>> -    {0x7479, "Security conflict in translated device"},
>> -
>> -    {0, NULL}
>> -};
>> -
>> -struct error_info2 {
>> -    unsigned char code1, code2_min, code2_max;
>> -    const char * fmt;
>> -};
>> -
>> -static const struct error_info2 additional2[] =
>> -{
>> -    {0x40, 0x00, 0x7f, "Ram failure (%x)"},
>> -    {0x40, 0x80, 0xff, "Diagnostic failure on component (%x)"},
>> -    {0x41, 0x00, 0xff, "Data path failure (%x)"},
>> -    {0x42, 0x00, 0xff, "Power-on or self-test failure (%x)"},
>> -    {0x4D, 0x00, 0xff, "Tagged overlapped commands (task tag %x)"},
>> -    {0x70, 0x00, 0xff, "Decompression exception short algorithm id of
>> %x"},
>> -    {0, 0, 0, NULL}
>> -};
>> -#endif
>> -
>> -/*
>> - * Get additional sense code string or NULL if not available.
>> - * This string may contain a "%x" and should be printed with ascq as
>> arg.
>> - */
>> -const char *
>> -scsi_extd_sense_format(unsigned char asc, unsigned char ascq) {
>> -#ifdef CONFIG_SCSI_CONSTANTS
>> -    int i;
>> -    unsigned short code = ((asc << 8) | ascq);
>> -
>> -    for (i = 0; additional[i].text; i++)
>> -        if (additional[i].code12 == code)
>> -            return additional[i].text;
>> -    for (i = 0; additional2[i].fmt; i++) {
>> -        if (additional2[i].code1 == asc &&
>> -            ascq >= additional2[i].code2_min &&
>> -            ascq <= additional2[i].code2_max)
>> -            return additional2[i].fmt;
>> -    }
>> -#endif
>> -    return NULL;
>> -}
>> -EXPORT_SYMBOL(scsi_extd_sense_format);
>> -
>> -void
>> -scsi_show_extd_sense(struct scsi_device *sdev, const char *name,
>> -             unsigned char asc, unsigned char ascq)
>> -{
>> -    const char *extd_sense_fmt = scsi_extd_sense_format(asc, ascq);
>> -
>> -    if (extd_sense_fmt) {
>> -        if (strstr(extd_sense_fmt, "%x")) {
>> -            char sense_buf[50];
>> -            sprintf(sense_buf, extd_sense_fmt, ascq);
>> -            sdev_printk(KERN_INFO, sdev,
>> -                    "[%s] Add. Sense: %s", name, sense_buf);
>> -        } else
>> -            sdev_printk(KERN_INFO, sdev,
>> -                    "[%s] Add. Sense: %s\n",
>> -                    name, extd_sense_fmt);
>> -    } else
>> -        sdev_printk(KERN_INFO, sdev,
>> -                "[%s] %sASC=0x%x %sASCQ=0x%x\n",
>> -                name, asc >= 0x80 ? "<<vendor>> " : "", asc,
>> -                asc < 0 && ascq >= 0x80 ? "<<vendor>> ": "",
>> -                ascq);
>> -}
>> -EXPORT_SYMBOL(scsi_show_extd_sense);
>> -
>> -/*
>> - * Print normalized SCSI sense header with a prefix.
>> - */
>> -void
>> -scsi_print_sense_hdr(struct scsi_device *sdev, const char *name,
>> -             struct scsi_sense_hdr *sshdr)
>> -{
>> -    trace_scsi_print_sense(sdev, name, sshdr, NULL, 0, 0);
>> -    scsi_show_extd_sense(sdev, name, sshdr->asc, sshdr->ascq);
>> -}
>> -EXPORT_SYMBOL(scsi_print_sense_hdr);
>> -
>> -/* Normalize and print sense buffer with name prefix */
>> -void __scsi_print_sense(struct scsi_device *sdev, const char *name,
>> -            const unsigned char *sense_buffer, int sense_len)
>> -{
>> -    struct scsi_sense_hdr sshdr;
>> -    int raw;
>> -
>> -    raw = !scsi_normalize_sense(sense_buffer, sense_len, &sshdr);
>> -
>> -    trace_scsi_print_sense(sdev, name, &sshdr, sense_buffer, sense_len,
>> -                   raw);
>> -    scsi_show_extd_sense(sdev, name, sshdr.asc, sshdr.ascq);
>> -}
>> -EXPORT_SYMBOL(__scsi_print_sense);
>> -
>> -/* Normalize and print sense buffer in SCSI command */
>> -void scsi_print_sense(struct scsi_cmnd *cmd)
>> -{
>> -    const char *devname = cmd->request->rq_disk ?
>> -        cmd->request->rq_disk->disk_name : "scsi";
>> -
>> -    __scsi_print_sense(cmd->device, devname, cmd->sense_buffer,
>> -               SCSI_SENSE_BUFFERSIZE);
>> -}
>> -EXPORT_SYMBOL(scsi_print_sense);
>> diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
>> index 2ecb1dc..60678d8 100644
>> --- a/drivers/scsi/scsi_trace.c
>> +++ b/drivers/scsi/scsi_trace.c
>> @@ -22,6 +22,7 @@
>>
>>   #include <scsi/scsi_dbg.h>
>>   #include <scsi/scsi_eh.h>
>> +#include <scsi/scsi_dbg.h>
>>
>>   #define SERVICE_ACTION16(cdb) (cdb[1] & 0x1f)
>>   #define SERVICE_ACTION32(cdb) ((cdb[8] << 8) | cdb[9])
>> @@ -291,6 +292,841 @@ scsi_trace_parse_cdb(struct trace_seq *p,
>> unsigned char *cdb, int len)
>>   }
>>
>>   #ifdef CONFIG_SCSI_CONSTANTS
>> +
>> +struct error_info {
>> +    unsigned short code12;    /* 0x0302 looks better than 0x03,0x02 */
>> +    const char *text;
>> +};
>> +
>> +/*
>> + * The canonical list of T10 Additional Sense Codes is available at:
>> + * http://www.t10.org/lists/asc-num.txt [most recent: 20130605]
>> + */
>> +
>> +static const struct error_info additional[] =
>> +{
>> +    {0x0000, "No additional sense information"},
>> +    {0x0001, "Filemark detected"},
>> +    {0x0002, "End-of-partition/medium detected"},
>> +    {0x0003, "Setmark detected"},
>> +    {0x0004, "Beginning-of-partition/medium detected"},
>> +    {0x0005, "End-of-data detected"},
>> +    {0x0006, "I/O process terminated"},
>> +    {0x0007, "Programmable early warning detected"},
>> +    {0x0011, "Audio play operation in progress"},
>> +    {0x0012, "Audio play operation paused"},
>> +    {0x0013, "Audio play operation successfully completed"},
>> +    {0x0014, "Audio play operation stopped due to error"},
>> +    {0x0015, "No current audio status to return"},
>> +    {0x0016, "Operation in progress"},
>> +    {0x0017, "Cleaning requested"},
>> +    {0x0018, "Erase operation in progress"},
>> +    {0x0019, "Locate operation in progress"},
>> +    {0x001A, "Rewind operation in progress"},
>> +    {0x001B, "Set capacity operation in progress"},
>> +    {0x001C, "Verify operation in progress"},
>> +    {0x001D, "ATA pass through information available"},
>> +    {0x001E, "Conflicting SA creation request"},
>> +    {0x001F, "Logical unit transitioning to another power condition"},
>> +    {0x0020, "Extended copy information available"},
>> +
>> +    {0x0100, "No index/sector signal"},
>> +
>> +    {0x0200, "No seek complete"},
>> +
>> +    {0x0300, "Peripheral device write fault"},
>> +    {0x0301, "No write current"},
>> +    {0x0302, "Excessive write errors"},
>> +
>> +    {0x0400, "Logical unit not ready, cause not reportable"},
>> +    {0x0401, "Logical unit is in process of becoming ready"},
>> +    {0x0402, "Logical unit not ready, initializing command required"},
>> +    {0x0403, "Logical unit not ready, manual intervention required"},
>> +    {0x0404, "Logical unit not ready, format in progress"},
>> +    {0x0405, "Logical unit not ready, rebuild in progress"},
>> +    {0x0406, "Logical unit not ready, recalculation in progress"},
>> +    {0x0407, "Logical unit not ready, operation in progress"},
>> +    {0x0408, "Logical unit not ready, long write in progress"},
>> +    {0x0409, "Logical unit not ready, self-test in progress"},
>> +    {0x040A, "Logical unit not accessible, asymmetric access state "
>> +     "transition"},
>> +    {0x040B, "Logical unit not accessible, target port in standby
>> state"},
>> +    {0x040C, "Logical unit not accessible, target port in unavailable "
>> +     "state"},
>> +    {0x040D, "Logical unit not ready, structure check required"},
>> +    {0x0410, "Logical unit not ready, auxiliary memory not accessible"},
>> +    {0x0411, "Logical unit not ready, notify (enable spinup) required"},
>> +    {0x0412, "Logical unit not ready, offline"},
>> +    {0x0413, "Logical unit not ready, SA creation in progress"},
>> +    {0x0414, "Logical unit not ready, space allocation in progress"},
>> +    {0x0415, "Logical unit not ready, robotics disabled"},
>> +    {0x0416, "Logical unit not ready, configuration required"},
>> +    {0x0417, "Logical unit not ready, calibration required"},
>> +    {0x0418, "Logical unit not ready, a door is open"},
>> +    {0x0419, "Logical unit not ready, operating in sequential mode"},
>> +    {0x041A, "Logical unit not ready, start stop unit command in "
>> +     "progress"},
>> +    {0x041B, "Logical unit not ready, sanitize in progress"},
>> +    {0x041C, "Logical unit not ready, additional power use not yet "
>> +     "granted"},
>> +    {0x041D, "Logical unit not ready, configuration in progress"},
>> +
>> +    {0x0500, "Logical unit does not respond to selection"},
>> +
>> +    {0x0600, "No reference position found"},
>> +
>> +    {0x0700, "Multiple peripheral devices selected"},
>> +
>> +    {0x0800, "Logical unit communication failure"},
>> +    {0x0801, "Logical unit communication time-out"},
>> +    {0x0802, "Logical unit communication parity error"},
>> +    {0x0803, "Logical unit communication CRC error (Ultra-DMA/32)"},
>> +    {0x0804, "Unreachable copy target"},
>> +
>> +    {0x0900, "Track following error"},
>> +    {0x0901, "Tracking servo failure"},
>> +    {0x0902, "Focus servo failure"},
>> +    {0x0903, "Spindle servo failure"},
>> +    {0x0904, "Head select fault"},
>> +
>> +    {0x0A00, "Error log overflow"},
>> +
>> +    {0x0B00, "Warning"},
>> +    {0x0B01, "Warning - specified temperature exceeded"},
>> +    {0x0B02, "Warning - enclosure degraded"},
>> +    {0x0B03, "Warning - background self-test failed"},
>> +    {0x0B04, "Warning - background pre-scan detected medium error"},
>> +    {0x0B05, "Warning - background medium scan detected medium error"},
>> +    {0x0B06, "Warning - non-volatile cache now volatile"},
>> +    {0x0B07, "Warning - degraded power to non-volatile cache"},
>> +    {0x0B08, "Warning - power loss expected"},
>> +    {0x0B09, "Warning - device statistics notification active"},
>> +
>> +    {0x0C00, "Write error"},
>> +    {0x0C01, "Write error - recovered with auto reallocation"},
>> +    {0x0C02, "Write error - auto reallocation failed"},
>> +    {0x0C03, "Write error - recommend reassignment"},
>> +    {0x0C04, "Compression check miscompare error"},
>> +    {0x0C05, "Data expansion occurred during compression"},
>> +    {0x0C06, "Block not compressible"},
>> +    {0x0C07, "Write error - recovery needed"},
>> +    {0x0C08, "Write error - recovery failed"},
>> +    {0x0C09, "Write error - loss of streaming"},
>> +    {0x0C0A, "Write error - padding blocks added"},
>> +    {0x0C0B, "Auxiliary memory write error"},
>> +    {0x0C0C, "Write error - unexpected unsolicited data"},
>> +    {0x0C0D, "Write error - not enough unsolicited data"},
>> +    {0x0C0E, "Multiple write errors"},
>> +    {0x0C0F, "Defects in error window"},
>> +
>> +    {0x0D00, "Error detected by third party temporary initiator"},
>> +    {0x0D01, "Third party device failure"},
>> +    {0x0D02, "Copy target device not reachable"},
>> +    {0x0D03, "Incorrect copy target device type"},
>> +    {0x0D04, "Copy target device data underrun"},
>> +    {0x0D05, "Copy target device data overrun"},
>> +
>> +    {0x0E00, "Invalid information unit"},
>> +    {0x0E01, "Information unit too short"},
>> +    {0x0E02, "Information unit too long"},
>> +    {0x0E03, "Invalid field in command information unit"},
>> +
>> +    {0x1000, "Id CRC or ECC error"},
>> +    {0x1001, "Logical block guard check failed"},
>> +    {0x1002, "Logical block application tag check failed"},
>> +    {0x1003, "Logical block reference tag check failed"},
>> +    {0x1004, "Logical block protection error on recover buffered data"},
>> +    {0x1005, "Logical block protection method error"},
>> +
>> +    {0x1100, "Unrecovered read error"},
>> +    {0x1101, "Read retries exhausted"},
>> +    {0x1102, "Error too long to correct"},
>> +    {0x1103, "Multiple read errors"},
>> +    {0x1104, "Unrecovered read error - auto reallocate failed"},
>> +    {0x1105, "L-EC uncorrectable error"},
>> +    {0x1106, "CIRC unrecovered error"},
>> +    {0x1107, "Data re-synchronization error"},
>> +    {0x1108, "Incomplete block read"},
>> +    {0x1109, "No gap found"},
>> +    {0x110A, "Miscorrected error"},
>> +    {0x110B, "Unrecovered read error - recommend reassignment"},
>> +    {0x110C, "Unrecovered read error - recommend rewrite the data"},
>> +    {0x110D, "De-compression CRC error"},
>> +    {0x110E, "Cannot decompress using declared algorithm"},
>> +    {0x110F, "Error reading UPC/EAN number"},
>> +    {0x1110, "Error reading ISRC number"},
>> +    {0x1111, "Read error - loss of streaming"},
>> +    {0x1112, "Auxiliary memory read error"},
>> +    {0x1113, "Read error - failed retransmission request"},
>> +    {0x1114, "Read error - lba marked bad by application client"},
>> +    {0x1115, "Write after sanitize required"},
>> +
>> +    {0x1200, "Address mark not found for id field"},
>> +
>> +    {0x1300, "Address mark not found for data field"},
>> +
>> +    {0x1400, "Recorded entity not found"},
>> +    {0x1401, "Record not found"},
>> +    {0x1402, "Filemark or setmark not found"},
>> +    {0x1403, "End-of-data not found"},
>> +    {0x1404, "Block sequence error"},
>> +    {0x1405, "Record not found - recommend reassignment"},
>> +    {0x1406, "Record not found - data auto-reallocated"},
>> +    {0x1407, "Locate operation failure"},
>> +
>> +    {0x1500, "Random positioning error"},
>> +    {0x1501, "Mechanical positioning error"},
>> +    {0x1502, "Positioning error detected by read of medium"},
>> +
>> +    {0x1600, "Data synchronization mark error"},
>> +    {0x1601, "Data sync error - data rewritten"},
>> +    {0x1602, "Data sync error - recommend rewrite"},
>> +    {0x1603, "Data sync error - data auto-reallocated"},
>> +    {0x1604, "Data sync error - recommend reassignment"},
>> +
>> +    {0x1700, "Recovered data with no error correction applied"},
>> +    {0x1701, "Recovered data with retries"},
>> +    {0x1702, "Recovered data with positive head offset"},
>> +    {0x1703, "Recovered data with negative head offset"},
>> +    {0x1704, "Recovered data with retries and/or circ applied"},
>> +    {0x1705, "Recovered data using previous sector id"},
>> +    {0x1706, "Recovered data without ECC - data auto-reallocated"},
>> +    {0x1707, "Recovered data without ECC - recommend reassignment"},
>> +    {0x1708, "Recovered data without ECC - recommend rewrite"},
>> +    {0x1709, "Recovered data without ECC - data rewritten"},
>> +
>> +    {0x1800, "Recovered data with error correction applied"},
>> +    {0x1801, "Recovered data with error corr. & retries applied"},
>> +    {0x1802, "Recovered data - data auto-reallocated"},
>> +    {0x1803, "Recovered data with CIRC"},
>> +    {0x1804, "Recovered data with L-EC"},
>> +    {0x1805, "Recovered data - recommend reassignment"},
>> +    {0x1806, "Recovered data - recommend rewrite"},
>> +    {0x1807, "Recovered data with ECC - data rewritten"},
>> +    {0x1808, "Recovered data with linking"},
>> +
>> +    {0x1900, "Defect list error"},
>> +    {0x1901, "Defect list not available"},
>> +    {0x1902, "Defect list error in primary list"},
>> +    {0x1903, "Defect list error in grown list"},
>> +
>> +    {0x1A00, "Parameter list length error"},
>> +
>> +    {0x1B00, "Synchronous data transfer error"},
>> +
>> +    {0x1C00, "Defect list not found"},
>> +    {0x1C01, "Primary defect list not found"},
>> +    {0x1C02, "Grown defect list not found"},
>> +
>> +    {0x1D00, "Miscompare during verify operation"},
>> +    {0x1D01, "Miscompare verify of unmapped LBA"},
>> +
>> +    {0x1E00, "Recovered id with ECC correction"},
>> +
>> +    {0x1F00, "Partial defect list transfer"},
>> +
>> +    {0x2000, "Invalid command operation code"},
>> +    {0x2001, "Access denied - initiator pending-enrolled"},
>> +    {0x2002, "Access denied - no access rights"},
>> +    {0x2003, "Access denied - invalid mgmt id key"},
>> +    {0x2004, "Illegal command while in write capable state"},
>> +    {0x2005, "Obsolete"},
>> +    {0x2006, "Illegal command while in explicit address mode"},
>> +    {0x2007, "Illegal command while in implicit address mode"},
>> +    {0x2008, "Access denied - enrollment conflict"},
>> +    {0x2009, "Access denied - invalid LU identifier"},
>> +    {0x200A, "Access denied - invalid proxy token"},
>> +    {0x200B, "Access denied - ACL LUN conflict"},
>> +    {0x200C, "Illegal command when not in append-only mode"},
>> +
>> +    {0x2100, "Logical block address out of range"},
>> +    {0x2101, "Invalid element address"},
>> +    {0x2102, "Invalid address for write"},
>> +    {0x2103, "Invalid write crossing layer jump"},
>> +
>> +    {0x2200, "Illegal function (use 20 00, 24 00, or 26 00)"},
>> +
>> +    {0x2300, "Invalid token operation, cause not reportable"},
>> +    {0x2301, "Invalid token operation, unsupported token type"},
>> +    {0x2302, "Invalid token operation, remote token usage not
>> supported"},
>> +    {0x2303, "Invalid token operation, remote rod token creation not "
>> +     "supported"},
>> +    {0x2304, "Invalid token operation, token unknown"},
>> +    {0x2305, "Invalid token operation, token corrupt"},
>> +    {0x2306, "Invalid token operation, token revoked"},
>> +    {0x2307, "Invalid token operation, token expired"},
>> +    {0x2308, "Invalid token operation, token cancelled"},
>> +    {0x2309, "Invalid token operation, token deleted"},
>> +    {0x230A, "Invalid token operation, invalid token length"},
>> +
>> +    {0x2400, "Invalid field in cdb"},
>> +    {0x2401, "CDB decryption error"},
>> +    {0x2402, "Obsolete"},
>> +    {0x2403, "Obsolete"},
>> +    {0x2404, "Security audit value frozen"},
>> +    {0x2405, "Security working key frozen"},
>> +    {0x2406, "Nonce not unique"},
>> +    {0x2407, "Nonce timestamp out of range"},
>> +    {0x2408, "Invalid XCDB"},
>> +
>> +    {0x2500, "Logical unit not supported"},
>> +
>> +    {0x2600, "Invalid field in parameter list"},
>> +    {0x2601, "Parameter not supported"},
>> +    {0x2602, "Parameter value invalid"},
>> +    {0x2603, "Threshold parameters not supported"},
>> +    {0x2604, "Invalid release of persistent reservation"},
>> +    {0x2605, "Data decryption error"},
>> +    {0x2606, "Too many target descriptors"},
>> +    {0x2607, "Unsupported target descriptor type code"},
>> +    {0x2608, "Too many segment descriptors"},
>> +    {0x2609, "Unsupported segment descriptor type code"},
>> +    {0x260A, "Unexpected inexact segment"},
>> +    {0x260B, "Inline data length exceeded"},
>> +    {0x260C, "Invalid operation for copy source or destination"},
>> +    {0x260D, "Copy segment granularity violation"},
>> +    {0x260E, "Invalid parameter while port is enabled"},
>> +    {0x260F, "Invalid data-out buffer integrity check value"},
>> +    {0x2610, "Data decryption key fail limit reached"},
>> +    {0x2611, "Incomplete key-associated data set"},
>> +    {0x2612, "Vendor specific key reference not found"},
>> +
>> +    {0x2700, "Write protected"},
>> +    {0x2701, "Hardware write protected"},
>> +    {0x2702, "Logical unit software write protected"},
>> +    {0x2703, "Associated write protect"},
>> +    {0x2704, "Persistent write protect"},
>> +    {0x2705, "Permanent write protect"},
>> +    {0x2706, "Conditional write protect"},
>> +    {0x2707, "Space allocation failed write protect"},
>> +
>> +    {0x2800, "Not ready to ready change, medium may have changed"},
>> +    {0x2801, "Import or export element accessed"},
>> +    {0x2802, "Format-layer may have changed"},
>> +    {0x2803, "Import/export element accessed, medium changed"},
>> +
>> +    {0x2900, "Power on, reset, or bus device reset occurred"},
>> +    {0x2901, "Power on occurred"},
>> +    {0x2902, "Scsi bus reset occurred"},
>> +    {0x2903, "Bus device reset function occurred"},
>> +    {0x2904, "Device internal reset"},
>> +    {0x2905, "Transceiver mode changed to single-ended"},
>> +    {0x2906, "Transceiver mode changed to lvd"},
>> +    {0x2907, "I_T nexus loss occurred"},
>> +
>> +    {0x2A00, "Parameters changed"},
>> +    {0x2A01, "Mode parameters changed"},
>> +    {0x2A02, "Log parameters changed"},
>> +    {0x2A03, "Reservations preempted"},
>> +    {0x2A04, "Reservations released"},
>> +    {0x2A05, "Registrations preempted"},
>> +    {0x2A06, "Asymmetric access state changed"},
>> +    {0x2A07, "Implicit asymmetric access state transition failed"},
>> +    {0x2A08, "Priority changed"},
>> +    {0x2A09, "Capacity data has changed"},
>> +    {0x2A0A, "Error history I_T nexus cleared"},
>> +    {0x2A0B, "Error history snapshot released"},
>> +    {0x2A0C, "Error recovery attributes have changed"},
>> +    {0x2A0D, "Data encryption capabilities changed"},
>> +    {0x2A10, "Timestamp changed"},
>> +    {0x2A11, "Data encryption parameters changed by another i_t nexus"},
>> +    {0x2A12, "Data encryption parameters changed by vendor specific "
>> +         "event"},
>> +    {0x2A13, "Data encryption key instance counter has changed"},
>> +    {0x2A14, "SA creation capabilities data has changed"},
>> +    {0x2A15, "Medium removal prevention preempted"},
>> +
>> +    {0x2B00, "Copy cannot execute since host cannot disconnect"},
>> +
>> +    {0x2C00, "Command sequence error"},
>> +    {0x2C01, "Too many windows specified"},
>> +    {0x2C02, "Invalid combination of windows specified"},
>> +    {0x2C03, "Current program area is not empty"},
>> +    {0x2C04, "Current program area is empty"},
>> +    {0x2C05, "Illegal power condition request"},
>> +    {0x2C06, "Persistent prevent conflict"},
>> +    {0x2C07, "Previous busy status"},
>> +    {0x2C08, "Previous task set full status"},
>> +    {0x2C09, "Previous reservation conflict status"},
>> +    {0x2C0A, "Partition or collection contains user objects"},
>> +    {0x2C0B, "Not reserved"},
>> +    {0x2C0C, "Orwrite generation does not match"},
>> +
>> +    {0x2D00, "Overwrite error on update in place"},
>> +
>> +    {0x2E00, "Insufficient time for operation"},
>> +
>> +    {0x2F00, "Commands cleared by another initiator"},
>> +    {0x2F01, "Commands cleared by power loss notification"},
>> +    {0x2F02, "Commands cleared by device server"},
>> +    {0x2F03, "Some commands cleared by queuing layer event"},
>> +
>> +    {0x3000, "Incompatible medium installed"},
>> +    {0x3001, "Cannot read medium - unknown format"},
>> +    {0x3002, "Cannot read medium - incompatible format"},
>> +    {0x3003, "Cleaning cartridge installed"},
>> +    {0x3004, "Cannot write medium - unknown format"},
>> +    {0x3005, "Cannot write medium - incompatible format"},
>> +    {0x3006, "Cannot format medium - incompatible medium"},
>> +    {0x3007, "Cleaning failure"},
>> +    {0x3008, "Cannot write - application code mismatch"},
>> +    {0x3009, "Current session not fixated for append"},
>> +    {0x300A, "Cleaning request rejected"},
>> +    {0x300C, "WORM medium - overwrite attempted"},
>> +    {0x300D, "WORM medium - integrity check"},
>> +    {0x3010, "Medium not formatted"},
>> +    {0x3011, "Incompatible volume type"},
>> +    {0x3012, "Incompatible volume qualifier"},
>> +    {0x3013, "Cleaning volume expired"},
>> +
>> +    {0x3100, "Medium format corrupted"},
>> +    {0x3101, "Format command failed"},
>> +    {0x3102, "Zoned formatting failed due to spare linking"},
>> +    {0x3103, "Sanitize command failed"},
>> +
>> +    {0x3200, "No defect spare location available"},
>> +    {0x3201, "Defect list update failure"},
>> +
>> +    {0x3300, "Tape length error"},
>> +
>> +    {0x3400, "Enclosure failure"},
>> +
>> +    {0x3500, "Enclosure services failure"},
>> +    {0x3501, "Unsupported enclosure function"},
>> +    {0x3502, "Enclosure services unavailable"},
>> +    {0x3503, "Enclosure services transfer failure"},
>> +    {0x3504, "Enclosure services transfer refused"},
>> +    {0x3505, "Enclosure services checksum error"},
>> +
>> +    {0x3600, "Ribbon, ink, or toner failure"},
>> +
>> +    {0x3700, "Rounded parameter"},
>> +
>> +    {0x3800, "Event status notification"},
>> +    {0x3802, "Esn - power management class event"},
>> +    {0x3804, "Esn - media class event"},
>> +    {0x3806, "Esn - device busy class event"},
>> +    {0x3807, "Thin Provisioning soft threshold reached"},
>> +
>> +    {0x3900, "Saving parameters not supported"},
>> +
>> +    {0x3A00, "Medium not present"},
>> +    {0x3A01, "Medium not present - tray closed"},
>> +    {0x3A02, "Medium not present - tray open"},
>> +    {0x3A03, "Medium not present - loadable"},
>> +    {0x3A04, "Medium not present - medium auxiliary memory accessible"},
>> +
>> +    {0x3B00, "Sequential positioning error"},
>> +    {0x3B01, "Tape position error at beginning-of-medium"},
>> +    {0x3B02, "Tape position error at end-of-medium"},
>> +    {0x3B03, "Tape or electronic vertical forms unit not ready"},
>> +    {0x3B04, "Slew failure"},
>> +    {0x3B05, "Paper jam"},
>> +    {0x3B06, "Failed to sense top-of-form"},
>> +    {0x3B07, "Failed to sense bottom-of-form"},
>> +    {0x3B08, "Reposition error"},
>> +    {0x3B09, "Read past end of medium"},
>> +    {0x3B0A, "Read past beginning of medium"},
>> +    {0x3B0B, "Position past end of medium"},
>> +    {0x3B0C, "Position past beginning of medium"},
>> +    {0x3B0D, "Medium destination element full"},
>> +    {0x3B0E, "Medium source element empty"},
>> +    {0x3B0F, "End of medium reached"},
>> +    {0x3B11, "Medium magazine not accessible"},
>> +    {0x3B12, "Medium magazine removed"},
>> +    {0x3B13, "Medium magazine inserted"},
>> +    {0x3B14, "Medium magazine locked"},
>> +    {0x3B15, "Medium magazine unlocked"},
>> +    {0x3B16, "Mechanical positioning or changer error"},
>> +    {0x3B17, "Read past end of user object"},
>> +    {0x3B18, "Element disabled"},
>> +    {0x3B19, "Element enabled"},
>> +    {0x3B1A, "Data transfer device removed"},
>> +    {0x3B1B, "Data transfer device inserted"},
>> +    {0x3B1C, "Too many logical objects on partition to support "
>> +     "operation"},
>> +
>> +    {0x3D00, "Invalid bits in identify message"},
>> +
>> +    {0x3E00, "Logical unit has not self-configured yet"},
>> +    {0x3E01, "Logical unit failure"},
>> +    {0x3E02, "Timeout on logical unit"},
>> +    {0x3E03, "Logical unit failed self-test"},
>> +    {0x3E04, "Logical unit unable to update self-test log"},
>> +
>> +    {0x3F00, "Target operating conditions have changed"},
>> +    {0x3F01, "Microcode has been changed"},
>> +    {0x3F02, "Changed operating definition"},
>> +    {0x3F03, "Inquiry data has changed"},
>> +    {0x3F04, "Component device attached"},
>> +    {0x3F05, "Device identifier changed"},
>> +    {0x3F06, "Redundancy group created or modified"},
>> +    {0x3F07, "Redundancy group deleted"},
>> +    {0x3F08, "Spare created or modified"},
>> +    {0x3F09, "Spare deleted"},
>> +    {0x3F0A, "Volume set created or modified"},
>> +    {0x3F0B, "Volume set deleted"},
>> +    {0x3F0C, "Volume set deassigned"},
>> +    {0x3F0D, "Volume set reassigned"},
>> +    {0x3F0E, "Reported luns data has changed"},
>> +    {0x3F0F, "Echo buffer overwritten"},
>> +    {0x3F10, "Medium loadable"},
>> +    {0x3F11, "Medium auxiliary memory accessible"},
>> +    {0x3F12, "iSCSI IP address added"},
>> +    {0x3F13, "iSCSI IP address removed"},
>> +    {0x3F14, "iSCSI IP address changed"},
>> +    {0x3F15, "Inspect referrals sense descriptors"},
>> +/*
>> + *    {0x40NN, "Ram failure"},
>> + *    {0x40NN, "Diagnostic failure on component nn"},
>> + *    {0x41NN, "Data path failure"},
>> + *    {0x42NN, "Power-on or self-test failure"},
>> + */
>> +    {0x4300, "Message error"},
>> +
>> +    {0x4400, "Internal target failure"},
>> +    {0x4401, "Persistent reservation information lost"},
>> +    {0x4471, "ATA device failed set features"},
>> +
>> +    {0x4500, "Select or reselect failure"},
>> +
>> +    {0x4600, "Unsuccessful soft reset"},
>> +
>> +    {0x4700, "Scsi parity error"},
>> +    {0x4701, "Data phase CRC error detected"},
>> +    {0x4702, "Scsi parity error detected during st data phase"},
>> +    {0x4703, "Information unit iuCRC error detected"},
>> +    {0x4704, "Asynchronous information protection error detected"},
>> +    {0x4705, "Protocol service CRC error"},
>> +    {0x4706, "Phy test function in progress"},
>> +    {0x477f, "Some commands cleared by iSCSI Protocol event"},
>> +
>> +    {0x4800, "Initiator detected error message received"},
>> +
>> +    {0x4900, "Invalid message error"},
>> +
>> +    {0x4A00, "Command phase error"},
>> +
>> +    {0x4B00, "Data phase error"},
>> +    {0x4B01, "Invalid target port transfer tag received"},
>> +    {0x4B02, "Too much write data"},
>> +    {0x4B03, "Ack/nak timeout"},
>> +    {0x4B04, "Nak received"},
>> +    {0x4B05, "Data offset error"},
>> +    {0x4B06, "Initiator response timeout"},
>> +    {0x4B07, "Connection lost"},
>> +    {0x4B08, "Data-in buffer overflow - data buffer size"},
>> +    {0x4B09, "Data-in buffer overflow - data buffer descriptor area"},
>> +    {0x4B0A, "Data-in buffer error"},
>> +    {0x4B0B, "Data-out buffer overflow - data buffer size"},
>> +    {0x4B0C, "Data-out buffer overflow - data buffer descriptor area"},
>> +    {0x4B0D, "Data-out buffer error"},
>> +    {0x4B0E, "PCIe fabric error"},
>> +    {0x4B0F, "PCIe completion timeout"},
>> +    {0x4B10, "PCIe completer abort"},
>> +    {0x4B11, "PCIe poisoned tlp received"},
>> +    {0x4B12, "PCIe eCRC check failed"},
>> +    {0x4B13, "PCIe unsupported request"},
>> +    {0x4B14, "PCIe acs violation"},
>> +    {0x4B15, "PCIe tlp prefix blocked"},
>> +
>> +    {0x4C00, "Logical unit failed self-configuration"},
>> +/*
>> + *    {0x4DNN, "Tagged overlapped commands (nn = queue tag)"},
>> + */
>> +    {0x4E00, "Overlapped commands attempted"},
>> +
>> +    {0x5000, "Write append error"},
>> +    {0x5001, "Write append position error"},
>> +    {0x5002, "Position error related to timing"},
>> +
>> +    {0x5100, "Erase failure"},
>> +    {0x5101, "Erase failure - incomplete erase operation detected"},
>> +
>> +    {0x5200, "Cartridge fault"},
>> +
>> +    {0x5300, "Media load or eject failed"},
>> +    {0x5301, "Unload tape failure"},
>> +    {0x5302, "Medium removal prevented"},
>> +    {0x5303, "Medium removal prevented by data transfer element"},
>> +    {0x5304, "Medium thread or unthread failure"},
>> +    {0x5305, "Volume identifier invalid"},
>> +    {0x5306, "Volume identifier missing"},
>> +    {0x5307, "Duplicate volume identifier"},
>> +    {0x5308, "Element status unknown"},
>> +
>> +    {0x5400, "Scsi to host system interface failure"},
>> +
>> +    {0x5500, "System resource failure"},
>> +    {0x5501, "System buffer full"},
>> +    {0x5502, "Insufficient reservation resources"},
>> +    {0x5503, "Insufficient resources"},
>> +    {0x5504, "Insufficient registration resources"},
>> +    {0x5505, "Insufficient access control resources"},
>> +    {0x5506, "Auxiliary memory out of space"},
>> +    {0x5507, "Quota error"},
>> +    {0x5508, "Maximum number of supplemental decryption keys exceeded"},
>> +    {0x5509, "Medium auxiliary memory not accessible"},
>> +    {0x550A, "Data currently unavailable"},
>> +    {0x550B, "Insufficient power for operation"},
>> +    {0x550C, "Insufficient resources to create rod"},
>> +    {0x550D, "Insufficient resources to create rod token"},
>> +
>> +    {0x5700, "Unable to recover table-of-contents"},
>> +
>> +    {0x5800, "Generation does not exist"},
>> +
>> +    {0x5900, "Updated block read"},
>> +
>> +    {0x5A00, "Operator request or state change input"},
>> +    {0x5A01, "Operator medium removal request"},
>> +    {0x5A02, "Operator selected write protect"},
>> +    {0x5A03, "Operator selected write permit"},
>> +
>> +    {0x5B00, "Log exception"},
>> +    {0x5B01, "Threshold condition met"},
>> +    {0x5B02, "Log counter at maximum"},
>> +    {0x5B03, "Log list codes exhausted"},
>> +
>> +    {0x5C00, "Rpl status change"},
>> +    {0x5C01, "Spindles synchronized"},
>> +    {0x5C02, "Spindles not synchronized"},
>> +
>> +    {0x5D00, "Failure prediction threshold exceeded"},
>> +    {0x5D01, "Media failure prediction threshold exceeded"},
>> +    {0x5D02, "Logical unit failure prediction threshold exceeded"},
>> +    {0x5D03, "Spare area exhaustion prediction threshold exceeded"},
>> +    {0x5D10, "Hardware impending failure general hard drive failure"},
>> +    {0x5D11, "Hardware impending failure drive error rate too high"},
>> +    {0x5D12, "Hardware impending failure data error rate too high"},
>> +    {0x5D13, "Hardware impending failure seek error rate too high"},
>> +    {0x5D14, "Hardware impending failure too many block reassigns"},
>> +    {0x5D15, "Hardware impending failure access times too high"},
>> +    {0x5D16, "Hardware impending failure start unit times too high"},
>> +    {0x5D17, "Hardware impending failure channel parametrics"},
>> +    {0x5D18, "Hardware impending failure controller detected"},
>> +    {0x5D19, "Hardware impending failure throughput performance"},
>> +    {0x5D1A, "Hardware impending failure seek time performance"},
>> +    {0x5D1B, "Hardware impending failure spin-up retry count"},
>> +    {0x5D1C, "Hardware impending failure drive calibration retry
>> count"},
>> +    {0x5D20, "Controller impending failure general hard drive failure"},
>> +    {0x5D21, "Controller impending failure drive error rate too high"},
>> +    {0x5D22, "Controller impending failure data error rate too high"},
>> +    {0x5D23, "Controller impending failure seek error rate too high"},
>> +    {0x5D24, "Controller impending failure too many block reassigns"},
>> +    {0x5D25, "Controller impending failure access times too high"},
>> +    {0x5D26, "Controller impending failure start unit times too high"},
>> +    {0x5D27, "Controller impending failure channel parametrics"},
>> +    {0x5D28, "Controller impending failure controller detected"},
>> +    {0x5D29, "Controller impending failure throughput performance"},
>> +    {0x5D2A, "Controller impending failure seek time performance"},
>> +    {0x5D2B, "Controller impending failure spin-up retry count"},
>> +    {0x5D2C, "Controller impending failure drive calibration retry
>> count"},
>> +    {0x5D30, "Data channel impending failure general hard drive
>> failure"},
>> +    {0x5D31, "Data channel impending failure drive error rate too
>> high"},
>> +    {0x5D32, "Data channel impending failure data error rate too high"},
>> +    {0x5D33, "Data channel impending failure seek error rate too high"},
>> +    {0x5D34, "Data channel impending failure too many block reassigns"},
>> +    {0x5D35, "Data channel impending failure access times too high"},
>> +    {0x5D36, "Data channel impending failure start unit times too
>> high"},
>> +    {0x5D37, "Data channel impending failure channel parametrics"},
>> +    {0x5D38, "Data channel impending failure controller detected"},
>> +    {0x5D39, "Data channel impending failure throughput performance"},
>> +    {0x5D3A, "Data channel impending failure seek time performance"},
>> +    {0x5D3B, "Data channel impending failure spin-up retry count"},
>> +    {0x5D3C, "Data channel impending failure drive calibration retry "
>> +     "count"},
>> +    {0x5D40, "Servo impending failure general hard drive failure"},
>> +    {0x5D41, "Servo impending failure drive error rate too high"},
>> +    {0x5D42, "Servo impending failure data error rate too high"},
>> +    {0x5D43, "Servo impending failure seek error rate too high"},
>> +    {0x5D44, "Servo impending failure too many block reassigns"},
>> +    {0x5D45, "Servo impending failure access times too high"},
>> +    {0x5D46, "Servo impending failure start unit times too high"},
>> +    {0x5D47, "Servo impending failure channel parametrics"},
>> +    {0x5D48, "Servo impending failure controller detected"},
>> +    {0x5D49, "Servo impending failure throughput performance"},
>> +    {0x5D4A, "Servo impending failure seek time performance"},
>> +    {0x5D4B, "Servo impending failure spin-up retry count"},
>> +    {0x5D4C, "Servo impending failure drive calibration retry count"},
>> +    {0x5D50, "Spindle impending failure general hard drive failure"},
>> +    {0x5D51, "Spindle impending failure drive error rate too high"},
>> +    {0x5D52, "Spindle impending failure data error rate too high"},
>> +    {0x5D53, "Spindle impending failure seek error rate too high"},
>> +    {0x5D54, "Spindle impending failure too many block reassigns"},
>> +    {0x5D55, "Spindle impending failure access times too high"},
>> +    {0x5D56, "Spindle impending failure start unit times too high"},
>> +    {0x5D57, "Spindle impending failure channel parametrics"},
>> +    {0x5D58, "Spindle impending failure controller detected"},
>> +    {0x5D59, "Spindle impending failure throughput performance"},
>> +    {0x5D5A, "Spindle impending failure seek time performance"},
>> +    {0x5D5B, "Spindle impending failure spin-up retry count"},
>> +    {0x5D5C, "Spindle impending failure drive calibration retry count"},
>> +    {0x5D60, "Firmware impending failure general hard drive failure"},
>> +    {0x5D61, "Firmware impending failure drive error rate too high"},
>> +    {0x5D62, "Firmware impending failure data error rate too high"},
>> +    {0x5D63, "Firmware impending failure seek error rate too high"},
>> +    {0x5D64, "Firmware impending failure too many block reassigns"},
>> +    {0x5D65, "Firmware impending failure access times too high"},
>> +    {0x5D66, "Firmware impending failure start unit times too high"},
>> +    {0x5D67, "Firmware impending failure channel parametrics"},
>> +    {0x5D68, "Firmware impending failure controller detected"},
>> +    {0x5D69, "Firmware impending failure throughput performance"},
>> +    {0x5D6A, "Firmware impending failure seek time performance"},
>> +    {0x5D6B, "Firmware impending failure spin-up retry count"},
>> +    {0x5D6C, "Firmware impending failure drive calibration retry
>> count"},
>> +    {0x5DFF, "Failure prediction threshold exceeded (false)"},
>> +
>> +    {0x5E00, "Low power condition on"},
>> +    {0x5E01, "Idle condition activated by timer"},
>> +    {0x5E02, "Standby condition activated by timer"},
>> +    {0x5E03, "Idle condition activated by command"},
>> +    {0x5E04, "Standby condition activated by command"},
>> +    {0x5E05, "Idle_b condition activated by timer"},
>> +    {0x5E06, "Idle_b condition activated by command"},
>> +    {0x5E07, "Idle_c condition activated by timer"},
>> +    {0x5E08, "Idle_c condition activated by command"},
>> +    {0x5E09, "Standby_y condition activated by timer"},
>> +    {0x5E0A, "Standby_y condition activated by command"},
>> +    {0x5E41, "Power state change to active"},
>> +    {0x5E42, "Power state change to idle"},
>> +    {0x5E43, "Power state change to standby"},
>> +    {0x5E45, "Power state change to sleep"},
>> +    {0x5E47, "Power state change to device control"},
>> +
>> +    {0x6000, "Lamp failure"},
>> +
>> +    {0x6100, "Video acquisition error"},
>> +    {0x6101, "Unable to acquire video"},
>> +    {0x6102, "Out of focus"},
>> +
>> +    {0x6200, "Scan head positioning error"},
>> +
>> +    {0x6300, "End of user area encountered on this track"},
>> +    {0x6301, "Packet does not fit in available space"},
>> +
>> +    {0x6400, "Illegal mode for this track"},
>> +    {0x6401, "Invalid packet size"},
>> +
>> +    {0x6500, "Voltage fault"},
>> +
>> +    {0x6600, "Automatic document feeder cover up"},
>> +    {0x6601, "Automatic document feeder lift up"},
>> +    {0x6602, "Document jam in automatic document feeder"},
>> +    {0x6603, "Document miss feed automatic in document feeder"},
>> +
>> +    {0x6700, "Configuration failure"},
>> +    {0x6701, "Configuration of incapable logical units failed"},
>> +    {0x6702, "Add logical unit failed"},
>> +    {0x6703, "Modification of logical unit failed"},
>> +    {0x6704, "Exchange of logical unit failed"},
>> +    {0x6705, "Remove of logical unit failed"},
>> +    {0x6706, "Attachment of logical unit failed"},
>> +    {0x6707, "Creation of logical unit failed"},
>> +    {0x6708, "Assign failure occurred"},
>> +    {0x6709, "Multiply assigned logical unit"},
>> +    {0x670A, "Set target port groups command failed"},
>> +    {0x670B, "ATA device feature not enabled"},
>> +
>> +    {0x6800, "Logical unit not configured"},
>> +    {0x6801, "Subsidiary logical unit not configured"},
>> +
>> +    {0x6900, "Data loss on logical unit"},
>> +    {0x6901, "Multiple logical unit failures"},
>> +    {0x6902, "Parity/data mismatch"},
>> +
>> +    {0x6A00, "Informational, refer to log"},
>> +
>> +    {0x6B00, "State change has occurred"},
>> +    {0x6B01, "Redundancy level got better"},
>> +    {0x6B02, "Redundancy level got worse"},
>> +    {0x6C00, "Rebuild failure occurred"},
>> +
>> +    {0x6D00, "Recalculate failure occurred"},
>> +
>> +    {0x6E00, "Command to logical unit failed"},
>> +
>> +    {0x6F00, "Copy protection key exchange failure - authentication "
>> +     "failure"},
>> +    {0x6F01, "Copy protection key exchange failure - key not present"},
>> +    {0x6F02, "Copy protection key exchange failure - key not
>> established"},
>> +    {0x6F03, "Read of scrambled sector without authentication"},
>> +    {0x6F04, "Media region code is mismatched to logical unit region"},
>> +    {0x6F05, "Drive region must be permanent/region reset count error"},
>> +    {0x6F06, "Insufficient block count for binding nonce recording"},
>> +    {0x6F07, "Conflict in binding nonce recording"},
>> +/*
>> + *    {0x70NN, "Decompression exception short algorithm id of nn"},
>> + */
>> +    {0x7100, "Decompression exception long algorithm id"},
>> +
>> +    {0x7200, "Session fixation error"},
>> +    {0x7201, "Session fixation error writing lead-in"},
>> +    {0x7202, "Session fixation error writing lead-out"},
>> +    {0x7203, "Session fixation error - incomplete track in session"},
>> +    {0x7204, "Empty or partially written reserved track"},
>> +    {0x7205, "No more track reservations allowed"},
>> +    {0x7206, "RMZ extension is not allowed"},
>> +    {0x7207, "No more test zone extensions are allowed"},
>> +
>> +    {0x7300, "Cd control error"},
>> +    {0x7301, "Power calibration area almost full"},
>> +    {0x7302, "Power calibration area is full"},
>> +    {0x7303, "Power calibration area error"},
>> +    {0x7304, "Program memory area update failure"},
>> +    {0x7305, "Program memory area is full"},
>> +    {0x7306, "RMA/PMA is almost full"},
>> +    {0x7310, "Current power calibration area almost full"},
>> +    {0x7311, "Current power calibration area is full"},
>> +    {0x7317, "RDZ is full"},
>> +
>> +    {0x7400, "Security error"},
>> +    {0x7401, "Unable to decrypt data"},
>> +    {0x7402, "Unencrypted data encountered while decrypting"},
>> +    {0x7403, "Incorrect data encryption key"},
>> +    {0x7404, "Cryptographic integrity validation failed"},
>> +    {0x7405, "Error decrypting data"},
>> +    {0x7406, "Unknown signature verification key"},
>> +    {0x7407, "Encryption parameters not useable"},
>> +    {0x7408, "Digital signature validation failure"},
>> +    {0x7409, "Encryption mode mismatch on read"},
>> +    {0x740A, "Encrypted block not raw read enabled"},
>> +    {0x740B, "Incorrect Encryption parameters"},
>> +    {0x740C, "Unable to decrypt parameter list"},
>> +    {0x740D, "Encryption algorithm disabled"},
>> +    {0x7410, "SA creation parameter value invalid"},
>> +    {0x7411, "SA creation parameter value rejected"},
>> +    {0x7412, "Invalid SA usage"},
>> +    {0x7421, "Data Encryption configuration prevented"},
>> +    {0x7430, "SA creation parameter not supported"},
>> +    {0x7440, "Authentication failed"},
>> +    {0x7461, "External data encryption key manager access error"},
>> +    {0x7462, "External data encryption key manager error"},
>> +    {0x7463, "External data encryption key not found"},
>> +    {0x7464, "External data encryption request not authorized"},
>> +    {0x746E, "External data encryption control timeout"},
>> +    {0x746F, "External data encryption control error"},
>> +    {0x7471, "Logical unit access not authorized"},
>> +    {0x7479, "Security conflict in translated device"},
>> +
>> +    {0, NULL}
>> +};
>> +
>> +struct error_info2 {
>> +    unsigned char code1, code2_min, code2_max;
>> +    const char * fmt;
>> +};
>> +
>> +static const struct error_info2 additional2[] = {
>> +    {0x40, 0x00, 0x7f, "Ram failure (%x)"},
>> +    {0x40, 0x80, 0xff, "Diagnostic failure on component (%x)"},
>> +    {0x41, 0x00, 0xff, "Data path failure (%x)"},
>> +    {0x42, 0x00, 0xff, "Power-on or self-test failure (%x)"},
>> +    {0x4D, 0x00, 0xff, "Tagged overlapped commands (task tag %x)"},
>> +    {0x70, 0x00, 0xff, "Decompression exception short algorithm id of
>> %x"},
>> +    {0, 0, 0, NULL}
>> +};
>> +
>>   /* description of the sense key values */
>>   static const char * const snstext[] = {
>>       "No Sense",        /* 0: There is no sense information */
>> @@ -342,6 +1178,65 @@ scsi_sense_format_string(u8 res_code)
>>       return res_code >= 0x72 ? "[descriptor]" : "";
>>   }
>>
>> +/*
>> + * Get additional sense code string or NULL if not available.
>> + * This string may contain a "%x" and should be printed with ascq as
>> arg.
>> + */
>> +const char *
>> +scsi_extd_sense_format(u8 asc, u8 ascq) {
>> +#ifdef CONFIG_SCSI_CONSTANTS
>> +    int i;
>> +    unsigned short code = ((asc << 8) | ascq);
>> +
>> +    for (i = 0; additional[i].text; i++)
>> +        if (additional[i].code12 == code)
>> +            return additional[i].text;
>> +    for (i = 0; additional2[i].fmt; i++) {
>> +        if (additional2[i].code1 == asc &&
>> +            ascq >= additional2[i].code2_min &&
>> +            ascq <= additional2[i].code2_max)
>> +            return additional2[i].fmt;
>> +    }
>> +#endif
>> +    return NULL;
>> +}
>> +EXPORT_SYMBOL(scsi_extd_sense_format);
>> +
>> +const char *
>> +scsi_show_extd_sense(struct trace_seq *p, u8 asc, u8 ascq)
>> +{
>> +    const char *ret = p->buffer + p->len;
>> +    const char *extd_sense_fmt = scsi_extd_sense_format(asc, ascq);
>> +
>> +    if (extd_sense_fmt) {
>> +        if (strstr(extd_sense_fmt, "%x")) {
>> +            char sense_buf[50];
>> +
>> +            sprintf(sense_buf, extd_sense_fmt, ascq);
>> +            trace_seq_printf(p, " Add. Sense (%s)", sense_buf);
>> +        } else
>> +            trace_seq_printf(p, " Add. Sense (%s)", extd_sense_fmt);
>> +    } else
>> +        trace_seq_printf(p, " %sASC=0x%x %sASCQ=0x%x",
>> +                 asc >= 0x80 ? "<<vendor>> " : "", asc,
>> +                 asc < 0 && ascq >= 0x80 ? "<<vendor>> " : "",
>> +                 ascq);
>> +
>> +    trace_seq_putc(p, 0);
>> +    return ret;
>> +}
>> +
>> +/*
>> + * Print normalized SCSI sense header with a prefix.
>> + */
>> +void
>> +scsi_print_sense_hdr(struct scsi_device *sdev, const char *name,
>> +             struct scsi_sense_hdr *sshdr)
>> +{
>> +    trace_scsi_print_sense(sdev, name, sshdr, NULL, 0, 0);
>> +}
>> +EXPORT_SYMBOL(scsi_print_sense_hdr);
>> +
>>   static const char *
>>   scsi_dump_sense_buffer(struct trace_seq *p, const unsigned char
>> *buf, int len)
>>   {
>> @@ -419,6 +1314,31 @@ out:
>>       return ret;
>>   }
>>
>> +/* Normalize and print sense buffer with name prefix */
>> +void __scsi_print_sense(struct scsi_device *sdev, const char *name,
>> +            const unsigned char *sense_buffer, int sense_len)
>> +{
>> +    struct scsi_sense_hdr sshdr;
>> +    int raw;
>> +
>> +    raw = !scsi_normalize_sense(sense_buffer, sense_len, &sshdr);
>> +
>> +    trace_scsi_print_sense(sdev, name, &sshdr, sense_buffer, sense_len,
>> +                   raw);
>> +}
>> +EXPORT_SYMBOL(__scsi_print_sense);
>> +
>> +/* Normalize and print sense buffer in SCSI command */
>> +void scsi_print_sense(struct scsi_cmnd *cmd)
>> +{
>> +    const char *devname = cmd->request->rq_disk ?
>> +        cmd->request->rq_disk->disk_name : "scsi";
>> +
>> +    __scsi_print_sense(cmd->device, devname, cmd->sense_buffer,
>> +               SCSI_SENSE_BUFFERSIZE);
>> +}
>> +EXPORT_SYMBOL(scsi_print_sense);
>> +
>>   void scsi_show_result(struct scsi_device *sdev, const char *name,
>> int result)
>>   {
>>       trace_scsi_show_result(sdev, name, result);
>> diff --git a/include/scsi/scsi_dbg.h b/include/scsi/scsi_dbg.h
>> index 68a29e4..67e6a89 100644
>> --- a/include/scsi/scsi_dbg.h
>> +++ b/include/scsi/scsi_dbg.h
>> @@ -8,8 +8,6 @@ struct scsi_device;
>>   extern void scsi_print_command(struct scsi_cmnd *);
>>   extern void __scsi_print_command(struct scsi_device *, const char *,
>>                    unsigned char *, int);
>> -extern void scsi_show_extd_sense(struct scsi_device *, const char *,
>> -                 unsigned char, unsigned char);
>>   extern void scsi_print_sense_hdr(struct scsi_device *, const char *,
>>                    struct scsi_sense_hdr *);
>>   extern void scsi_print_sense(struct scsi_cmnd *);
>> diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
>> index 572aa65..6d3543f 100644
>> --- a/include/trace/events/scsi.h
>> +++ b/include/trace/events/scsi.h
>> @@ -400,6 +400,9 @@ const char *scsi_trace_decode_sense_extras(struct
>> trace_seq*, u8, u8,
>>   #define __decode_extras(sense_key, res_code, buf, len, raw) \
>>       scsi_trace_decode_sense_extras(p, sense_key, res_code, buf, len,
>> raw)
>>
>> +const char *scsi_show_extd_sense(struct trace_seq*, u8, u8);
>> +#define __extd_sense(asc, ascq) scsi_show_extd_sense(p, asc, ascq)
>> +
>>   TRACE_EVENT(scsi_print_sense,
>>
>>       TP_PROTO(struct scsi_device *sdev, const char *devname,
>> @@ -433,15 +436,18 @@ TRACE_EVENT(scsi_print_sense,
>>           __entry->res_code    = sshdr->response_code;
>>           memcpy(__get_dynamic_array(sense_buffer), sense_buffer,
>>                  sense_len);
>> +        __entry->asc        = sshdr->asc;
>> +        __entry->ascq        = sshdr->ascq;
>>           __entry->sense_len    = sense_len;
>>           __entry->raw        = raw;
>>       ),
>>
>> -    TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] %s",
>> +    TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] %s %s",
>>             __entry->host_no, __entry->channel, __entry->id,
>> __entry->lun,
>>             __get_str(devname), __decode_extras(__entry->sense_key,
>>             __entry->res_code, __get_dynamic_array(sense_buffer),
>> -          __entry->sense_len,  __entry->raw))
>> +          __entry->sense_len,  __entry->raw),
>> +          __extd_sense(__entry->asc, __entry->ascq))
>>   );
>>   #endif /*  _TRACE_SCSI_H */
>>
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>
> As discussed above, please use the existing functions from constants.c
> here.

OK, I'll use those.

Thanks,
Yoshihiro YUNOMAE


-- 
Yoshihiro YUNOMAE
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: yoshihiro.yunomae.ez@hitachi.com

[RFC PATCH 10/10] scsi/trace: Use scsi_print_command trace point instead of printk

[Yoshihiro YUNOMAE]

Previous printk messages of SCSI command can be mixed into other printk
messages because multiple printk messages are output for it. To avoid the
problem, patch 4e64bb8d6 in Hannes' branch(*1) introduced a local buffer.
But using local buffers can induce stack overflow, so we want to solve the
problem without local buffer if possible.

trace_seq_printf can add log messages without local buffer, so we use it.

Note:
We don't need constans.c any more.

(*1) http://git.kernel.org/cgit/linux/kernel/git/hare/scsi-devel.git/log/?h=logging

 - Result examples

<Before> (printk)
sd 2:0:0:0: [sda] CDB: Read(10)

<After>
scsi_print_command: host_no=2 channel=0 id=0 lun=0 [sda] CDB (Read(10))

Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Doug Gilbert <dgilbert@interlog.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
 drivers/scsi/Makefile       |    2 
 drivers/scsi/constants.c    |  425 -------------------------------------------
 drivers/scsi/scsi_trace.c   |  408 +++++++++++++++++++++++++++++++++++++++++
 include/scsi/scsi.h         |    8 +
 include/trace/events/scsi.h |   45 +++++
 5 files changed, 461 insertions(+), 427 deletions(-)
 delete mode 100644 drivers/scsi/constants.c

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 5f0d299..c56f692 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -158,7 +158,7 @@ obj-$(CONFIG_SCSI_OSD_INITIATOR) += osd/
 # This goes last, so that "real" scsi devices probe earlier
 obj-$(CONFIG_SCSI_DEBUG)	+= scsi_debug.o
 
-scsi_mod-y			+= scsi.o hosts.o scsi_ioctl.o constants.o \
+scsi_mod-y			+= scsi.o hosts.o scsi_ioctl.o \
 				   scsicam.o scsi_error.o scsi_lib.o
 scsi_mod-$(CONFIG_SCSI_DMA)	+= scsi_lib_dma.o
 scsi_mod-y			+= scsi_scan.o scsi_sysfs.o scsi_devinfo.o
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
deleted file mode 100644
index ce9ceb8..0000000
--- a/drivers/scsi/constants.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * ASCII values for a number of symbolic constants, printing functions,
- * etc.
- * Additions for SCSI 2 and Linux 2.2.x by D. Gilbert (990422)
- * Additions for SCSI 3+ (SPC-3 T10/1416-D Rev 07 3 May 2002)
- *   by D. Gilbert and aeb (20020609)
- * Updated to SPC-4 T10/1713-D Rev 36g, D. Gilbert 20130701
- */
-
-#include <linux/blkdev.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <asm/unaligned.h>
-
-#include <scsi/scsi.h>
-#include <scsi/scsi_cmnd.h>
-
-/* Commands with service actions that change the command name */
-#define SERVICE_ACTION_IN_12 0xab
-#define SERVICE_ACTION_OUT_12 0xa9
-#define SERVICE_ACTION_BIDIRECTIONAL 0x9d
-#define SERVICE_ACTION_IN_16 0x9e
-#define SERVICE_ACTION_OUT_16 0x9f
-#define THIRD_PARTY_COPY_OUT 0x83
-#define THIRD_PARTY_COPY_IN 0x84
-
-
-
-#ifdef CONFIG_SCSI_CONSTANTS
-static const char * cdb_byte0_names[] = {
-/* 00-03 */ "Test Unit Ready", "Rezero Unit/Rewind", NULL, "Request Sense",
-/* 04-07 */ "Format Unit/Medium", "Read Block Limits", NULL,
-	    "Reassign Blocks",
-/* 08-0d */ "Read(6)", NULL, "Write(6)", "Seek(6)", NULL, NULL,
-/* 0e-12 */ NULL, "Read Reverse", "Write Filemarks", "Space", "Inquiry",
-/* 13-16 */ "Verify(6)", "Recover Buffered Data", "Mode Select(6)",
-	    "Reserve(6)",
-/* 17-1a */ "Release(6)", "Copy", "Erase", "Mode Sense(6)",
-/* 1b-1d */ "Start/Stop Unit", "Receive Diagnostic", "Send Diagnostic",
-/* 1e-1f */ "Prevent/Allow Medium Removal", NULL,
-/* 20-22 */  NULL, NULL, NULL,
-/* 23-28 */ "Read Format Capacities", "Set Window",
-	    "Read Capacity(10)", NULL, NULL, "Read(10)",
-/* 29-2d */ "Read Generation", "Write(10)", "Seek(10)", "Erase(10)",
-            "Read updated block",
-/* 2e-31 */ "Write Verify(10)", "Verify(10)", "Search High", "Search Equal",
-/* 32-34 */ "Search Low", "Set Limits", "Prefetch/Read Position",
-/* 35-37 */ "Synchronize Cache(10)", "Lock/Unlock Cache(10)",
-	    "Read Defect Data(10)",
-/* 38-3c */ "Medium Scan", "Compare", "Copy Verify", "Write Buffer",
-	    "Read Buffer",
-/* 3d-3f */ "Update Block", "Read Long(10)",  "Write Long(10)",
-/* 40-41 */ "Change Definition", "Write Same(10)",
-/* 42-48 */ "Unmap/Read sub-channel", "Read TOC/PMA/ATIP",
-	    "Read density support", "Play audio(10)", "Get configuration",
-	    "Play audio msf", "Sanitize/Play audio track/index",
-/* 49-4f */ "Play track relative(10)", "Get event status notification",
-            "Pause/resume", "Log Select", "Log Sense", "Stop play/scan",
-            NULL,
-/* 50-55 */ "Xdwrite", "Xpwrite, Read disk info", "Xdread, Read track info",
-            "Reserve track", "Send OPC info", "Mode Select(10)",
-/* 56-5b */ "Reserve(10)", "Release(10)", "Repair track", "Read master cue",
-            "Mode Sense(10)", "Close track/session",
-/* 5c-5f */ "Read buffer capacity", "Send cue sheet", "Persistent reserve in",
-            "Persistent reserve out",
-/* 60-67 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-/* 68-6f */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-/* 70-77 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-/* 78-7f */ NULL, NULL, NULL, NULL, NULL, NULL, "Extended CDB",
-	    "Variable length",
-/* 80-84 */ "Xdwrite(16)", "Rebuild(16)", "Regenerate(16)",
-	    "Third party copy out", "Third party copy in",
-/* 85-89 */ "ATA command pass through(16)", "Access control in",
-	    "Access control out", "Read(16)", "Compare and Write",
-/* 8a-8f */ "Write(16)", "ORWrite", "Read attributes", "Write attributes",
-            "Write and verify(16)", "Verify(16)",
-/* 90-94 */ "Pre-fetch(16)", "Synchronize cache(16)",
-            "Lock/unlock cache(16)", "Write same(16)", NULL,
-/* 95-99 */ NULL, NULL, NULL, NULL, NULL,
-/* 9a-9f */ NULL, NULL, NULL, "Service action bidirectional",
-	    "Service action in(16)", "Service action out(16)",
-/* a0-a5 */ "Report luns", "ATA command pass through(12)/Blank",
-            "Security protocol in", "Maintenance in", "Maintenance out",
-	    "Move medium/play audio(12)",
-/* a6-a9 */ "Exchange medium", "Move medium attached", "Read(12)",
-            "Play track relative(12)",
-/* aa-ae */ "Write(12)", NULL, "Erase(12), Get Performance",
-            "Read DVD structure", "Write and verify(12)",
-/* af-b1 */ "Verify(12)", "Search data high(12)", "Search data equal(12)",
-/* b2-b4 */ "Search data low(12)", "Set limits(12)",
-            "Read element status attached",
-/* b5-b6 */ "Security protocol out", "Send volume tag, set streaming",
-/* b7-b9 */ "Read defect data(12)", "Read element status", "Read CD msf",
-/* ba-bc */ "Redundancy group (in), Scan",
-            "Redundancy group (out), Set cd-rom speed", "Spare (in), Play cd",
-/* bd-bf */ "Spare (out), Mechanism status", "Volume set (in), Read cd",
-            "Volume set (out), Send DVD structure",
-};
-
-struct value_name_pair {
-	int value;
-	const char * name;
-};
-
-static const struct value_name_pair maint_in_arr[] = {
-	{0x5, "Report identifying information"},
-	{0xa, "Report target port groups"},
-	{0xb, "Report aliases"},
-	{0xc, "Report supported operation codes"},
-	{0xd, "Report supported task management functions"},
-	{0xe, "Report priority"},
-	{0xf, "Report timestamp"},
-	{0x10, "Management protocol in"},
-};
-#define MAINT_IN_SZ ARRAY_SIZE(maint_in_arr)
-
-static const struct value_name_pair maint_out_arr[] = {
-	{0x6, "Set identifying information"},
-	{0xa, "Set target port groups"},
-	{0xb, "Change aliases"},
-	{0xc, "Remove I_T nexus"},
-	{0xe, "Set priority"},
-	{0xf, "Set timestamp"},
-	{0x10, "Management protocol out"},
-};
-#define MAINT_OUT_SZ ARRAY_SIZE(maint_out_arr)
-
-static const struct value_name_pair serv_in12_arr[] = {
-	{0x1, "Read media serial number"},
-};
-#define SERV_IN12_SZ ARRAY_SIZE(serv_in12_arr)
-
-static const struct value_name_pair serv_out12_arr[] = {
-	{-1, "dummy entry"},
-};
-#define SERV_OUT12_SZ ARRAY_SIZE(serv_out12_arr)
-
-static const struct value_name_pair serv_bidi_arr[] = {
-	{-1, "dummy entry"},
-};
-#define SERV_BIDI_SZ ARRAY_SIZE(serv_bidi_arr)
-
-static const struct value_name_pair serv_in16_arr[] = {
-	{0x10, "Read capacity(16)"},
-	{0x11, "Read long(16)"},
-	{0x12, "Get LBA status"},
-	{0x13, "Report referrals"},
-};
-#define SERV_IN16_SZ ARRAY_SIZE(serv_in16_arr)
-
-static const struct value_name_pair serv_out16_arr[] = {
-	{0x11, "Write long(16)"},
-	{0x1f, "Notify data transfer device(16)"},
-};
-#define SERV_OUT16_SZ ARRAY_SIZE(serv_out16_arr)
-
-static const struct value_name_pair pr_in_arr[] = {
-	{0x0, "Persistent reserve in, read keys"},
-	{0x1, "Persistent reserve in, read reservation"},
-	{0x2, "Persistent reserve in, report capabilities"},
-	{0x3, "Persistent reserve in, read full status"},
-};
-#define PR_IN_SZ ARRAY_SIZE(pr_in_arr)
-
-static const struct value_name_pair pr_out_arr[] = {
-	{0x0, "Persistent reserve out, register"},
-	{0x1, "Persistent reserve out, reserve"},
-	{0x2, "Persistent reserve out, release"},
-	{0x3, "Persistent reserve out, clear"},
-	{0x4, "Persistent reserve out, preempt"},
-	{0x5, "Persistent reserve out, preempt and abort"},
-	{0x6, "Persistent reserve out, register and ignore existing key"},
-	{0x7, "Persistent reserve out, register and move"},
-};
-#define PR_OUT_SZ ARRAY_SIZE(pr_out_arr)
-
-/* SPC-4 rev 34 renamed the Extended Copy opcode to Third Party Copy Out.
-   LID1 (List Identifier length: 1 byte) is the Extended Copy found in SPC-2
-   and SPC-3 */
-static const struct value_name_pair tpc_out_arr[] = {
-	{0x0, "Extended copy(LID1)"},
-	{0x1, "Extended copy(LID4)"},
-	{0x10, "Populate token"},
-	{0x11, "Write using token"},
-	{0x1c, "Copy operation abort"},
-};
-#define TPC_OUT_SZ ARRAY_SIZE(tpc_out_arr)
-
-static const struct value_name_pair tpc_in_arr[] = {
-	{0x0, "Receive copy status(LID1)"},
-	{0x1, "Receive copy data(LID1)"},
-	{0x3, "Receive copy operating parameters"},
-	{0x4, "Receive copy failure details(LID1)"},
-	{0x5, "Receive copy status(LID4)"},
-	{0x6, "Receive copy data(LID4)"},
-	{0x7, "Receive ROD token information"},
-	{0x8, "Report all ROD tokens"},
-};
-#define TPC_IN_SZ ARRAY_SIZE(tpc_in_arr)
-
-
-static const struct value_name_pair variable_length_arr[] = {
-	{0x1, "Rebuild(32)"},
-	{0x2, "Regenerate(32)"},
-	{0x3, "Xdread(32)"},
-	{0x4, "Xdwrite(32)"},
-	{0x5, "Xdwrite extended(32)"},
-	{0x6, "Xpwrite(32)"},
-	{0x7, "Xdwriteread(32)"},
-	{0x8, "Xdwrite extended(64)"},
-	{0x9, "Read(32)"},
-	{0xa, "Verify(32)"},
-	{0xb, "Write(32)"},
-	{0xc, "Write an verify(32)"},
-	{0xd, "Write same(32)"},
-	{0x8801, "Format OSD"},
-	{0x8802, "Create (osd)"},
-	{0x8803, "List (osd)"},
-	{0x8805, "Read (osd)"},
-	{0x8806, "Write (osd)"},
-	{0x8807, "Append (osd)"},
-	{0x8808, "Flush (osd)"},
-	{0x880a, "Remove (osd)"},
-	{0x880b, "Create partition (osd)"},
-	{0x880c, "Remove partition (osd)"},
-	{0x880e, "Get attributes (osd)"},
-	{0x880f, "Set attributes (osd)"},
-	{0x8812, "Create and write (osd)"},
-	{0x8815, "Create collection (osd)"},
-	{0x8816, "Remove collection (osd)"},
-	{0x8817, "List collection (osd)"},
-	{0x8818, "Set key (osd)"},
-	{0x8819, "Set master key (osd)"},
-	{0x881a, "Flush collection (osd)"},
-	{0x881b, "Flush partition (osd)"},
-	{0x881c, "Flush OSD"},
-	{0x8f7e, "Perform SCSI command (osd)"},
-	{0x8f7f, "Perform task management function (osd)"},
-};
-#define VARIABLE_LENGTH_SZ ARRAY_SIZE(variable_length_arr)
-
-struct sa_name_list {
-	int cmd;
-	const struct value_name_pair *arr;
-	int arr_sz;
-};
-
-static struct sa_name_list sa_names_arr[] = {
-	{VARIABLE_LENGTH_CMD, variable_length_arr, VARIABLE_LENGTH_SZ},
-	{MAINTENANCE_IN, maint_in_arr, MAINT_IN_SZ},
-	{MAINTENANCE_OUT, maint_out_arr, MAINT_OUT_SZ},
-	{PERSISTENT_RESERVE_IN, pr_in_arr, PR_IN_SZ},
-	{PERSISTENT_RESERVE_OUT, pr_out_arr, PR_OUT_SZ},
-	{SERVICE_ACTION_IN_12, serv_in12_arr, SERV_IN12_SZ},
-	{SERVICE_ACTION_OUT_12, serv_out12_arr, SERV_OUT12_SZ},
-	{SERVICE_ACTION_BIDIRECTIONAL, serv_bidi_arr, SERV_BIDI_SZ},
-	{SERVICE_ACTION_IN_16, serv_in16_arr, SERV_IN16_SZ},
-	{SERVICE_ACTION_OUT_16, serv_out16_arr, SERV_OUT16_SZ},
-	{THIRD_PARTY_COPY_IN, tpc_in_arr, TPC_IN_SZ},
-	{THIRD_PARTY_COPY_OUT, tpc_out_arr, TPC_OUT_SZ},
-	{0, NULL, 0},
-};
-#define SA_NAME_LIST_SZ ARRAY_SIZE(sa_names_arr)
-
-static int scsi_opcode_sa_name(int cmd, int service_action,
-			       const char **sa_name)
-{
-	struct sa_name_list *sa_name_ptr = sa_names_arr;
-	const struct value_name_pair * arr = NULL;
-	int arr_sz, k;
-
-	for (k = 0; k < SA_NAME_LIST_SZ; ++k, ++sa_name_ptr) {
-		if (sa_name_ptr->cmd == cmd) {
-			arr = sa_name_ptr->arr;
-			arr_sz = sa_name_ptr->arr_sz;
-			break;
-		}
-	}
-	if (!arr)
-		return 0;
-
-	for (k = 0; k < arr_sz; ++k, ++arr) {
-		if (service_action == arr->value)
-			break;
-	}
-	if (k < arr_sz)
-		*sa_name = arr->name;
-
-	return 1;
-}
-#else
-static int scsi_opcode_sa_name(int cmd, int service_action,
-			       const char **sa_name)
-{
-	switch (cmd) {
-	case VARIABLE_LENGTH_CMD:
-	case MAINTENANCE_IN:
-	case MAINTENANCE_OUT:
-	case PERSISTENT_RESERVE_IN:
-	case PERSISTENT_RESERVE_OUT:
-	case SERVICE_ACTION_IN_12:
-	case SERVICE_ACTION_OUT_12:
-	case SERVICE_ACTION_BIDIRECTIONAL:
-	case SERVICE_ACTION_IN_16:
-	case SERVICE_ACTION_OUT_16:
-	case THIRD_PARTY_COPY_IN:
-	case THIRD_PARTY_COPY_OUT:
-		return 1;
-	}
-	return 0;
-}
-#endif /* CONFIG_SCSI_CONSTANTS */
-
-/* attempt to guess cdb length if cdb_len==0 . No trailing linefeed. */
-static void print_opcode_name(struct scsi_device *sdev, const char *prefix,
-			      unsigned char * cdbp, int cdb_len)
-{
-	int sa, cdb0, sa_valid;
-	const char * cdb_name = NULL, *sa_name = NULL;
-	const char * cdb_classifier = NULL;
-
-	cdb0 = cdbp[0];
-	if (cdb0 == VARIABLE_LENGTH_CMD) {
-#ifdef CONFIG_SCSI_CONSTANTS
-		const struct value_name_pair * arr = NULL;
-		int k;
-#endif
-		int len;
-
-		len = scsi_varlen_cdb_length(cdbp);
-		if (len < 10) {
-			sdev_printk(KERN_INFO, sdev,
-				    "short variable length command, "
-				    "len=%d ext_len=%d", len, cdb_len);
-			return;
-		}
-		sa = (cdbp[8] << 8) + cdbp[9];
-#ifdef CONFIG_SCSI_CONSTANTS
-		arr = variable_length_arr;
-		for (k = 0; k < VARIABLE_LENGTH_SZ; ++k, ++arr) {
-			if (sa == arr->value) {
-				sa_name = arr->name;
-				break;
-			}
-		}
-#endif
-		if (sa_name)
-			sdev_printk(KERN_INFO, sdev,
-				    "[%s] CDB: %s, in_cdb_len=%d, ext_len=%d",
-				    prefix, sa_name, len, cdb_len);
-		else
-			sdev_printk(KERN_INFO, sdev,
-				    "[%s] CDB: cdb[0]=0x%x, sa=0x%x, "
-				    "in_cdb_len=%d, ext_len=%d",
-				    prefix, cdb0, sa, len, cdb_len);
-		return;
-	}
-
-	if (cdb0 < 0xc0) {
-		cdb_classifier = NULL;
-#ifdef CONFIG_SCSI_CONSTANTS
-		cdb_name = cdb_byte0_names[cdb0];
-		if (!cdb_name)
-			cdb_classifier = " (reserved)";
-#endif
-	} else
-		cdb_classifier = " (vendor)";
-
-	sa = cdbp[1] & 0x1f;
-	sa_valid = scsi_opcode_sa_name(cdb0, sa, &sa_name);
-
-	if (!sa_valid) {
-		if (cdb_name)
-			sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s",
-				    prefix, cdb_name);
-		else
-			sdev_printk(KERN_INFO, sdev, "[%s] CDB: cdb[0]=0x%x%s",
-				    prefix, cdb0, cdb_classifier );
-	} else {
-		if (sa_name)
-			sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s",
-				    prefix, sa_name);
-		else if (cdb_name)
-			sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s, sa=0x%x",
-				    prefix, cdb_name, sa);
-		else
-			sdev_printk(KERN_INFO, sdev,
-				    "[%s] CDB: cdb[0]=0x%x, sa=0x%x",
-				    prefix, cdb0, sa);
-	}
-}
-
-void __scsi_print_command(struct scsi_device *sdev, const char *prefix,
-			  unsigned char *cdb, int cdb_len)
-{
-	char linebuf[128];
-	int i, linelen, remaining;
-
-	print_opcode_name(sdev, prefix, cdb, 0);
-	if (!cdb_len)
-		cdb_len = scsi_command_size(cdb);
-	/* print out all bytes in cdb */
-	remaining = cdb_len;
-	for (i = 0; i < cdb_len; i += 16) {
-		linelen = min(remaining, 16);
-		remaining -= 16;
-
-		hex_dump_to_buffer(cdb + i, linelen, 16, 1,
-				   linebuf, sizeof(linebuf), false);
-	}
-	sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s\n", prefix, linebuf);
-}
-EXPORT_SYMBOL(__scsi_print_command);
-
-void scsi_print_command(struct scsi_cmnd *cmd)
-{
-	const char *devname = cmd->request->rq_disk ?
-		cmd->request->rq_disk->disk_name : "scsi";
-
-	if (cmd->cmnd == NULL)
-		return;
-
-	print_opcode_name(cmd->device, devname, cmd->cmnd, cmd->cmd_len);
-}
-EXPORT_SYMBOL(scsi_print_command);
diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
index 60678d8..6761077 100644
--- a/drivers/scsi/scsi_trace.c
+++ b/drivers/scsi/scsi_trace.c
@@ -1237,6 +1237,414 @@ scsi_print_sense_hdr(struct scsi_device *sdev, const char *name,
 }
 EXPORT_SYMBOL(scsi_print_sense_hdr);
 
+/* Commands with service actions that change the command name */
+#define SERVICE_ACTION_IN_12 0xab
+#define SERVICE_ACTION_OUT_12 0xa9
+#define SERVICE_ACTION_BIDIRECTIONAL 0x9d
+#define SERVICE_ACTION_IN_16 0x9e
+#define SERVICE_ACTION_OUT_16 0x9f
+#define THIRD_PARTY_COPY_OUT 0x83
+#define THIRD_PARTY_COPY_IN 0x84
+
+#ifdef CONFIG_SCSI_CONSTANTS
+static const char *cdb_byte0_names[] = {
+/* 00-03 */ "Test Unit Ready", "Rezero Unit/Rewind", NULL, "Request Sense",
+/* 04-07 */ "Format Unit/Medium", "Read Block Limits", NULL,
+	    "Reassign Blocks",
+/* 08-0d */ "Read(6)", NULL, "Write(6)", "Seek(6)", NULL, NULL,
+/* 0e-12 */ NULL, "Read Reverse", "Write Filemarks", "Space", "Inquiry",
+/* 13-16 */ "Verify(6)", "Recover Buffered Data", "Mode Select(6)",
+	    "Reserve(6)",
+/* 17-1a */ "Release(6)", "Copy", "Erase", "Mode Sense(6)",
+/* 1b-1d */ "Start/Stop Unit", "Receive Diagnostic", "Send Diagnostic",
+/* 1e-1f */ "Prevent/Allow Medium Removal", NULL,
+/* 20-22 */  NULL, NULL, NULL,
+/* 23-28 */ "Read Format Capacities", "Set Window",
+	    "Read Capacity(10)", NULL, NULL, "Read(10)",
+/* 29-2d */ "Read Generation", "Write(10)", "Seek(10)", "Erase(10)",
+	    "Read updated block",
+/* 2e-31 */ "Write Verify(10)", "Verify(10)", "Search High", "Search Equal",
+/* 32-34 */ "Search Low", "Set Limits", "Prefetch/Read Position",
+/* 35-37 */ "Synchronize Cache(10)", "Lock/Unlock Cache(10)",
+	    "Read Defect Data(10)",
+/* 38-3c */ "Medium Scan", "Compare", "Copy Verify", "Write Buffer",
+	    "Read Buffer",
+/* 3d-3f */ "Update Block", "Read Long(10)",  "Write Long(10)",
+/* 40-41 */ "Change Definition", "Write Same(10)",
+/* 42-48 */ "Unmap/Read sub-channel", "Read TOC/PMA/ATIP",
+	    "Read density support", "Play audio(10)", "Get configuration",
+	    "Play audio msf", "Sanitize/Play audio track/index",
+/* 49-4f */ "Play track relative(10)", "Get event status notification",
+	    "Pause/resume", "Log Select", "Log Sense", "Stop play/scan",
+	    NULL,
+/* 50-55 */ "Xdwrite", "Xpwrite, Read disk info", "Xdread, Read track info",
+	    "Reserve track", "Send OPC info", "Mode Select(10)",
+/* 56-5b */ "Reserve(10)", "Release(10)", "Repair track", "Read master cue",
+	    "Mode Sense(10)", "Close track/session",
+/* 5c-5f */ "Read buffer capacity", "Send cue sheet", "Persistent reserve in",
+	    "Persistent reserve out",
+/* 60-67 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+/* 68-6f */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+/* 70-77 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+/* 78-7f */ NULL, NULL, NULL, NULL, NULL, NULL, "Extended CDB",
+	    "Variable length",
+/* 80-84 */ "Xdwrite(16)", "Rebuild(16)", "Regenerate(16)",
+	    "Third party copy out", "Third party copy in",
+/* 85-89 */ "ATA command pass through(16)", "Access control in",
+	    "Access control out", "Read(16)", "Compare and Write",
+/* 8a-8f */ "Write(16)", "ORWrite", "Read attributes", "Write attributes",
+	    "Write and verify(16)", "Verify(16)",
+/* 90-94 */ "Pre-fetch(16)", "Synchronize cache(16)",
+	    "Lock/unlock cache(16)", "Write same(16)", NULL,
+/* 95-99 */ NULL, NULL, NULL, NULL, NULL,
+/* 9a-9f */ NULL, NULL, NULL, "Service action bidirectional",
+	    "Service action in(16)", "Service action out(16)",
+/* a0-a5 */ "Report luns", "ATA command pass through(12)/Blank",
+	    "Security protocol in", "Maintenance in", "Maintenance out",
+	    "Move medium/play audio(12)",
+/* a6-a9 */ "Exchange medium", "Move medium attached", "Read(12)",
+	    "Play track relative(12)",
+/* aa-ae */ "Write(12)", NULL, "Erase(12), Get Performance",
+	    "Read DVD structure", "Write and verify(12)",
+/* af-b1 */ "Verify(12)", "Search data high(12)", "Search data equal(12)",
+/* b2-b4 */ "Search data low(12)", "Set limits(12)",
+	    "Read element status attached",
+/* b5-b6 */ "Security protocol out", "Send volume tag, set streaming",
+/* b7-b9 */ "Read defect data(12)", "Read element status", "Read CD msf",
+/* ba-bc */ "Redundancy group (in), Scan",
+	    "Redundancy group (out), Set cd-rom speed", "Spare (in), Play cd",
+/* bd-bf */ "Spare (out), Mechanism status", "Volume set (in), Read cd",
+	    "Volume set (out), Send DVD structure",
+};
+
+struct value_name_pair {
+	int value;
+	const char *name;
+};
+
+static const struct value_name_pair maint_in_arr[] = {
+	{0x5, "Report identifying information"},
+	{0xa, "Report target port groups"},
+	{0xb, "Report aliases"},
+	{0xc, "Report supported operation codes"},
+	{0xd, "Report supported task management functions"},
+	{0xe, "Report priority"},
+	{0xf, "Report timestamp"},
+	{0x10, "Management protocol in"},
+};
+#define MAINT_IN_SZ ARRAY_SIZE(maint_in_arr)
+
+static const struct value_name_pair maint_out_arr[] = {
+	{0x6, "Set identifying information"},
+	{0xa, "Set target port groups"},
+	{0xb, "Change aliases"},
+	{0xc, "Remove I_T nexus"},
+	{0xe, "Set priority"},
+	{0xf, "Set timestamp"},
+	{0x10, "Management protocol out"},
+};
+#define MAINT_OUT_SZ ARRAY_SIZE(maint_out_arr)
+
+static const struct value_name_pair serv_in12_arr[] = {
+	{0x1, "Read media serial number"},
+};
+#define SERV_IN12_SZ ARRAY_SIZE(serv_in12_arr)
+
+static const struct value_name_pair serv_out12_arr[] = {
+	{-1, "dummy entry"},
+};
+#define SERV_OUT12_SZ ARRAY_SIZE(serv_out12_arr)
+
+static const struct value_name_pair serv_bidi_arr[] = {
+	{-1, "dummy entry"},
+};
+#define SERV_BIDI_SZ ARRAY_SIZE(serv_bidi_arr)
+
+static const struct value_name_pair serv_in16_arr[] = {
+	{0x10, "Read capacity(16)"},
+	{0x11, "Read long(16)"},
+	{0x12, "Get LBA status"},
+	{0x13, "Report referrals"},
+};
+#define SERV_IN16_SZ ARRAY_SIZE(serv_in16_arr)
+
+static const struct value_name_pair serv_out16_arr[] = {
+	{0x11, "Write long(16)"},
+	{0x1f, "Notify data transfer device(16)"},
+};
+#define SERV_OUT16_SZ ARRAY_SIZE(serv_out16_arr)
+
+static const struct value_name_pair pr_in_arr[] = {
+	{0x0, "Persistent reserve in, read keys"},
+	{0x1, "Persistent reserve in, read reservation"},
+	{0x2, "Persistent reserve in, report capabilities"},
+	{0x3, "Persistent reserve in, read full status"},
+};
+#define PR_IN_SZ ARRAY_SIZE(pr_in_arr)
+
+static const struct value_name_pair pr_out_arr[] = {
+	{0x0, "Persistent reserve out, register"},
+	{0x1, "Persistent reserve out, reserve"},
+	{0x2, "Persistent reserve out, release"},
+	{0x3, "Persistent reserve out, clear"},
+	{0x4, "Persistent reserve out, preempt"},
+	{0x5, "Persistent reserve out, preempt and abort"},
+	{0x6, "Persistent reserve out, register and ignore existing key"},
+	{0x7, "Persistent reserve out, register and move"},
+};
+#define PR_OUT_SZ ARRAY_SIZE(pr_out_arr)
+
+/* SPC-4 rev 34 renamed the Extended Copy opcode to Third Party Copy Out.
+   LID1 (List Identifier length: 1 byte) is the Extended Copy found in SPC-2
+   and SPC-3 */
+static const struct value_name_pair tpc_out_arr[] = {
+	{0x0, "Extended copy(LID1)"},
+	{0x1, "Extended copy(LID4)"},
+	{0x10, "Populate token"},
+	{0x11, "Write using token"},
+	{0x1c, "Copy operation abort"},
+};
+#define TPC_OUT_SZ ARRAY_SIZE(tpc_out_arr)
+
+static const struct value_name_pair tpc_in_arr[] = {
+	{0x0, "Receive copy status(LID1)"},
+	{0x1, "Receive copy data(LID1)"},
+	{0x3, "Receive copy operating parameters"},
+	{0x4, "Receive copy failure details(LID1)"},
+	{0x5, "Receive copy status(LID4)"},
+	{0x6, "Receive copy data(LID4)"},
+	{0x7, "Receive ROD token information"},
+	{0x8, "Report all ROD tokens"},
+};
+#define TPC_IN_SZ ARRAY_SIZE(tpc_in_arr)
+
+static const struct value_name_pair variable_length_arr[] = {
+	{0x1, "Rebuild(32)"},
+	{0x2, "Regenerate(32)"},
+	{0x3, "Xdread(32)"},
+	{0x4, "Xdwrite(32)"},
+	{0x5, "Xdwrite extended(32)"},
+	{0x6, "Xpwrite(32)"},
+	{0x7, "Xdwriteread(32)"},
+	{0x8, "Xdwrite extended(64)"},
+	{0x9, "Read(32)"},
+	{0xa, "Verify(32)"},
+	{0xb, "Write(32)"},
+	{0xc, "Write an verify(32)"},
+	{0xd, "Write same(32)"},
+	{0x8801, "Format OSD"},
+	{0x8802, "Create (osd)"},
+	{0x8803, "List (osd)"},
+	{0x8805, "Read (osd)"},
+	{0x8806, "Write (osd)"},
+	{0x8807, "Append (osd)"},
+	{0x8808, "Flush (osd)"},
+	{0x880a, "Remove (osd)"},
+	{0x880b, "Create partition (osd)"},
+	{0x880c, "Remove partition (osd)"},
+	{0x880e, "Get attributes (osd)"},
+	{0x880f, "Set attributes (osd)"},
+	{0x8812, "Create and write (osd)"},
+	{0x8815, "Create collection (osd)"},
+	{0x8816, "Remove collection (osd)"},
+	{0x8817, "List collection (osd)"},
+	{0x8818, "Set key (osd)"},
+	{0x8819, "Set master key (osd)"},
+	{0x881a, "Flush collection (osd)"},
+	{0x881b, "Flush partition (osd)"},
+	{0x881c, "Flush OSD"},
+	{0x8f7e, "Perform SCSI command (osd)"},
+	{0x8f7f, "Perform task management function (osd)"},
+};
+#define VARIABLE_LENGTH_SZ ARRAY_SIZE(variable_length_arr)
+
+struct sa_name_list {
+	int cmd;
+	const struct value_name_pair *arr;
+	int arr_sz;
+};
+
+static struct sa_name_list sa_names_arr[] = {
+	{VARIABLE_LENGTH_CMD, variable_length_arr, VARIABLE_LENGTH_SZ},
+	{MAINTENANCE_IN, maint_in_arr, MAINT_IN_SZ},
+	{MAINTENANCE_OUT, maint_out_arr, MAINT_OUT_SZ},
+	{PERSISTENT_RESERVE_IN, pr_in_arr, PR_IN_SZ},
+	{PERSISTENT_RESERVE_OUT, pr_out_arr, PR_OUT_SZ},
+	{SERVICE_ACTION_IN_12, serv_in12_arr, SERV_IN12_SZ},
+	{SERVICE_ACTION_OUT_12, serv_out12_arr, SERV_OUT12_SZ},
+	{SERVICE_ACTION_BIDIRECTIONAL, serv_bidi_arr, SERV_BIDI_SZ},
+	{SERVICE_ACTION_IN_16, serv_in16_arr, SERV_IN16_SZ},
+	{SERVICE_ACTION_OUT_16, serv_out16_arr, SERV_OUT16_SZ},
+	{THIRD_PARTY_COPY_IN, tpc_in_arr, TPC_IN_SZ},
+	{THIRD_PARTY_COPY_OUT, tpc_out_arr, TPC_OUT_SZ},
+	{0, NULL, 0},
+};
+#define SA_NAME_LIST_SZ ARRAY_SIZE(sa_names_arr)
+
+static int scsi_opcode_sa_name(int cmd, int service_action,
+			       const char **sa_name)
+{
+	struct sa_name_list *sa_name_ptr = sa_names_arr;
+	const struct value_name_pair *arr = NULL;
+	int arr_sz, k;
+
+	for (k = 0; k < SA_NAME_LIST_SZ; ++k, ++sa_name_ptr) {
+		if (sa_name_ptr->cmd == cmd) {
+			arr = sa_name_ptr->arr;
+			arr_sz = sa_name_ptr->arr_sz;
+			break;
+		}
+	}
+	if (!arr)
+		return 0;
+
+	for (k = 0; k < arr_sz; ++k, ++arr) {
+		if (service_action == arr->value)
+			break;
+	}
+	if (k < arr_sz)
+		*sa_name = arr->name;
+
+	return 1;
+}
+#else
+static int scsi_opcode_sa_name(int cmd, int service_action,
+			       const char **sa_name)
+{
+	switch (cmd) {
+	case VARIABLE_LENGTH_CMD:
+	case MAINTENANCE_IN:
+	case MAINTENANCE_OUT:
+	case PERSISTENT_RESERVE_IN:
+	case PERSISTENT_RESERVE_OUT:
+	case SERVICE_ACTION_IN_12:
+	case SERVICE_ACTION_OUT_12:
+	case SERVICE_ACTION_BIDIRECTIONAL:
+	case SERVICE_ACTION_IN_16:
+	case SERVICE_ACTION_OUT_16:
+	case THIRD_PARTY_COPY_IN:
+	case THIRD_PARTY_COPY_OUT:
+		return 1;
+	}
+	return 0;
+}
+#endif /* CONFIG_SCSI_CONSTANTS */
+
+const char *
+output_all_bytes(struct trace_seq *p, unsigned char *cdbp, int cdb_len)
+{
+	const char *ret = p->buffer + p->len;
+	int i;
+
+	if (!cdb_len)
+		cdb_len = scsi_command_size(cdbp);
+
+	for (i = 0; i < cdb_len; ++i)
+		trace_seq_printf(p, "%02x", cdbp[i]);
+
+	trace_seq_putc(p, 0);
+	return ret;
+}
+
+const char *
+print_opcode_name(struct trace_seq *p, unsigned char *cdbp, int cdb_len,
+		  bool output_raw, int raw_len)
+{
+	int sa, cdb0, sa_valid;
+	const char *cdb_name = NULL, *sa_name = NULL;
+	const char *cdb_classifier = NULL;
+	const char *ret = p->buffer + p->len;
+
+	cdb0 = cdbp[0];
+	if (cdb0 == VARIABLE_LENGTH_CMD) {
+#ifdef CONFIG_SCSI_CONSTANTS
+		const struct value_name_pair *arr = NULL;
+		int k;
+#endif
+		int len;
+
+		len = scsi_varlen_cdb_length(cdbp);
+		if (len < 10) {
+			trace_seq_printf(p, "short variable length command, "
+					 "len=%d ext_len=%d", len, cdb_len);
+			goto out;
+		}
+		sa = (cdbp[8] << 8) + cdbp[9];
+#ifdef CONFIG_SCSI_CONSTANTS
+		arr = variable_length_arr;
+		for (k = 0; k < VARIABLE_LENGTH_SZ; ++k, ++arr) {
+			if (sa == arr->value) {
+				sa_name = arr->name;
+				break;
+			}
+		}
+#endif
+		if (sa_name)
+			trace_seq_printf(p, "CDB (%s, in_cdb_len=%d, "
+					 "ext_len=%d)", sa_name, len, cdb_len);
+		else
+			trace_seq_printf(p, "CDB (cdb[0]=0x%x, sa=0x%x, "
+					 "in_cdb_len=%d, ext_len=%d)",
+					 cdb0, sa, len, cdb_len);
+		goto out;
+	}
+
+	if (cdb0 < 0xc0) {
+		cdb_classifier = NULL;
+#ifdef CONFIG_SCSI_CONSTANTS
+		cdb_name = cdb_byte0_names[cdb0];
+		if (!cdb_name)
+			cdb_classifier = " (reserved)";
+#endif
+	} else
+		cdb_classifier = " (vendor)";
+
+	sa = cdbp[1] & 0x1f;
+	sa_valid = scsi_opcode_sa_name(cdb0, sa, &sa_name);
+
+	if (!sa_valid) {
+		if (cdb_name)
+			trace_seq_printf(p, "CDB (%s)", cdb_name);
+		else
+			trace_seq_printf(p, "CDB (cdb[0]=0x%x%s)",
+					 cdb0, cdb_classifier);
+	} else {
+		if (sa_name)
+			trace_seq_printf(p, "CDB (%s)", sa_name);
+		else if (cdb_name)
+			trace_seq_printf(p, "CDB (%s, sa=0x%x)", cdb_name, sa);
+		else
+			trace_seq_printf(p, "CDB (cdb[0]=0x%x, sa=0x%x)",
+					 cdb0, sa);
+	}
+
+out:
+	if (output_raw)
+		return output_all_bytes(p, cdbp, raw_len);
+	trace_seq_putc(p, 0);
+	return ret;
+}
+
+void __scsi_print_command(struct scsi_device *sdev, const char *prefix,
+			  unsigned char *cdb, int cdb_len)
+{
+	trace_scsi_print_command(sdev, prefix, cdb, 0, true, cdb_len);
+}
+EXPORT_SYMBOL(__scsi_print_command);
+
+void scsi_print_command(struct scsi_cmnd *cmd)
+{
+	const char *devname = cmd->request->rq_disk ?
+		cmd->request->rq_disk->disk_name : "scsi";
+
+	if (cmd->cmnd == NULL)
+		return;
+
+	trace_scsi_print_command(cmd->device, devname, cmd->cmnd,
+				 cmd->cmd_len, false, 0);
+}
+EXPORT_SYMBOL(scsi_print_command);
+
 static const char *
 scsi_dump_sense_buffer(struct trace_seq *p, const unsigned char *buf, int len)
 {
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 54ebf54..1680135 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -207,10 +207,16 @@ struct scsi_varlen_cdb_hdr {
 	/* service specific data follows */
 };
 
+static inline unsigned __scsi_varlen_cdb_length(u8 additional_cdb_length)
+{
+	return additional_cdb_length + 8;
+}
+
 static inline unsigned
 scsi_varlen_cdb_length(const void *hdr)
 {
-	return ((struct scsi_varlen_cdb_hdr *)hdr)->additional_cdb_length + 8;
+	return __scsi_varlen_cdb_length(
+		((struct scsi_varlen_cdb_hdr *)hdr)->additional_cdb_length);
 }
 
 extern const unsigned char scsi_command_size_tbl[8];
diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
index 6d3543f..c50bade 100644
--- a/include/trace/events/scsi.h
+++ b/include/trace/events/scsi.h
@@ -449,6 +449,51 @@ TRACE_EVENT(scsi_print_sense,
 		  __entry->sense_len,  __entry->raw),
 		  __extd_sense(__entry->asc, __entry->ascq))
 );
+
+const char *
+print_opcode_name(struct trace_seq*, unsigned char*, int, bool, int);
+#define __opcode_name(cdbp, cdb_len, output_raw, raw_len)	\
+			print_opcode_name(p, cdbp, cdb_len, output_raw, raw_len)
+
+TRACE_EVENT(scsi_print_command,
+
+	TP_PROTO(struct scsi_device *sdev, const char *devname,
+		 unsigned char *cdbp, int cdb_len, bool output_raw,
+		 int raw_len),
+
+	TP_ARGS(sdev, devname, cdbp, cdb_len, output_raw, raw_len),
+
+	TP_STRUCT__entry(
+		__field( unsigned int,		host_no		)
+		__field( unsigned int,		channel		)
+		__field( unsigned int,		id		)
+		__field( unsigned int,		lun		)
+		__string(devname,		devname		)
+		__dynamic_array(unsigned char,	cdbp,
+				cdb_len ? cdb_len : scsi_command_size(cdbp))
+		__field( int,			cdb_len		)
+		__field( bool,			output_raw	)
+		__field( int,			raw_len		)
+	),
+
+	TP_fast_assign(
+		__entry->host_no	= sdev->host->host_no;
+		__entry->channel	= sdev->channel;
+		__entry->id		= sdev->id;
+		__entry->lun		= sdev->lun;
+		__assign_str(devname, devname);
+		memcpy(__get_dynamic_array(cdbp), cdbp,
+		       cdb_len ? cdb_len : scsi_command_size(cdbp));
+		__entry->cdb_len	= cdb_len;
+		__entry->output_raw	= output_raw;
+		__entry->raw_len	= raw_len;
+	),
+
+	TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] %s",
+		  __entry->host_no, __entry->channel, __entry->id, __entry->lun,
+		  __get_str(devname), __opcode_name(__get_dynamic_array(cdbp),
+		  __entry->cdb_len, __entry->output_raw, __entry->raw_len))
+);
 #endif /*  _TRACE_SCSI_H */
 
 /* This part must be outside protection */

Re: [RFC PATCH 10/10] scsi/trace: Use scsi_print_command trace point instead of printk

[Hannes Reinecke]

On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
> Previous printk messages of SCSI command can be mixed into other printk
> messages because multiple printk messages are output for it. To avoid the
> problem, patch 4e64bb8d6 in Hannes' branch(*1) introduced a local buffer.
> But using local buffers can induce stack overflow, so we want to solve the
> problem without local buffer if possible.
>
> trace_seq_printf can add log messages without local buffer, so we use it.
>
> Note:
> We don't need constans.c any more.
>
> (*1) http://git.kernel.org/cgit/linux/kernel/git/hare/scsi-devel.git/log/?h=logging
>
>   - Result examples
>
> <Before> (printk)
> sd 2:0:0:0: [sda] CDB: Read(10)
>
> <After>
> scsi_print_command: host_no=2 channel=0 id=0 lun=0 [sda] CDB (Read(10))
>
> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Doug Gilbert <dgilbert@interlog.com>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>   drivers/scsi/Makefile       |    2
>   drivers/scsi/constants.c    |  425 -------------------------------------------
>   drivers/scsi/scsi_trace.c   |  408 +++++++++++++++++++++++++++++++++++++++++
>   include/scsi/scsi.h         |    8 +
>   include/trace/events/scsi.h |   45 +++++
>   5 files changed, 461 insertions(+), 427 deletions(-)
>   delete mode 100644 drivers/scsi/constants.c
>
> diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
> index 5f0d299..c56f692 100644
> --- a/drivers/scsi/Makefile
> +++ b/drivers/scsi/Makefile
> @@ -158,7 +158,7 @@ obj-$(CONFIG_SCSI_OSD_INITIATOR) += osd/
>   # This goes last, so that "real" scsi devices probe earlier
>   obj-$(CONFIG_SCSI_DEBUG)	+= scsi_debug.o
>
> -scsi_mod-y			+= scsi.o hosts.o scsi_ioctl.o constants.o \
> +scsi_mod-y			+= scsi.o hosts.o scsi_ioctl.o \
>   				   scsicam.o scsi_error.o scsi_lib.o
>   scsi_mod-$(CONFIG_SCSI_DMA)	+= scsi_lib_dma.o
>   scsi_mod-y			+= scsi_scan.o scsi_sysfs.o scsi_devinfo.o
> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
> deleted file mode 100644
> index ce9ceb8..0000000
> --- a/drivers/scsi/constants.c
> +++ /dev/null
> @@ -1,425 +0,0 @@
> -/*
> - * ASCII values for a number of symbolic constants, printing functions,
> - * etc.
> - * Additions for SCSI 2 and Linux 2.2.x by D. Gilbert (990422)
> - * Additions for SCSI 3+ (SPC-3 T10/1416-D Rev 07 3 May 2002)
> - *   by D. Gilbert and aeb (20020609)
> - * Updated to SPC-4 T10/1713-D Rev 36g, D. Gilbert 20130701
> - */
> -
> -#include <linux/blkdev.h>
> -#include <linux/module.h>
> -#include <linux/kernel.h>
> -#include <asm/unaligned.h>
> -
> -#include <scsi/scsi.h>
> -#include <scsi/scsi_cmnd.h>
> -
> -/* Commands with service actions that change the command name */
> -#define SERVICE_ACTION_IN_12 0xab
> -#define SERVICE_ACTION_OUT_12 0xa9
> -#define SERVICE_ACTION_BIDIRECTIONAL 0x9d
> -#define SERVICE_ACTION_IN_16 0x9e
> -#define SERVICE_ACTION_OUT_16 0x9f
> -#define THIRD_PARTY_COPY_OUT 0x83
> -#define THIRD_PARTY_COPY_IN 0x84
> -
> -
> -
> -#ifdef CONFIG_SCSI_CONSTANTS
> -static const char * cdb_byte0_names[] = {
> -/* 00-03 */ "Test Unit Ready", "Rezero Unit/Rewind", NULL, "Request Sense",
> -/* 04-07 */ "Format Unit/Medium", "Read Block Limits", NULL,
> -	    "Reassign Blocks",
> -/* 08-0d */ "Read(6)", NULL, "Write(6)", "Seek(6)", NULL, NULL,
> -/* 0e-12 */ NULL, "Read Reverse", "Write Filemarks", "Space", "Inquiry",
> -/* 13-16 */ "Verify(6)", "Recover Buffered Data", "Mode Select(6)",
> -	    "Reserve(6)",
> -/* 17-1a */ "Release(6)", "Copy", "Erase", "Mode Sense(6)",
> -/* 1b-1d */ "Start/Stop Unit", "Receive Diagnostic", "Send Diagnostic",
> -/* 1e-1f */ "Prevent/Allow Medium Removal", NULL,
> -/* 20-22 */  NULL, NULL, NULL,
> -/* 23-28 */ "Read Format Capacities", "Set Window",
> -	    "Read Capacity(10)", NULL, NULL, "Read(10)",
> -/* 29-2d */ "Read Generation", "Write(10)", "Seek(10)", "Erase(10)",
> -            "Read updated block",
> -/* 2e-31 */ "Write Verify(10)", "Verify(10)", "Search High", "Search Equal",
> -/* 32-34 */ "Search Low", "Set Limits", "Prefetch/Read Position",
> -/* 35-37 */ "Synchronize Cache(10)", "Lock/Unlock Cache(10)",
> -	    "Read Defect Data(10)",
> -/* 38-3c */ "Medium Scan", "Compare", "Copy Verify", "Write Buffer",
> -	    "Read Buffer",
> -/* 3d-3f */ "Update Block", "Read Long(10)",  "Write Long(10)",
> -/* 40-41 */ "Change Definition", "Write Same(10)",
> -/* 42-48 */ "Unmap/Read sub-channel", "Read TOC/PMA/ATIP",
> -	    "Read density support", "Play audio(10)", "Get configuration",
> -	    "Play audio msf", "Sanitize/Play audio track/index",
> -/* 49-4f */ "Play track relative(10)", "Get event status notification",
> -            "Pause/resume", "Log Select", "Log Sense", "Stop play/scan",
> -            NULL,
> -/* 50-55 */ "Xdwrite", "Xpwrite, Read disk info", "Xdread, Read track info",
> -            "Reserve track", "Send OPC info", "Mode Select(10)",
> -/* 56-5b */ "Reserve(10)", "Release(10)", "Repair track", "Read master cue",
> -            "Mode Sense(10)", "Close track/session",
> -/* 5c-5f */ "Read buffer capacity", "Send cue sheet", "Persistent reserve in",
> -            "Persistent reserve out",
> -/* 60-67 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
> -/* 68-6f */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
> -/* 70-77 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
> -/* 78-7f */ NULL, NULL, NULL, NULL, NULL, NULL, "Extended CDB",
> -	    "Variable length",
> -/* 80-84 */ "Xdwrite(16)", "Rebuild(16)", "Regenerate(16)",
> -	    "Third party copy out", "Third party copy in",
> -/* 85-89 */ "ATA command pass through(16)", "Access control in",
> -	    "Access control out", "Read(16)", "Compare and Write",
> -/* 8a-8f */ "Write(16)", "ORWrite", "Read attributes", "Write attributes",
> -            "Write and verify(16)", "Verify(16)",
> -/* 90-94 */ "Pre-fetch(16)", "Synchronize cache(16)",
> -            "Lock/unlock cache(16)", "Write same(16)", NULL,
> -/* 95-99 */ NULL, NULL, NULL, NULL, NULL,
> -/* 9a-9f */ NULL, NULL, NULL, "Service action bidirectional",
> -	    "Service action in(16)", "Service action out(16)",
> -/* a0-a5 */ "Report luns", "ATA command pass through(12)/Blank",
> -            "Security protocol in", "Maintenance in", "Maintenance out",
> -	    "Move medium/play audio(12)",
> -/* a6-a9 */ "Exchange medium", "Move medium attached", "Read(12)",
> -            "Play track relative(12)",
> -/* aa-ae */ "Write(12)", NULL, "Erase(12), Get Performance",
> -            "Read DVD structure", "Write and verify(12)",
> -/* af-b1 */ "Verify(12)", "Search data high(12)", "Search data equal(12)",
> -/* b2-b4 */ "Search data low(12)", "Set limits(12)",
> -            "Read element status attached",
> -/* b5-b6 */ "Security protocol out", "Send volume tag, set streaming",
> -/* b7-b9 */ "Read defect data(12)", "Read element status", "Read CD msf",
> -/* ba-bc */ "Redundancy group (in), Scan",
> -            "Redundancy group (out), Set cd-rom speed", "Spare (in), Play cd",
> -/* bd-bf */ "Spare (out), Mechanism status", "Volume set (in), Read cd",
> -            "Volume set (out), Send DVD structure",
> -};
> -
> -struct value_name_pair {
> -	int value;
> -	const char * name;
> -};
> -
> -static const struct value_name_pair maint_in_arr[] = {
> -	{0x5, "Report identifying information"},
> -	{0xa, "Report target port groups"},
> -	{0xb, "Report aliases"},
> -	{0xc, "Report supported operation codes"},
> -	{0xd, "Report supported task management functions"},
> -	{0xe, "Report priority"},
> -	{0xf, "Report timestamp"},
> -	{0x10, "Management protocol in"},
> -};
> -#define MAINT_IN_SZ ARRAY_SIZE(maint_in_arr)
> -
> -static const struct value_name_pair maint_out_arr[] = {
> -	{0x6, "Set identifying information"},
> -	{0xa, "Set target port groups"},
> -	{0xb, "Change aliases"},
> -	{0xc, "Remove I_T nexus"},
> -	{0xe, "Set priority"},
> -	{0xf, "Set timestamp"},
> -	{0x10, "Management protocol out"},
> -};
> -#define MAINT_OUT_SZ ARRAY_SIZE(maint_out_arr)
> -
> -static const struct value_name_pair serv_in12_arr[] = {
> -	{0x1, "Read media serial number"},
> -};
> -#define SERV_IN12_SZ ARRAY_SIZE(serv_in12_arr)
> -
> -static const struct value_name_pair serv_out12_arr[] = {
> -	{-1, "dummy entry"},
> -};
> -#define SERV_OUT12_SZ ARRAY_SIZE(serv_out12_arr)
> -
> -static const struct value_name_pair serv_bidi_arr[] = {
> -	{-1, "dummy entry"},
> -};
> -#define SERV_BIDI_SZ ARRAY_SIZE(serv_bidi_arr)
> -
> -static const struct value_name_pair serv_in16_arr[] = {
> -	{0x10, "Read capacity(16)"},
> -	{0x11, "Read long(16)"},
> -	{0x12, "Get LBA status"},
> -	{0x13, "Report referrals"},
> -};
> -#define SERV_IN16_SZ ARRAY_SIZE(serv_in16_arr)
> -
> -static const struct value_name_pair serv_out16_arr[] = {
> -	{0x11, "Write long(16)"},
> -	{0x1f, "Notify data transfer device(16)"},
> -};
> -#define SERV_OUT16_SZ ARRAY_SIZE(serv_out16_arr)
> -
> -static const struct value_name_pair pr_in_arr[] = {
> -	{0x0, "Persistent reserve in, read keys"},
> -	{0x1, "Persistent reserve in, read reservation"},
> -	{0x2, "Persistent reserve in, report capabilities"},
> -	{0x3, "Persistent reserve in, read full status"},
> -};
> -#define PR_IN_SZ ARRAY_SIZE(pr_in_arr)
> -
> -static const struct value_name_pair pr_out_arr[] = {
> -	{0x0, "Persistent reserve out, register"},
> -	{0x1, "Persistent reserve out, reserve"},
> -	{0x2, "Persistent reserve out, release"},
> -	{0x3, "Persistent reserve out, clear"},
> -	{0x4, "Persistent reserve out, preempt"},
> -	{0x5, "Persistent reserve out, preempt and abort"},
> -	{0x6, "Persistent reserve out, register and ignore existing key"},
> -	{0x7, "Persistent reserve out, register and move"},
> -};
> -#define PR_OUT_SZ ARRAY_SIZE(pr_out_arr)
> -
> -/* SPC-4 rev 34 renamed the Extended Copy opcode to Third Party Copy Out.
> -   LID1 (List Identifier length: 1 byte) is the Extended Copy found in SPC-2
> -   and SPC-3 */
> -static const struct value_name_pair tpc_out_arr[] = {
> -	{0x0, "Extended copy(LID1)"},
> -	{0x1, "Extended copy(LID4)"},
> -	{0x10, "Populate token"},
> -	{0x11, "Write using token"},
> -	{0x1c, "Copy operation abort"},
> -};
> -#define TPC_OUT_SZ ARRAY_SIZE(tpc_out_arr)
> -
> -static const struct value_name_pair tpc_in_arr[] = {
> -	{0x0, "Receive copy status(LID1)"},
> -	{0x1, "Receive copy data(LID1)"},
> -	{0x3, "Receive copy operating parameters"},
> -	{0x4, "Receive copy failure details(LID1)"},
> -	{0x5, "Receive copy status(LID4)"},
> -	{0x6, "Receive copy data(LID4)"},
> -	{0x7, "Receive ROD token information"},
> -	{0x8, "Report all ROD tokens"},
> -};
> -#define TPC_IN_SZ ARRAY_SIZE(tpc_in_arr)
> -
> -
> -static const struct value_name_pair variable_length_arr[] = {
> -	{0x1, "Rebuild(32)"},
> -	{0x2, "Regenerate(32)"},
> -	{0x3, "Xdread(32)"},
> -	{0x4, "Xdwrite(32)"},
> -	{0x5, "Xdwrite extended(32)"},
> -	{0x6, "Xpwrite(32)"},
> -	{0x7, "Xdwriteread(32)"},
> -	{0x8, "Xdwrite extended(64)"},
> -	{0x9, "Read(32)"},
> -	{0xa, "Verify(32)"},
> -	{0xb, "Write(32)"},
> -	{0xc, "Write an verify(32)"},
> -	{0xd, "Write same(32)"},
> -	{0x8801, "Format OSD"},
> -	{0x8802, "Create (osd)"},
> -	{0x8803, "List (osd)"},
> -	{0x8805, "Read (osd)"},
> -	{0x8806, "Write (osd)"},
> -	{0x8807, "Append (osd)"},
> -	{0x8808, "Flush (osd)"},
> -	{0x880a, "Remove (osd)"},
> -	{0x880b, "Create partition (osd)"},
> -	{0x880c, "Remove partition (osd)"},
> -	{0x880e, "Get attributes (osd)"},
> -	{0x880f, "Set attributes (osd)"},
> -	{0x8812, "Create and write (osd)"},
> -	{0x8815, "Create collection (osd)"},
> -	{0x8816, "Remove collection (osd)"},
> -	{0x8817, "List collection (osd)"},
> -	{0x8818, "Set key (osd)"},
> -	{0x8819, "Set master key (osd)"},
> -	{0x881a, "Flush collection (osd)"},
> -	{0x881b, "Flush partition (osd)"},
> -	{0x881c, "Flush OSD"},
> -	{0x8f7e, "Perform SCSI command (osd)"},
> -	{0x8f7f, "Perform task management function (osd)"},
> -};
> -#define VARIABLE_LENGTH_SZ ARRAY_SIZE(variable_length_arr)
> -
> -struct sa_name_list {
> -	int cmd;
> -	const struct value_name_pair *arr;
> -	int arr_sz;
> -};
> -
> -static struct sa_name_list sa_names_arr[] = {
> -	{VARIABLE_LENGTH_CMD, variable_length_arr, VARIABLE_LENGTH_SZ},
> -	{MAINTENANCE_IN, maint_in_arr, MAINT_IN_SZ},
> -	{MAINTENANCE_OUT, maint_out_arr, MAINT_OUT_SZ},
> -	{PERSISTENT_RESERVE_IN, pr_in_arr, PR_IN_SZ},
> -	{PERSISTENT_RESERVE_OUT, pr_out_arr, PR_OUT_SZ},
> -	{SERVICE_ACTION_IN_12, serv_in12_arr, SERV_IN12_SZ},
> -	{SERVICE_ACTION_OUT_12, serv_out12_arr, SERV_OUT12_SZ},
> -	{SERVICE_ACTION_BIDIRECTIONAL, serv_bidi_arr, SERV_BIDI_SZ},
> -	{SERVICE_ACTION_IN_16, serv_in16_arr, SERV_IN16_SZ},
> -	{SERVICE_ACTION_OUT_16, serv_out16_arr, SERV_OUT16_SZ},
> -	{THIRD_PARTY_COPY_IN, tpc_in_arr, TPC_IN_SZ},
> -	{THIRD_PARTY_COPY_OUT, tpc_out_arr, TPC_OUT_SZ},
> -	{0, NULL, 0},
> -};
> -#define SA_NAME_LIST_SZ ARRAY_SIZE(sa_names_arr)
> -
> -static int scsi_opcode_sa_name(int cmd, int service_action,
> -			       const char **sa_name)
> -{
> -	struct sa_name_list *sa_name_ptr = sa_names_arr;
> -	const struct value_name_pair * arr = NULL;
> -	int arr_sz, k;
> -
> -	for (k = 0; k < SA_NAME_LIST_SZ; ++k, ++sa_name_ptr) {
> -		if (sa_name_ptr->cmd == cmd) {
> -			arr = sa_name_ptr->arr;
> -			arr_sz = sa_name_ptr->arr_sz;
> -			break;
> -		}
> -	}
> -	if (!arr)
> -		return 0;
> -
> -	for (k = 0; k < arr_sz; ++k, ++arr) {
> -		if (service_action == arr->value)
> -			break;
> -	}
> -	if (k < arr_sz)
> -		*sa_name = arr->name;
> -
> -	return 1;
> -}
> -#else
> -static int scsi_opcode_sa_name(int cmd, int service_action,
> -			       const char **sa_name)
> -{
> -	switch (cmd) {
> -	case VARIABLE_LENGTH_CMD:
> -	case MAINTENANCE_IN:
> -	case MAINTENANCE_OUT:
> -	case PERSISTENT_RESERVE_IN:
> -	case PERSISTENT_RESERVE_OUT:
> -	case SERVICE_ACTION_IN_12:
> -	case SERVICE_ACTION_OUT_12:
> -	case SERVICE_ACTION_BIDIRECTIONAL:
> -	case SERVICE_ACTION_IN_16:
> -	case SERVICE_ACTION_OUT_16:
> -	case THIRD_PARTY_COPY_IN:
> -	case THIRD_PARTY_COPY_OUT:
> -		return 1;
> -	}
> -	return 0;
> -}
> -#endif /* CONFIG_SCSI_CONSTANTS */
> -
> -/* attempt to guess cdb length if cdb_len==0 . No trailing linefeed. */
> -static void print_opcode_name(struct scsi_device *sdev, const char *prefix,
> -			      unsigned char * cdbp, int cdb_len)
> -{
> -	int sa, cdb0, sa_valid;
> -	const char * cdb_name = NULL, *sa_name = NULL;
> -	const char * cdb_classifier = NULL;
> -
> -	cdb0 = cdbp[0];
> -	if (cdb0 == VARIABLE_LENGTH_CMD) {
> -#ifdef CONFIG_SCSI_CONSTANTS
> -		const struct value_name_pair * arr = NULL;
> -		int k;
> -#endif
> -		int len;
> -
> -		len = scsi_varlen_cdb_length(cdbp);
> -		if (len < 10) {
> -			sdev_printk(KERN_INFO, sdev,
> -				    "short variable length command, "
> -				    "len=%d ext_len=%d", len, cdb_len);
> -			return;
> -		}
> -		sa = (cdbp[8] << 8) + cdbp[9];
> -#ifdef CONFIG_SCSI_CONSTANTS
> -		arr = variable_length_arr;
> -		for (k = 0; k < VARIABLE_LENGTH_SZ; ++k, ++arr) {
> -			if (sa == arr->value) {
> -				sa_name = arr->name;
> -				break;
> -			}
> -		}
> -#endif
> -		if (sa_name)
> -			sdev_printk(KERN_INFO, sdev,
> -				    "[%s] CDB: %s, in_cdb_len=%d, ext_len=%d",
> -				    prefix, sa_name, len, cdb_len);
> -		else
> -			sdev_printk(KERN_INFO, sdev,
> -				    "[%s] CDB: cdb[0]=0x%x, sa=0x%x, "
> -				    "in_cdb_len=%d, ext_len=%d",
> -				    prefix, cdb0, sa, len, cdb_len);
> -		return;
> -	}
> -
> -	if (cdb0 < 0xc0) {
> -		cdb_classifier = NULL;
> -#ifdef CONFIG_SCSI_CONSTANTS
> -		cdb_name = cdb_byte0_names[cdb0];
> -		if (!cdb_name)
> -			cdb_classifier = " (reserved)";
> -#endif
> -	} else
> -		cdb_classifier = " (vendor)";
> -
> -	sa = cdbp[1] & 0x1f;
> -	sa_valid = scsi_opcode_sa_name(cdb0, sa, &sa_name);
> -
> -	if (!sa_valid) {
> -		if (cdb_name)
> -			sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s",
> -				    prefix, cdb_name);
> -		else
> -			sdev_printk(KERN_INFO, sdev, "[%s] CDB: cdb[0]=0x%x%s",
> -				    prefix, cdb0, cdb_classifier );
> -	} else {
> -		if (sa_name)
> -			sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s",
> -				    prefix, sa_name);
> -		else if (cdb_name)
> -			sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s, sa=0x%x",
> -				    prefix, cdb_name, sa);
> -		else
> -			sdev_printk(KERN_INFO, sdev,
> -				    "[%s] CDB: cdb[0]=0x%x, sa=0x%x",
> -				    prefix, cdb0, sa);
> -	}
> -}
> -
> -void __scsi_print_command(struct scsi_device *sdev, const char *prefix,
> -			  unsigned char *cdb, int cdb_len)
> -{
> -	char linebuf[128];
> -	int i, linelen, remaining;
> -
> -	print_opcode_name(sdev, prefix, cdb, 0);
> -	if (!cdb_len)
> -		cdb_len = scsi_command_size(cdb);
> -	/* print out all bytes in cdb */
> -	remaining = cdb_len;
> -	for (i = 0; i < cdb_len; i += 16) {
> -		linelen = min(remaining, 16);
> -		remaining -= 16;
> -
> -		hex_dump_to_buffer(cdb + i, linelen, 16, 1,
> -				   linebuf, sizeof(linebuf), false);
> -	}
> -	sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s\n", prefix, linebuf);
> -}
> -EXPORT_SYMBOL(__scsi_print_command);
> -
> -void scsi_print_command(struct scsi_cmnd *cmd)
> -{
> -	const char *devname = cmd->request->rq_disk ?
> -		cmd->request->rq_disk->disk_name : "scsi";
> -
> -	if (cmd->cmnd == NULL)
> -		return;
> -
> -	print_opcode_name(cmd->device, devname, cmd->cmnd, cmd->cmd_len);
> -}
> -EXPORT_SYMBOL(scsi_print_command);
> diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
> index 60678d8..6761077 100644
> --- a/drivers/scsi/scsi_trace.c
> +++ b/drivers/scsi/scsi_trace.c
> @@ -1237,6 +1237,414 @@ scsi_print_sense_hdr(struct scsi_device *sdev, const char *name,
>   }
>   EXPORT_SYMBOL(scsi_print_sense_hdr);
>
> +/* Commands with service actions that change the command name */
> +#define SERVICE_ACTION_IN_12 0xab
> +#define SERVICE_ACTION_OUT_12 0xa9
> +#define SERVICE_ACTION_BIDIRECTIONAL 0x9d
> +#define SERVICE_ACTION_IN_16 0x9e
> +#define SERVICE_ACTION_OUT_16 0x9f
> +#define THIRD_PARTY_COPY_OUT 0x83
> +#define THIRD_PARTY_COPY_IN 0x84
> +
> +#ifdef CONFIG_SCSI_CONSTANTS
> +static const char *cdb_byte0_names[] = {
> +/* 00-03 */ "Test Unit Ready", "Rezero Unit/Rewind", NULL, "Request Sense",
> +/* 04-07 */ "Format Unit/Medium", "Read Block Limits", NULL,
> +	    "Reassign Blocks",
> +/* 08-0d */ "Read(6)", NULL, "Write(6)", "Seek(6)", NULL, NULL,
> +/* 0e-12 */ NULL, "Read Reverse", "Write Filemarks", "Space", "Inquiry",
> +/* 13-16 */ "Verify(6)", "Recover Buffered Data", "Mode Select(6)",
> +	    "Reserve(6)",
> +/* 17-1a */ "Release(6)", "Copy", "Erase", "Mode Sense(6)",
> +/* 1b-1d */ "Start/Stop Unit", "Receive Diagnostic", "Send Diagnostic",
> +/* 1e-1f */ "Prevent/Allow Medium Removal", NULL,
> +/* 20-22 */  NULL, NULL, NULL,
> +/* 23-28 */ "Read Format Capacities", "Set Window",
> +	    "Read Capacity(10)", NULL, NULL, "Read(10)",
> +/* 29-2d */ "Read Generation", "Write(10)", "Seek(10)", "Erase(10)",
> +	    "Read updated block",
> +/* 2e-31 */ "Write Verify(10)", "Verify(10)", "Search High", "Search Equal",
> +/* 32-34 */ "Search Low", "Set Limits", "Prefetch/Read Position",
> +/* 35-37 */ "Synchronize Cache(10)", "Lock/Unlock Cache(10)",
> +	    "Read Defect Data(10)",
> +/* 38-3c */ "Medium Scan", "Compare", "Copy Verify", "Write Buffer",
> +	    "Read Buffer",
> +/* 3d-3f */ "Update Block", "Read Long(10)",  "Write Long(10)",
> +/* 40-41 */ "Change Definition", "Write Same(10)",
> +/* 42-48 */ "Unmap/Read sub-channel", "Read TOC/PMA/ATIP",
> +	    "Read density support", "Play audio(10)", "Get configuration",
> +	    "Play audio msf", "Sanitize/Play audio track/index",
> +/* 49-4f */ "Play track relative(10)", "Get event status notification",
> +	    "Pause/resume", "Log Select", "Log Sense", "Stop play/scan",
> +	    NULL,
> +/* 50-55 */ "Xdwrite", "Xpwrite, Read disk info", "Xdread, Read track info",
> +	    "Reserve track", "Send OPC info", "Mode Select(10)",
> +/* 56-5b */ "Reserve(10)", "Release(10)", "Repair track", "Read master cue",
> +	    "Mode Sense(10)", "Close track/session",
> +/* 5c-5f */ "Read buffer capacity", "Send cue sheet", "Persistent reserve in",
> +	    "Persistent reserve out",
> +/* 60-67 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
> +/* 68-6f */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
> +/* 70-77 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
> +/* 78-7f */ NULL, NULL, NULL, NULL, NULL, NULL, "Extended CDB",
> +	    "Variable length",
> +/* 80-84 */ "Xdwrite(16)", "Rebuild(16)", "Regenerate(16)",
> +	    "Third party copy out", "Third party copy in",
> +/* 85-89 */ "ATA command pass through(16)", "Access control in",
> +	    "Access control out", "Read(16)", "Compare and Write",
> +/* 8a-8f */ "Write(16)", "ORWrite", "Read attributes", "Write attributes",
> +	    "Write and verify(16)", "Verify(16)",
> +/* 90-94 */ "Pre-fetch(16)", "Synchronize cache(16)",
> +	    "Lock/unlock cache(16)", "Write same(16)", NULL,
> +/* 95-99 */ NULL, NULL, NULL, NULL, NULL,
> +/* 9a-9f */ NULL, NULL, NULL, "Service action bidirectional",
> +	    "Service action in(16)", "Service action out(16)",
> +/* a0-a5 */ "Report luns", "ATA command pass through(12)/Blank",
> +	    "Security protocol in", "Maintenance in", "Maintenance out",
> +	    "Move medium/play audio(12)",
> +/* a6-a9 */ "Exchange medium", "Move medium attached", "Read(12)",
> +	    "Play track relative(12)",
> +/* aa-ae */ "Write(12)", NULL, "Erase(12), Get Performance",
> +	    "Read DVD structure", "Write and verify(12)",
> +/* af-b1 */ "Verify(12)", "Search data high(12)", "Search data equal(12)",
> +/* b2-b4 */ "Search data low(12)", "Set limits(12)",
> +	    "Read element status attached",
> +/* b5-b6 */ "Security protocol out", "Send volume tag, set streaming",
> +/* b7-b9 */ "Read defect data(12)", "Read element status", "Read CD msf",
> +/* ba-bc */ "Redundancy group (in), Scan",
> +	    "Redundancy group (out), Set cd-rom speed", "Spare (in), Play cd",
> +/* bd-bf */ "Spare (out), Mechanism status", "Volume set (in), Read cd",
> +	    "Volume set (out), Send DVD structure",
> +};
> +
> +struct value_name_pair {
> +	int value;
> +	const char *name;
> +};
> +
> +static const struct value_name_pair maint_in_arr[] = {
> +	{0x5, "Report identifying information"},
> +	{0xa, "Report target port groups"},
> +	{0xb, "Report aliases"},
> +	{0xc, "Report supported operation codes"},
> +	{0xd, "Report supported task management functions"},
> +	{0xe, "Report priority"},
> +	{0xf, "Report timestamp"},
> +	{0x10, "Management protocol in"},
> +};
> +#define MAINT_IN_SZ ARRAY_SIZE(maint_in_arr)
> +
> +static const struct value_name_pair maint_out_arr[] = {
> +	{0x6, "Set identifying information"},
> +	{0xa, "Set target port groups"},
> +	{0xb, "Change aliases"},
> +	{0xc, "Remove I_T nexus"},
> +	{0xe, "Set priority"},
> +	{0xf, "Set timestamp"},
> +	{0x10, "Management protocol out"},
> +};
> +#define MAINT_OUT_SZ ARRAY_SIZE(maint_out_arr)
> +
> +static const struct value_name_pair serv_in12_arr[] = {
> +	{0x1, "Read media serial number"},
> +};
> +#define SERV_IN12_SZ ARRAY_SIZE(serv_in12_arr)
> +
> +static const struct value_name_pair serv_out12_arr[] = {
> +	{-1, "dummy entry"},
> +};
> +#define SERV_OUT12_SZ ARRAY_SIZE(serv_out12_arr)
> +
> +static const struct value_name_pair serv_bidi_arr[] = {
> +	{-1, "dummy entry"},
> +};
> +#define SERV_BIDI_SZ ARRAY_SIZE(serv_bidi_arr)
> +
> +static const struct value_name_pair serv_in16_arr[] = {
> +	{0x10, "Read capacity(16)"},
> +	{0x11, "Read long(16)"},
> +	{0x12, "Get LBA status"},
> +	{0x13, "Report referrals"},
> +};
> +#define SERV_IN16_SZ ARRAY_SIZE(serv_in16_arr)
> +
> +static const struct value_name_pair serv_out16_arr[] = {
> +	{0x11, "Write long(16)"},
> +	{0x1f, "Notify data transfer device(16)"},
> +};
> +#define SERV_OUT16_SZ ARRAY_SIZE(serv_out16_arr)
> +
> +static const struct value_name_pair pr_in_arr[] = {
> +	{0x0, "Persistent reserve in, read keys"},
> +	{0x1, "Persistent reserve in, read reservation"},
> +	{0x2, "Persistent reserve in, report capabilities"},
> +	{0x3, "Persistent reserve in, read full status"},
> +};
> +#define PR_IN_SZ ARRAY_SIZE(pr_in_arr)
> +
> +static const struct value_name_pair pr_out_arr[] = {
> +	{0x0, "Persistent reserve out, register"},
> +	{0x1, "Persistent reserve out, reserve"},
> +	{0x2, "Persistent reserve out, release"},
> +	{0x3, "Persistent reserve out, clear"},
> +	{0x4, "Persistent reserve out, preempt"},
> +	{0x5, "Persistent reserve out, preempt and abort"},
> +	{0x6, "Persistent reserve out, register and ignore existing key"},
> +	{0x7, "Persistent reserve out, register and move"},
> +};
> +#define PR_OUT_SZ ARRAY_SIZE(pr_out_arr)
> +
> +/* SPC-4 rev 34 renamed the Extended Copy opcode to Third Party Copy Out.
> +   LID1 (List Identifier length: 1 byte) is the Extended Copy found in SPC-2
> +   and SPC-3 */
> +static const struct value_name_pair tpc_out_arr[] = {
> +	{0x0, "Extended copy(LID1)"},
> +	{0x1, "Extended copy(LID4)"},
> +	{0x10, "Populate token"},
> +	{0x11, "Write using token"},
> +	{0x1c, "Copy operation abort"},
> +};
> +#define TPC_OUT_SZ ARRAY_SIZE(tpc_out_arr)
> +
> +static const struct value_name_pair tpc_in_arr[] = {
> +	{0x0, "Receive copy status(LID1)"},
> +	{0x1, "Receive copy data(LID1)"},
> +	{0x3, "Receive copy operating parameters"},
> +	{0x4, "Receive copy failure details(LID1)"},
> +	{0x5, "Receive copy status(LID4)"},
> +	{0x6, "Receive copy data(LID4)"},
> +	{0x7, "Receive ROD token information"},
> +	{0x8, "Report all ROD tokens"},
> +};
> +#define TPC_IN_SZ ARRAY_SIZE(tpc_in_arr)
> +
> +static const struct value_name_pair variable_length_arr[] = {
> +	{0x1, "Rebuild(32)"},
> +	{0x2, "Regenerate(32)"},
> +	{0x3, "Xdread(32)"},
> +	{0x4, "Xdwrite(32)"},
> +	{0x5, "Xdwrite extended(32)"},
> +	{0x6, "Xpwrite(32)"},
> +	{0x7, "Xdwriteread(32)"},
> +	{0x8, "Xdwrite extended(64)"},
> +	{0x9, "Read(32)"},
> +	{0xa, "Verify(32)"},
> +	{0xb, "Write(32)"},
> +	{0xc, "Write an verify(32)"},
> +	{0xd, "Write same(32)"},
> +	{0x8801, "Format OSD"},
> +	{0x8802, "Create (osd)"},
> +	{0x8803, "List (osd)"},
> +	{0x8805, "Read (osd)"},
> +	{0x8806, "Write (osd)"},
> +	{0x8807, "Append (osd)"},
> +	{0x8808, "Flush (osd)"},
> +	{0x880a, "Remove (osd)"},
> +	{0x880b, "Create partition (osd)"},
> +	{0x880c, "Remove partition (osd)"},
> +	{0x880e, "Get attributes (osd)"},
> +	{0x880f, "Set attributes (osd)"},
> +	{0x8812, "Create and write (osd)"},
> +	{0x8815, "Create collection (osd)"},
> +	{0x8816, "Remove collection (osd)"},
> +	{0x8817, "List collection (osd)"},
> +	{0x8818, "Set key (osd)"},
> +	{0x8819, "Set master key (osd)"},
> +	{0x881a, "Flush collection (osd)"},
> +	{0x881b, "Flush partition (osd)"},
> +	{0x881c, "Flush OSD"},
> +	{0x8f7e, "Perform SCSI command (osd)"},
> +	{0x8f7f, "Perform task management function (osd)"},
> +};
> +#define VARIABLE_LENGTH_SZ ARRAY_SIZE(variable_length_arr)
> +
> +struct sa_name_list {
> +	int cmd;
> +	const struct value_name_pair *arr;
> +	int arr_sz;
> +};
> +
> +static struct sa_name_list sa_names_arr[] = {
> +	{VARIABLE_LENGTH_CMD, variable_length_arr, VARIABLE_LENGTH_SZ},
> +	{MAINTENANCE_IN, maint_in_arr, MAINT_IN_SZ},
> +	{MAINTENANCE_OUT, maint_out_arr, MAINT_OUT_SZ},
> +	{PERSISTENT_RESERVE_IN, pr_in_arr, PR_IN_SZ},
> +	{PERSISTENT_RESERVE_OUT, pr_out_arr, PR_OUT_SZ},
> +	{SERVICE_ACTION_IN_12, serv_in12_arr, SERV_IN12_SZ},
> +	{SERVICE_ACTION_OUT_12, serv_out12_arr, SERV_OUT12_SZ},
> +	{SERVICE_ACTION_BIDIRECTIONAL, serv_bidi_arr, SERV_BIDI_SZ},
> +	{SERVICE_ACTION_IN_16, serv_in16_arr, SERV_IN16_SZ},
> +	{SERVICE_ACTION_OUT_16, serv_out16_arr, SERV_OUT16_SZ},
> +	{THIRD_PARTY_COPY_IN, tpc_in_arr, TPC_IN_SZ},
> +	{THIRD_PARTY_COPY_OUT, tpc_out_arr, TPC_OUT_SZ},
> +	{0, NULL, 0},
> +};
> +#define SA_NAME_LIST_SZ ARRAY_SIZE(sa_names_arr)
> +
> +static int scsi_opcode_sa_name(int cmd, int service_action,
> +			       const char **sa_name)
> +{
> +	struct sa_name_list *sa_name_ptr = sa_names_arr;
> +	const struct value_name_pair *arr = NULL;
> +	int arr_sz, k;
> +
> +	for (k = 0; k < SA_NAME_LIST_SZ; ++k, ++sa_name_ptr) {
> +		if (sa_name_ptr->cmd == cmd) {
> +			arr = sa_name_ptr->arr;
> +			arr_sz = sa_name_ptr->arr_sz;
> +			break;
> +		}
> +	}
> +	if (!arr)
> +		return 0;
> +
> +	for (k = 0; k < arr_sz; ++k, ++arr) {
> +		if (service_action == arr->value)
> +			break;
> +	}
> +	if (k < arr_sz)
> +		*sa_name = arr->name;
> +
> +	return 1;
> +}
> +#else
> +static int scsi_opcode_sa_name(int cmd, int service_action,
> +			       const char **sa_name)
> +{
> +	switch (cmd) {
> +	case VARIABLE_LENGTH_CMD:
> +	case MAINTENANCE_IN:
> +	case MAINTENANCE_OUT:
> +	case PERSISTENT_RESERVE_IN:
> +	case PERSISTENT_RESERVE_OUT:
> +	case SERVICE_ACTION_IN_12:
> +	case SERVICE_ACTION_OUT_12:
> +	case SERVICE_ACTION_BIDIRECTIONAL:
> +	case SERVICE_ACTION_IN_16:
> +	case SERVICE_ACTION_OUT_16:
> +	case THIRD_PARTY_COPY_IN:
> +	case THIRD_PARTY_COPY_OUT:
> +		return 1;
> +	}
> +	return 0;
> +}
> +#endif /* CONFIG_SCSI_CONSTANTS */
> +
> +const char *
> +output_all_bytes(struct trace_seq *p, unsigned char *cdbp, int cdb_len)
> +{
> +	const char *ret = p->buffer + p->len;
> +	int i;
> +
> +	if (!cdb_len)
> +		cdb_len = scsi_command_size(cdbp);
> +
> +	for (i = 0; i < cdb_len; ++i)
> +		trace_seq_printf(p, "%02x", cdbp[i]);
> +
> +	trace_seq_putc(p, 0);
> +	return ret;
> +}
> +
> +const char *
> +print_opcode_name(struct trace_seq *p, unsigned char *cdbp, int cdb_len,
> +		  bool output_raw, int raw_len)
> +{
> +	int sa, cdb0, sa_valid;
> +	const char *cdb_name = NULL, *sa_name = NULL;
> +	const char *cdb_classifier = NULL;
> +	const char *ret = p->buffer + p->len;
> +
> +	cdb0 = cdbp[0];
> +	if (cdb0 == VARIABLE_LENGTH_CMD) {
> +#ifdef CONFIG_SCSI_CONSTANTS
> +		const struct value_name_pair *arr = NULL;
> +		int k;
> +#endif
> +		int len;
> +
> +		len = scsi_varlen_cdb_length(cdbp);
> +		if (len < 10) {
> +			trace_seq_printf(p, "short variable length command, "
> +					 "len=%d ext_len=%d", len, cdb_len);
> +			goto out;
> +		}
> +		sa = (cdbp[8] << 8) + cdbp[9];
> +#ifdef CONFIG_SCSI_CONSTANTS
> +		arr = variable_length_arr;
> +		for (k = 0; k < VARIABLE_LENGTH_SZ; ++k, ++arr) {
> +			if (sa == arr->value) {
> +				sa_name = arr->name;
> +				break;
> +			}
> +		}
> +#endif
> +		if (sa_name)
> +			trace_seq_printf(p, "CDB (%s, in_cdb_len=%d, "
> +					 "ext_len=%d)", sa_name, len, cdb_len);
> +		else
> +			trace_seq_printf(p, "CDB (cdb[0]=0x%x, sa=0x%x, "
> +					 "in_cdb_len=%d, ext_len=%d)",
> +					 cdb0, sa, len, cdb_len);
> +		goto out;
> +	}
> +
> +	if (cdb0 < 0xc0) {
> +		cdb_classifier = NULL;
> +#ifdef CONFIG_SCSI_CONSTANTS
> +		cdb_name = cdb_byte0_names[cdb0];
> +		if (!cdb_name)
> +			cdb_classifier = " (reserved)";
> +#endif
> +	} else
> +		cdb_classifier = " (vendor)";
> +
> +	sa = cdbp[1] & 0x1f;
> +	sa_valid = scsi_opcode_sa_name(cdb0, sa, &sa_name);
> +
> +	if (!sa_valid) {
> +		if (cdb_name)
> +			trace_seq_printf(p, "CDB (%s)", cdb_name);
> +		else
> +			trace_seq_printf(p, "CDB (cdb[0]=0x%x%s)",
> +					 cdb0, cdb_classifier);
> +	} else {
> +		if (sa_name)
> +			trace_seq_printf(p, "CDB (%s)", sa_name);
> +		else if (cdb_name)
> +			trace_seq_printf(p, "CDB (%s, sa=0x%x)", cdb_name, sa);
> +		else
> +			trace_seq_printf(p, "CDB (cdb[0]=0x%x, sa=0x%x)",
> +					 cdb0, sa);
> +	}
> +
> +out:
> +	if (output_raw)
> +		return output_all_bytes(p, cdbp, raw_len);
> +	trace_seq_putc(p, 0);
> +	return ret;
> +}
> +
> +void __scsi_print_command(struct scsi_device *sdev, const char *prefix,
> +			  unsigned char *cdb, int cdb_len)
> +{
> +	trace_scsi_print_command(sdev, prefix, cdb, 0, true, cdb_len);
> +}
> +EXPORT_SYMBOL(__scsi_print_command);
> +
> +void scsi_print_command(struct scsi_cmnd *cmd)
> +{
> +	const char *devname = cmd->request->rq_disk ?
> +		cmd->request->rq_disk->disk_name : "scsi";
> +
> +	if (cmd->cmnd == NULL)
> +		return;
> +
> +	trace_scsi_print_command(cmd->device, devname, cmd->cmnd,
> +				 cmd->cmd_len, false, 0);
> +}
> +EXPORT_SYMBOL(scsi_print_command);
> +
>   static const char *
>   scsi_dump_sense_buffer(struct trace_seq *p, const unsigned char *buf, int len)
>   {
> diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
> index 54ebf54..1680135 100644
> --- a/include/scsi/scsi.h
> +++ b/include/scsi/scsi.h
> @@ -207,10 +207,16 @@ struct scsi_varlen_cdb_hdr {
>   	/* service specific data follows */
>   };
>
> +static inline unsigned __scsi_varlen_cdb_length(u8 additional_cdb_length)
> +{
> +	return additional_cdb_length + 8;
> +}
> +
>   static inline unsigned
>   scsi_varlen_cdb_length(const void *hdr)
>   {
> -	return ((struct scsi_varlen_cdb_hdr *)hdr)->additional_cdb_length + 8;
> +	return __scsi_varlen_cdb_length(
> +		((struct scsi_varlen_cdb_hdr *)hdr)->additional_cdb_length);
>   }
>
>   extern const unsigned char scsi_command_size_tbl[8];
> diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
> index 6d3543f..c50bade 100644
> --- a/include/trace/events/scsi.h
> +++ b/include/trace/events/scsi.h
> @@ -449,6 +449,51 @@ TRACE_EVENT(scsi_print_sense,
>   		  __entry->sense_len,  __entry->raw),
>   		  __extd_sense(__entry->asc, __entry->ascq))
>   );
> +
> +const char *
> +print_opcode_name(struct trace_seq*, unsigned char*, int, bool, int);
> +#define __opcode_name(cdbp, cdb_len, output_raw, raw_len)	\
> +			print_opcode_name(p, cdbp, cdb_len, output_raw, raw_len)
> +
> +TRACE_EVENT(scsi_print_command,
> +
> +	TP_PROTO(struct scsi_device *sdev, const char *devname,
> +		 unsigned char *cdbp, int cdb_len, bool output_raw,
> +		 int raw_len),
> +
> +	TP_ARGS(sdev, devname, cdbp, cdb_len, output_raw, raw_len),
> +
> +	TP_STRUCT__entry(
> +		__field( unsigned int,		host_no		)
> +		__field( unsigned int,		channel		)
> +		__field( unsigned int,		id		)
> +		__field( unsigned int,		lun		)
> +		__string(devname,		devname		)
> +		__dynamic_array(unsigned char,	cdbp,
> +				cdb_len ? cdb_len : scsi_command_size(cdbp))
> +		__field( int,			cdb_len		)
> +		__field( bool,			output_raw	)
> +		__field( int,			raw_len		)
> +	),
> +
> +	TP_fast_assign(
> +		__entry->host_no	= sdev->host->host_no;
> +		__entry->channel	= sdev->channel;
> +		__entry->id		= sdev->id;
> +		__entry->lun		= sdev->lun;
> +		__assign_str(devname, devname);
> +		memcpy(__get_dynamic_array(cdbp), cdbp,
> +		       cdb_len ? cdb_len : scsi_command_size(cdbp));
> +		__entry->cdb_len	= cdb_len;
> +		__entry->output_raw	= output_raw;
> +		__entry->raw_len	= raw_len;
> +	),
> +
> +	TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] %s",
> +		  __entry->host_no, __entry->channel, __entry->id, __entry->lun,
> +		  __get_str(devname), __opcode_name(__get_dynamic_array(cdbp),
> +		  __entry->cdb_len, __entry->output_raw, __entry->raw_len))
> +);
>   #endif /*  _TRACE_SCSI_H */
>
>   /* This part must be outside protection */
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
No.
constants.c is influenced by CONFIG_SCSI_CONSTANTS, and we should be 
keeping it that way.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

Re: Re: [RFC PATCH 10/10] scsi/trace: Use scsi_print_command trace point instead of printk

[Yoshihiro YUNOMAE]

(2014/08/27 23:16), Hannes Reinecke wrote:
> On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
>> Previous printk messages of SCSI command can be mixed into other printk
>> messages because multiple printk messages are output for it. To avoid the
>> problem, patch 4e64bb8d6 in Hannes' branch(*1) introduced a local buffer.
>> But using local buffers can induce stack overflow, so we want to solve
>> the
>> problem without local buffer if possible.
>>
>> trace_seq_printf can add log messages without local buffer, so we use it.
>>
>> Note:
>> We don't need constans.c any more.
>>
>> (*1)
>> http://git.kernel.org/cgit/linux/kernel/git/hare/scsi-devel.git/log/?h=logging
>>
>>
>>   - Result examples
>>
>> <Before> (printk)
>> sd 2:0:0:0: [sda] CDB: Read(10)
>>
>> <After>
>> scsi_print_command: host_no=2 channel=0 id=0 lun=0 [sda] CDB (Read(10))
>>
>> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
>> Cc: Hannes Reinecke <hare@suse.de>
>> Cc: Doug Gilbert <dgilbert@interlog.com>
>> Cc: Martin K. Petersen <martin.petersen@oracle.com>
>> Cc: Christoph Hellwig <hch@lst.de>
>> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
>> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
>> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
>> ---
>>   drivers/scsi/Makefile       |    2
>>   drivers/scsi/constants.c    |  425
>> -------------------------------------------
>>   drivers/scsi/scsi_trace.c   |  408
>> +++++++++++++++++++++++++++++++++++++++++
>>   include/scsi/scsi.h         |    8 +
>>   include/trace/events/scsi.h |   45 +++++
>>   5 files changed, 461 insertions(+), 427 deletions(-)
>>   delete mode 100644 drivers/scsi/constants.c
>>
>> diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
>> index 5f0d299..c56f692 100644
>> --- a/drivers/scsi/Makefile
>> +++ b/drivers/scsi/Makefile
>> @@ -158,7 +158,7 @@ obj-$(CONFIG_SCSI_OSD_INITIATOR) += osd/
>>   # This goes last, so that "real" scsi devices probe earlier
>>   obj-$(CONFIG_SCSI_DEBUG)    += scsi_debug.o
>>
>> -scsi_mod-y            += scsi.o hosts.o scsi_ioctl.o constants.o \
>> +scsi_mod-y            += scsi.o hosts.o scsi_ioctl.o \
>>                      scsicam.o scsi_error.o scsi_lib.o
>>   scsi_mod-$(CONFIG_SCSI_DMA)    += scsi_lib_dma.o
>>   scsi_mod-y            += scsi_scan.o scsi_sysfs.o scsi_devinfo.o
>> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
>> deleted file mode 100644
>> index ce9ceb8..0000000
>> --- a/drivers/scsi/constants.c
>> +++ /dev/null
>> @@ -1,425 +0,0 @@
>> -/*
>> - * ASCII values for a number of symbolic constants, printing functions,
>> - * etc.
>> - * Additions for SCSI 2 and Linux 2.2.x by D. Gilbert (990422)
>> - * Additions for SCSI 3+ (SPC-3 T10/1416-D Rev 07 3 May 2002)
>> - *   by D. Gilbert and aeb (20020609)
>> - * Updated to SPC-4 T10/1713-D Rev 36g, D. Gilbert 20130701
>> - */
>> -
>> -#include <linux/blkdev.h>
>> -#include <linux/module.h>
>> -#include <linux/kernel.h>
>> -#include <asm/unaligned.h>
>> -
>> -#include <scsi/scsi.h>
>> -#include <scsi/scsi_cmnd.h>
>> -
>> -/* Commands with service actions that change the command name */
>> -#define SERVICE_ACTION_IN_12 0xab
>> -#define SERVICE_ACTION_OUT_12 0xa9
>> -#define SERVICE_ACTION_BIDIRECTIONAL 0x9d
>> -#define SERVICE_ACTION_IN_16 0x9e
>> -#define SERVICE_ACTION_OUT_16 0x9f
>> -#define THIRD_PARTY_COPY_OUT 0x83
>> -#define THIRD_PARTY_COPY_IN 0x84
>> -
>> -
>> -
>> -#ifdef CONFIG_SCSI_CONSTANTS
>> -static const char * cdb_byte0_names[] = {
>> -/* 00-03 */ "Test Unit Ready", "Rezero Unit/Rewind", NULL, "Request
>> Sense",
>> -/* 04-07 */ "Format Unit/Medium", "Read Block Limits", NULL,
>> -        "Reassign Blocks",
>> -/* 08-0d */ "Read(6)", NULL, "Write(6)", "Seek(6)", NULL, NULL,
>> -/* 0e-12 */ NULL, "Read Reverse", "Write Filemarks", "Space", "Inquiry",
>> -/* 13-16 */ "Verify(6)", "Recover Buffered Data", "Mode Select(6)",
>> -        "Reserve(6)",
>> -/* 17-1a */ "Release(6)", "Copy", "Erase", "Mode Sense(6)",
>> -/* 1b-1d */ "Start/Stop Unit", "Receive Diagnostic", "Send Diagnostic",
>> -/* 1e-1f */ "Prevent/Allow Medium Removal", NULL,
>> -/* 20-22 */  NULL, NULL, NULL,
>> -/* 23-28 */ "Read Format Capacities", "Set Window",
>> -        "Read Capacity(10)", NULL, NULL, "Read(10)",
>> -/* 29-2d */ "Read Generation", "Write(10)", "Seek(10)", "Erase(10)",
>> -            "Read updated block",
>> -/* 2e-31 */ "Write Verify(10)", "Verify(10)", "Search High", "Search
>> Equal",
>> -/* 32-34 */ "Search Low", "Set Limits", "Prefetch/Read Position",
>> -/* 35-37 */ "Synchronize Cache(10)", "Lock/Unlock Cache(10)",
>> -        "Read Defect Data(10)",
>> -/* 38-3c */ "Medium Scan", "Compare", "Copy Verify", "Write Buffer",
>> -        "Read Buffer",
>> -/* 3d-3f */ "Update Block", "Read Long(10)",  "Write Long(10)",
>> -/* 40-41 */ "Change Definition", "Write Same(10)",
>> -/* 42-48 */ "Unmap/Read sub-channel", "Read TOC/PMA/ATIP",
>> -        "Read density support", "Play audio(10)", "Get configuration",
>> -        "Play audio msf", "Sanitize/Play audio track/index",
>> -/* 49-4f */ "Play track relative(10)", "Get event status notification",
>> -            "Pause/resume", "Log Select", "Log Sense", "Stop play/scan",
>> -            NULL,
>> -/* 50-55 */ "Xdwrite", "Xpwrite, Read disk info", "Xdread, Read track
>> info",
>> -            "Reserve track", "Send OPC info", "Mode Select(10)",
>> -/* 56-5b */ "Reserve(10)", "Release(10)", "Repair track", "Read
>> master cue",
>> -            "Mode Sense(10)", "Close track/session",
>> -/* 5c-5f */ "Read buffer capacity", "Send cue sheet", "Persistent
>> reserve in",
>> -            "Persistent reserve out",
>> -/* 60-67 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
>> -/* 68-6f */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
>> -/* 70-77 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
>> -/* 78-7f */ NULL, NULL, NULL, NULL, NULL, NULL, "Extended CDB",
>> -        "Variable length",
>> -/* 80-84 */ "Xdwrite(16)", "Rebuild(16)", "Regenerate(16)",
>> -        "Third party copy out", "Third party copy in",
>> -/* 85-89 */ "ATA command pass through(16)", "Access control in",
>> -        "Access control out", "Read(16)", "Compare and Write",
>> -/* 8a-8f */ "Write(16)", "ORWrite", "Read attributes", "Write
>> attributes",
>> -            "Write and verify(16)", "Verify(16)",
>> -/* 90-94 */ "Pre-fetch(16)", "Synchronize cache(16)",
>> -            "Lock/unlock cache(16)", "Write same(16)", NULL,
>> -/* 95-99 */ NULL, NULL, NULL, NULL, NULL,
>> -/* 9a-9f */ NULL, NULL, NULL, "Service action bidirectional",
>> -        "Service action in(16)", "Service action out(16)",
>> -/* a0-a5 */ "Report luns", "ATA command pass through(12)/Blank",
>> -            "Security protocol in", "Maintenance in", "Maintenance out",
>> -        "Move medium/play audio(12)",
>> -/* a6-a9 */ "Exchange medium", "Move medium attached", "Read(12)",
>> -            "Play track relative(12)",
>> -/* aa-ae */ "Write(12)", NULL, "Erase(12), Get Performance",
>> -            "Read DVD structure", "Write and verify(12)",
>> -/* af-b1 */ "Verify(12)", "Search data high(12)", "Search data
>> equal(12)",
>> -/* b2-b4 */ "Search data low(12)", "Set limits(12)",
>> -            "Read element status attached",
>> -/* b5-b6 */ "Security protocol out", "Send volume tag, set streaming",
>> -/* b7-b9 */ "Read defect data(12)", "Read element status", "Read CD
>> msf",
>> -/* ba-bc */ "Redundancy group (in), Scan",
>> -            "Redundancy group (out), Set cd-rom speed", "Spare (in),
>> Play cd",
>> -/* bd-bf */ "Spare (out), Mechanism status", "Volume set (in), Read cd",
>> -            "Volume set (out), Send DVD structure",
>> -};
>> -
>> -struct value_name_pair {
>> -    int value;
>> -    const char * name;
>> -};
>> -
>> -static const struct value_name_pair maint_in_arr[] = {
>> -    {0x5, "Report identifying information"},
>> -    {0xa, "Report target port groups"},
>> -    {0xb, "Report aliases"},
>> -    {0xc, "Report supported operation codes"},
>> -    {0xd, "Report supported task management functions"},
>> -    {0xe, "Report priority"},
>> -    {0xf, "Report timestamp"},
>> -    {0x10, "Management protocol in"},
>> -};
>> -#define MAINT_IN_SZ ARRAY_SIZE(maint_in_arr)
>> -
>> -static const struct value_name_pair maint_out_arr[] = {
>> -    {0x6, "Set identifying information"},
>> -    {0xa, "Set target port groups"},
>> -    {0xb, "Change aliases"},
>> -    {0xc, "Remove I_T nexus"},
>> -    {0xe, "Set priority"},
>> -    {0xf, "Set timestamp"},
>> -    {0x10, "Management protocol out"},
>> -};
>> -#define MAINT_OUT_SZ ARRAY_SIZE(maint_out_arr)
>> -
>> -static const struct value_name_pair serv_in12_arr[] = {
>> -    {0x1, "Read media serial number"},
>> -};
>> -#define SERV_IN12_SZ ARRAY_SIZE(serv_in12_arr)
>> -
>> -static const struct value_name_pair serv_out12_arr[] = {
>> -    {-1, "dummy entry"},
>> -};
>> -#define SERV_OUT12_SZ ARRAY_SIZE(serv_out12_arr)
>> -
>> -static const struct value_name_pair serv_bidi_arr[] = {
>> -    {-1, "dummy entry"},
>> -};
>> -#define SERV_BIDI_SZ ARRAY_SIZE(serv_bidi_arr)
>> -
>> -static const struct value_name_pair serv_in16_arr[] = {
>> -    {0x10, "Read capacity(16)"},
>> -    {0x11, "Read long(16)"},
>> -    {0x12, "Get LBA status"},
>> -    {0x13, "Report referrals"},
>> -};
>> -#define SERV_IN16_SZ ARRAY_SIZE(serv_in16_arr)
>> -
>> -static const struct value_name_pair serv_out16_arr[] = {
>> -    {0x11, "Write long(16)"},
>> -    {0x1f, "Notify data transfer device(16)"},
>> -};
>> -#define SERV_OUT16_SZ ARRAY_SIZE(serv_out16_arr)
>> -
>> -static const struct value_name_pair pr_in_arr[] = {
>> -    {0x0, "Persistent reserve in, read keys"},
>> -    {0x1, "Persistent reserve in, read reservation"},
>> -    {0x2, "Persistent reserve in, report capabilities"},
>> -    {0x3, "Persistent reserve in, read full status"},
>> -};
>> -#define PR_IN_SZ ARRAY_SIZE(pr_in_arr)
>> -
>> -static const struct value_name_pair pr_out_arr[] = {
>> -    {0x0, "Persistent reserve out, register"},
>> -    {0x1, "Persistent reserve out, reserve"},
>> -    {0x2, "Persistent reserve out, release"},
>> -    {0x3, "Persistent reserve out, clear"},
>> -    {0x4, "Persistent reserve out, preempt"},
>> -    {0x5, "Persistent reserve out, preempt and abort"},
>> -    {0x6, "Persistent reserve out, register and ignore existing key"},
>> -    {0x7, "Persistent reserve out, register and move"},
>> -};
>> -#define PR_OUT_SZ ARRAY_SIZE(pr_out_arr)
>> -
>> -/* SPC-4 rev 34 renamed the Extended Copy opcode to Third Party Copy
>> Out.
>> -   LID1 (List Identifier length: 1 byte) is the Extended Copy found
>> in SPC-2
>> -   and SPC-3 */
>> -static const struct value_name_pair tpc_out_arr[] = {
>> -    {0x0, "Extended copy(LID1)"},
>> -    {0x1, "Extended copy(LID4)"},
>> -    {0x10, "Populate token"},
>> -    {0x11, "Write using token"},
>> -    {0x1c, "Copy operation abort"},
>> -};
>> -#define TPC_OUT_SZ ARRAY_SIZE(tpc_out_arr)
>> -
>> -static const struct value_name_pair tpc_in_arr[] = {
>> -    {0x0, "Receive copy status(LID1)"},
>> -    {0x1, "Receive copy data(LID1)"},
>> -    {0x3, "Receive copy operating parameters"},
>> -    {0x4, "Receive copy failure details(LID1)"},
>> -    {0x5, "Receive copy status(LID4)"},
>> -    {0x6, "Receive copy data(LID4)"},
>> -    {0x7, "Receive ROD token information"},
>> -    {0x8, "Report all ROD tokens"},
>> -};
>> -#define TPC_IN_SZ ARRAY_SIZE(tpc_in_arr)
>> -
>> -
>> -static const struct value_name_pair variable_length_arr[] = {
>> -    {0x1, "Rebuild(32)"},
>> -    {0x2, "Regenerate(32)"},
>> -    {0x3, "Xdread(32)"},
>> -    {0x4, "Xdwrite(32)"},
>> -    {0x5, "Xdwrite extended(32)"},
>> -    {0x6, "Xpwrite(32)"},
>> -    {0x7, "Xdwriteread(32)"},
>> -    {0x8, "Xdwrite extended(64)"},
>> -    {0x9, "Read(32)"},
>> -    {0xa, "Verify(32)"},
>> -    {0xb, "Write(32)"},
>> -    {0xc, "Write an verify(32)"},
>> -    {0xd, "Write same(32)"},
>> -    {0x8801, "Format OSD"},
>> -    {0x8802, "Create (osd)"},
>> -    {0x8803, "List (osd)"},
>> -    {0x8805, "Read (osd)"},
>> -    {0x8806, "Write (osd)"},
>> -    {0x8807, "Append (osd)"},
>> -    {0x8808, "Flush (osd)"},
>> -    {0x880a, "Remove (osd)"},
>> -    {0x880b, "Create partition (osd)"},
>> -    {0x880c, "Remove partition (osd)"},
>> -    {0x880e, "Get attributes (osd)"},
>> -    {0x880f, "Set attributes (osd)"},
>> -    {0x8812, "Create and write (osd)"},
>> -    {0x8815, "Create collection (osd)"},
>> -    {0x8816, "Remove collection (osd)"},
>> -    {0x8817, "List collection (osd)"},
>> -    {0x8818, "Set key (osd)"},
>> -    {0x8819, "Set master key (osd)"},
>> -    {0x881a, "Flush collection (osd)"},
>> -    {0x881b, "Flush partition (osd)"},
>> -    {0x881c, "Flush OSD"},
>> -    {0x8f7e, "Perform SCSI command (osd)"},
>> -    {0x8f7f, "Perform task management function (osd)"},
>> -};
>> -#define VARIABLE_LENGTH_SZ ARRAY_SIZE(variable_length_arr)
>> -
>> -struct sa_name_list {
>> -    int cmd;
>> -    const struct value_name_pair *arr;
>> -    int arr_sz;
>> -};
>> -
>> -static struct sa_name_list sa_names_arr[] = {
>> -    {VARIABLE_LENGTH_CMD, variable_length_arr, VARIABLE_LENGTH_SZ},
>> -    {MAINTENANCE_IN, maint_in_arr, MAINT_IN_SZ},
>> -    {MAINTENANCE_OUT, maint_out_arr, MAINT_OUT_SZ},
>> -    {PERSISTENT_RESERVE_IN, pr_in_arr, PR_IN_SZ},
>> -    {PERSISTENT_RESERVE_OUT, pr_out_arr, PR_OUT_SZ},
>> -    {SERVICE_ACTION_IN_12, serv_in12_arr, SERV_IN12_SZ},
>> -    {SERVICE_ACTION_OUT_12, serv_out12_arr, SERV_OUT12_SZ},
>> -    {SERVICE_ACTION_BIDIRECTIONAL, serv_bidi_arr, SERV_BIDI_SZ},
>> -    {SERVICE_ACTION_IN_16, serv_in16_arr, SERV_IN16_SZ},
>> -    {SERVICE_ACTION_OUT_16, serv_out16_arr, SERV_OUT16_SZ},
>> -    {THIRD_PARTY_COPY_IN, tpc_in_arr, TPC_IN_SZ},
>> -    {THIRD_PARTY_COPY_OUT, tpc_out_arr, TPC_OUT_SZ},
>> -    {0, NULL, 0},
>> -};
>> -#define SA_NAME_LIST_SZ ARRAY_SIZE(sa_names_arr)
>> -
>> -static int scsi_opcode_sa_name(int cmd, int service_action,
>> -                   const char **sa_name)
>> -{
>> -    struct sa_name_list *sa_name_ptr = sa_names_arr;
>> -    const struct value_name_pair * arr = NULL;
>> -    int arr_sz, k;
>> -
>> -    for (k = 0; k < SA_NAME_LIST_SZ; ++k, ++sa_name_ptr) {
>> -        if (sa_name_ptr->cmd == cmd) {
>> -            arr = sa_name_ptr->arr;
>> -            arr_sz = sa_name_ptr->arr_sz;
>> -            break;
>> -        }
>> -    }
>> -    if (!arr)
>> -        return 0;
>> -
>> -    for (k = 0; k < arr_sz; ++k, ++arr) {
>> -        if (service_action == arr->value)
>> -            break;
>> -    }
>> -    if (k < arr_sz)
>> -        *sa_name = arr->name;
>> -
>> -    return 1;
>> -}
>> -#else
>> -static int scsi_opcode_sa_name(int cmd, int service_action,
>> -                   const char **sa_name)
>> -{
>> -    switch (cmd) {
>> -    case VARIABLE_LENGTH_CMD:
>> -    case MAINTENANCE_IN:
>> -    case MAINTENANCE_OUT:
>> -    case PERSISTENT_RESERVE_IN:
>> -    case PERSISTENT_RESERVE_OUT:
>> -    case SERVICE_ACTION_IN_12:
>> -    case SERVICE_ACTION_OUT_12:
>> -    case SERVICE_ACTION_BIDIRECTIONAL:
>> -    case SERVICE_ACTION_IN_16:
>> -    case SERVICE_ACTION_OUT_16:
>> -    case THIRD_PARTY_COPY_IN:
>> -    case THIRD_PARTY_COPY_OUT:
>> -        return 1;
>> -    }
>> -    return 0;
>> -}
>> -#endif /* CONFIG_SCSI_CONSTANTS */
>> -
>> -/* attempt to guess cdb length if cdb_len==0 . No trailing linefeed. */
>> -static void print_opcode_name(struct scsi_device *sdev, const char
>> *prefix,
>> -                  unsigned char * cdbp, int cdb_len)
>> -{
>> -    int sa, cdb0, sa_valid;
>> -    const char * cdb_name = NULL, *sa_name = NULL;
>> -    const char * cdb_classifier = NULL;
>> -
>> -    cdb0 = cdbp[0];
>> -    if (cdb0 == VARIABLE_LENGTH_CMD) {
>> -#ifdef CONFIG_SCSI_CONSTANTS
>> -        const struct value_name_pair * arr = NULL;
>> -        int k;
>> -#endif
>> -        int len;
>> -
>> -        len = scsi_varlen_cdb_length(cdbp);
>> -        if (len < 10) {
>> -            sdev_printk(KERN_INFO, sdev,
>> -                    "short variable length command, "
>> -                    "len=%d ext_len=%d", len, cdb_len);
>> -            return;
>> -        }
>> -        sa = (cdbp[8] << 8) + cdbp[9];
>> -#ifdef CONFIG_SCSI_CONSTANTS
>> -        arr = variable_length_arr;
>> -        for (k = 0; k < VARIABLE_LENGTH_SZ; ++k, ++arr) {
>> -            if (sa == arr->value) {
>> -                sa_name = arr->name;
>> -                break;
>> -            }
>> -        }
>> -#endif
>> -        if (sa_name)
>> -            sdev_printk(KERN_INFO, sdev,
>> -                    "[%s] CDB: %s, in_cdb_len=%d, ext_len=%d",
>> -                    prefix, sa_name, len, cdb_len);
>> -        else
>> -            sdev_printk(KERN_INFO, sdev,
>> -                    "[%s] CDB: cdb[0]=0x%x, sa=0x%x, "
>> -                    "in_cdb_len=%d, ext_len=%d",
>> -                    prefix, cdb0, sa, len, cdb_len);
>> -        return;
>> -    }
>> -
>> -    if (cdb0 < 0xc0) {
>> -        cdb_classifier = NULL;
>> -#ifdef CONFIG_SCSI_CONSTANTS
>> -        cdb_name = cdb_byte0_names[cdb0];
>> -        if (!cdb_name)
>> -            cdb_classifier = " (reserved)";
>> -#endif
>> -    } else
>> -        cdb_classifier = " (vendor)";
>> -
>> -    sa = cdbp[1] & 0x1f;
>> -    sa_valid = scsi_opcode_sa_name(cdb0, sa, &sa_name);
>> -
>> -    if (!sa_valid) {
>> -        if (cdb_name)
>> -            sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s",
>> -                    prefix, cdb_name);
>> -        else
>> -            sdev_printk(KERN_INFO, sdev, "[%s] CDB: cdb[0]=0x%x%s",
>> -                    prefix, cdb0, cdb_classifier );
>> -    } else {
>> -        if (sa_name)
>> -            sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s",
>> -                    prefix, sa_name);
>> -        else if (cdb_name)
>> -            sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s, sa=0x%x",
>> -                    prefix, cdb_name, sa);
>> -        else
>> -            sdev_printk(KERN_INFO, sdev,
>> -                    "[%s] CDB: cdb[0]=0x%x, sa=0x%x",
>> -                    prefix, cdb0, sa);
>> -    }
>> -}
>> -
>> -void __scsi_print_command(struct scsi_device *sdev, const char *prefix,
>> -              unsigned char *cdb, int cdb_len)
>> -{
>> -    char linebuf[128];
>> -    int i, linelen, remaining;
>> -
>> -    print_opcode_name(sdev, prefix, cdb, 0);
>> -    if (!cdb_len)
>> -        cdb_len = scsi_command_size(cdb);
>> -    /* print out all bytes in cdb */
>> -    remaining = cdb_len;
>> -    for (i = 0; i < cdb_len; i += 16) {
>> -        linelen = min(remaining, 16);
>> -        remaining -= 16;
>> -
>> -        hex_dump_to_buffer(cdb + i, linelen, 16, 1,
>> -                   linebuf, sizeof(linebuf), false);
>> -    }
>> -    sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s\n", prefix, linebuf);
>> -}
>> -EXPORT_SYMBOL(__scsi_print_command);
>> -
>> -void scsi_print_command(struct scsi_cmnd *cmd)
>> -{
>> -    const char *devname = cmd->request->rq_disk ?
>> -        cmd->request->rq_disk->disk_name : "scsi";
>> -
>> -    if (cmd->cmnd == NULL)
>> -        return;
>> -
>> -    print_opcode_name(cmd->device, devname, cmd->cmnd, cmd->cmd_len);
>> -}
>> -EXPORT_SYMBOL(scsi_print_command);
>> diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
>> index 60678d8..6761077 100644
>> --- a/drivers/scsi/scsi_trace.c
>> +++ b/drivers/scsi/scsi_trace.c
>> @@ -1237,6 +1237,414 @@ scsi_print_sense_hdr(struct scsi_device *sdev,
>> const char *name,
>>   }
>>   EXPORT_SYMBOL(scsi_print_sense_hdr);
>>
>> +/* Commands with service actions that change the command name */
>> +#define SERVICE_ACTION_IN_12 0xab
>> +#define SERVICE_ACTION_OUT_12 0xa9
>> +#define SERVICE_ACTION_BIDIRECTIONAL 0x9d
>> +#define SERVICE_ACTION_IN_16 0x9e
>> +#define SERVICE_ACTION_OUT_16 0x9f
>> +#define THIRD_PARTY_COPY_OUT 0x83
>> +#define THIRD_PARTY_COPY_IN 0x84
>> +
>> +#ifdef CONFIG_SCSI_CONSTANTS
>> +static const char *cdb_byte0_names[] = {
>> +/* 00-03 */ "Test Unit Ready", "Rezero Unit/Rewind", NULL, "Request
>> Sense",
>> +/* 04-07 */ "Format Unit/Medium", "Read Block Limits", NULL,
>> +        "Reassign Blocks",
>> +/* 08-0d */ "Read(6)", NULL, "Write(6)", "Seek(6)", NULL, NULL,
>> +/* 0e-12 */ NULL, "Read Reverse", "Write Filemarks", "Space", "Inquiry",
>> +/* 13-16 */ "Verify(6)", "Recover Buffered Data", "Mode Select(6)",
>> +        "Reserve(6)",
>> +/* 17-1a */ "Release(6)", "Copy", "Erase", "Mode Sense(6)",
>> +/* 1b-1d */ "Start/Stop Unit", "Receive Diagnostic", "Send Diagnostic",
>> +/* 1e-1f */ "Prevent/Allow Medium Removal", NULL,
>> +/* 20-22 */  NULL, NULL, NULL,
>> +/* 23-28 */ "Read Format Capacities", "Set Window",
>> +        "Read Capacity(10)", NULL, NULL, "Read(10)",
>> +/* 29-2d */ "Read Generation", "Write(10)", "Seek(10)", "Erase(10)",
>> +        "Read updated block",
>> +/* 2e-31 */ "Write Verify(10)", "Verify(10)", "Search High", "Search
>> Equal",
>> +/* 32-34 */ "Search Low", "Set Limits", "Prefetch/Read Position",
>> +/* 35-37 */ "Synchronize Cache(10)", "Lock/Unlock Cache(10)",
>> +        "Read Defect Data(10)",
>> +/* 38-3c */ "Medium Scan", "Compare", "Copy Verify", "Write Buffer",
>> +        "Read Buffer",
>> +/* 3d-3f */ "Update Block", "Read Long(10)",  "Write Long(10)",
>> +/* 40-41 */ "Change Definition", "Write Same(10)",
>> +/* 42-48 */ "Unmap/Read sub-channel", "Read TOC/PMA/ATIP",
>> +        "Read density support", "Play audio(10)", "Get configuration",
>> +        "Play audio msf", "Sanitize/Play audio track/index",
>> +/* 49-4f */ "Play track relative(10)", "Get event status notification",
>> +        "Pause/resume", "Log Select", "Log Sense", "Stop play/scan",
>> +        NULL,
>> +/* 50-55 */ "Xdwrite", "Xpwrite, Read disk info", "Xdread, Read track
>> info",
>> +        "Reserve track", "Send OPC info", "Mode Select(10)",
>> +/* 56-5b */ "Reserve(10)", "Release(10)", "Repair track", "Read
>> master cue",
>> +        "Mode Sense(10)", "Close track/session",
>> +/* 5c-5f */ "Read buffer capacity", "Send cue sheet", "Persistent
>> reserve in",
>> +        "Persistent reserve out",
>> +/* 60-67 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
>> +/* 68-6f */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
>> +/* 70-77 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
>> +/* 78-7f */ NULL, NULL, NULL, NULL, NULL, NULL, "Extended CDB",
>> +        "Variable length",
>> +/* 80-84 */ "Xdwrite(16)", "Rebuild(16)", "Regenerate(16)",
>> +        "Third party copy out", "Third party copy in",
>> +/* 85-89 */ "ATA command pass through(16)", "Access control in",
>> +        "Access control out", "Read(16)", "Compare and Write",
>> +/* 8a-8f */ "Write(16)", "ORWrite", "Read attributes", "Write
>> attributes",
>> +        "Write and verify(16)", "Verify(16)",
>> +/* 90-94 */ "Pre-fetch(16)", "Synchronize cache(16)",
>> +        "Lock/unlock cache(16)", "Write same(16)", NULL,
>> +/* 95-99 */ NULL, NULL, NULL, NULL, NULL,
>> +/* 9a-9f */ NULL, NULL, NULL, "Service action bidirectional",
>> +        "Service action in(16)", "Service action out(16)",
>> +/* a0-a5 */ "Report luns", "ATA command pass through(12)/Blank",
>> +        "Security protocol in", "Maintenance in", "Maintenance out",
>> +        "Move medium/play audio(12)",
>> +/* a6-a9 */ "Exchange medium", "Move medium attached", "Read(12)",
>> +        "Play track relative(12)",
>> +/* aa-ae */ "Write(12)", NULL, "Erase(12), Get Performance",
>> +        "Read DVD structure", "Write and verify(12)",
>> +/* af-b1 */ "Verify(12)", "Search data high(12)", "Search data
>> equal(12)",
>> +/* b2-b4 */ "Search data low(12)", "Set limits(12)",
>> +        "Read element status attached",
>> +/* b5-b6 */ "Security protocol out", "Send volume tag, set streaming",
>> +/* b7-b9 */ "Read defect data(12)", "Read element status", "Read CD
>> msf",
>> +/* ba-bc */ "Redundancy group (in), Scan",
>> +        "Redundancy group (out), Set cd-rom speed", "Spare (in), Play
>> cd",
>> +/* bd-bf */ "Spare (out), Mechanism status", "Volume set (in), Read cd",
>> +        "Volume set (out), Send DVD structure",
>> +};
>> +
>> +struct value_name_pair {
>> +    int value;
>> +    const char *name;
>> +};
>> +
>> +static const struct value_name_pair maint_in_arr[] = {
>> +    {0x5, "Report identifying information"},
>> +    {0xa, "Report target port groups"},
>> +    {0xb, "Report aliases"},
>> +    {0xc, "Report supported operation codes"},
>> +    {0xd, "Report supported task management functions"},
>> +    {0xe, "Report priority"},
>> +    {0xf, "Report timestamp"},
>> +    {0x10, "Management protocol in"},
>> +};
>> +#define MAINT_IN_SZ ARRAY_SIZE(maint_in_arr)
>> +
>> +static const struct value_name_pair maint_out_arr[] = {
>> +    {0x6, "Set identifying information"},
>> +    {0xa, "Set target port groups"},
>> +    {0xb, "Change aliases"},
>> +    {0xc, "Remove I_T nexus"},
>> +    {0xe, "Set priority"},
>> +    {0xf, "Set timestamp"},
>> +    {0x10, "Management protocol out"},
>> +};
>> +#define MAINT_OUT_SZ ARRAY_SIZE(maint_out_arr)
>> +
>> +static const struct value_name_pair serv_in12_arr[] = {
>> +    {0x1, "Read media serial number"},
>> +};
>> +#define SERV_IN12_SZ ARRAY_SIZE(serv_in12_arr)
>> +
>> +static const struct value_name_pair serv_out12_arr[] = {
>> +    {-1, "dummy entry"},
>> +};
>> +#define SERV_OUT12_SZ ARRAY_SIZE(serv_out12_arr)
>> +
>> +static const struct value_name_pair serv_bidi_arr[] = {
>> +    {-1, "dummy entry"},
>> +};
>> +#define SERV_BIDI_SZ ARRAY_SIZE(serv_bidi_arr)
>> +
>> +static const struct value_name_pair serv_in16_arr[] = {
>> +    {0x10, "Read capacity(16)"},
>> +    {0x11, "Read long(16)"},
>> +    {0x12, "Get LBA status"},
>> +    {0x13, "Report referrals"},
>> +};
>> +#define SERV_IN16_SZ ARRAY_SIZE(serv_in16_arr)
>> +
>> +static const struct value_name_pair serv_out16_arr[] = {
>> +    {0x11, "Write long(16)"},
>> +    {0x1f, "Notify data transfer device(16)"},
>> +};
>> +#define SERV_OUT16_SZ ARRAY_SIZE(serv_out16_arr)
>> +
>> +static const struct value_name_pair pr_in_arr[] = {
>> +    {0x0, "Persistent reserve in, read keys"},
>> +    {0x1, "Persistent reserve in, read reservation"},
>> +    {0x2, "Persistent reserve in, report capabilities"},
>> +    {0x3, "Persistent reserve in, read full status"},
>> +};
>> +#define PR_IN_SZ ARRAY_SIZE(pr_in_arr)
>> +
>> +static const struct value_name_pair pr_out_arr[] = {
>> +    {0x0, "Persistent reserve out, register"},
>> +    {0x1, "Persistent reserve out, reserve"},
>> +    {0x2, "Persistent reserve out, release"},
>> +    {0x3, "Persistent reserve out, clear"},
>> +    {0x4, "Persistent reserve out, preempt"},
>> +    {0x5, "Persistent reserve out, preempt and abort"},
>> +    {0x6, "Persistent reserve out, register and ignore existing key"},
>> +    {0x7, "Persistent reserve out, register and move"},
>> +};
>> +#define PR_OUT_SZ ARRAY_SIZE(pr_out_arr)
>> +
>> +/* SPC-4 rev 34 renamed the Extended Copy opcode to Third Party Copy
>> Out.
>> +   LID1 (List Identifier length: 1 byte) is the Extended Copy found
>> in SPC-2
>> +   and SPC-3 */
>> +static const struct value_name_pair tpc_out_arr[] = {
>> +    {0x0, "Extended copy(LID1)"},
>> +    {0x1, "Extended copy(LID4)"},
>> +    {0x10, "Populate token"},
>> +    {0x11, "Write using token"},
>> +    {0x1c, "Copy operation abort"},
>> +};
>> +#define TPC_OUT_SZ ARRAY_SIZE(tpc_out_arr)
>> +
>> +static const struct value_name_pair tpc_in_arr[] = {
>> +    {0x0, "Receive copy status(LID1)"},
>> +    {0x1, "Receive copy data(LID1)"},
>> +    {0x3, "Receive copy operating parameters"},
>> +    {0x4, "Receive copy failure details(LID1)"},
>> +    {0x5, "Receive copy status(LID4)"},
>> +    {0x6, "Receive copy data(LID4)"},
>> +    {0x7, "Receive ROD token information"},
>> +    {0x8, "Report all ROD tokens"},
>> +};
>> +#define TPC_IN_SZ ARRAY_SIZE(tpc_in_arr)
>> +
>> +static const struct value_name_pair variable_length_arr[] = {
>> +    {0x1, "Rebuild(32)"},
>> +    {0x2, "Regenerate(32)"},
>> +    {0x3, "Xdread(32)"},
>> +    {0x4, "Xdwrite(32)"},
>> +    {0x5, "Xdwrite extended(32)"},
>> +    {0x6, "Xpwrite(32)"},
>> +    {0x7, "Xdwriteread(32)"},
>> +    {0x8, "Xdwrite extended(64)"},
>> +    {0x9, "Read(32)"},
>> +    {0xa, "Verify(32)"},
>> +    {0xb, "Write(32)"},
>> +    {0xc, "Write an verify(32)"},
>> +    {0xd, "Write same(32)"},
>> +    {0x8801, "Format OSD"},
>> +    {0x8802, "Create (osd)"},
>> +    {0x8803, "List (osd)"},
>> +    {0x8805, "Read (osd)"},
>> +    {0x8806, "Write (osd)"},
>> +    {0x8807, "Append (osd)"},
>> +    {0x8808, "Flush (osd)"},
>> +    {0x880a, "Remove (osd)"},
>> +    {0x880b, "Create partition (osd)"},
>> +    {0x880c, "Remove partition (osd)"},
>> +    {0x880e, "Get attributes (osd)"},
>> +    {0x880f, "Set attributes (osd)"},
>> +    {0x8812, "Create and write (osd)"},
>> +    {0x8815, "Create collection (osd)"},
>> +    {0x8816, "Remove collection (osd)"},
>> +    {0x8817, "List collection (osd)"},
>> +    {0x8818, "Set key (osd)"},
>> +    {0x8819, "Set master key (osd)"},
>> +    {0x881a, "Flush collection (osd)"},
>> +    {0x881b, "Flush partition (osd)"},
>> +    {0x881c, "Flush OSD"},
>> +    {0x8f7e, "Perform SCSI command (osd)"},
>> +    {0x8f7f, "Perform task management function (osd)"},
>> +};
>> +#define VARIABLE_LENGTH_SZ ARRAY_SIZE(variable_length_arr)
>> +
>> +struct sa_name_list {
>> +    int cmd;
>> +    const struct value_name_pair *arr;
>> +    int arr_sz;
>> +};
>> +
>> +static struct sa_name_list sa_names_arr[] = {
>> +    {VARIABLE_LENGTH_CMD, variable_length_arr, VARIABLE_LENGTH_SZ},
>> +    {MAINTENANCE_IN, maint_in_arr, MAINT_IN_SZ},
>> +    {MAINTENANCE_OUT, maint_out_arr, MAINT_OUT_SZ},
>> +    {PERSISTENT_RESERVE_IN, pr_in_arr, PR_IN_SZ},
>> +    {PERSISTENT_RESERVE_OUT, pr_out_arr, PR_OUT_SZ},
>> +    {SERVICE_ACTION_IN_12, serv_in12_arr, SERV_IN12_SZ},
>> +    {SERVICE_ACTION_OUT_12, serv_out12_arr, SERV_OUT12_SZ},
>> +    {SERVICE_ACTION_BIDIRECTIONAL, serv_bidi_arr, SERV_BIDI_SZ},
>> +    {SERVICE_ACTION_IN_16, serv_in16_arr, SERV_IN16_SZ},
>> +    {SERVICE_ACTION_OUT_16, serv_out16_arr, SERV_OUT16_SZ},
>> +    {THIRD_PARTY_COPY_IN, tpc_in_arr, TPC_IN_SZ},
>> +    {THIRD_PARTY_COPY_OUT, tpc_out_arr, TPC_OUT_SZ},
>> +    {0, NULL, 0},
>> +};
>> +#define SA_NAME_LIST_SZ ARRAY_SIZE(sa_names_arr)
>> +
>> +static int scsi_opcode_sa_name(int cmd, int service_action,
>> +                   const char **sa_name)
>> +{
>> +    struct sa_name_list *sa_name_ptr = sa_names_arr;
>> +    const struct value_name_pair *arr = NULL;
>> +    int arr_sz, k;
>> +
>> +    for (k = 0; k < SA_NAME_LIST_SZ; ++k, ++sa_name_ptr) {
>> +        if (sa_name_ptr->cmd == cmd) {
>> +            arr = sa_name_ptr->arr;
>> +            arr_sz = sa_name_ptr->arr_sz;
>> +            break;
>> +        }
>> +    }
>> +    if (!arr)
>> +        return 0;
>> +
>> +    for (k = 0; k < arr_sz; ++k, ++arr) {
>> +        if (service_action == arr->value)
>> +            break;
>> +    }
>> +    if (k < arr_sz)
>> +        *sa_name = arr->name;
>> +
>> +    return 1;
>> +}
>> +#else
>> +static int scsi_opcode_sa_name(int cmd, int service_action,
>> +                   const char **sa_name)
>> +{
>> +    switch (cmd) {
>> +    case VARIABLE_LENGTH_CMD:
>> +    case MAINTENANCE_IN:
>> +    case MAINTENANCE_OUT:
>> +    case PERSISTENT_RESERVE_IN:
>> +    case PERSISTENT_RESERVE_OUT:
>> +    case SERVICE_ACTION_IN_12:
>> +    case SERVICE_ACTION_OUT_12:
>> +    case SERVICE_ACTION_BIDIRECTIONAL:
>> +    case SERVICE_ACTION_IN_16:
>> +    case SERVICE_ACTION_OUT_16:
>> +    case THIRD_PARTY_COPY_IN:
>> +    case THIRD_PARTY_COPY_OUT:
>> +        return 1;
>> +    }
>> +    return 0;
>> +}
>> +#endif /* CONFIG_SCSI_CONSTANTS */
>> +
>> +const char *
>> +output_all_bytes(struct trace_seq *p, unsigned char *cdbp, int cdb_len)
>> +{
>> +    const char *ret = p->buffer + p->len;
>> +    int i;
>> +
>> +    if (!cdb_len)
>> +        cdb_len = scsi_command_size(cdbp);
>> +
>> +    for (i = 0; i < cdb_len; ++i)
>> +        trace_seq_printf(p, "%02x", cdbp[i]);
>> +
>> +    trace_seq_putc(p, 0);
>> +    return ret;
>> +}
>> +
>> +const char *
>> +print_opcode_name(struct trace_seq *p, unsigned char *cdbp, int cdb_len,
>> +          bool output_raw, int raw_len)
>> +{
>> +    int sa, cdb0, sa_valid;
>> +    const char *cdb_name = NULL, *sa_name = NULL;
>> +    const char *cdb_classifier = NULL;
>> +    const char *ret = p->buffer + p->len;
>> +
>> +    cdb0 = cdbp[0];
>> +    if (cdb0 == VARIABLE_LENGTH_CMD) {
>> +#ifdef CONFIG_SCSI_CONSTANTS
>> +        const struct value_name_pair *arr = NULL;
>> +        int k;
>> +#endif
>> +        int len;
>> +
>> +        len = scsi_varlen_cdb_length(cdbp);
>> +        if (len < 10) {
>> +            trace_seq_printf(p, "short variable length command, "
>> +                     "len=%d ext_len=%d", len, cdb_len);
>> +            goto out;
>> +        }
>> +        sa = (cdbp[8] << 8) + cdbp[9];
>> +#ifdef CONFIG_SCSI_CONSTANTS
>> +        arr = variable_length_arr;
>> +        for (k = 0; k < VARIABLE_LENGTH_SZ; ++k, ++arr) {
>> +            if (sa == arr->value) {
>> +                sa_name = arr->name;
>> +                break;
>> +            }
>> +        }
>> +#endif
>> +        if (sa_name)
>> +            trace_seq_printf(p, "CDB (%s, in_cdb_len=%d, "
>> +                     "ext_len=%d)", sa_name, len, cdb_len);
>> +        else
>> +            trace_seq_printf(p, "CDB (cdb[0]=0x%x, sa=0x%x, "
>> +                     "in_cdb_len=%d, ext_len=%d)",
>> +                     cdb0, sa, len, cdb_len);
>> +        goto out;
>> +    }
>> +
>> +    if (cdb0 < 0xc0) {
>> +        cdb_classifier = NULL;
>> +#ifdef CONFIG_SCSI_CONSTANTS
>> +        cdb_name = cdb_byte0_names[cdb0];
>> +        if (!cdb_name)
>> +            cdb_classifier = " (reserved)";
>> +#endif
>> +    } else
>> +        cdb_classifier = " (vendor)";
>> +
>> +    sa = cdbp[1] & 0x1f;
>> +    sa_valid = scsi_opcode_sa_name(cdb0, sa, &sa_name);
>> +
>> +    if (!sa_valid) {
>> +        if (cdb_name)
>> +            trace_seq_printf(p, "CDB (%s)", cdb_name);
>> +        else
>> +            trace_seq_printf(p, "CDB (cdb[0]=0x%x%s)",
>> +                     cdb0, cdb_classifier);
>> +    } else {
>> +        if (sa_name)
>> +            trace_seq_printf(p, "CDB (%s)", sa_name);
>> +        else if (cdb_name)
>> +            trace_seq_printf(p, "CDB (%s, sa=0x%x)", cdb_name, sa);
>> +        else
>> +            trace_seq_printf(p, "CDB (cdb[0]=0x%x, sa=0x%x)",
>> +                     cdb0, sa);
>> +    }
>> +
>> +out:
>> +    if (output_raw)
>> +        return output_all_bytes(p, cdbp, raw_len);
>> +    trace_seq_putc(p, 0);
>> +    return ret;
>> +}
>> +
>> +void __scsi_print_command(struct scsi_device *sdev, const char *prefix,
>> +              unsigned char *cdb, int cdb_len)
>> +{
>> +    trace_scsi_print_command(sdev, prefix, cdb, 0, true, cdb_len);
>> +}
>> +EXPORT_SYMBOL(__scsi_print_command);
>> +
>> +void scsi_print_command(struct scsi_cmnd *cmd)
>> +{
>> +    const char *devname = cmd->request->rq_disk ?
>> +        cmd->request->rq_disk->disk_name : "scsi";
>> +
>> +    if (cmd->cmnd == NULL)
>> +        return;
>> +
>> +    trace_scsi_print_command(cmd->device, devname, cmd->cmnd,
>> +                 cmd->cmd_len, false, 0);
>> +}
>> +EXPORT_SYMBOL(scsi_print_command);
>> +
>>   static const char *
>>   scsi_dump_sense_buffer(struct trace_seq *p, const unsigned char
>> *buf, int len)
>>   {
>> diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
>> index 54ebf54..1680135 100644
>> --- a/include/scsi/scsi.h
>> +++ b/include/scsi/scsi.h
>> @@ -207,10 +207,16 @@ struct scsi_varlen_cdb_hdr {
>>       /* service specific data follows */
>>   };
>>
>> +static inline unsigned __scsi_varlen_cdb_length(u8
>> additional_cdb_length)
>> +{
>> +    return additional_cdb_length + 8;
>> +}
>> +
>>   static inline unsigned
>>   scsi_varlen_cdb_length(const void *hdr)
>>   {
>> -    return ((struct scsi_varlen_cdb_hdr *)hdr)->additional_cdb_length
>> + 8;
>> +    return __scsi_varlen_cdb_length(
>> +        ((struct scsi_varlen_cdb_hdr *)hdr)->additional_cdb_length);
>>   }
>>
>>   extern const unsigned char scsi_command_size_tbl[8];
>> diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
>> index 6d3543f..c50bade 100644
>> --- a/include/trace/events/scsi.h
>> +++ b/include/trace/events/scsi.h
>> @@ -449,6 +449,51 @@ TRACE_EVENT(scsi_print_sense,
>>             __entry->sense_len,  __entry->raw),
>>             __extd_sense(__entry->asc, __entry->ascq))
>>   );
>> +
>> +const char *
>> +print_opcode_name(struct trace_seq*, unsigned char*, int, bool, int);
>> +#define __opcode_name(cdbp, cdb_len, output_raw, raw_len)    \
>> +            print_opcode_name(p, cdbp, cdb_len, output_raw, raw_len)
>> +
>> +TRACE_EVENT(scsi_print_command,
>> +
>> +    TP_PROTO(struct scsi_device *sdev, const char *devname,
>> +         unsigned char *cdbp, int cdb_len, bool output_raw,
>> +         int raw_len),
>> +
>> +    TP_ARGS(sdev, devname, cdbp, cdb_len, output_raw, raw_len),
>> +
>> +    TP_STRUCT__entry(
>> +        __field( unsigned int,        host_no        )
>> +        __field( unsigned int,        channel        )
>> +        __field( unsigned int,        id        )
>> +        __field( unsigned int,        lun        )
>> +        __string(devname,        devname        )
>> +        __dynamic_array(unsigned char,    cdbp,
>> +                cdb_len ? cdb_len : scsi_command_size(cdbp))
>> +        __field( int,            cdb_len        )
>> +        __field( bool,            output_raw    )
>> +        __field( int,            raw_len        )
>> +    ),
>> +
>> +    TP_fast_assign(
>> +        __entry->host_no    = sdev->host->host_no;
>> +        __entry->channel    = sdev->channel;
>> +        __entry->id        = sdev->id;
>> +        __entry->lun        = sdev->lun;
>> +        __assign_str(devname, devname);
>> +        memcpy(__get_dynamic_array(cdbp), cdbp,
>> +               cdb_len ? cdb_len : scsi_command_size(cdbp));
>> +        __entry->cdb_len    = cdb_len;
>> +        __entry->output_raw    = output_raw;
>> +        __entry->raw_len    = raw_len;
>> +    ),
>> +
>> +    TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] %s",
>> +          __entry->host_no, __entry->channel, __entry->id, __entry->lun,
>> +          __get_str(devname), __opcode_name(__get_dynamic_array(cdbp),
>> +          __entry->cdb_len, __entry->output_raw, __entry->raw_len))
>> +);
>>   #endif /*  _TRACE_SCSI_H */
>>
>>   /* This part must be outside protection */
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>
> No.
> constants.c is influenced by CONFIG_SCSI_CONSTANTS, and we should be
> keeping it that way.

OK, I'll do that. We'll use existing decoder in constants.c.

Thanks,
Yoshihiro YUNOMAE

-- 
Yoshihiro YUNOMAE
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: yoshihiro.yunomae.ez@hitachi.com

Re: Re: Re: [RFC PATCH 10/10] scsi/trace: Use scsi_print_command trace point instead of printk

[Yoshihiro YUNOMAE]

Hi Hannes,

I tried to remove duplicated decoder of SCSI command, but the
output format of it in constants.c is different from it in traceevents.
I have two questions for it.

(Ex1)
traceevents: TEST_UNIT_READY
constants: Test Unit Ready

=> Which of "XXX_YYY_ZZZ" and "Xxx Yyy Zzz" should the kernel output
strings? This difference comes from difference of implementation.
The decoder in traceevents are using macro. So, it cannot define
separated words. On the other hand, the decoder in constants are using
constant string array table. So, it can define separated words.

(Ex2)
traceevents: (nothing)
constants: Set limits(12)

=> Should we merge those decoder?

I understand we use the decoder of constants, but we need to solve
these problems. Would you give me your comments?

Thanks,
Yoshihiro YUNOMAE

(2014/08/28 10:40), Yoshihiro YUNOMAE wrote:
> (2014/08/27 23:16), Hannes Reinecke wrote:
>> On 08/08/2014 01:50 PM, Yoshihiro YUNOMAE wrote:
>>> Previous printk messages of SCSI command can be mixed into other printk
>>> messages because multiple printk messages are output for it. To avoid
>>> the
>>> problem, patch 4e64bb8d6 in Hannes' branch(*1) introduced a local
>>> buffer.
>>> But using local buffers can induce stack overflow, so we want to solve
>>> the
>>> problem without local buffer if possible.
>>>
>>> trace_seq_printf can add log messages without local buffer, so we use
>>> it.
>>>
>>> Note:
>>> We don't need constans.c any more.
>>>
>>> (*1)
>>> http://git.kernel.org/cgit/linux/kernel/git/hare/scsi-devel.git/log/?h=logging
>>>
>>>
>>>
>>>   - Result examples
>>>
>>> <Before> (printk)
>>> sd 2:0:0:0: [sda] CDB: Read(10)
>>>
>>> <After>
>>> scsi_print_command: host_no=2 channel=0 id=0 lun=0 [sda] CDB (Read(10))
>>>
>>> Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
>>> Cc: Hannes Reinecke <hare@suse.de>
>>> Cc: Doug Gilbert <dgilbert@interlog.com>
>>> Cc: Martin K. Petersen <martin.petersen@oracle.com>
>>> Cc: Christoph Hellwig <hch@lst.de>
>>> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
>>> Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
>>> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
>>> ---
>>>   drivers/scsi/Makefile       |    2
>>>   drivers/scsi/constants.c    |  425
>>> -------------------------------------------
>>>   drivers/scsi/scsi_trace.c   |  408
>>> +++++++++++++++++++++++++++++++++++++++++
>>>   include/scsi/scsi.h         |    8 +
>>>   include/trace/events/scsi.h |   45 +++++
>>>   5 files changed, 461 insertions(+), 427 deletions(-)
>>>   delete mode 100644 drivers/scsi/constants.c
>>>
>>> diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
>>> index 5f0d299..c56f692 100644
>>> --- a/drivers/scsi/Makefile
>>> +++ b/drivers/scsi/Makefile
>>> @@ -158,7 +158,7 @@ obj-$(CONFIG_SCSI_OSD_INITIATOR) += osd/
>>>   # This goes last, so that "real" scsi devices probe earlier
>>>   obj-$(CONFIG_SCSI_DEBUG)    += scsi_debug.o
>>>
>>> -scsi_mod-y            += scsi.o hosts.o scsi_ioctl.o constants.o \
>>> +scsi_mod-y            += scsi.o hosts.o scsi_ioctl.o \
>>>                      scsicam.o scsi_error.o scsi_lib.o
>>>   scsi_mod-$(CONFIG_SCSI_DMA)    += scsi_lib_dma.o
>>>   scsi_mod-y            += scsi_scan.o scsi_sysfs.o scsi_devinfo.o
>>> diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
>>> deleted file mode 100644
>>> index ce9ceb8..0000000
>>> --- a/drivers/scsi/constants.c
>>> +++ /dev/null
>>> @@ -1,425 +0,0 @@
>>> -/*
>>> - * ASCII values for a number of symbolic constants, printing functions,
>>> - * etc.
>>> - * Additions for SCSI 2 and Linux 2.2.x by D. Gilbert (990422)
>>> - * Additions for SCSI 3+ (SPC-3 T10/1416-D Rev 07 3 May 2002)
>>> - *   by D. Gilbert and aeb (20020609)
>>> - * Updated to SPC-4 T10/1713-D Rev 36g, D. Gilbert 20130701
>>> - */
>>> -
>>> -#include <linux/blkdev.h>
>>> -#include <linux/module.h>
>>> -#include <linux/kernel.h>
>>> -#include <asm/unaligned.h>
>>> -
>>> -#include <scsi/scsi.h>
>>> -#include <scsi/scsi_cmnd.h>
>>> -
>>> -/* Commands with service actions that change the command name */
>>> -#define SERVICE_ACTION_IN_12 0xab
>>> -#define SERVICE_ACTION_OUT_12 0xa9
>>> -#define SERVICE_ACTION_BIDIRECTIONAL 0x9d
>>> -#define SERVICE_ACTION_IN_16 0x9e
>>> -#define SERVICE_ACTION_OUT_16 0x9f
>>> -#define THIRD_PARTY_COPY_OUT 0x83
>>> -#define THIRD_PARTY_COPY_IN 0x84
>>> -
>>> -
>>> -
>>> -#ifdef CONFIG_SCSI_CONSTANTS
>>> -static const char * cdb_byte0_names[] = {
>>> -/* 00-03 */ "Test Unit Ready", "Rezero Unit/Rewind", NULL, "Request
>>> Sense",
>>> -/* 04-07 */ "Format Unit/Medium", "Read Block Limits", NULL,
>>> -        "Reassign Blocks",
>>> -/* 08-0d */ "Read(6)", NULL, "Write(6)", "Seek(6)", NULL, NULL,
>>> -/* 0e-12 */ NULL, "Read Reverse", "Write Filemarks", "Space",
>>> "Inquiry",
>>> -/* 13-16 */ "Verify(6)", "Recover Buffered Data", "Mode Select(6)",
>>> -        "Reserve(6)",
>>> -/* 17-1a */ "Release(6)", "Copy", "Erase", "Mode Sense(6)",
>>> -/* 1b-1d */ "Start/Stop Unit", "Receive Diagnostic", "Send Diagnostic",
>>> -/* 1e-1f */ "Prevent/Allow Medium Removal", NULL,
>>> -/* 20-22 */  NULL, NULL, NULL,
>>> -/* 23-28 */ "Read Format Capacities", "Set Window",
>>> -        "Read Capacity(10)", NULL, NULL, "Read(10)",
>>> -/* 29-2d */ "Read Generation", "Write(10)", "Seek(10)", "Erase(10)",
>>> -            "Read updated block",
>>> -/* 2e-31 */ "Write Verify(10)", "Verify(10)", "Search High", "Search
>>> Equal",
>>> -/* 32-34 */ "Search Low", "Set Limits", "Prefetch/Read Position",
>>> -/* 35-37 */ "Synchronize Cache(10)", "Lock/Unlock Cache(10)",
>>> -        "Read Defect Data(10)",
>>> -/* 38-3c */ "Medium Scan", "Compare", "Copy Verify", "Write Buffer",
>>> -        "Read Buffer",
>>> -/* 3d-3f */ "Update Block", "Read Long(10)",  "Write Long(10)",
>>> -/* 40-41 */ "Change Definition", "Write Same(10)",
>>> -/* 42-48 */ "Unmap/Read sub-channel", "Read TOC/PMA/ATIP",
>>> -        "Read density support", "Play audio(10)", "Get configuration",
>>> -        "Play audio msf", "Sanitize/Play audio track/index",
>>> -/* 49-4f */ "Play track relative(10)", "Get event status notification",
>>> -            "Pause/resume", "Log Select", "Log Sense", "Stop
>>> play/scan",
>>> -            NULL,
>>> -/* 50-55 */ "Xdwrite", "Xpwrite, Read disk info", "Xdread, Read track
>>> info",
>>> -            "Reserve track", "Send OPC info", "Mode Select(10)",
>>> -/* 56-5b */ "Reserve(10)", "Release(10)", "Repair track", "Read
>>> master cue",
>>> -            "Mode Sense(10)", "Close track/session",
>>> -/* 5c-5f */ "Read buffer capacity", "Send cue sheet", "Persistent
>>> reserve in",
>>> -            "Persistent reserve out",
>>> -/* 60-67 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
>>> -/* 68-6f */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
>>> -/* 70-77 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
>>> -/* 78-7f */ NULL, NULL, NULL, NULL, NULL, NULL, "Extended CDB",
>>> -        "Variable length",
>>> -/* 80-84 */ "Xdwrite(16)", "Rebuild(16)", "Regenerate(16)",
>>> -        "Third party copy out", "Third party copy in",
>>> -/* 85-89 */ "ATA command pass through(16)", "Access control in",
>>> -        "Access control out", "Read(16)", "Compare and Write",
>>> -/* 8a-8f */ "Write(16)", "ORWrite", "Read attributes", "Write
>>> attributes",
>>> -            "Write and verify(16)", "Verify(16)",
>>> -/* 90-94 */ "Pre-fetch(16)", "Synchronize cache(16)",
>>> -            "Lock/unlock cache(16)", "Write same(16)", NULL,
>>> -/* 95-99 */ NULL, NULL, NULL, NULL, NULL,
>>> -/* 9a-9f */ NULL, NULL, NULL, "Service action bidirectional",
>>> -        "Service action in(16)", "Service action out(16)",
>>> -/* a0-a5 */ "Report luns", "ATA command pass through(12)/Blank",
>>> -            "Security protocol in", "Maintenance in", "Maintenance
>>> out",
>>> -        "Move medium/play audio(12)",
>>> -/* a6-a9 */ "Exchange medium", "Move medium attached", "Read(12)",
>>> -            "Play track relative(12)",
>>> -/* aa-ae */ "Write(12)", NULL, "Erase(12), Get Performance",
>>> -            "Read DVD structure", "Write and verify(12)",
>>> -/* af-b1 */ "Verify(12)", "Search data high(12)", "Search data
>>> equal(12)",
>>> -/* b2-b4 */ "Search data low(12)", "Set limits(12)",
>>> -            "Read element status attached",
>>> -/* b5-b6 */ "Security protocol out", "Send volume tag, set streaming",
>>> -/* b7-b9 */ "Read defect data(12)", "Read element status", "Read CD
>>> msf",
>>> -/* ba-bc */ "Redundancy group (in), Scan",
>>> -            "Redundancy group (out), Set cd-rom speed", "Spare (in),
>>> Play cd",
>>> -/* bd-bf */ "Spare (out), Mechanism status", "Volume set (in), Read
>>> cd",
>>> -            "Volume set (out), Send DVD structure",
>>> -};
>>> -
>>> -struct value_name_pair {
>>> -    int value;
>>> -    const char * name;
>>> -};
>>> -
>>> -static const struct value_name_pair maint_in_arr[] = {
>>> -    {0x5, "Report identifying information"},
>>> -    {0xa, "Report target port groups"},
>>> -    {0xb, "Report aliases"},
>>> -    {0xc, "Report supported operation codes"},
>>> -    {0xd, "Report supported task management functions"},
>>> -    {0xe, "Report priority"},
>>> -    {0xf, "Report timestamp"},
>>> -    {0x10, "Management protocol in"},
>>> -};
>>> -#define MAINT_IN_SZ ARRAY_SIZE(maint_in_arr)
>>> -
>>> -static const struct value_name_pair maint_out_arr[] = {
>>> -    {0x6, "Set identifying information"},
>>> -    {0xa, "Set target port groups"},
>>> -    {0xb, "Change aliases"},
>>> -    {0xc, "Remove I_T nexus"},
>>> -    {0xe, "Set priority"},
>>> -    {0xf, "Set timestamp"},
>>> -    {0x10, "Management protocol out"},
>>> -};
>>> -#define MAINT_OUT_SZ ARRAY_SIZE(maint_out_arr)
>>> -
>>> -static const struct value_name_pair serv_in12_arr[] = {
>>> -    {0x1, "Read media serial number"},
>>> -};
>>> -#define SERV_IN12_SZ ARRAY_SIZE(serv_in12_arr)
>>> -
>>> -static const struct value_name_pair serv_out12_arr[] = {
>>> -    {-1, "dummy entry"},
>>> -};
>>> -#define SERV_OUT12_SZ ARRAY_SIZE(serv_out12_arr)
>>> -
>>> -static const struct value_name_pair serv_bidi_arr[] = {
>>> -    {-1, "dummy entry"},
>>> -};
>>> -#define SERV_BIDI_SZ ARRAY_SIZE(serv_bidi_arr)
>>> -
>>> -static const struct value_name_pair serv_in16_arr[] = {
>>> -    {0x10, "Read capacity(16)"},
>>> -    {0x11, "Read long(16)"},
>>> -    {0x12, "Get LBA status"},
>>> -    {0x13, "Report referrals"},
>>> -};
>>> -#define SERV_IN16_SZ ARRAY_SIZE(serv_in16_arr)
>>> -
>>> -static const struct value_name_pair serv_out16_arr[] = {
>>> -    {0x11, "Write long(16)"},
>>> -    {0x1f, "Notify data transfer device(16)"},
>>> -};
>>> -#define SERV_OUT16_SZ ARRAY_SIZE(serv_out16_arr)
>>> -
>>> -static const struct value_name_pair pr_in_arr[] = {
>>> -    {0x0, "Persistent reserve in, read keys"},
>>> -    {0x1, "Persistent reserve in, read reservation"},
>>> -    {0x2, "Persistent reserve in, report capabilities"},
>>> -    {0x3, "Persistent reserve in, read full status"},
>>> -};
>>> -#define PR_IN_SZ ARRAY_SIZE(pr_in_arr)
>>> -
>>> -static const struct value_name_pair pr_out_arr[] = {
>>> -    {0x0, "Persistent reserve out, register"},
>>> -    {0x1, "Persistent reserve out, reserve"},
>>> -    {0x2, "Persistent reserve out, release"},
>>> -    {0x3, "Persistent reserve out, clear"},
>>> -    {0x4, "Persistent reserve out, preempt"},
>>> -    {0x5, "Persistent reserve out, preempt and abort"},
>>> -    {0x6, "Persistent reserve out, register and ignore existing key"},
>>> -    {0x7, "Persistent reserve out, register and move"},
>>> -};
>>> -#define PR_OUT_SZ ARRAY_SIZE(pr_out_arr)
>>> -
>>> -/* SPC-4 rev 34 renamed the Extended Copy opcode to Third Party Copy
>>> Out.
>>> -   LID1 (List Identifier length: 1 byte) is the Extended Copy found
>>> in SPC-2
>>> -   and SPC-3 */
>>> -static const struct value_name_pair tpc_out_arr[] = {
>>> -    {0x0, "Extended copy(LID1)"},
>>> -    {0x1, "Extended copy(LID4)"},
>>> -    {0x10, "Populate token"},
>>> -    {0x11, "Write using token"},
>>> -    {0x1c, "Copy operation abort"},
>>> -};
>>> -#define TPC_OUT_SZ ARRAY_SIZE(tpc_out_arr)
>>> -
>>> -static const struct value_name_pair tpc_in_arr[] = {
>>> -    {0x0, "Receive copy status(LID1)"},
>>> -    {0x1, "Receive copy data(LID1)"},
>>> -    {0x3, "Receive copy operating parameters"},
>>> -    {0x4, "Receive copy failure details(LID1)"},
>>> -    {0x5, "Receive copy status(LID4)"},
>>> -    {0x6, "Receive copy data(LID4)"},
>>> -    {0x7, "Receive ROD token information"},
>>> -    {0x8, "Report all ROD tokens"},
>>> -};
>>> -#define TPC_IN_SZ ARRAY_SIZE(tpc_in_arr)
>>> -
>>> -
>>> -static const struct value_name_pair variable_length_arr[] = {
>>> -    {0x1, "Rebuild(32)"},
>>> -    {0x2, "Regenerate(32)"},
>>> -    {0x3, "Xdread(32)"},
>>> -    {0x4, "Xdwrite(32)"},
>>> -    {0x5, "Xdwrite extended(32)"},
>>> -    {0x6, "Xpwrite(32)"},
>>> -    {0x7, "Xdwriteread(32)"},
>>> -    {0x8, "Xdwrite extended(64)"},
>>> -    {0x9, "Read(32)"},
>>> -    {0xa, "Verify(32)"},
>>> -    {0xb, "Write(32)"},
>>> -    {0xc, "Write an verify(32)"},
>>> -    {0xd, "Write same(32)"},
>>> -    {0x8801, "Format OSD"},
>>> -    {0x8802, "Create (osd)"},
>>> -    {0x8803, "List (osd)"},
>>> -    {0x8805, "Read (osd)"},
>>> -    {0x8806, "Write (osd)"},
>>> -    {0x8807, "Append (osd)"},
>>> -    {0x8808, "Flush (osd)"},
>>> -    {0x880a, "Remove (osd)"},
>>> -    {0x880b, "Create partition (osd)"},
>>> -    {0x880c, "Remove partition (osd)"},
>>> -    {0x880e, "Get attributes (osd)"},
>>> -    {0x880f, "Set attributes (osd)"},
>>> -    {0x8812, "Create and write (osd)"},
>>> -    {0x8815, "Create collection (osd)"},
>>> -    {0x8816, "Remove collection (osd)"},
>>> -    {0x8817, "List collection (osd)"},
>>> -    {0x8818, "Set key (osd)"},
>>> -    {0x8819, "Set master key (osd)"},
>>> -    {0x881a, "Flush collection (osd)"},
>>> -    {0x881b, "Flush partition (osd)"},
>>> -    {0x881c, "Flush OSD"},
>>> -    {0x8f7e, "Perform SCSI command (osd)"},
>>> -    {0x8f7f, "Perform task management function (osd)"},
>>> -};
>>> -#define VARIABLE_LENGTH_SZ ARRAY_SIZE(variable_length_arr)
>>> -
>>> -struct sa_name_list {
>>> -    int cmd;
>>> -    const struct value_name_pair *arr;
>>> -    int arr_sz;
>>> -};
>>> -
>>> -static struct sa_name_list sa_names_arr[] = {
>>> -    {VARIABLE_LENGTH_CMD, variable_length_arr, VARIABLE_LENGTH_SZ},
>>> -    {MAINTENANCE_IN, maint_in_arr, MAINT_IN_SZ},
>>> -    {MAINTENANCE_OUT, maint_out_arr, MAINT_OUT_SZ},
>>> -    {PERSISTENT_RESERVE_IN, pr_in_arr, PR_IN_SZ},
>>> -    {PERSISTENT_RESERVE_OUT, pr_out_arr, PR_OUT_SZ},
>>> -    {SERVICE_ACTION_IN_12, serv_in12_arr, SERV_IN12_SZ},
>>> -    {SERVICE_ACTION_OUT_12, serv_out12_arr, SERV_OUT12_SZ},
>>> -    {SERVICE_ACTION_BIDIRECTIONAL, serv_bidi_arr, SERV_BIDI_SZ},
>>> -    {SERVICE_ACTION_IN_16, serv_in16_arr, SERV_IN16_SZ},
>>> -    {SERVICE_ACTION_OUT_16, serv_out16_arr, SERV_OUT16_SZ},
>>> -    {THIRD_PARTY_COPY_IN, tpc_in_arr, TPC_IN_SZ},
>>> -    {THIRD_PARTY_COPY_OUT, tpc_out_arr, TPC_OUT_SZ},
>>> -    {0, NULL, 0},
>>> -};
>>> -#define SA_NAME_LIST_SZ ARRAY_SIZE(sa_names_arr)
>>> -
>>> -static int scsi_opcode_sa_name(int cmd, int service_action,
>>> -                   const char **sa_name)
>>> -{
>>> -    struct sa_name_list *sa_name_ptr = sa_names_arr;
>>> -    const struct value_name_pair * arr = NULL;
>>> -    int arr_sz, k;
>>> -
>>> -    for (k = 0; k < SA_NAME_LIST_SZ; ++k, ++sa_name_ptr) {
>>> -        if (sa_name_ptr->cmd == cmd) {
>>> -            arr = sa_name_ptr->arr;
>>> -            arr_sz = sa_name_ptr->arr_sz;
>>> -            break;
>>> -        }
>>> -    }
>>> -    if (!arr)
>>> -        return 0;
>>> -
>>> -    for (k = 0; k < arr_sz; ++k, ++arr) {
>>> -        if (service_action == arr->value)
>>> -            break;
>>> -    }
>>> -    if (k < arr_sz)
>>> -        *sa_name = arr->name;
>>> -
>>> -    return 1;
>>> -}
>>> -#else
>>> -static int scsi_opcode_sa_name(int cmd, int service_action,
>>> -                   const char **sa_name)
>>> -{
>>> -    switch (cmd) {
>>> -    case VARIABLE_LENGTH_CMD:
>>> -    case MAINTENANCE_IN:
>>> -    case MAINTENANCE_OUT:
>>> -    case PERSISTENT_RESERVE_IN:
>>> -    case PERSISTENT_RESERVE_OUT:
>>> -    case SERVICE_ACTION_IN_12:
>>> -    case SERVICE_ACTION_OUT_12:
>>> -    case SERVICE_ACTION_BIDIRECTIONAL:
>>> -    case SERVICE_ACTION_IN_16:
>>> -    case SERVICE_ACTION_OUT_16:
>>> -    case THIRD_PARTY_COPY_IN:
>>> -    case THIRD_PARTY_COPY_OUT:
>>> -        return 1;
>>> -    }
>>> -    return 0;
>>> -}
>>> -#endif /* CONFIG_SCSI_CONSTANTS */
>>> -
>>> -/* attempt to guess cdb length if cdb_len==0 . No trailing linefeed. */
>>> -static void print_opcode_name(struct scsi_device *sdev, const char
>>> *prefix,
>>> -                  unsigned char * cdbp, int cdb_len)
>>> -{
>>> -    int sa, cdb0, sa_valid;
>>> -    const char * cdb_name = NULL, *sa_name = NULL;
>>> -    const char * cdb_classifier = NULL;
>>> -
>>> -    cdb0 = cdbp[0];
>>> -    if (cdb0 == VARIABLE_LENGTH_CMD) {
>>> -#ifdef CONFIG_SCSI_CONSTANTS
>>> -        const struct value_name_pair * arr = NULL;
>>> -        int k;
>>> -#endif
>>> -        int len;
>>> -
>>> -        len = scsi_varlen_cdb_length(cdbp);
>>> -        if (len < 10) {
>>> -            sdev_printk(KERN_INFO, sdev,
>>> -                    "short variable length command, "
>>> -                    "len=%d ext_len=%d", len, cdb_len);
>>> -            return;
>>> -        }
>>> -        sa = (cdbp[8] << 8) + cdbp[9];
>>> -#ifdef CONFIG_SCSI_CONSTANTS
>>> -        arr = variable_length_arr;
>>> -        for (k = 0; k < VARIABLE_LENGTH_SZ; ++k, ++arr) {
>>> -            if (sa == arr->value) {
>>> -                sa_name = arr->name;
>>> -                break;
>>> -            }
>>> -        }
>>> -#endif
>>> -        if (sa_name)
>>> -            sdev_printk(KERN_INFO, sdev,
>>> -                    "[%s] CDB: %s, in_cdb_len=%d, ext_len=%d",
>>> -                    prefix, sa_name, len, cdb_len);
>>> -        else
>>> -            sdev_printk(KERN_INFO, sdev,
>>> -                    "[%s] CDB: cdb[0]=0x%x, sa=0x%x, "
>>> -                    "in_cdb_len=%d, ext_len=%d",
>>> -                    prefix, cdb0, sa, len, cdb_len);
>>> -        return;
>>> -    }
>>> -
>>> -    if (cdb0 < 0xc0) {
>>> -        cdb_classifier = NULL;
>>> -#ifdef CONFIG_SCSI_CONSTANTS
>>> -        cdb_name = cdb_byte0_names[cdb0];
>>> -        if (!cdb_name)
>>> -            cdb_classifier = " (reserved)";
>>> -#endif
>>> -    } else
>>> -        cdb_classifier = " (vendor)";
>>> -
>>> -    sa = cdbp[1] & 0x1f;
>>> -    sa_valid = scsi_opcode_sa_name(cdb0, sa, &sa_name);
>>> -
>>> -    if (!sa_valid) {
>>> -        if (cdb_name)
>>> -            sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s",
>>> -                    prefix, cdb_name);
>>> -        else
>>> -            sdev_printk(KERN_INFO, sdev, "[%s] CDB: cdb[0]=0x%x%s",
>>> -                    prefix, cdb0, cdb_classifier );
>>> -    } else {
>>> -        if (sa_name)
>>> -            sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s",
>>> -                    prefix, sa_name);
>>> -        else if (cdb_name)
>>> -            sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s, sa=0x%x",
>>> -                    prefix, cdb_name, sa);
>>> -        else
>>> -            sdev_printk(KERN_INFO, sdev,
>>> -                    "[%s] CDB: cdb[0]=0x%x, sa=0x%x",
>>> -                    prefix, cdb0, sa);
>>> -    }
>>> -}
>>> -
>>> -void __scsi_print_command(struct scsi_device *sdev, const char *prefix,
>>> -              unsigned char *cdb, int cdb_len)
>>> -{
>>> -    char linebuf[128];
>>> -    int i, linelen, remaining;
>>> -
>>> -    print_opcode_name(sdev, prefix, cdb, 0);
>>> -    if (!cdb_len)
>>> -        cdb_len = scsi_command_size(cdb);
>>> -    /* print out all bytes in cdb */
>>> -    remaining = cdb_len;
>>> -    for (i = 0; i < cdb_len; i += 16) {
>>> -        linelen = min(remaining, 16);
>>> -        remaining -= 16;
>>> -
>>> -        hex_dump_to_buffer(cdb + i, linelen, 16, 1,
>>> -                   linebuf, sizeof(linebuf), false);
>>> -    }
>>> -    sdev_printk(KERN_INFO, sdev, "[%s] CDB: %s\n", prefix, linebuf);
>>> -}
>>> -EXPORT_SYMBOL(__scsi_print_command);
>>> -
>>> -void scsi_print_command(struct scsi_cmnd *cmd)
>>> -{
>>> -    const char *devname = cmd->request->rq_disk ?
>>> -        cmd->request->rq_disk->disk_name : "scsi";
>>> -
>>> -    if (cmd->cmnd == NULL)
>>> -        return;
>>> -
>>> -    print_opcode_name(cmd->device, devname, cmd->cmnd, cmd->cmd_len);
>>> -}
>>> -EXPORT_SYMBOL(scsi_print_command);
>>> diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
>>> index 60678d8..6761077 100644
>>> --- a/drivers/scsi/scsi_trace.c
>>> +++ b/drivers/scsi/scsi_trace.c
>>> @@ -1237,6 +1237,414 @@ scsi_print_sense_hdr(struct scsi_device *sdev,
>>> const char *name,
>>>   }
>>>   EXPORT_SYMBOL(scsi_print_sense_hdr);
>>>
>>> +/* Commands with service actions that change the command name */
>>> +#define SERVICE_ACTION_IN_12 0xab
>>> +#define SERVICE_ACTION_OUT_12 0xa9
>>> +#define SERVICE_ACTION_BIDIRECTIONAL 0x9d
>>> +#define SERVICE_ACTION_IN_16 0x9e
>>> +#define SERVICE_ACTION_OUT_16 0x9f
>>> +#define THIRD_PARTY_COPY_OUT 0x83
>>> +#define THIRD_PARTY_COPY_IN 0x84
>>> +
>>> +#ifdef CONFIG_SCSI_CONSTANTS
>>> +static const char *cdb_byte0_names[] = {
>>> +/* 00-03 */ "Test Unit Ready", "Rezero Unit/Rewind", NULL, "Request
>>> Sense",
>>> +/* 04-07 */ "Format Unit/Medium", "Read Block Limits", NULL,
>>> +        "Reassign Blocks",
>>> +/* 08-0d */ "Read(6)", NULL, "Write(6)", "Seek(6)", NULL, NULL,
>>> +/* 0e-12 */ NULL, "Read Reverse", "Write Filemarks", "Space",
>>> "Inquiry",
>>> +/* 13-16 */ "Verify(6)", "Recover Buffered Data", "Mode Select(6)",
>>> +        "Reserve(6)",
>>> +/* 17-1a */ "Release(6)", "Copy", "Erase", "Mode Sense(6)",
>>> +/* 1b-1d */ "Start/Stop Unit", "Receive Diagnostic", "Send Diagnostic",
>>> +/* 1e-1f */ "Prevent/Allow Medium Removal", NULL,
>>> +/* 20-22 */  NULL, NULL, NULL,
>>> +/* 23-28 */ "Read Format Capacities", "Set Window",
>>> +        "Read Capacity(10)", NULL, NULL, "Read(10)",
>>> +/* 29-2d */ "Read Generation", "Write(10)", "Seek(10)", "Erase(10)",
>>> +        "Read updated block",
>>> +/* 2e-31 */ "Write Verify(10)", "Verify(10)", "Search High", "Search
>>> Equal",
>>> +/* 32-34 */ "Search Low", "Set Limits", "Prefetch/Read Position",
>>> +/* 35-37 */ "Synchronize Cache(10)", "Lock/Unlock Cache(10)",
>>> +        "Read Defect Data(10)",
>>> +/* 38-3c */ "Medium Scan", "Compare", "Copy Verify", "Write Buffer",
>>> +        "Read Buffer",
>>> +/* 3d-3f */ "Update Block", "Read Long(10)",  "Write Long(10)",
>>> +/* 40-41 */ "Change Definition", "Write Same(10)",
>>> +/* 42-48 */ "Unmap/Read sub-channel", "Read TOC/PMA/ATIP",
>>> +        "Read density support", "Play audio(10)", "Get configuration",
>>> +        "Play audio msf", "Sanitize/Play audio track/index",
>>> +/* 49-4f */ "Play track relative(10)", "Get event status notification",
>>> +        "Pause/resume", "Log Select", "Log Sense", "Stop play/scan",
>>> +        NULL,
>>> +/* 50-55 */ "Xdwrite", "Xpwrite, Read disk info", "Xdread, Read track
>>> info",
>>> +        "Reserve track", "Send OPC info", "Mode Select(10)",
>>> +/* 56-5b */ "Reserve(10)", "Release(10)", "Repair track", "Read
>>> master cue",
>>> +        "Mode Sense(10)", "Close track/session",
>>> +/* 5c-5f */ "Read buffer capacity", "Send cue sheet", "Persistent
>>> reserve in",
>>> +        "Persistent reserve out",
>>> +/* 60-67 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
>>> +/* 68-6f */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
>>> +/* 70-77 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
>>> +/* 78-7f */ NULL, NULL, NULL, NULL, NULL, NULL, "Extended CDB",
>>> +        "Variable length",
>>> +/* 80-84 */ "Xdwrite(16)", "Rebuild(16)", "Regenerate(16)",
>>> +        "Third party copy out", "Third party copy in",
>>> +/* 85-89 */ "ATA command pass through(16)", "Access control in",
>>> +        "Access control out", "Read(16)", "Compare and Write",
>>> +/* 8a-8f */ "Write(16)", "ORWrite", "Read attributes", "Write
>>> attributes",
>>> +        "Write and verify(16)", "Verify(16)",
>>> +/* 90-94 */ "Pre-fetch(16)", "Synchronize cache(16)",
>>> +        "Lock/unlock cache(16)", "Write same(16)", NULL,
>>> +/* 95-99 */ NULL, NULL, NULL, NULL, NULL,
>>> +/* 9a-9f */ NULL, NULL, NULL, "Service action bidirectional",
>>> +        "Service action in(16)", "Service action out(16)",
>>> +/* a0-a5 */ "Report luns", "ATA command pass through(12)/Blank",
>>> +        "Security protocol in", "Maintenance in", "Maintenance out",
>>> +        "Move medium/play audio(12)",
>>> +/* a6-a9 */ "Exchange medium", "Move medium attached", "Read(12)",
>>> +        "Play track relative(12)",
>>> +/* aa-ae */ "Write(12)", NULL, "Erase(12), Get Performance",
>>> +        "Read DVD structure", "Write and verify(12)",
>>> +/* af-b1 */ "Verify(12)", "Search data high(12)", "Search data
>>> equal(12)",
>>> +/* b2-b4 */ "Search data low(12)", "Set limits(12)",
>>> +        "Read element status attached",
>>> +/* b5-b6 */ "Security protocol out", "Send volume tag, set streaming",
>>> +/* b7-b9 */ "Read defect data(12)", "Read element status", "Read CD
>>> msf",
>>> +/* ba-bc */ "Redundancy group (in), Scan",
>>> +        "Redundancy group (out), Set cd-rom speed", "Spare (in), Play
>>> cd",
>>> +/* bd-bf */ "Spare (out), Mechanism status", "Volume set (in), Read
>>> cd",
>>> +        "Volume set (out), Send DVD structure",
>>> +};
>>> +
>>> +struct value_name_pair {
>>> +    int value;
>>> +    const char *name;
>>> +};
>>> +
>>> +static const struct value_name_pair maint_in_arr[] = {
>>> +    {0x5, "Report identifying information"},
>>> +    {0xa, "Report target port groups"},
>>> +    {0xb, "Report aliases"},
>>> +    {0xc, "Report supported operation codes"},
>>> +    {0xd, "Report supported task management functions"},
>>> +    {0xe, "Report priority"},
>>> +    {0xf, "Report timestamp"},
>>> +    {0x10, "Management protocol in"},
>>> +};
>>> +#define MAINT_IN_SZ ARRAY_SIZE(maint_in_arr)
>>> +
>>> +static const struct value_name_pair maint_out_arr[] = {
>>> +    {0x6, "Set identifying information"},
>>> +    {0xa, "Set target port groups"},
>>> +    {0xb, "Change aliases"},
>>> +    {0xc, "Remove I_T nexus"},
>>> +    {0xe, "Set priority"},
>>> +    {0xf, "Set timestamp"},
>>> +    {0x10, "Management protocol out"},
>>> +};
>>> +#define MAINT_OUT_SZ ARRAY_SIZE(maint_out_arr)
>>> +
>>> +static const struct value_name_pair serv_in12_arr[] = {
>>> +    {0x1, "Read media serial number"},
>>> +};
>>> +#define SERV_IN12_SZ ARRAY_SIZE(serv_in12_arr)
>>> +
>>> +static const struct value_name_pair serv_out12_arr[] = {
>>> +    {-1, "dummy entry"},
>>> +};
>>> +#define SERV_OUT12_SZ ARRAY_SIZE(serv_out12_arr)
>>> +
>>> +static const struct value_name_pair serv_bidi_arr[] = {
>>> +    {-1, "dummy entry"},
>>> +};
>>> +#define SERV_BIDI_SZ ARRAY_SIZE(serv_bidi_arr)
>>> +
>>> +static const struct value_name_pair serv_in16_arr[] = {
>>> +    {0x10, "Read capacity(16)"},
>>> +    {0x11, "Read long(16)"},
>>> +    {0x12, "Get LBA status"},
>>> +    {0x13, "Report referrals"},
>>> +};
>>> +#define SERV_IN16_SZ ARRAY_SIZE(serv_in16_arr)
>>> +
>>> +static const struct value_name_pair serv_out16_arr[] = {
>>> +    {0x11, "Write long(16)"},
>>> +    {0x1f, "Notify data transfer device(16)"},
>>> +};
>>> +#define SERV_OUT16_SZ ARRAY_SIZE(serv_out16_arr)
>>> +
>>> +static const struct value_name_pair pr_in_arr[] = {
>>> +    {0x0, "Persistent reserve in, read keys"},
>>> +    {0x1, "Persistent reserve in, read reservation"},
>>> +    {0x2, "Persistent reserve in, report capabilities"},
>>> +    {0x3, "Persistent reserve in, read full status"},
>>> +};
>>> +#define PR_IN_SZ ARRAY_SIZE(pr_in_arr)
>>> +
>>> +static const struct value_name_pair pr_out_arr[] = {
>>> +    {0x0, "Persistent reserve out, register"},
>>> +    {0x1, "Persistent reserve out, reserve"},
>>> +    {0x2, "Persistent reserve out, release"},
>>> +    {0x3, "Persistent reserve out, clear"},
>>> +    {0x4, "Persistent reserve out, preempt"},
>>> +    {0x5, "Persistent reserve out, preempt and abort"},
>>> +    {0x6, "Persistent reserve out, register and ignore existing key"},
>>> +    {0x7, "Persistent reserve out, register and move"},
>>> +};
>>> +#define PR_OUT_SZ ARRAY_SIZE(pr_out_arr)
>>> +
>>> +/* SPC-4 rev 34 renamed the Extended Copy opcode to Third Party Copy
>>> Out.
>>> +   LID1 (List Identifier length: 1 byte) is the Extended Copy found
>>> in SPC-2
>>> +   and SPC-3 */
>>> +static const struct value_name_pair tpc_out_arr[] = {
>>> +    {0x0, "Extended copy(LID1)"},
>>> +    {0x1, "Extended copy(LID4)"},
>>> +    {0x10, "Populate token"},
>>> +    {0x11, "Write using token"},
>>> +    {0x1c, "Copy operation abort"},
>>> +};
>>> +#define TPC_OUT_SZ ARRAY_SIZE(tpc_out_arr)
>>> +
>>> +static const struct value_name_pair tpc_in_arr[] = {
>>> +    {0x0, "Receive copy status(LID1)"},
>>> +    {0x1, "Receive copy data(LID1)"},
>>> +    {0x3, "Receive copy operating parameters"},
>>> +    {0x4, "Receive copy failure details(LID1)"},
>>> +    {0x5, "Receive copy status(LID4)"},
>>> +    {0x6, "Receive copy data(LID4)"},
>>> +    {0x7, "Receive ROD token information"},
>>> +    {0x8, "Report all ROD tokens"},
>>> +};
>>> +#define TPC_IN_SZ ARRAY_SIZE(tpc_in_arr)
>>> +
>>> +static const struct value_name_pair variable_length_arr[] = {
>>> +    {0x1, "Rebuild(32)"},
>>> +    {0x2, "Regenerate(32)"},
>>> +    {0x3, "Xdread(32)"},
>>> +    {0x4, "Xdwrite(32)"},
>>> +    {0x5, "Xdwrite extended(32)"},
>>> +    {0x6, "Xpwrite(32)"},
>>> +    {0x7, "Xdwriteread(32)"},
>>> +    {0x8, "Xdwrite extended(64)"},
>>> +    {0x9, "Read(32)"},
>>> +    {0xa, "Verify(32)"},
>>> +    {0xb, "Write(32)"},
>>> +    {0xc, "Write an verify(32)"},
>>> +    {0xd, "Write same(32)"},
>>> +    {0x8801, "Format OSD"},
>>> +    {0x8802, "Create (osd)"},
>>> +    {0x8803, "List (osd)"},
>>> +    {0x8805, "Read (osd)"},
>>> +    {0x8806, "Write (osd)"},
>>> +    {0x8807, "Append (osd)"},
>>> +    {0x8808, "Flush (osd)"},
>>> +    {0x880a, "Remove (osd)"},
>>> +    {0x880b, "Create partition (osd)"},
>>> +    {0x880c, "Remove partition (osd)"},
>>> +    {0x880e, "Get attributes (osd)"},
>>> +    {0x880f, "Set attributes (osd)"},
>>> +    {0x8812, "Create and write (osd)"},
>>> +    {0x8815, "Create collection (osd)"},
>>> +    {0x8816, "Remove collection (osd)"},
>>> +    {0x8817, "List collection (osd)"},
>>> +    {0x8818, "Set key (osd)"},
>>> +    {0x8819, "Set master key (osd)"},
>>> +    {0x881a, "Flush collection (osd)"},
>>> +    {0x881b, "Flush partition (osd)"},
>>> +    {0x881c, "Flush OSD"},
>>> +    {0x8f7e, "Perform SCSI command (osd)"},
>>> +    {0x8f7f, "Perform task management function (osd)"},
>>> +};
>>> +#define VARIABLE_LENGTH_SZ ARRAY_SIZE(variable_length_arr)
>>> +
>>> +struct sa_name_list {
>>> +    int cmd;
>>> +    const struct value_name_pair *arr;
>>> +    int arr_sz;
>>> +};
>>> +
>>> +static struct sa_name_list sa_names_arr[] = {
>>> +    {VARIABLE_LENGTH_CMD, variable_length_arr, VARIABLE_LENGTH_SZ},
>>> +    {MAINTENANCE_IN, maint_in_arr, MAINT_IN_SZ},
>>> +    {MAINTENANCE_OUT, maint_out_arr, MAINT_OUT_SZ},
>>> +    {PERSISTENT_RESERVE_IN, pr_in_arr, PR_IN_SZ},
>>> +    {PERSISTENT_RESERVE_OUT, pr_out_arr, PR_OUT_SZ},
>>> +    {SERVICE_ACTION_IN_12, serv_in12_arr, SERV_IN12_SZ},
>>> +    {SERVICE_ACTION_OUT_12, serv_out12_arr, SERV_OUT12_SZ},
>>> +    {SERVICE_ACTION_BIDIRECTIONAL, serv_bidi_arr, SERV_BIDI_SZ},
>>> +    {SERVICE_ACTION_IN_16, serv_in16_arr, SERV_IN16_SZ},
>>> +    {SERVICE_ACTION_OUT_16, serv_out16_arr, SERV_OUT16_SZ},
>>> +    {THIRD_PARTY_COPY_IN, tpc_in_arr, TPC_IN_SZ},
>>> +    {THIRD_PARTY_COPY_OUT, tpc_out_arr, TPC_OUT_SZ},
>>> +    {0, NULL, 0},
>>> +};
>>> +#define SA_NAME_LIST_SZ ARRAY_SIZE(sa_names_arr)
>>> +
>>> +static int scsi_opcode_sa_name(int cmd, int service_action,
>>> +                   const char **sa_name)
>>> +{
>>> +    struct sa_name_list *sa_name_ptr = sa_names_arr;
>>> +    const struct value_name_pair *arr = NULL;
>>> +    int arr_sz, k;
>>> +
>>> +    for (k = 0; k < SA_NAME_LIST_SZ; ++k, ++sa_name_ptr) {
>>> +        if (sa_name_ptr->cmd == cmd) {
>>> +            arr = sa_name_ptr->arr;
>>> +            arr_sz = sa_name_ptr->arr_sz;
>>> +            break;
>>> +        }
>>> +    }
>>> +    if (!arr)
>>> +        return 0;
>>> +
>>> +    for (k = 0; k < arr_sz; ++k, ++arr) {
>>> +        if (service_action == arr->value)
>>> +            break;
>>> +    }
>>> +    if (k < arr_sz)
>>> +        *sa_name = arr->name;
>>> +
>>> +    return 1;
>>> +}
>>> +#else
>>> +static int scsi_opcode_sa_name(int cmd, int service_action,
>>> +                   const char **sa_name)
>>> +{
>>> +    switch (cmd) {
>>> +    case VARIABLE_LENGTH_CMD:
>>> +    case MAINTENANCE_IN:
>>> +    case MAINTENANCE_OUT:
>>> +    case PERSISTENT_RESERVE_IN:
>>> +    case PERSISTENT_RESERVE_OUT:
>>> +    case SERVICE_ACTION_IN_12:
>>> +    case SERVICE_ACTION_OUT_12:
>>> +    case SERVICE_ACTION_BIDIRECTIONAL:
>>> +    case SERVICE_ACTION_IN_16:
>>> +    case SERVICE_ACTION_OUT_16:
>>> +    case THIRD_PARTY_COPY_IN:
>>> +    case THIRD_PARTY_COPY_OUT:
>>> +        return 1;
>>> +    }
>>> +    return 0;
>>> +}
>>> +#endif /* CONFIG_SCSI_CONSTANTS */
>>> +
>>> +const char *
>>> +output_all_bytes(struct trace_seq *p, unsigned char *cdbp, int cdb_len)
>>> +{
>>> +    const char *ret = p->buffer + p->len;
>>> +    int i;
>>> +
>>> +    if (!cdb_len)
>>> +        cdb_len = scsi_command_size(cdbp);
>>> +
>>> +    for (i = 0; i < cdb_len; ++i)
>>> +        trace_seq_printf(p, "%02x", cdbp[i]);
>>> +
>>> +    trace_seq_putc(p, 0);
>>> +    return ret;
>>> +}
>>> +
>>> +const char *
>>> +print_opcode_name(struct trace_seq *p, unsigned char *cdbp, int
>>> cdb_len,
>>> +          bool output_raw, int raw_len)
>>> +{
>>> +    int sa, cdb0, sa_valid;
>>> +    const char *cdb_name = NULL, *sa_name = NULL;
>>> +    const char *cdb_classifier = NULL;
>>> +    const char *ret = p->buffer + p->len;
>>> +
>>> +    cdb0 = cdbp[0];
>>> +    if (cdb0 == VARIABLE_LENGTH_CMD) {
>>> +#ifdef CONFIG_SCSI_CONSTANTS
>>> +        const struct value_name_pair *arr = NULL;
>>> +        int k;
>>> +#endif
>>> +        int len;
>>> +
>>> +        len = scsi_varlen_cdb_length(cdbp);
>>> +        if (len < 10) {
>>> +            trace_seq_printf(p, "short variable length command, "
>>> +                     "len=%d ext_len=%d", len, cdb_len);
>>> +            goto out;
>>> +        }
>>> +        sa = (cdbp[8] << 8) + cdbp[9];
>>> +#ifdef CONFIG_SCSI_CONSTANTS
>>> +        arr = variable_length_arr;
>>> +        for (k = 0; k < VARIABLE_LENGTH_SZ; ++k, ++arr) {
>>> +            if (sa == arr->value) {
>>> +                sa_name = arr->name;
>>> +                break;
>>> +            }
>>> +        }
>>> +#endif
>>> +        if (sa_name)
>>> +            trace_seq_printf(p, "CDB (%s, in_cdb_len=%d, "
>>> +                     "ext_len=%d)", sa_name, len, cdb_len);
>>> +        else
>>> +            trace_seq_printf(p, "CDB (cdb[0]=0x%x, sa=0x%x, "
>>> +                     "in_cdb_len=%d, ext_len=%d)",
>>> +                     cdb0, sa, len, cdb_len);
>>> +        goto out;
>>> +    }
>>> +
>>> +    if (cdb0 < 0xc0) {
>>> +        cdb_classifier = NULL;
>>> +#ifdef CONFIG_SCSI_CONSTANTS
>>> +        cdb_name = cdb_byte0_names[cdb0];
>>> +        if (!cdb_name)
>>> +            cdb_classifier = " (reserved)";
>>> +#endif
>>> +    } else
>>> +        cdb_classifier = " (vendor)";
>>> +
>>> +    sa = cdbp[1] & 0x1f;
>>> +    sa_valid = scsi_opcode_sa_name(cdb0, sa, &sa_name);
>>> +
>>> +    if (!sa_valid) {
>>> +        if (cdb_name)
>>> +            trace_seq_printf(p, "CDB (%s)", cdb_name);
>>> +        else
>>> +            trace_seq_printf(p, "CDB (cdb[0]=0x%x%s)",
>>> +                     cdb0, cdb_classifier);
>>> +    } else {
>>> +        if (sa_name)
>>> +            trace_seq_printf(p, "CDB (%s)", sa_name);
>>> +        else if (cdb_name)
>>> +            trace_seq_printf(p, "CDB (%s, sa=0x%x)", cdb_name, sa);
>>> +        else
>>> +            trace_seq_printf(p, "CDB (cdb[0]=0x%x, sa=0x%x)",
>>> +                     cdb0, sa);
>>> +    }
>>> +
>>> +out:
>>> +    if (output_raw)
>>> +        return output_all_bytes(p, cdbp, raw_len);
>>> +    trace_seq_putc(p, 0);
>>> +    return ret;
>>> +}
>>> +
>>> +void __scsi_print_command(struct scsi_device *sdev, const char *prefix,
>>> +              unsigned char *cdb, int cdb_len)
>>> +{
>>> +    trace_scsi_print_command(sdev, prefix, cdb, 0, true, cdb_len);
>>> +}
>>> +EXPORT_SYMBOL(__scsi_print_command);
>>> +
>>> +void scsi_print_command(struct scsi_cmnd *cmd)
>>> +{
>>> +    const char *devname = cmd->request->rq_disk ?
>>> +        cmd->request->rq_disk->disk_name : "scsi";
>>> +
>>> +    if (cmd->cmnd == NULL)
>>> +        return;
>>> +
>>> +    trace_scsi_print_command(cmd->device, devname, cmd->cmnd,
>>> +                 cmd->cmd_len, false, 0);
>>> +}
>>> +EXPORT_SYMBOL(scsi_print_command);
>>> +
>>>   static const char *
>>>   scsi_dump_sense_buffer(struct trace_seq *p, const unsigned char
>>> *buf, int len)
>>>   {
>>> diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
>>> index 54ebf54..1680135 100644
>>> --- a/include/scsi/scsi.h
>>> +++ b/include/scsi/scsi.h
>>> @@ -207,10 +207,16 @@ struct scsi_varlen_cdb_hdr {
>>>       /* service specific data follows */
>>>   };
>>>
>>> +static inline unsigned __scsi_varlen_cdb_length(u8
>>> additional_cdb_length)
>>> +{
>>> +    return additional_cdb_length + 8;
>>> +}
>>> +
>>>   static inline unsigned
>>>   scsi_varlen_cdb_length(const void *hdr)
>>>   {
>>> -    return ((struct scsi_varlen_cdb_hdr *)hdr)->additional_cdb_length
>>> + 8;
>>> +    return __scsi_varlen_cdb_length(
>>> +        ((struct scsi_varlen_cdb_hdr *)hdr)->additional_cdb_length);
>>>   }
>>>
>>>   extern const unsigned char scsi_command_size_tbl[8];
>>> diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h
>>> index 6d3543f..c50bade 100644
>>> --- a/include/trace/events/scsi.h
>>> +++ b/include/trace/events/scsi.h
>>> @@ -449,6 +449,51 @@ TRACE_EVENT(scsi_print_sense,
>>>             __entry->sense_len,  __entry->raw),
>>>             __extd_sense(__entry->asc, __entry->ascq))
>>>   );
>>> +
>>> +const char *
>>> +print_opcode_name(struct trace_seq*, unsigned char*, int, bool, int);
>>> +#define __opcode_name(cdbp, cdb_len, output_raw, raw_len)    \
>>> +            print_opcode_name(p, cdbp, cdb_len, output_raw, raw_len)
>>> +
>>> +TRACE_EVENT(scsi_print_command,
>>> +
>>> +    TP_PROTO(struct scsi_device *sdev, const char *devname,
>>> +         unsigned char *cdbp, int cdb_len, bool output_raw,
>>> +         int raw_len),
>>> +
>>> +    TP_ARGS(sdev, devname, cdbp, cdb_len, output_raw, raw_len),
>>> +
>>> +    TP_STRUCT__entry(
>>> +        __field( unsigned int,        host_no        )
>>> +        __field( unsigned int,        channel        )
>>> +        __field( unsigned int,        id        )
>>> +        __field( unsigned int,        lun        )
>>> +        __string(devname,        devname        )
>>> +        __dynamic_array(unsigned char,    cdbp,
>>> +                cdb_len ? cdb_len : scsi_command_size(cdbp))
>>> +        __field( int,            cdb_len        )
>>> +        __field( bool,            output_raw    )
>>> +        __field( int,            raw_len        )
>>> +    ),
>>> +
>>> +    TP_fast_assign(
>>> +        __entry->host_no    = sdev->host->host_no;
>>> +        __entry->channel    = sdev->channel;
>>> +        __entry->id        = sdev->id;
>>> +        __entry->lun        = sdev->lun;
>>> +        __assign_str(devname, devname);
>>> +        memcpy(__get_dynamic_array(cdbp), cdbp,
>>> +               cdb_len ? cdb_len : scsi_command_size(cdbp));
>>> +        __entry->cdb_len    = cdb_len;
>>> +        __entry->output_raw    = output_raw;
>>> +        __entry->raw_len    = raw_len;
>>> +    ),
>>> +
>>> +    TP_printk("host_no=%u channel=%u id=%u lun=%u [%s] %s",
>>> +          __entry->host_no, __entry->channel, __entry->id,
>>> __entry->lun,
>>> +          __get_str(devname), __opcode_name(__get_dynamic_array(cdbp),
>>> +          __entry->cdb_len, __entry->output_raw, __entry->raw_len))
>>> +);
>>>   #endif /*  _TRACE_SCSI_H */
>>>
>>>   /* This part must be outside protection */
>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>>
>> No.
>> constants.c is influenced by CONFIG_SCSI_CONSTANTS, and we should be
>> keeping it that way.
>
> OK, I'll do that. We'll use existing decoder in constants.c.
>
> Thanks,
> Yoshihiro YUNOMAE
>

-- 
Yoshihiro YUNOMAE
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: yoshihiro.yunomae.ez@hitachi.com

Re: [RFC PATCH 10/10] scsi/trace: Use scsi_print_command trace point instead of printk

[Hannes Reinecke]

On 08/28/2014 08:19 AM, Yoshihiro YUNOMAE wrote:
> Hi Hannes,
>
> I tried to remove duplicated decoder of SCSI command, but the
> output format of it in constants.c is different from it in traceevents.
> I have two questions for it.
>
> (Ex1)
> traceevents: TEST_UNIT_READY
> constants: Test Unit Ready
>
> => Which of "XXX_YYY_ZZZ" and "Xxx Yyy Zzz" should the kernel output
> strings? This difference comes from difference of implementation.
> The decoder in traceevents are using macro. So, it cannot define
> separated words. On the other hand, the decoder in constants are using
> constant string array table. So, it can define separated words.
>
I would go with the wording in constants.c, but set in double quotes 
like "Test Unit Ready" to avoid parsing errors later on.

> (Ex2)
> traceevents: (nothing)
> constants: Set limits(12)
>
> => Should we merge those decoder?
>
Yes, I would prefer this. Again, we should be setting the strings in 
double quotes irrespective if there are spaces in the resulting 
string or not.

> I understand we use the decoder of constants, but we need to solve
> these problems. Would you give me your comments?
>
As mentioned previously, my aim is to convert the logging system in 
several steps:

a) convert all lone 'printk' statements into dev_printk() variants
    and ensure everything is printed in one statement to avoid
    linebreaks in the resulting logging message.
    This will eliminate the immediate problem we're having, namely
    that debugging is near to impossible under high load.
    The patchset is nearing completion, and I will be posting it
    later this week.
b) Convert scsi_trace to use the functions from constants.c to
    avoid code duplication and update scsi_trace to log sense codes.
c) Remove all logging functions in the hot path (ie
    SCSI_LOG_MLQUEUE and SCSI_LOG_MLCOMPLETE) and replace them
    with trace events.

b) is what you're working on, right?
For 'c)' the problem is that we should retain the existing 
functionality with scsi_logging_level here, at least initially.
So we cannot just replace it, as this would leave SCSI_LOG_ML
a dummy without any real functionality.

I'll be posting my current patchset for review shortly.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

Re: [RFC PATCH 10/10] scsi/trace: Use scsi_print_command trace point instead of printk

[Yoshihiro YUNOMAE]

Hi Hannes,

Sorry for the late reply.

(2014/08/28 21:15), Hannes Reinecke wrote:
> On 08/28/2014 08:19 AM, Yoshihiro YUNOMAE wrote:
>> Hi Hannes,
>>
>> I tried to remove duplicated decoder of SCSI command, but the
>> output format of it in constants.c is different from it in traceevents.
>> I have two questions for it.
>>
>> (Ex1)
>> traceevents: TEST_UNIT_READY
>> constants: Test Unit Ready
>>
>> => Which of "XXX_YYY_ZZZ" and "Xxx Yyy Zzz" should the kernel output
>> strings? This difference comes from difference of implementation.
>> The decoder in traceevents are using macro. So, it cannot define
>> separated words. On the other hand, the decoder in constants are using
>> constant string array table. So, it can define separated words.
>>
> I would go with the wording in constants.c, but set in double quotes
> like "Test Unit Ready" to avoid parsing errors later on.

OK, we use constants' format and add double quotes for each sense code.

>> (Ex2)
>> traceevents: (nothing)
>> constants: Set limits(12)
>>
>> => Should we merge those decoder?
>>
> Yes, I would prefer this. Again, we should be setting the strings in
> double quotes irrespective if there are spaces in the resulting string
> or not.

Sure.

>> I understand we use the decoder of constants, but we need to solve
>> these problems. Would you give me your comments?
>>
> As mentioned previously, my aim is to convert the logging system in
> several steps:
>
> a) convert all lone 'printk' statements into dev_printk() variants
>     and ensure everything is printed in one statement to avoid
>     linebreaks in the resulting logging message.
>     This will eliminate the immediate problem we're having, namely
>     that debugging is near to impossible under high load.
>     The patchset is nearing completion, and I will be posting it
>     later this week.
> b) Convert scsi_trace to use the functions from constants.c to
>     avoid code duplication and update scsi_trace to log sense codes.
> c) Remove all logging functions in the hot path (ie
>     SCSI_LOG_MLQUEUE and SCSI_LOG_MLCOMPLETE) and replace them
>     with trace events.
>
> b) is what you're working on, right?

Right.

> For 'c)' the problem is that we should retain the existing functionality
> with scsi_logging_level here, at least initially.
> So we cannot just replace it, as this would leave SCSI_LOG_ML
> a dummy without any real functionality.

I tried to change printk messages to new tracevents, but I'll stop it
until we solve the problem.
I'll submit the patch set removing duplicated decoder first.

Thanks,
Yoshihiro YUNOMAE

-- 
Yoshihiro YUNOMAE
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: yoshihiro.yunomae.ez@hitachi.com

Re: [RFC PATCH -logging 00/10] scsi/constants: Output continuous error messages on trace

[Douglas Gilbert]

On 14-08-08 01:50 PM, Yoshihiro YUNOMAE wrote:
> Hi All,
>
> This patch set introduces new traceevents in order to output continuous error
> messages. Current SCSI printk messages in upstream kernel can be divided by and
> mixed with other messages. Even if each error message has its device id,
> sometimes we can easily be lost in mixed logs because the message's device id
> is separated from it's body. To avoid it, I'd like to use traceevents to
> store error messages into the ftrace or perf buuffer, because traceevents
> are atomically commited to the buffer.
>
> In this patch set, all printk messages are removed based on a local
> discussion with Hannes, but I think printk messages should be kept because all
> users don't enable traceevents and rsyslog can store as files.
>
> However, if printk of logging branch is kept, the messages are duplicate and
> it can induce stack overflow by using local buffer(*1).
>
>   (*1) https://lkml.org/lkml/2014/5/20/742
>
> So, my suggestion is follows:
>
> 1) printk
> Keeps current implemntation of upstream kernel.
> The messages are divided and can be mixed, but all users can check the error
> messages without any settings.
>
> 2) traceevents
> To get the complete messages, we can use ftrace or perf (or something on them).
> Users can always understand correct messages, but they need to set up the
> tracers.
>
> This patch set is based on Hannes' logging branch:
> http://git.kernel.org/cgit/linux/kernel/git/hare/scsi-devel.git/log/?h=logging
>
> [1/10] ~  [6/10]: just cleanup for logging branch
> [7/10] ~ [10/10]: introduce new traceevents
>
> Any comments are welcome!

In sg3_utils there are now string yielding equivalents
to the sense buffer "print" functions. They take a form
like this:
   char * get_sense_str(const unsigned char * sense_buffer,
                        int sb_len, int blen, char * b);

So this just does the hard work of decoding the sense buffer
(or saying it is invalid) the result of which it places in
buffer 'b'. And 'b' is returned (so this function can be in
the arguments of a driver's printing function).

Adding such string functions would give other parts of the
SCSI subsystem the capability of tailoring their own
messages that include sense data information.


Existing sense buffer "print" function could be kept and
implemented using the newer "_str" variants. Would that
be worth the trouble?

Doug Gilbert

Re: Re: [RFC PATCH -logging 00/10] scsi/constants: Output continuous error messages on trace

[Yoshihiro YUNOMAE]

Hi Douglas,

Thank you for your comment.

(2014/08/08 22:07), Douglas Gilbert wrote:
> On 14-08-08 01:50 PM, Yoshihiro YUNOMAE wrote:
>> Hi All,
>>
>> This patch set introduces new traceevents in order to output
>> continuous error
>> messages. Current SCSI printk messages in upstream kernel can be
>> divided by and
>> mixed with other messages. Even if each error message has its device id,
>> sometimes we can easily be lost in mixed logs because the message's
>> device id
>> is separated from it's body. To avoid it, I'd like to use traceevents to
>> store error messages into the ftrace or perf buuffer, because traceevents
>> are atomically commited to the buffer.
>>
>> In this patch set, all printk messages are removed based on a local
>> discussion with Hannes, but I think printk messages should be kept
>> because all
>> users don't enable traceevents and rsyslog can store as files.
>>
>> However, if printk of logging branch is kept, the messages are
>> duplicate and
>> it can induce stack overflow by using local buffer(*1).
>>
>>   (*1) https://lkml.org/lkml/2014/5/20/742
>>
>> So, my suggestion is follows:
>>
>> 1) printk
>> Keeps current implemntation of upstream kernel.
>> The messages are divided and can be mixed, but all users can check the
>> error
>> messages without any settings.
>>
>> 2) traceevents
>> To get the complete messages, we can use ftrace or perf (or something
>> on them).
>> Users can always understand correct messages, but they need to set up the
>> tracers.
>>
>> This patch set is based on Hannes' logging branch:
>> http://git.kernel.org/cgit/linux/kernel/git/hare/scsi-devel.git/log/?h=logging
>>
>>
>> [1/10] ~  [6/10]: just cleanup for logging branch
>> [7/10] ~ [10/10]: introduce new traceevents
>>
>> Any comments are welcome!
>
> In sg3_utils there are now string yielding equivalents
> to the sense buffer "print" functions. They take a form
> like this:
>    char * get_sense_str(const unsigned char * sense_buffer,
>                         int sb_len, int blen, char * b);
>
> So this just does the hard work of decoding the sense buffer
> (or saying it is invalid) the result of which it places in
> buffer 'b'. And 'b' is returned (so this function can be in
> the arguments of a driver's printing function).
>
> Adding such string functions would give other parts of the
> SCSI subsystem the capability of tailoring their own
> messages that include sense data information.
>
>
> Existing sense buffer "print" function could be kept and
> implemented using the newer "_str" variants. Would that
> be worth the trouble?

I have already sent the idea using local buffer on this February,
but it was rejected by James (*1). By using stack region for local
buffer, stack overflow can occur. So, I implemented this feature
to atomically output an error message with device information.

(*1) https://lkml.org/lkml/2014/5/20/742

Thanks,
Yoshihiro YUNOMAE

-- 
Yoshihiro YUNOMAE
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: yoshihiro.yunomae.ez@hitachi.com

Re: [RFC PATCH -logging 00/10] scsi/constants: Output continuous error messages on trace

[Douglas Gilbert]

On 14-08-12 11:13 PM, Yoshihiro YUNOMAE wrote:
> Hi Douglas,
>
> Thank you for your comment.
>
> (2014/08/08 22:07), Douglas Gilbert wrote:
>> On 14-08-08 01:50 PM, Yoshihiro YUNOMAE wrote:
>>> Hi All,
>>>
>>> This patch set introduces new traceevents in order to output
>>> continuous error
>>> messages. Current SCSI printk messages in upstream kernel can be
>>> divided by and
>>> mixed with other messages. Even if each error message has its device id,
>>> sometimes we can easily be lost in mixed logs because the message's
>>> device id
>>> is separated from it's body. To avoid it, I'd like to use traceevents to
>>> store error messages into the ftrace or perf buuffer, because traceevents
>>> are atomically commited to the buffer.
>>>
>>> In this patch set, all printk messages are removed based on a local
>>> discussion with Hannes, but I think printk messages should be kept
>>> because all
>>> users don't enable traceevents and rsyslog can store as files.
>>>
>>> However, if printk of logging branch is kept, the messages are
>>> duplicate and
>>> it can induce stack overflow by using local buffer(*1).
>>>
>>>   (*1) https://lkml.org/lkml/2014/5/20/742
>>>
>>> So, my suggestion is follows:
>>>
>>> 1) printk
>>> Keeps current implemntation of upstream kernel.
>>> The messages are divided and can be mixed, but all users can check the
>>> error
>>> messages without any settings.
>>>
>>> 2) traceevents
>>> To get the complete messages, we can use ftrace or perf (or something
>>> on them).
>>> Users can always understand correct messages, but they need to set up the
>>> tracers.
>>>
>>> This patch set is based on Hannes' logging branch:
>>> http://git.kernel.org/cgit/linux/kernel/git/hare/scsi-devel.git/log/?h=logging
>>>
>>>
>>> [1/10] ~  [6/10]: just cleanup for logging branch
>>> [7/10] ~ [10/10]: introduce new traceevents
>>>
>>> Any comments are welcome!
>>
>> In sg3_utils there are now string yielding equivalents
>> to the sense buffer "print" functions. They take a form
>> like this:
>>    char * get_sense_str(const unsigned char * sense_buffer,
>>                         int sb_len, int blen, char * b);
>>
>> So this just does the hard work of decoding the sense buffer
>> (or saying it is invalid) the result of which it places in
>> buffer 'b'. And 'b' is returned (so this function can be in
>> the arguments of a driver's printing function).
>>
>> Adding such string functions would give other parts of the
>> SCSI subsystem the capability of tailoring their own
>> messages that include sense data information.
>>
>>
>> Existing sense buffer "print" function could be kept and
>> implemented using the newer "_str" variants. Would that
>> be worth the trouble?
>
> I have already sent the idea using local buffer on this February,
> but it was rejected by James (*1). By using stack region for local
> buffer, stack overflow can occur. So, I implemented this feature
> to atomically output an error message with device information.
>
> (*1) https://lkml.org/lkml/2014/5/20/742

Hi,
In the "_str" variants that I referred to, the caller provides
the buffer and its length. The responsibility of the
implementation of those "_str" variants is to use that
buffer, not exceed it, and make sure that it is null terminated
on return.

Can't see any inherent threat to the stack size there, and if
there is then that is just bad design by the caller.

The advantage of the "_str" variants is that the caller can
supply context and print/log a more useful message, perhaps
including the caller's __func__ . That message could include
sense information (perhaps truncated to 128 bytes, say),
and be output as a single unit.

IMO too many log messages are multi-line and in a noisy,
misbehaving system those messages can be interleaved
with other "noise" making them difficult to decipher.

Doug Gilbert

Re: [RFC PATCH -logging 00/10] scsi/constants: Output continuous error messages on trace

[Hannes Reinecke]

On 08/22/2014 09:54 PM, Douglas Gilbert wrote:
> On 14-08-12 11:13 PM, Yoshihiro YUNOMAE wrote:
>> Hi Douglas,
>>
>> Thank you for your comment.
>>
>> (2014/08/08 22:07), Douglas Gilbert wrote:
>>> On 14-08-08 01:50 PM, Yoshihiro YUNOMAE wrote:
>>>> Hi All,
>>>>
>>>> This patch set introduces new traceevents in order to output
>>>> continuous error
>>>> messages. Current SCSI printk messages in upstream kernel can be
>>>> divided by and
>>>> mixed with other messages. Even if each error message has its
>>>> device id,
>>>> sometimes we can easily be lost in mixed logs because the message's
>>>> device id
>>>> is separated from it's body. To avoid it, I'd like to use
>>>> traceevents to
>>>> store error messages into the ftrace or perf buuffer, because
>>>> traceevents
>>>> are atomically commited to the buffer.
>>>>
>>>> In this patch set, all printk messages are removed based on a local
>>>> discussion with Hannes, but I think printk messages should be kept
>>>> because all
>>>> users don't enable traceevents and rsyslog can store as files.
>>>>
>>>> However, if printk of logging branch is kept, the messages are
>>>> duplicate and
>>>> it can induce stack overflow by using local buffer(*1).
>>>>
>>>>   (*1) https://lkml.org/lkml/2014/5/20/742
>>>>
>>>> So, my suggestion is follows:
>>>>
>>>> 1) printk
>>>> Keeps current implemntation of upstream kernel.
>>>> The messages are divided and can be mixed, but all users can
>>>> check the
>>>> error
>>>> messages without any settings.
>>>>
>>>> 2) traceevents
>>>> To get the complete messages, we can use ftrace or perf (or
>>>> something
>>>> on them).
>>>> Users can always understand correct messages, but they need to
>>>> set up the
>>>> tracers.
>>>>
>>>> This patch set is based on Hannes' logging branch:
>>>> http://git.kernel.org/cgit/linux/kernel/git/hare/scsi-devel.git/log/?h=logging
>>>>
>>>>
>>>>
>>>> [1/10] ~  [6/10]: just cleanup for logging branch
>>>> [7/10] ~ [10/10]: introduce new traceevents
>>>>
>>>> Any comments are welcome!
>>>
>>> In sg3_utils there are now string yielding equivalents
>>> to the sense buffer "print" functions. They take a form
>>> like this:
>>>    char * get_sense_str(const unsigned char * sense_buffer,
>>>                         int sb_len, int blen, char * b);
>>>
>>> So this just does the hard work of decoding the sense buffer
>>> (or saying it is invalid) the result of which it places in
>>> buffer 'b'. And 'b' is returned (so this function can be in
>>> the arguments of a driver's printing function).
>>>
>>> Adding such string functions would give other parts of the
>>> SCSI subsystem the capability of tailoring their own
>>> messages that include sense data information.
>>>
>>>
>>> Existing sense buffer "print" function could be kept and
>>> implemented using the newer "_str" variants. Would that
>>> be worth the trouble?
>>
>> I have already sent the idea using local buffer on this February,
>> but it was rejected by James (*1). By using stack region for local
>> buffer, stack overflow can occur. So, I implemented this feature
>> to atomically output an error message with device information.
>>
>> (*1) https://lkml.org/lkml/2014/5/20/742
>
> Hi,
> In the "_str" variants that I referred to, the caller provides
> the buffer and its length. The responsibility of the
> implementation of those "_str" variants is to use that
> buffer, not exceed it, and make sure that it is null terminated
> on return.
>
> Can't see any inherent threat to the stack size there, and if
> there is then that is just bad design by the caller.
>
> The advantage of the "_str" variants is that the caller can
> supply context and print/log a more useful message, perhaps
> including the caller's __func__ . That message could include
> sense information (perhaps truncated to 128 bytes, say),
> and be output as a single unit.
>
> IMO too many log messages are multi-line and in a noisy,
> misbehaving system those messages can be interleaved
> with other "noise" making them difficult to decipher.
>
Precisely, and that is what my patchset is trying to address.

I'm currently porting it to core-for-3.18, will be posting it
for review once it's done.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

Re: [RFC PATCH -logging 00/10] scsi/constants: Output continuous error messages on trace

[Hannes Reinecke]

On 08/08/2014 03:07 PM, Douglas Gilbert wrote:
> On 14-08-08 01:50 PM, Yoshihiro YUNOMAE wrote:
>> Hi All,
>>
>> This patch set introduces new traceevents in order to output
>> continuous error
>> messages. Current SCSI printk messages in upstream kernel can be
>> divided by and
>> mixed with other messages. Even if each error message has its
>> device id,
>> sometimes we can easily be lost in mixed logs because the
>> message's device id
>> is separated from it's body. To avoid it, I'd like to use
>> traceevents to
>> store error messages into the ftrace or perf buuffer, because
>> traceevents
>> are atomically commited to the buffer.
>>
>> In this patch set, all printk messages are removed based on a local
>> discussion with Hannes, but I think printk messages should be kept
>> because all
>> users don't enable traceevents and rsyslog can store as files.
>>
>> However, if printk of logging branch is kept, the messages are
>> duplicate and
>> it can induce stack overflow by using local buffer(*1).
>>
>>   (*1) https://lkml.org/lkml/2014/5/20/742
>>
>> So, my suggestion is follows:
>>
>> 1) printk
>> Keeps current implemntation of upstream kernel.
>> The messages are divided and can be mixed, but all users can check
>> the error
>> messages without any settings.
>>
>> 2) traceevents
>> To get the complete messages, we can use ftrace or perf (or
>> something on them).
>> Users can always understand correct messages, but they need to set
>> up the
>> tracers.
>>
>> This patch set is based on Hannes' logging branch:
>> http://git.kernel.org/cgit/linux/kernel/git/hare/scsi-devel.git/log/?h=logging
>>
>>
>> [1/10] ~  [6/10]: just cleanup for logging branch
>> [7/10] ~ [10/10]: introduce new traceevents
>>
>> Any comments are welcome!
>
> In sg3_utils there are now string yielding equivalents
> to the sense buffer "print" functions. They take a form
> like this:
>    char * get_sense_str(const unsigned char * sense_buffer,
>                         int sb_len, int blen, char * b);
>
> So this just does the hard work of decoding the sense buffer
> (or saying it is invalid) the result of which it places in
> buffer 'b'. And 'b' is returned (so this function can be in
> the arguments of a driver's printing function).
>
> Adding such string functions would give other parts of the
> SCSI subsystem the capability of tailoring their own
> messages that include sense data information.
>
>
> Existing sense buffer "print" function could be kept and
> implemented using the newer "_str" variants. Would that
> be worth the trouble?
>
Hmm. Probably not.

I would rather go the approach we've been taking with the
VPD pages, and do _not_ decode any sense code data
(except from the usual sense key/ASC/ASCQ values, of course).
Instead we should rather ensure that we can get to the raw
sense code values from userspace so that we can interpret
it later with userspace tools.

My plan for updating scsi logging is:

- move all lone 'printk' statements into dev_printk() variants
   and ensure they are printed in one line to avoid breaking
   logging statements up under high load
- Update scsi_trace to use the functionality from constants.c
- Convert the current scsi_logging mechanism over to tracepoints.

The first bit is mostly done; I'll be sending the patchset for review.
The hard part is the third bit; would be really grand if we can
model this with the existing scsi_logging_level interface intact.
But not sure if that's possible nor if it's desirable.

Btw, _now_ would be a good chance to send an update of constants.c
with latest SPC bits ...

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

Re: [RFC PATCH -logging 00/10] scsi/constants: Output continuous error messages on trace

[Douglas Gilbert]

On 14-08-27 10:23 AM, Hannes Reinecke wrote:
> On 08/08/2014 03:07 PM, Douglas Gilbert wrote:
>> On 14-08-08 01:50 PM, Yoshihiro YUNOMAE wrote:
>>> Hi All,
>>>
>>> This patch set introduces new traceevents in order to output
>>> continuous error
>>> messages. Current SCSI printk messages in upstream kernel can be
>>> divided by and
>>> mixed with other messages. Even if each error message has its
>>> device id,
>>> sometimes we can easily be lost in mixed logs because the
>>> message's device id
>>> is separated from it's body. To avoid it, I'd like to use
>>> traceevents to
>>> store error messages into the ftrace or perf buuffer, because
>>> traceevents
>>> are atomically commited to the buffer.
>>>
>>> In this patch set, all printk messages are removed based on a local
>>> discussion with Hannes, but I think printk messages should be kept
>>> because all
>>> users don't enable traceevents and rsyslog can store as files.
>>>
>>> However, if printk of logging branch is kept, the messages are
>>> duplicate and
>>> it can induce stack overflow by using local buffer(*1).
>>>
>>>   (*1) https://lkml.org/lkml/2014/5/20/742
>>>
>>> So, my suggestion is follows:
>>>
>>> 1) printk
>>> Keeps current implemntation of upstream kernel.
>>> The messages are divided and can be mixed, but all users can check
>>> the error
>>> messages without any settings.
>>>
>>> 2) traceevents
>>> To get the complete messages, we can use ftrace or perf (or
>>> something on them).
>>> Users can always understand correct messages, but they need to set
>>> up the
>>> tracers.
>>>
>>> This patch set is based on Hannes' logging branch:
>>> http://git.kernel.org/cgit/linux/kernel/git/hare/scsi-devel.git/log/?h=logging
>>>
>>>
>>> [1/10] ~  [6/10]: just cleanup for logging branch
>>> [7/10] ~ [10/10]: introduce new traceevents
>>>
>>> Any comments are welcome!
>>
>> In sg3_utils there are now string yielding equivalents
>> to the sense buffer "print" functions. They take a form
>> like this:
>>    char * get_sense_str(const unsigned char * sense_buffer,
>>                         int sb_len, int blen, char * b);
>>
>> So this just does the hard work of decoding the sense buffer
>> (or saying it is invalid) the result of which it places in
>> buffer 'b'. And 'b' is returned (so this function can be in
>> the arguments of a driver's printing function).
>>
>> Adding such string functions would give other parts of the
>> SCSI subsystem the capability of tailoring their own
>> messages that include sense data information.
>>
>>
>> Existing sense buffer "print" function could be kept and
>> implemented using the newer "_str" variants. Would that
>> be worth the trouble?
>>
> Hmm. Probably not.
>
> I would rather go the approach we've been taking with the
> VPD pages, and do _not_ decode any sense code data
> (except from the usual sense key/ASC/ASCQ values, of course).
> Instead we should rather ensure that we can get to the raw
> sense code values from userspace so that we can interpret
> it later with userspace tools.
>
> My plan for updating scsi logging is:
>
> - move all lone 'printk' statements into dev_printk() variants
>    and ensure they are printed in one line to avoid breaking
>    logging statements up under high load
> - Update scsi_trace to use the functionality from constants.c
> - Convert the current scsi_logging mechanism over to tracepoints.
>
> The first bit is mostly done; I'll be sending the patchset for review.
> The hard part is the third bit; would be really grand if we can
> model this with the existing scsi_logging_level interface intact.
> But not sure if that's possible nor if it's desirable.
>
> Btw, _now_ would be a good chance to send an update of constants.c
> with latest SPC bits ...

 From constants.c:
  * Updated to SPC-4 T10/1713-D Rev 36g, D. Gilbert 20130701

Not much has changed between then and now (37a). There is a
lot pending for SPC-5 plus all the ZBC stuff, little of which
has hit the drafts yet. WRITE ATOMIC and a few new asc/ascq
codes is about all that I have noticed. Even when new asc/ascq
strings are approved, it needs the SPC4/5 technical editor to
allocate numbers for them.

So even if the timing is good from the kernel POV, not much
is available. The next T10 meeting is in a few weeks, lets
see what happens there.

Doug Gilbert

RE: [RFC PATCH -logging 00/10] scsi/constants: Output continuous error messages on trace

[Elliott, Robert (Server Storage)]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 2728 bytes --]

> -----Original Message-----
> From: linux-scsi-owner@vger.kernel.org [mailto:linux-scsi-
> owner@vger.kernel.org] On Behalf Of Yoshihiro YUNOMAE
> Sent: Friday, 08 August, 2014 6:50 AM
> Subject: [RFC PATCH -logging 00/10] scsi/constants: Output continuous
> error messages on trace
...
> 1) printk
> Keeps current implemntation of upstream kernel.
> The messages are divided and can be mixed, but all users can
> check the error messages without any settings.

scsi_io_completion ignore the scsi_logging_level and always calls
printk if it detects ACTION_FAIL, resulting in messages like:

    [10240.338600] sd 2:0:0:0: [sdr]
    [10240.339722] Result: hostbyte=DID_OK driverbyte=DRIVER_SENSE
    [10240.341662] sd 2:0:0:0: [sdr]
    [10240.342792] Sense Key : Hardware Error [current]
    [10240.344575] sd 2:0:0:0: [sdr]
    [10240.345653] Add. Sense: Logical unit failure
    [10240.347138] sd 2:0:0:0: [sdr] CDB:
    [10240.348309] Read(10): 28 00 00 00 00 80 00 00 08 00

If you trigger hundreds of errors (e.g., hot remove a device
during heavy IO), then all the prints to the linux serial console
bog down the system, causing timeouts in commands to other
devices and soft lockups for applications.

Some changes that would help are:
1. Put them under SCSI logging level control
2. Use printk_ratelimited so an excessive number are trimmed

Would you like to include something like this in your
patch set?

This is an example patch that only prints them if the MLCOMPLETE 
logging level is nonzero.
Off: scsi_logging_level --set --mlcomplete=0
On: scsi_logging_level --set --mlcomplete=1

Some other loglevel (e.g., ERROR_RECOVERY) could be used.

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index d6b4ea8..dbb601f 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1037,7 +1037,9 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
 	switch (action) {
 	case ACTION_FAIL:
 		/* Give up and fail the remainder of the request */
-		if (!(req->cmd_flags & REQ_QUIET)) {
+		if (!(req->cmd_flags & REQ_QUIET) &&
+		    SCSI_LOG_LEVEL(SCSI_LOG_MLCOMPLETE_SHIFT,
+		    SCSI_LOG_MLCOMPLETE_BITS)) {
 			scsi_print_result(cmd);
 			if (driver_byte(result) & DRIVER_SENSE)
 				scsi_print_sense("", cmd);

Converting to printk_ratelimited is harder since the prints
are spread out over three functions (and as your patch
series notes, many individual printk calls).  The rates
for the printk calls might not match, which would lead to
even more confusing output.

---
Rob Elliott    HP Server Storage



ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

scsi logging future directions, was Re: [RFC PATCH -logging 00/10] scsi/constants: Output continuous error messages on trace

[Christoph Hellwig]

On Fri, Aug 22, 2014 at 12:39:59AM +0000, Elliott, Robert (Server Storage) wrote:
> If you trigger hundreds of errors (e.g., hot remove a device
> during heavy IO), then all the prints to the linux serial console
> bog down the system, causing timeouts in commands to other
> devices and soft lockups for applications.
> 
> Some changes that would help are:
> 1. Put them under SCSI logging level control
> 2. Use printk_ratelimited so an excessive number are trimmed
> 
> Would you like to include something like this in your
> patch set?

I think we should come to an agreement where we want to go with scsi
logging first before doing various smaller adjustments.  (Although your
example is one that's urgent enough that I'd like to put it in ASAP,
I had issues with it a few times).

I had a chat with Martin at Linuxcon about these issues, and we were
both in favor of getting rid of the old scsi logging mechansisms and
instead replace it by an extended version of the scsi tracepoints that
cover all places, and dump all data from the old logging mechanism
that people find useful.

In a few places we'd still want to log normal dev_printk style errors,
and the I/O completion is one of them, even if they really need to be
ratelimited and condensed.

If someone has arguments in favour of keeping the old logging code
I'd love to hear them, but in practive the traceevent code has huge
benefits:

 - almost zero overhead if disabled
 - can easily be used without any tools through configs, but can be used
   even better with tools like trace-cmd or perf
 - allows both fine and coarse grained selections of events to trace
 - allows to capture statistics on each trace point without event enabling the
   output
 - doesn't have any of the console lockup problems.

Re: scsi logging future directions, was Re: [RFC PATCH -logging 00/10] scsi/constants: Output continuous error messages on trace

[Hannes Reinecke]

On 08/24/2014 10:44 PM, Christoph Hellwig wrote:
> On Fri, Aug 22, 2014 at 12:39:59AM +0000, Elliott, Robert (Server Storage) wrote:
>> If you trigger hundreds of errors (e.g., hot remove a device
>> during heavy IO), then all the prints to the linux serial console
>> bog down the system, causing timeouts in commands to other
>> devices and soft lockups for applications.
>>
>> Some changes that would help are:
>> 1. Put them under SCSI logging level control
>> 2. Use printk_ratelimited so an excessive number are trimmed
>>
>> Would you like to include something like this in your
>> patch set?
>
> I think we should come to an agreement where we want to go with scsi
> logging first before doing various smaller adjustments.  (Although your
> example is one that's urgent enough that I'd like to put it in ASAP,
> I had issues with it a few times).
>
> I had a chat with Martin at Linuxcon about these issues, and we were
> both in favor of getting rid of the old scsi logging mechansisms and
> instead replace it by an extended version of the scsi tracepoints that
> cover all places, and dump all data from the old logging mechanism
> that people find useful.
>
> In a few places we'd still want to log normal dev_printk style errors,
> and the I/O completion is one of them, even if they really need to be
> ratelimited and condensed.
>
> If someone has arguments in favour of keeping the old logging code
> I'd love to hear them, but in practive the traceevent code has huge
> benefits:
>
>   - almost zero overhead if disabled
>   - can easily be used without any tools through configs, but can be used
>     even better with tools like trace-cmd or perf
>   - allows both fine and coarse grained selections of events to trace
>   - allows to capture statistics on each trace point without event enabling the
>     output
>   - doesn't have any of the console lockup problems.
>
I've already been working on updating scsi logging infrastructure, 
removing old cludges and streamlining it.
I'm all in favour of moving things over to scsi tracing; in fact I've 
already moved all the current SCSI_ML_XXX statements to tracepoints in
my current patchset.

Unfortunately I haven't found time to test things out there, and there's 
the patchset from Yoshihiro which needs review and integration.

As of now I've treated this as rather low priority as no-one seemed to 
mind and the patchsets will be touching each and every driver.

I'll be updating the patchset and send it for review.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)

Re: [RFC PATCH -logging 00/10] scsi/constants: Output continuous error messages on trace

[Hannes Reinecke]

On 08/22/2014 02:39 AM, Elliott, Robert (Server Storage) wrote:
>> -----Original Message-----
>> From: linux-scsi-owner@vger.kernel.org [mailto:linux-scsi-
>> owner@vger.kernel.org] On Behalf Of Yoshihiro YUNOMAE
>> Sent: Friday, 08 August, 2014 6:50 AM
>> Subject: [RFC PATCH -logging 00/10] scsi/constants: Output continuous
>> error messages on trace
> ...
>> 1) printk
>> Keeps current implemntation of upstream kernel.
>> The messages are divided and can be mixed, but all users can
>> check the error messages without any settings.
>
> scsi_io_completion ignore the scsi_logging_level and always calls
> printk if it detects ACTION_FAIL, resulting in messages like:
>
>      [10240.338600] sd 2:0:0:0: [sdr]
>      [10240.339722] Result: hostbyte=DID_OK driverbyte=DRIVER_SENSE
>      [10240.341662] sd 2:0:0:0: [sdr]
>      [10240.342792] Sense Key : Hardware Error [current]
>      [10240.344575] sd 2:0:0:0: [sdr]
>      [10240.345653] Add. Sense: Logical unit failure
>      [10240.347138] sd 2:0:0:0: [sdr] CDB:
>      [10240.348309] Read(10): 28 00 00 00 00 80 00 00 08 00
>
> If you trigger hundreds of errors (e.g., hot remove a device
> during heavy IO), then all the prints to the linux serial console
> bog down the system, causing timeouts in commands to other
> devices and soft lockups for applications.
>
> Some changes that would help are:
> 1. Put them under SCSI logging level control
> 2. Use printk_ratelimited so an excessive number are trimmed
>
> Would you like to include something like this in your
> patch set?
>
> This is an example patch that only prints them if the MLCOMPLETE
> logging level is nonzero.
> Off: scsi_logging_level --set --mlcomplete=0
> On: scsi_logging_level --set --mlcomplete=1
>
> Some other loglevel (e.g., ERROR_RECOVERY) could be used.
>
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index d6b4ea8..dbb601f 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -1037,7 +1037,9 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
>   	switch (action) {
>   	case ACTION_FAIL:
>   		/* Give up and fail the remainder of the request */
> -		if (!(req->cmd_flags & REQ_QUIET)) {
> +		if (!(req->cmd_flags & REQ_QUIET) &&
> +		    SCSI_LOG_LEVEL(SCSI_LOG_MLCOMPLETE_SHIFT,
> +		    SCSI_LOG_MLCOMPLETE_BITS)) {
>   			scsi_print_result(cmd);
>   			if (driver_byte(result) & DRIVER_SENSE)
>   				scsi_print_sense("", cmd);
>
> Converting to printk_ratelimited is harder since the prints
> are spread out over three functions (and as your patch
> series notes, many individual printk calls).  The rates
> for the printk calls might not match, which would lead to
> even more confusing output.
>
Good point. Will be including it.

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare@suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)