Re: [PATCH v3] block: add io timeout to sysfs

[Christoph Hellwig]

I think we need a check for the presence of a timeout method and
only show this attribute if the driver actually supports block level
timeouts.

Re: [PATCH v3] block: add io timeout to sysfs

[Jens Axboe]

On 11/28/18 9:04 AM, Weiping Zhang wrote:
> Give a interface to adjust io timeout(ms) by device.

Looks good, applied.

-- 
Jens Axboe

[PATCH v3] block: add io timeout to sysfs

[Weiping Zhang]

Give a interface to adjust io timeout(ms) by device.

Signed-off-by: Weiping Zhang 
---

Changes since v2:
* use msecs_to_jiffies and jiffies_to_msecs

Changes since v1:
* make sure timeout > 0

 block/blk-sysfs.c | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 80eef48fddc8..9f0cb370b39b 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -417,6 +417,26 @@ static ssize_t queue_poll_store(struct request_queue *q, 
const char *page,
return ret;
 }
 
+static ssize_t queue_io_timeout_show(struct request_queue *q, char *page)
+{
+   return sprintf(page, "%u\n", jiffies_to_msecs(q->rq_timeout));
+}
+
+static ssize_t queue_io_timeout_store(struct request_queue *q, const char 
*page,
+ size_t count)
+{
+   unsigned int val;
+   int err;
+
+   err = kstrtou32(page, 10, );
+   if (err || val == 0)
+   return -EINVAL;
+
+   blk_queue_rq_timeout(q, msecs_to_jiffies(val));
+
+   return count;
+}
+
 static ssize_t queue_wb_lat_show(struct request_queue *q, char *page)
 {
if (!wbt_rq_qos(q))
@@ -685,6 +705,12 @@ static struct queue_sysfs_entry queue_dax_entry = {
.show = queue_dax_show,
 };
 
+static struct queue_sysfs_entry queue_io_timeout_entry = {
+   .attr = {.name = "io_timeout", .mode = 0644 },
+   .show = queue_io_timeout_show,
+   .store = queue_io_timeout_store,
+};
+
 static struct queue_sysfs_entry queue_wb_lat_entry = {
.attr = {.name = "wbt_lat_usec", .mode = 0644 },
.show = queue_wb_lat_show,
@@ -734,6 +760,7 @@ static struct attribute *default_attrs[] = {
_dax_entry.attr,
_wb_lat_entry.attr,
_poll_delay_entry.attr,
+   _io_timeout_entry.attr,
 #ifdef CONFIG_BLK_DEV_THROTTLING_LOW
_sample_time_entry.attr,
 #endif
-- 
2.14.1