Skip to contentSkip to conversation

scsi: core: Add io timeout count for scsi device

PATCH Applied Wu Bo 3 participants 3 messages Sep 20, 2022 – Sep 25, 2022 SCSI

lore
Share & tools
lore

Wu Bo

author
#0 lore raw

PATCH v2 1/1 scsi: core: Add io timeout count for scsi device

From: Wu Bo <[email protected]>

Current the scsi device has iorequest count, iodone count and ioerr count, but lack of io timeout count.

For better tracking of scsi io, So add it now.

---
v1->v2
Rebase this patch on top of Martin's for-next branch.

---
 drivers/scsi/scsi_error.c  | 1 +
 drivers/scsi/scsi_sysfs.c  | 2 ++
 include/scsi/scsi_device.h | 1 +
 3 files changed, 4 insertions(+)
drivers/scsi/scsi_error.c +1 -0
index 448748e..e84aea9 100644
@@ -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
index 5d61f58..c95177c 100644
@@ -976,6 +976,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)
@@ -1295,6 +1296,7 @@ static umode_t scsi_sdev_bin_attr_is_visible(struct kobject *kobj,
 	&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
index 2493bd6..c36656d 100644
@@ -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;
Signature · 1 line
1.8.3.1
#2 lore raw
In reply to Wu Bo

Wu,

Quoted 2 lines

Current the scsi device has iorequest count, iodone count and ioerr count, but lack of io timeout count.

Applied to 6.1/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering