nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

blk-mq: Fix poll_stat for new size-based bucketing.

Browse source 
Fixes an issue where the size of the poll_stat array in request_queue
does not match the size expected by the new size based bucketing for
IO completion polling.

Fixes: 720b8ccc45 ("blk-mq: Add a polling specific stats function")
Signed-off-by: Stephen Bates <sbates@raithlin.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Stephen Bates 2017-04-20 16:59:11 -06:00 committed by Jens Axboe
parent b00c53e8f4
commit 0206319fdf
3 changed files with 13 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

11
block/blk-mq-debugfs.c
View file

@ -159,14 +159,17 @@ static void print_stat(struct seq_file *m, struct blk_rq_stat *stat)
static int queue_poll_stat_show(struct seq_file *m, void *v) static int queue_poll_stat_show(struct seq_file *m, void *v)
{ {
struct request_queue *q = m->private; struct request_queue *q = m->private;
int bucket;
seq_puts(m, "read: "); for (bucket = 0; bucket < BLK_MQ_POLL_STATS_BKTS/2; bucket++) {
print_stat(m, &q->poll_stat[READ]); seq_printf(m, "read (%d Bytes): ", 1 << (9+bucket));
print_stat(m, &q->poll_stat[2*bucket]);
seq_puts(m, "\n"); seq_puts(m, "\n");
seq_puts(m, "write: "); seq_printf(m, "write (%d Bytes): ", 1 << (9+bucket));
print_stat(m, &q->poll_stat[WRITE]); print_stat(m, &q->poll_stat[2*bucket+1]);
seq_puts(m, "\n"); seq_puts(m, "\n");
}
return 0; return 0;
} }

2
block/blk-mq.c
View file

@ -42,8 +42,6 @@ static LIST_HEAD(all_q_list);
static void blk_mq_poll_stats_start(struct request_queue *q); static void blk_mq_poll_stats_start(struct request_queue *q);
static void blk_mq_poll_stats_fn(struct blk_stat_callback *cb); static void blk_mq_poll_stats_fn(struct blk_stat_callback *cb);
/* Must be consisitent with function below */
#define BLK_MQ_POLL_STATS_BKTS 16
static int blk_mq_poll_stats_bkt(const struct request *rq) static int blk_mq_poll_stats_bkt(const struct request *rq)
{ {
int ddir, bytes, bucket; int ddir, bytes, bucket;

5
include/linux/blkdev.h
View file

@ -46,6 +46,9 @@ struct blk_stat_callback;
#define BLKDEV_MIN_RQ 4 #define BLKDEV_MIN_RQ 4
#define BLKDEV_MAX_RQ 128 /* Default maximum */ #define BLKDEV_MAX_RQ 128 /* Default maximum */
/* Must be consisitent with blk_mq_poll_stats_bkt() */
#define BLK_MQ_POLL_STATS_BKTS 16
/* /*
* Maximum number of blkcg policies allowed to be registered concurrently. * Maximum number of blkcg policies allowed to be registered concurrently.
* Defined here to simplify include dependency. * Defined here to simplify include dependency.
@ -517,7 +520,7 @@ struct request_queue {
int poll_nsec; int poll_nsec;
struct blk_stat_callback *poll_cb; struct blk_stat_callback *poll_cb;
struct blk_rq_stat poll_stat[2]; struct blk_rq_stat poll_stat[BLK_MQ_POLL_STATS_BKTS];
struct timer_list timeout; struct timer_list timeout;
struct work_struct timeout_work; struct work_struct timeout_work;