Commit cb700eb3faa4 ("block: don't plug for aio/O_DIRECT HIPRI IO")
only does not call blk_start_plug() or blk_finish_plug for HIPRI IO
in __blkdev_direct_IO(), but if upper layer subsystem, such as io_uring,
still initializes valid plug, block layer may still plug HIPRI IO.
To disable plug for HIPRI IO completely, do it in blk_mq_plug().
Signed-off-by: Xiaoguang Wang <xiaoguang.wang@xxxxxxxxxxxxxxxxx>
---
block/blk-mq.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/block/blk-mq.h b/block/blk-mq.h
index a52703c..5453d14 100644
--- a/block/blk-mq.h
+++ b/block/blk-mq.h
@@ -272,9 +272,11 @@ static inline struct blk_plug *blk_mq_plug(struct request_queue *q,
{
/*
* For regular block devices or read operations, use the context plug
- * which may be NULL if blk_start_plug() was not executed.
+ * which may be NULL if blk_start_plug() was not executed, and don't
+ * plug for HIPRI/polled IO, as those should go straight to issue.
*/
- if (!blk_queue_is_zoned(q) || !op_is_write(bio_op(bio)))
+ if (!(bio->bi_opf & REQ_HIPRI) &&
+ (!blk_queue_is_zoned(q) || !op_is_write(bio_op(bio))))
return current->plug;
/* Zoned block device write operation case: do not plug the BIO */
--
1.8.3.1
