Skip to content
Permalink
Browse files
wbt: don't show valid wbt_lat_usec in sysfs while wbt is disabled
Currently, if wbt is initialized and then disabled by
wbt_disable_default(), sysfs will still show valid wbt_lat_usec, which
will confuse users that wbt is still enabled.

This patch shows wbt_lat_usec as zero and forbid to set it while wbt
is disabled.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reported-and-tested-by: Holger Hoffstätte <holger@applied-asynchrony.com>
  • Loading branch information
Yu Kuai authored and intel-lab-lkp committed Sep 19, 2022
1 parent d5538ab commit dd5a7be692b8fc9794f29648d0805a2d65b9c4de
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
@@ -467,10 +467,14 @@ static ssize_t queue_io_timeout_store(struct request_queue *q, const char *page,

static ssize_t queue_wb_lat_show(struct request_queue *q, char *page)
{
u64 lat;

if (!wbt_rq_qos(q))
return -EINVAL;

return sprintf(page, "%llu\n", div_u64(wbt_get_min_lat(q), 1000));
lat = wbt_disabled(q) ? 0 : div_u64(wbt_get_min_lat(q), 1000);

return sprintf(page, "%llu\n", lat);
}

static ssize_t queue_wb_lat_store(struct request_queue *q, const char *page,
@@ -493,6 +497,9 @@ static ssize_t queue_wb_lat_store(struct request_queue *q, const char *page,
return ret;
}

if (wbt_disabled(q))
return -EINVAL;

if (val == -1)
val = wbt_default_latency_nsec(q);
else if (val >= 0)
@@ -422,6 +422,13 @@ static void wbt_update_limits(struct rq_wb *rwb)
rwb_wake_all(rwb);
}

bool wbt_disabled(struct request_queue *q)
{
struct rq_qos *rqos = wbt_rq_qos(q);

return !rqos || RQWB(rqos)->enable_state == WBT_STATE_OFF_DEFAULT;
}

u64 wbt_get_min_lat(struct request_queue *q)
{
struct rq_qos *rqos = wbt_rq_qos(q);
@@ -94,6 +94,7 @@ void wbt_enable_default(struct request_queue *);

u64 wbt_get_min_lat(struct request_queue *q);
void wbt_set_min_lat(struct request_queue *q, u64 val);
bool wbt_disabled(struct request_queue *);

void wbt_set_write_cache(struct request_queue *, bool);

0 comments on commit dd5a7be

Please sign in to comment.