blk-mq: never redirect polled IO completions

It's pointless to do so, we are by definition on the CPU we want/need
to be, as that's the one waiting for a completion event.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-mq.c b/block/blk-mq.c
index ba3c7b6..37674c1 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -585,7 +585,12 @@ static void __blk_mq_complete_request(struct request *rq)
                return;
        }
 
-       if (!test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags)) {
+       /*
+        * For a polled request, always complete locallly, it's pointless
+        * to redirect the completion.
+        */
+       if ((rq->cmd_flags & REQ_HIPRI) ||
+           !test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags)) {
                q->mq_ops->complete(rq);
                return;
        }