On Thu, 2016-03-24 at 11:23 +0100, Hannes Reinecke wrote:
> Signed-off-by: Hannes Reinecke <hare@xxxxxxxx>
> ---
> drivers/scsi/scsi_trace.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 96 insertions(+)
>
> diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c
> index 08bb47b..b50cfe8 100644
> --- a/drivers/scsi/scsi_trace.c
> +++ b/drivers/scsi/scsi_trace.c
> @@ -231,6 +231,98 @@ out:
> }
>
> static const char *
> +scsi_trace_maintenance_in(struct trace_seq *p, unsigned char *cdb, int len)
> +{
> + const char *ret = trace_seq_buffer_ptr(p), *cmd;
> + u32 alloc_len = 0;
> +
> + switch (SERVICE_ACTION16(cdb)) {
> + case MI_REPORT_IDENTIFYING_INFORMATION:
> + cmd = "REPORT_IDENTIFYING_INFORMATION";
> + break;
> + case MI_REPORT_TARGET_PGS:
> + cmd = "REPORT_TARGET_PORT_GROUPS";
> + break;
> + case MI_REPORT_ALIASES:
> + cmd = "REPORT_ALIASES";
> + break;
> + case MI_REPORT_SUPPORTED_OPERATION_CODES:
> + cmd = "REPORT_SUPPORTED_OPERATION_CODES";
> + break;
> + case MI_REPORT_SUPPORTED_TASK_MANAGEMENT_FUNCTIONS:
> + cmd = "REPORT_SUPPORTED_TASK_MANAGEMENT_FUNCTIONS";
> + break;
> + case MI_REPORT_PRIORITY:
> + cmd = "REPORT_PRIORITY";
> + break;
> + case MI_REPORT_TIMESTAMP:
> + cmd = "REPORT_TIMESTAMP";
> + break;
> + case MI_MANAGEMENT_PROTOCOL_IN:
> + cmd = "MANAGEMENT_PROTOCOL_IN";
> + break;
> + default:
> + trace_seq_puts(p, "UNKNOWN");
> + goto out;
> + }
> +
> + alloc_len |= (cdb[6] << 24);
> + alloc_len |= (cdb[7] << 16);
> + alloc_len |= (cdb[8] << 8);
> + alloc_len |= cdb[9];
You could use get_unaligned_be32() here instead, as well as in
scsi_trace_maintenance_out() and similar get_unaligned_XX calls
in the other functions in scsi_trace.c
> +
> + trace_seq_printf(p, "%s alloc_len=%u", cmd, alloc_len);
> +
> +out:
> + trace_seq_putc(p, 0);
> +
> + return ret;
> +}
> +
> +static const char *
> +scsi_trace_maintenance_out(struct trace_seq *p, unsigned char *cdb, int len)
> +{
> + const char *ret = trace_seq_buffer_ptr(p), *cmd;
> + u32 alloc_len = 0;
> +
> + switch (SERVICE_ACTION16(cdb)) {
> + case MO_SET_IDENTIFYING_INFORMATION:
> + cmd = "SET_IDENTIFYING_INFORMATION";
> + break;
> + case MO_SET_TARGET_PGS:
> + cmd = "SET_TARGET_PORT_GROUPS";
> + break;
> + case MO_CHANGE_ALIASES:
> + cmd = "CHANGE_ALIASES";
> + break;
> + case MO_SET_PRIORITY:
> + cmd = "SET_PRIORITY";
> + break;
> + case MO_SET_TIMESTAMP:
> + cmd = "SET_TIMESTAMP";
> + break;
> + case MO_MANAGEMENT_PROTOCOL_OUT:
> + cmd = "MANAGEMENT_PROTOCOL_OUT";
> + break;
> + default:
> + trace_seq_puts(p, "UNKNOWN");
> + goto out;
> + }
> +
> + alloc_len |= (cdb[6] << 24);
> + alloc_len |= (cdb[7] << 16);
> + alloc_len |= (cdb[8] << 8);
> + alloc_len |= cdb[9];
> +
> + trace_seq_printf(p, "%s alloc_len=%u", cmd, alloc_len);
> +
> +out:
> + trace_seq_putc(p, 0);
> +
> + return ret;
> +}
> +
> +static const char *
> scsi_trace_varlen(struct trace_seq *p, unsigned char *cdb, int len)
> {
> switch (SERVICE_ACTION32(cdb)) {
> @@ -282,6 +374,10 @@ scsi_trace_parse_cdb(struct trace_seq *p, unsigned char *cdb, int len)
> return scsi_trace_service_action_in(p, cdb, len);
> case VARIABLE_LENGTH_CMD:
> return scsi_trace_varlen(p, cdb, len);
> + case MAINTENANCE_IN:
> + return scsi_trace_maintenance_in(p, cdb, len);
> + case MAINTENANCE_OUT:
> + return scsi_trace_maintenance_out(p, cdb, len);
> default:
> return scsi_trace_misc(p, cdb, len);
> }
Reviewed-by: Ewan D. Milne <emilne@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
