diff mbox series

[V2] scsi: core: Add io timeout count for scsi device

Message ID 1663666339-17560-1-git-send-email-wubo40@huawei.com
State New
Headers show
Series [V2] scsi: core: Add io timeout count for scsi device | expand

Commit Message

Wu Bo Sept. 20, 2022, 9:32 a.m. UTC 
From: Wu Bo <wubo40@huawei.com>

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.

Signed-off-by: Wu Bo <wubo40@huawei.com>
---
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(+)

Comments

Bart Van Assche Sept. 21, 2022, 2:01 p.m. UTC | #1 
On 9/20/22 02:32, Wu Bo wrote:
> 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.

Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Martin K. Petersen Sept. 25, 2022, 5:25 p.m. UTC | #2 
Wu,

> 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!
diff mbox series

Patch

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 448748e..e84aea9 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -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;
 
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 5d61f58..c95177c 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -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,
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 2493bd6..c36656d 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -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;