From: Keith Busch <kbusch@xxxxxxxxxx> Polling needs a bio with a valid bi_bdev, but neither of those are guaranteed for polled driver requests. Make request based polling use directly use blk-mq's polling function. When executing a request from a polled hctx, we know the request's cookie, and that it's from a live multi-queue that supports polling, so we can safely skip everything that bio_poll provides. Link: http://lists.infradead.org/pipermail/linux-nvme/2023-March/038340.html Reported-by: Martin Belanger <Martin.Belanger@xxxxxxxx> Reported-by: Daniel Wagner <dwagner@xxxxxxx> Signed-off-by: Keith Busch <kbusch@xxxxxxxxxx> --- block/blk-mq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 4e30459df8151..932d2e95392e6 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1334,8 +1334,6 @@ bool blk_rq_is_poll(struct request *rq) return false; if (rq->mq_hctx->type != HCTX_TYPE_POLL) return false; - if (WARN_ON_ONCE(!rq->bio)) - return false; return true; } EXPORT_SYMBOL_GPL(blk_rq_is_poll); @@ -1343,7 +1341,7 @@ EXPORT_SYMBOL_GPL(blk_rq_is_poll); static void blk_rq_poll_completion(struct request *rq, struct completion *wait) { do { - bio_poll(rq->bio, NULL, 0); + blk_mq_poll(rq->q, blk_rq_to_qc(rq), NULL, 0); cond_resched(); } while (!completion_done(wait)); } -- 2.34.1
