scsi: core: Add io timeout count for scsi device

Commit Message

Wu Bo Sept. 8, 2022, 8:14 a.m. UTC

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 <[e-mail]>
---
  drivers/scsi/scsi_error.c  | 1 +
  drivers/scsi/scsi_sysfs.c  | 2 ++
  include/scsi/scsi_device.h | 1 +
  3 files changed, 4 insertions(+)

--
1.8.3.1

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 9dad2fd..72e702c 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -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 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 3113471..78039d1 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;