Pull more block updates from Jens Axboe: - MD fixes via Song: - md-cluster fixes (Heming Zhao) - raid1 fix (Mateusz Jończyk) - s390/dasd module description (Jeff) - Series cleaning up and hardening the blk-mq debugfs flag handling (John, Christoph) - blk-cgroup cleanup (Xiu) - Error polled IO attempts if backend doesn't support it (hexue) - Fix for an sbitmap hang (Yang) * tag 'for-6.11/block-20240722' of git://git.kernel.dk/linux: (23 commits) blk-cgroup: move congestion_count to struct blkcg sbitmap: fix io hung due to race on sbitmap_word::cleared block: avoid polling configuration errors block: Catch possible entries missing from rqf_name[] block: Simplify definition of RQF_NAME() block: Use enum to define RQF_x bit indexes block: Catch possible entries missing from cmd_flag_name[] block: Catch possible entries missing from alloc_policy_name[] block: Catch possible entries missing from hctx_flag_name[] block: Catch possible entries missing from hctx_state_name[] block: Catch possible entries missing from blk_queue_flag_name[] block: Make QUEUE_FLAG_x as an enum block: Relocate BLK_MQ_MAX_DEPTH block: Relocate BLK_MQ_CPU_WORK_BATCH block: remove QUEUE_FLAG_STOPPED block: Add missing entry to hctx_flag_name[] block: Add zone write plugging entry to rqf_name[] block: Add missing entries from cmd_flag_name[] s390/dasd: fix error checks in dasd_copy_pair_store() s390/dasd: add missing MODULE_DESCRIPTION() macros ...
Showing the changes to include/linux/blkdev.h (1 of 19 files). Show all
Unified · Split
| @@ -588,27 +588,28 @@ struct request_queue { · 587 unmodified lines | |||
| 588 | }; | 588 | }; |
| 589 | 589 | ||
| 590 | /* Keep blk_queue_flag_name[] in sync with the definitions below */ | 590 | /* Keep blk_queue_flag_name[] in sync with the definitions below */ |
| 591 | #define QUEUE_FLAG_STOPPED 0 /* queue is stopped */ | 591 | enum { |
| 592 | #define QUEUE_FLAG_DYING 1 /* queue being torn down */ | 592 | QUEUE_FLAG_DYING, /* queue being torn down */ |
| 593 | #define QUEUE_FLAG_NOMERGES 3 /* disable merge attempts */ | 593 | QUEUE_FLAG_NOMERGES, /* disable merge attempts */ |
| 594 | #define QUEUE_FLAG_SAME_COMP 4 /* complete on same CPU-group */ | 594 | QUEUE_FLAG_SAME_COMP, /* complete on same CPU-group */ |
| 595 | #define QUEUE_FLAG_FAIL_IO 5 /* fake timeout */ | 595 | QUEUE_FLAG_FAIL_IO, /* fake timeout */ |
| 596 | #define QUEUE_FLAG_NOXMERGES 9 /* No extended merges */ | 596 | QUEUE_FLAG_NOXMERGES, /* No extended merges */ |
| 597 | #define QUEUE_FLAG_SAME_FORCE 12 /* force complete on same CPU */ | 597 | QUEUE_FLAG_SAME_FORCE, /* force complete on same CPU */ |
| 598 | #define QUEUE_FLAG_INIT_DONE 14 /* queue is initialized */ | 598 | QUEUE_FLAG_INIT_DONE, /* queue is initialized */ |
| 599 | #define QUEUE_FLAG_STATS 20 /* track IO start and completion times */ | 599 | QUEUE_FLAG_STATS, /* track IO start and completion times */ |
| 600 | #define QUEUE_FLAG_REGISTERED 22 /* queue has been registered to a disk */ | 600 | QUEUE_FLAG_REGISTERED, /* queue has been registered to a disk */ |
| 601 | #define QUEUE_FLAG_QUIESCED 24 /* queue has been quiesced */ | 601 | QUEUE_FLAG_QUIESCED, /* queue has been quiesced */ |
| 602 | #define QUEUE_FLAG_RQ_ALLOC_TIME 27 /* record rq->alloc_time_ns */ | 602 | QUEUE_FLAG_RQ_ALLOC_TIME, /* record rq->alloc_time_ns */ |
| 603 | #define QUEUE_FLAG_HCTX_ACTIVE 28 /* at least one blk-mq hctx is active */ | 603 | QUEUE_FLAG_HCTX_ACTIVE, /* at least one blk-mq hctx is active */ |
| 604 | #define QUEUE_FLAG_SQ_SCHED 30 /* single queue style io dispatch */ | 604 | QUEUE_FLAG_SQ_SCHED, /* single queue style io dispatch */ |
| 605 | QUEUE_FLAG_MAX | ||
| 606 | }; | ||
| 605 | 607 | ||
| 606 | #define QUEUE_FLAG_MQ_DEFAULT (1UL << QUEUE_FLAG_SAME_COMP) | 608 | #define QUEUE_FLAG_MQ_DEFAULT (1UL << QUEUE_FLAG_SAME_COMP) |
| 607 | 609 | ||
| 608 | void blk_queue_flag_set(unsigned int flag, struct request_queue *q); | 610 | void blk_queue_flag_set(unsigned int flag, struct request_queue *q); |
| 609 | void blk_queue_flag_clear(unsigned int flag, struct request_queue *q); | 611 | void blk_queue_flag_clear(unsigned int flag, struct request_queue *q); |
| 610 | 612 | ||
| 611 | #define blk_queue_stopped(q) test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags) | ||
| 612 | #define blk_queue_dying(q) test_bit(QUEUE_FLAG_DYING, &(q)->queue_flags) | 613 | #define blk_queue_dying(q) test_bit(QUEUE_FLAG_DYING, &(q)->queue_flags) |
| 613 | #define blk_queue_init_done(q) test_bit(QUEUE_FLAG_INIT_DONE, &(q)->queue_flags) | 614 | #define blk_queue_init_done(q) test_bit(QUEUE_FLAG_INIT_DONE, &(q)->queue_flags) |
| 614 | #define blk_queue_nomerges(q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags) | 615 | #define blk_queue_nomerges(q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags) |