Commit 30654614 authored by Ed Tsai's avatar Ed Tsai Committed by Jens Axboe

blk-mq: check on cpu id when there is only one ctx mapping

commit f168420c ("blk-mq: don't redirect completion for hctx withs
only one ctx mapping") When nvme applies a 1:1 mapping of hctx and ctx,
there will be no remote request.

But for ufs, the submission and completion queues could be asymmetric.
(e.g. Multiple SQs share one CQ) Therefore, 1:1 mapping of hctx and
ctx won't complete request on the submission cpu. In this situation,
this nr_ctx check could violate the QUEUE_FLAG_SAME_FORCE, as a result,
check on cpu id when there is only one ctx mapping.
Signed-off-by: default avatarEd Tsai <ed.tsai@mediatek.com>
Signed-off-by: default avatarPo-Wen Kao <powen.kao@mediatek.com>
Suggested-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230614002529.6636-1-ed.tsai@mediatek.com
[axboe: fixed up indentation]
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 60701311
...@@ -1185,7 +1185,8 @@ bool blk_mq_complete_request_remote(struct request *rq) ...@@ -1185,7 +1185,8 @@ bool blk_mq_complete_request_remote(struct request *rq)
* or a polled request, always complete locally, * or a polled request, always complete locally,
* it's pointless to redirect the completion. * it's pointless to redirect the completion.
*/ */
if (rq->mq_hctx->nr_ctx == 1 || if ((rq->mq_hctx->nr_ctx == 1 &&
rq->mq_ctx->cpu == raw_smp_processor_id()) ||
rq->cmd_flags & REQ_POLLED) rq->cmd_flags & REQ_POLLED)
return false; return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment