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.
Unified · Split
| @@ -2856,7 +2856,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, · 2855 unmodified lines | ||
| 2856 | 2856 | /* |
| 2857 | 2857 | * Default to classic polling |
| 2858 | 2858 | */ |
| 2859 | − q->poll_nsec = -1; | |
| 2859 | + q->poll_nsec = BLK_MQ_POLL_CLASSIC; | |
| 2860 | 2860 | |
| 2861 | 2861 | blk_mq_init_cpu_queues(q, set->nr_hw_queues); |
| 2862 | 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 | 3392 | struct request *rq; |
| 3393 | 3393 | |
| 3394 | − if (q->poll_nsec == -1) | |
| 3394 | + if (q->poll_nsec == BLK_MQ_POLL_CLASSIC) | |
| 3395 | 3395 | return false; |
| 3396 | 3396 | |
| 3397 | 3397 | if (!blk_qc_t_is_internal(cookie)) |
| @@ -360,8 +360,8 @@ static ssize_t queue_poll_delay_show(struct request_queue *q, char *page) · 359 unmodified lines | ||
| 360 | 360 | { |
| 361 | 361 | int val; |
| 362 | 362 | |
| 363 | − if (q->poll_nsec == -1) | |
| 364 | − val = -1; | |
| 363 | + if (q->poll_nsec == BLK_MQ_POLL_CLASSIC) | |
| 364 | + val = BLK_MQ_POLL_CLASSIC; | |
| 365 | 365 | else |
| 366 | 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 | 380 | if (err < 0) |
| 381 | 381 | return err; |
| 382 | 382 | |
| 383 | − if (val == -1) | |
| 384 | − q->poll_nsec = -1; | |
| 385 | − else | |
| 383 | + if (val == BLK_MQ_POLL_CLASSIC) | |
| 384 | + q->poll_nsec = BLK_MQ_POLL_CLASSIC; | |
| 385 | + else if (val >= 0) | |
| 386 | 386 | q->poll_nsec = val * 1000; |
| 387 | + else | |
| 388 | + return -EINVAL; | |
| 387 | 389 | |
| 388 | 390 | return count; |
| 389 | 391 | } |
| @@ -50,6 +50,9 @@ struct blk_stat_callback; · 49 unmodified lines | ||
| 50 | 50 | /* Must be consistent with blk_mq_poll_stats_bkt() */ |
| 51 | 51 | #define BLK_MQ_POLL_STATS_BKTS 16 |
| 52 | 52 | |
| 53 | +/* Doing classic polling */ | |
| 54 | +#define BLK_MQ_POLL_CLASSIC -1 | |
| 55 | + | |
| 53 | 56 | /* |
| 54 | 57 | * Maximum number of blkcg policies allowed to be registered concurrently. |
| 55 | 58 | * Defined here to simplify include dependency. |