Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <c0c7b4cde76c9b15aad9fa213dcaeb75295763fd.camel@redhat.com>
Subject: Re: [PATCH] scsi_logging: print cdb into new line after opcode
From:   "Ewan D. Milne" <emilne@redhat.com>
To:     Martin Kepplinger <martin.kepplinger@puri.sm>, jejb@linux.ibm.com,
        martin.petersen@oracle.com
Cc:     dgilbert@interlog.com, bvanassche@acm.org,
        linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Date:   Fri, 22 Jan 2021 14:52:56 -0500
In-Reply-To: <20210122083918.901-1-martin.kepplinger@puri.sm>
References: <20210122083918.901-1-martin.kepplinger@puri.sm>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Fri, 2021-01-22 at 09:39 +0100, Martin Kepplinger wrote:
> The current log message results in a line like the following where
> the first byte is duplicated, giving a wrong impression:
> 
> sd 0:0:0:0: [sda] tag#0 CDB: opcode=0x28 28 00 00 00 60 40 00 00 01
> 00
> 
> Print the cdb into a new line in any case, not only when cmd_len is
> greater than 16. The above example error will then read:
> 
> sd 0:0:0:0: [sda] tag#0 CDB: opcode=0x28
> 28 00 01 c0 09 00 00 00 08 00
> 
> Signed-off-by: Martin Kepplinger <martin.kepplinger@puri.sm>
> ---
>  drivers/scsi/scsi_logging.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/scsi/scsi_logging.c
> b/drivers/scsi/scsi_logging.c
> index 8ea44c6595ef..0081d3936f83 100644
> --- a/drivers/scsi/scsi_logging.c
> +++ b/drivers/scsi/scsi_logging.c
> @@ -200,10 +200,11 @@ void scsi_print_command(struct scsi_cmnd *cmd)
>  	if (off >= logbuf_len)
>  		goto out_printk;
>  
> +	/* Print opcode in one line and use separate lines for CDB */
> +	off += scnprintf(logbuf + off, logbuf_len - off, "\n");
> +
>  	/* print out all bytes in cdb */
>  	if (cmd->cmd_len > 16) {
> -		/* Print opcode in one line and use separate lines for
> CDB */
> -		off += scnprintf(logbuf + off, logbuf_len - off, "\n");
>  		dev_printk(KERN_INFO, &cmd->device->sdev_gendev, "%s",
> logbuf);
>  		for (k = 0; k < cmd->cmd_len; k += 16) {
>  			size_t linelen = min(cmd->cmd_len - k, 16);
> @@ -224,7 +225,6 @@ void scsi_print_command(struct scsi_cmnd *cmd)
>  		goto out;
>  	}
>  	if (!WARN_ON(off > logbuf_len - 49)) {
> -		off += scnprintf(logbuf + off, logbuf_len - off, " ");
>  		hex_dump_to_buffer(cmd->cmnd, cmd->cmd_len, 16, 1,
>  				   logbuf + off, logbuf_len - off,
>  				   false);

I'd rather we not change this.

-Ewan