Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4d04a4c authored by Martin K. Petersen's avatar Martin K. Petersen Committed by James Bottomley
Browse files

[SCSI] Make error printing more verbose 



This patch enhances SCSI error printing by:

 - Making use of scsi_print_result() in the completion functions.

 - Having scmd_printk() output the disk name (when applicable).

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 684b7fe9

drivers/scsi/scsi.c

+17 −30
Original line number Diff line number Diff line
@@ -344,7 +344,6 @@ void scsi_destroy_command_freelist(struct Scsi_Host *shost) 
void scsi_log_send(struct scsi_cmnd *cmd)

{

	unsigned int level;

	struct scsi_device *sdev;



	/*

	 * If ML QUEUE log level is greater than or equal to:
@@ -361,22 +360,17 @@ void scsi_log_send(struct scsi_cmnd *cmd) 
		level = SCSI_LOG_LEVEL(SCSI_LOG_MLQUEUE_SHIFT,

				       SCSI_LOG_MLQUEUE_BITS);

		if (level > 1) {

			sdev = cmd->device;

			sdev_printk(KERN_INFO, sdev, "send ");

			scmd_printk(KERN_INFO, cmd, "Send: ");

			if (level > 2)

				printk("0x%p ", cmd);

			/*

			 * spaces to match disposition and cmd->result

			 * output in scsi_log_completion.

			 */

			printk("                 ");

			printk("\n");

			scsi_print_command(cmd);

			if (level > 3) {

				printk(KERN_INFO "buffer = 0x%p, bufflen = %d,"

				       " done = 0x%p, queuecommand 0x%p\n",

					cmd->request_buffer, cmd->request_bufflen,

					cmd->done,

					sdev->host->hostt->queuecommand);

					cmd->device->host->hostt->queuecommand);



			}

		}
@@ -386,7 +380,6 @@ void scsi_log_send(struct scsi_cmnd *cmd) 
void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)

{

	unsigned int level;

	struct scsi_device *sdev;



	/*

	 * If ML COMPLETE log level is greater than or equal to:
@@ -405,8 +398,7 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition) 
				       SCSI_LOG_MLCOMPLETE_BITS);

		if (((level > 0) && (cmd->result || disposition != SUCCESS)) ||

		    (level > 1)) {

			sdev = cmd->device;

			sdev_printk(KERN_INFO, sdev, "done ");

			scmd_printk(KERN_INFO, cmd, "Done: ");

			if (level > 2)

				printk("0x%p ", cmd);

			/*
@@ -415,40 +407,35 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition) 
			 */

			switch (disposition) {

			case SUCCESS:

				printk("SUCCESS");

				printk("SUCCESS\n");

				break;

			case NEEDS_RETRY:

				printk("RETRY  ");

				printk("RETRY\n");

				break;

			case ADD_TO_MLQUEUE:

				printk("MLQUEUE");

				printk("MLQUEUE\n");

				break;

			case FAILED:

				printk("FAILED ");

				printk("FAILED\n");

				break;

			case TIMEOUT_ERROR:

				/* 

				 * If called via scsi_times_out.

				 */

				printk("TIMEOUT");

				printk("TIMEOUT\n");

				break;

			default:

				printk("UNKNOWN");

				printk("UNKNOWN\n");

			}

			printk(" %8x ", cmd->result);

			scsi_print_result(cmd);

			scsi_print_command(cmd);

			if (status_byte(cmd->result) & CHECK_CONDITION) {

				/*

				 * XXX The scsi_print_sense formatting/prefix

				 * doesn't match this function.

				 */

			if (status_byte(cmd->result) & CHECK_CONDITION)

				scsi_print_sense("", cmd);

			}

			if (level > 3) {

				printk(KERN_INFO "scsi host busy %d failed %d\n",

				       sdev->host->host_busy,

				       sdev->host->host_failed);

			}

			if (level > 3)

				scmd_printk(KERN_INFO, cmd,

					    "scsi host busy %d failed %d\n",

					    cmd->device->host->host_busy,

					    cmd->device->host->host_failed);

		}

	}

}

drivers/scsi/scsi_lib.c

+1 −3
Original line number Diff line number Diff line
@@ -968,9 +968,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) 
	}

	if (result) {

		if (!(req->cmd_flags & REQ_QUIET)) {

			scmd_printk(KERN_INFO, cmd,

				    "SCSI error: return code = 0x%08x\n",

				    result);

			scsi_print_result(cmd);

			if (driver_byte(result) & DRIVER_SENSE)

				scsi_print_sense("", cmd);

		}

include/scsi/scsi_device.h

+6 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/list.h>

#include <linux/spinlock.h>

#include <linux/workqueue.h>

#include <linux/blkdev.h>

#include <asm/atomic.h>



struct request_queue;
@@ -155,7 +156,10 @@ struct scsi_device { 
	dev_printk(prefix, &(sdev)->sdev_gendev, fmt, ##a)



#define scmd_printk(prefix, scmd, fmt, a...)				\

	dev_printk(prefix, &(scmd)->device->sdev_gendev, fmt, ##a)

        (scmd)->request->rq_disk ?					\

	sdev_printk(prefix, (scmd)->device, "[%s] " fmt,		\

		    (scmd)->request->rq_disk->disk_name, ##a) :		\

	sdev_printk(prefix, (scmd)->device, fmt, ##a)



enum scsi_target_state {

	STARGET_RUNNING = 1,