Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2024-12-29 09:13:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

blk-stat: convert blk-stat bucket callback to signed

Browse Source 
In order to allow for filtering of IO based on some other properties
of the request than direction we allow the bucket function to return
an int.

If the bucket callback returns a negative do no count it in the stats
accumulation.

Signed-off-by: Stephen Bates <sbates@raithlin.com>

Fixed up Kyber scheduler stat callback.

Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Stephen Bates 2017-04-20 15:29:16 -06:00 committed by Jens Axboe
parent caf7df1227
commit a37244e4cc
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block/blk-stat.c
View File

@ -19,7 +19,7 @@ struct blk_queue_stats {
bool enable_accounting;
};
unsigned int blk_stat_rq_ddir(const struct request *rq)
int blk_stat_rq_ddir(const struct request *rq)
{
return rq_data_dir(rq);
}
@ -104,6 +104,8 @@ void blk_stat_add(struct request *rq)
list_for_each_entry_rcu(cb, &q->stats->callbacks, list) {
if (blk_stat_is_active(cb)) {
bucket = cb->bucket_fn(rq);
if (bucket < 0)
continue;
stat = &this_cpu_ptr(cb->cpu_stat)[bucket];
__blk_stat_add(stat, value);
}
@ -135,7 +137,7 @@ static void blk_stat_timer_fn(unsigned long data)
struct blk_stat_callback *
blk_stat_alloc_callback(void (*timer_fn)(struct blk_stat_callback *),
unsigned int (*bucket_fn)(const struct request *),
int (*bucket_fn)(const struct request *),
unsigned int buckets, void *data)
{
struct blk_stat_callback *cb;

9
block/blk-stat.h
View File

@ -48,9 +48,10 @@ struct blk_stat_callback {
/**
* @bucket_fn: Given a request, returns which statistics bucket it
* should be accounted under.
* should be accounted under. Return -1 for no bucket for this
* request.
*/
unsigned int (*bucket_fn)(const struct request *);
int (*bucket_fn)(const struct request *);
/**
* @buckets: Number of statistics buckets.
@ -120,7 +121,7 @@ void blk_stat_enable_accounting(struct request_queue *q);
*
* Return: Data direction of the request, either READ or WRITE.
*/
unsigned int blk_stat_rq_ddir(const struct request *rq);
int blk_stat_rq_ddir(const struct request *rq);
/**
* blk_stat_alloc_callback() - Allocate a block statistics callback.
@ -135,7 +136,7 @@ unsigned int blk_stat_rq_ddir(const struct request *rq);
*/
struct blk_stat_callback *
blk_stat_alloc_callback(void (*timer_fn)(struct blk_stat_callback *),
unsigned int (*bucket_fn)(const struct request *),
int (*bucket_fn)(const struct request *),
unsigned int buckets, void *data);
/**

2
block/kyber-iosched.c
View File

@ -102,7 +102,7 @@ struct kyber_hctx_data {
atomic_t wait_index[KYBER_NUM_DOMAINS];
};
static unsigned int rq_sched_domain(const struct request *rq)
static int rq_sched_domain(const struct request *rq)
{
unsigned int op = rq->cmd_flags;