]> git.baikalelectronics.ru Git - kernel.git/commit
blk-mq: fallback to previous nr_hw_queues when updating fails
authorJianchao Wang <jianchao.w.wang@oracle.com>
Fri, 12 Oct 2018 10:07:28 +0000 (18:07 +0800)
committerJens Axboe <axboe@kernel.dk>
Sat, 13 Oct 2018 21:42:04 +0000 (15:42 -0600)
commit2d86f4482d537f37730676eb1b1dd130654c1d28
treed84fbc92eacf1b2341032ae25dd93a3dc3dd1a3d
parent05102fa80bf373f2bb0efd95e36374bf1b69b12b
blk-mq: fallback to previous nr_hw_queues when updating fails

When we try to increate the nr_hw_queues, we may fail due to
shortage of memory or other reason, then blk_mq_realloc_hw_ctxs stops
and some entries in q->queue_hw_ctx are left with NULL. However,
because queue map has been updated with new nr_hw_queues, some cpus
have been mapped to hw queue which just encounters allocation failure,
thus blk_mq_map_queue could return NULL. This will cause panic in
following blk_mq_map_swqueue.

To fix it, when increase nr_hw_queues fails, fallback to previous
nr_hw_queues and post warning. At the same time, driver's .map_queues
usually use completion irq affinity to map hw and cpu, fallback
nr_hw_queues will cause lack of some cpu's map to hw, so use default
blk_mq_map_queues to do that.

Reported-by: syzbot+83e8cbe702263932d9d4@syzkaller.appspotmail.com
Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-mq.c