Commit 48517eef authored by Wu Bo's avatar Wu Bo Committed by Martin K. Petersen
Browse files

scsi: core: Add I/O timeout count for SCSI device 

Currently struct scsi_device maintains counters for requests, completions,
and errors but is missing a counter for timeouts.

For better tracking of timeouts, add a suitable counter.

Link: https://lore.kernel.org/r/1663666339-17560-1-git-send-email-wubo40@huawei.com


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarWu Bo <wubo40@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 592642e6

drivers/scsi/scsi_error.c

+1 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ enum blk_eh_timer_return scsi_timeout(struct request *req) 
	trace_scsi_dispatch_cmd_timeout(scmd);

	scsi_log_completion(scmd, TIMEOUT_ERROR);



	atomic_inc(&scmd->device->iotmo_cnt);

	if (host->eh_deadline != -1 && !host->last_reset)

		host->last_reset = jiffies;

drivers/scsi/scsi_sysfs.c

+2 −0
Original line number Diff line number Diff line
@@ -970,6 +970,7 @@ static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL) 
show_sdev_iostat(iorequest_cnt);

show_sdev_iostat(iodone_cnt);

show_sdev_iostat(ioerr_cnt);

show_sdev_iostat(iotmo_cnt);



static ssize_t

sdev_show_modalias(struct device *dev, struct device_attribute *attr, char *buf)
@@ -1289,6 +1290,7 @@ static struct attribute *scsi_sdev_attrs[] = { 
	&dev_attr_iorequest_cnt.attr,

	&dev_attr_iodone_cnt.attr,

	&dev_attr_ioerr_cnt.attr,

	&dev_attr_iotmo_cnt.attr,

	&dev_attr_modalias.attr,

	&dev_attr_queue_depth.attr,

	&dev_attr_queue_type.attr,

include/scsi/scsi_device.h

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ struct scsi_device { 
	atomic_t iorequest_cnt;

	atomic_t iodone_cnt;

	atomic_t ioerr_cnt;

	atomic_t iotmo_cnt;



	struct device		sdev_gendev,

				sdev_dev;