History

block: add BLK_MQ_POLL_CLASSIC for hybrid poll and return EINVAL for unexpected value

For q->poll_nsec == -1, means doing classic poll, not hybrid poll. We introduce a new flag BLK_MQ_POLL_CLASSIC to replace -1, which may make code much easier to read. Additionally, since val is an int obtained with kstrtoint(), val can be a negative value other than -1, so return -EINVAL for that case. Thanks to Damien Le Moal for some good suggestion.

Yufen Yu committed 7 years ago

Commit 29ece8b1 parent 9496c013 files · +12 −7Browse files

Unified · Split

3 files
  1. block/blk-mq.c +2 −2
  2. block/blk-sysfs.c +7 −5
  3. include/linux/blkdev.h +3 −0
block/blk-mq.c+2−2
@@ -2856,7 +2856,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, · 2855 unmodified lines
2856 /*2856 /*
2857 * Default to classic polling2857 * Default to classic polling
2858 */2858 */
2859 q->poll_nsec = -1;2859 q->poll_nsec = BLK_MQ_POLL_CLASSIC;
2860 2860
2861 blk_mq_init_cpu_queues(q, set->nr_hw_queues);2861 blk_mq_init_cpu_queues(q, set->nr_hw_queues);
2862 blk_mq_add_queue_tag_set(set, q);2862 blk_mq_add_queue_tag_set(set, q);
@@ -3391,7 +3391,7 @@ static bool blk_mq_poll_hybrid(struct request_queue *q, · 528 unmodified lines
3391{3391{
3392 struct request *rq;3392 struct request *rq;
3393 3393
3394 if (q->poll_nsec == -1)3394 if (q->poll_nsec == BLK_MQ_POLL_CLASSIC)
3395 return false;3395 return false;
3396 3396
3397 if (!blk_qc_t_is_internal(cookie))3397 if (!blk_qc_t_is_internal(cookie))
block/blk-sysfs.c+7−5
@@ -360,8 +360,8 @@ static ssize_t queue_poll_delay_show(struct request_queue *q, char *page) · 359 unmodified lines
360{360{
361 int val;361 int val;
362 362
363 if (q->poll_nsec == -1)363 if (q->poll_nsec == BLK_MQ_POLL_CLASSIC)
364 val = -1;364 val = BLK_MQ_POLL_CLASSIC;
365 else365 else
366 val = q->poll_nsec / 1000;366 val = q->poll_nsec / 1000;
367 367
@@ -380,10 +380,12 @@ static ssize_t queue_poll_delay_store(struct request_queue *q, const char *page, · 12 unmodified lines
380 if (err < 0)380 if (err < 0)
381 return err;381 return err;
382 382
383 if (val == -1)383 if (val == BLK_MQ_POLL_CLASSIC)
384 q->poll_nsec = -1;384 q->poll_nsec = BLK_MQ_POLL_CLASSIC;
385 else385 else if (val >= 0)
386 q->poll_nsec = val * 1000;386 q->poll_nsec = val * 1000;
387 else
388 return -EINVAL;
387 389
388 return count;390 return count;
389}391}
include/linux/blkdev.h+3−0
@@ -50,6 +50,9 @@ struct blk_stat_callback; · 49 unmodified lines
50/* Must be consistent with blk_mq_poll_stats_bkt() */50/* Must be consistent with blk_mq_poll_stats_bkt() */
51#define BLK_MQ_POLL_STATS_BKTS 1651#define BLK_MQ_POLL_STATS_BKTS 16
52 52
53/* Doing classic polling */
54#define BLK_MQ_POLL_CLASSIC -1
55
53/*56/*
54 * Maximum number of blkcg policies allowed to be registered concurrently.57 * Maximum number of blkcg policies allowed to be registered concurrently.
55 * Defined here to simplify include dependency.58 * Defined here to simplify include dependency.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t