On Thu, 2019-04-04 at 16:43 +-0800, Ming Lei wrote: +AD4 Just like aio/io+AF8-uring, we need to grab 2 refcount for queuing one +AD4 request, one is for submission, another is for completion. +AD4 +AD4 If the request isn't queued from plug code path, the refcount grabbed +AD4 in generic+AF8-make+AF8-request() serves for submission. In theroy, this +AD4 refcount should have been released after the sumission(async run queue) +AD4 is done. blk+AF8-freeze+AF8-queue() works with blk+AF8-sync+AF8-queue() together +AD4 for avoiding race between cleanup queue and IO submission, given async +AD4 run queue activities are canceled because hctx-+AD4-run+AF8-work is scheduled with +AD4 the refcount held, so it is fine to not hold the refcount when +AD4 running the run queue work function for dispatch IO. +AD4 +AD4 However, if request is staggered into plug list, and finally queued +AD4 from plug code path, the refcount in submission side is actually missed. +AD4 And we may start to run queue after queue is removed because the queue's +AD4 kobject refcount isn't guaranteed to be grabbed in flushing plug list +AD4 context, then kernel oops is triggered, see the following race: +AD4 +AD4 blk+AF8-mq+AF8-flush+AF8-plug+AF8-list(): +AD4 blk+AF8-mq+AF8-sched+AF8-insert+AF8-requests() +AD4 insert requests to sw queue or scheduler queue +AD4 blk+AF8-mq+AF8-run+AF8-hw+AF8-queue +AD4 +AD4 Because of concurrent run queue, all requests inserted above may be +AD4 completed before calling the above blk+AF8-mq+AF8-run+AF8-hw+AF8-queue. Then queue can +AD4 be freed during the above blk+AF8-mq+AF8-run+AF8-hw+AF8-queue(). +AD4 +AD4 Fixes the issue by grab .q+AF8-usage+AF8-counter before calling +AD4 blk+AF8-mq+AF8-sched+AF8-insert+AF8-requests() in blk+AF8-mq+AF8-flush+AF8-plug+AF8-list(). This way is +AD4 safe because the queue is absolutely alive before inserting request. +AD4 +AD4 Cc: Dongli Zhang +ADw-dongli.zhang+AEA-oracle.com+AD4 +AD4 Cc: James Smart +ADw-james.smart+AEA-broadcom.com+AD4 +AD4 Cc: Bart Van Assche +ADw-bart.vanassche+AEA-wdc.com+AD4 +AD4 Cc: linux-scsi+AEA-vger.kernel.org, +AD4 Cc: Martin K . Petersen +ADw-martin.petersen+AEA-oracle.com+AD4, +AD4 Cc: Christoph Hellwig +ADw-hch+AEA-lst.de+AD4, +AD4 Cc: James E . J . Bottomley +ADw-jejb+AEA-linux.vnet.ibm.com+AD4, +AD4 Cc: jianchao wang +ADw-jianchao.w.wang+AEA-oracle.com+AD4 +AD4 Signed-off-by: Ming Lei +ADw-ming.lei+AEA-redhat.com+AD4 +AD4 --- +AD4 block/blk-mq.c +AHw 6 +-+-+-+-+-+- +AD4 1 file changed, 6 insertions(+-) +AD4 +AD4 diff --git a/block/blk-mq.c b/block/blk-mq.c +AD4 index 3ff3d7b49969..5b586affee09 100644 +AD4 --- a/block/blk-mq.c +AD4 +-+-+- b/block/blk-mq.c +AD4 +AEAAQA -1728,9 +-1728,12 +AEAAQA void blk+AF8-mq+AF8-flush+AF8-plug+AF8-list(struct blk+AF8-plug +ACo-plug, bool from+AF8-schedule) +AD4 if (rq-+AD4-mq+AF8-hctx +ACEAPQ this+AF8-hctx +AHwAfA rq-+AD4-mq+AF8-ctx +ACEAPQ this+AF8-ctx) +AHs +AD4 if (this+AF8-hctx) +AHs +AD4 trace+AF8-block+AF8-unplug(this+AF8-q, depth, +ACE-from+AF8-schedule)+ADs +AD4 +- +AD4 +- percpu+AF8-ref+AF8-get(+ACY-this+AF8-q-+AD4-q+AF8-usage+AF8-counter)+ADs +AD4 blk+AF8-mq+AF8-sched+AF8-insert+AF8-requests(this+AF8-hctx, this+AF8-ctx, +AD4 +ACY-rq+AF8-list, +AD4 from+AF8-schedule)+ADs +AD4 +- percpu+AF8-ref+AF8-put(+ACY-this+AF8-q-+AD4-q+AF8-usage+AF8-counter)+ADs +AD4 +AH0 +AD4 +AD4 this+AF8-q +AD0 rq-+AD4-q+ADs +AD4 +AEAAQA -1749,8 +-1752,11 +AEAAQA void blk+AF8-mq+AF8-flush+AF8-plug+AF8-list(struct blk+AF8-plug +ACo-plug, bool from+AF8-schedule) +AD4 +ACo-/ +AD4 if (this+AF8-hctx) +AHs +AD4 trace+AF8-block+AF8-unplug(this+AF8-q, depth, +ACE-from+AF8-schedule)+ADs +AD4 +- +AD4 +- percpu+AF8-ref+AF8-get(+ACY-this+AF8-q-+AD4-q+AF8-usage+AF8-counter)+ADs +AD4 blk+AF8-mq+AF8-sched+AF8-insert+AF8-requests(this+AF8-hctx, this+AF8-ctx, +ACY-rq+AF8-list, +AD4 from+AF8-schedule)+ADs +AD4 +- percpu+AF8-ref+AF8-put(+ACY-this+AF8-q-+AD4-q+AF8-usage+AF8-counter)+ADs +AD4 +AH0 +AD4 +AH0 Although this patch looks fine to me: have you considered to insert one percpu+AF8-ref+AF8-get() call at the start of blk+AF8-mq+AF8-flush+AF8-plug+AF8-list() and one percpu+AF8-ref+AF8-put() call at the end of the same function? Thanks, Bart.
