* [PATCH] block: Fix handling of offline queues in blk_mq_alloc_request_hctx()
@ 2022-06-15 21:00 Bart Van Assche
2022-06-16 1:39 ` Ming Lei
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Bart Van Assche @ 2022-06-15 21:00 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-block, Christoph Hellwig, Bart Van Assche, Ming Lei
This patch prevents that test nvme/004 triggers the following:
UBSAN: array-index-out-of-bounds in block/blk-mq.h:135:9
index 512 is out of range for type 'long unsigned int [512]'
Call Trace:
show_stack+0x52/0x58
dump_stack_lvl+0x49/0x5e
dump_stack+0x10/0x12
ubsan_epilogue+0x9/0x3b
__ubsan_handle_out_of_bounds.cold+0x44/0x49
blk_mq_alloc_request_hctx+0x304/0x310
__nvme_submit_sync_cmd+0x70/0x200 [nvme_core]
nvmf_connect_io_queue+0x23e/0x2a0 [nvme_fabrics]
nvme_loop_connect_io_queues+0x8d/0xb0 [nvme_loop]
nvme_loop_create_ctrl+0x58e/0x7d0 [nvme_loop]
nvmf_create_ctrl+0x1d7/0x4d0 [nvme_fabrics]
nvmf_dev_write+0xae/0x111 [nvme_fabrics]
vfs_write+0x144/0x560
ksys_write+0xb7/0x140
__x64_sys_write+0x42/0x50
do_syscall_64+0x35/0x80
entry_SYSCALL_64_after_hwframe+0x44/0xae
Cc: Christoph Hellwig <hch@lst.de>
Cc: Ming Lei <ming.lei@redhat.com>
Fixes: 20e4d8139319 ("blk-mq: simplify queue mapping & schedule with each possisble CPU")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
block/blk-mq.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 7a5558bbc7f6..1c09c6017ea9 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -579,6 +579,8 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q,
if (!blk_mq_hw_queue_mapped(data.hctx))
goto out_queue_exit;
cpu = cpumask_first_and(data.hctx->cpumask, cpu_online_mask);
+ if (cpu >= nr_cpu_ids)
+ goto out_queue_exit;
data.ctx = __blk_mq_get_ctx(q, cpu);
if (!q->elevator)
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] block: Fix handling of offline queues in blk_mq_alloc_request_hctx()
2022-06-15 21:00 [PATCH] block: Fix handling of offline queues in blk_mq_alloc_request_hctx() Bart Van Assche
@ 2022-06-16 1:39 ` Ming Lei
2022-06-16 6:18 ` Christoph Hellwig
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Ming Lei @ 2022-06-16 1:39 UTC (permalink / raw)
To: Bart Van Assche; +Cc: Jens Axboe, linux-block, Christoph Hellwig
On Wed, Jun 15, 2022 at 02:00:04PM -0700, Bart Van Assche wrote:
> This patch prevents that test nvme/004 triggers the following:
>
> UBSAN: array-index-out-of-bounds in block/blk-mq.h:135:9
> index 512 is out of range for type 'long unsigned int [512]'
> Call Trace:
> show_stack+0x52/0x58
> dump_stack_lvl+0x49/0x5e
> dump_stack+0x10/0x12
> ubsan_epilogue+0x9/0x3b
> __ubsan_handle_out_of_bounds.cold+0x44/0x49
> blk_mq_alloc_request_hctx+0x304/0x310
> __nvme_submit_sync_cmd+0x70/0x200 [nvme_core]
> nvmf_connect_io_queue+0x23e/0x2a0 [nvme_fabrics]
> nvme_loop_connect_io_queues+0x8d/0xb0 [nvme_loop]
> nvme_loop_create_ctrl+0x58e/0x7d0 [nvme_loop]
> nvmf_create_ctrl+0x1d7/0x4d0 [nvme_fabrics]
> nvmf_dev_write+0xae/0x111 [nvme_fabrics]
> vfs_write+0x144/0x560
> ksys_write+0xb7/0x140
> __x64_sys_write+0x42/0x50
> do_syscall_64+0x35/0x80
> entry_SYSCALL_64_after_hwframe+0x44/0xae
>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Ming Lei <ming.lei@redhat.com>
> Fixes: 20e4d8139319 ("blk-mq: simplify queue mapping & schedule with each possisble CPU")
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
> block/blk-mq.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index 7a5558bbc7f6..1c09c6017ea9 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -579,6 +579,8 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q,
> if (!blk_mq_hw_queue_mapped(data.hctx))
> goto out_queue_exit;
> cpu = cpumask_first_and(data.hctx->cpumask, cpu_online_mask);
> + if (cpu >= nr_cpu_ids)
> + goto out_queue_exit;
> data.ctx = __blk_mq_get_ctx(q, cpu);
>
> if (!q->elevator)
>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Thanks,
Ming
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] block: Fix handling of offline queues in blk_mq_alloc_request_hctx()
2022-06-15 21:00 [PATCH] block: Fix handling of offline queues in blk_mq_alloc_request_hctx() Bart Van Assche
2022-06-16 1:39 ` Ming Lei
@ 2022-06-16 6:18 ` Christoph Hellwig
2022-06-16 8:03 ` John Garry
2022-06-16 20:46 ` Jens Axboe
3 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2022-06-16 6:18 UTC (permalink / raw)
To: Bart Van Assche; +Cc: Jens Axboe, linux-block, Christoph Hellwig, Ming Lei
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] block: Fix handling of offline queues in blk_mq_alloc_request_hctx()
2022-06-15 21:00 [PATCH] block: Fix handling of offline queues in blk_mq_alloc_request_hctx() Bart Van Assche
2022-06-16 1:39 ` Ming Lei
2022-06-16 6:18 ` Christoph Hellwig
@ 2022-06-16 8:03 ` John Garry
2022-06-16 8:23 ` Ming Lei
2022-06-16 20:46 ` Jens Axboe
3 siblings, 1 reply; 6+ messages in thread
From: John Garry @ 2022-06-16 8:03 UTC (permalink / raw)
To: Bart Van Assche, Jens Axboe, Ming Lei; +Cc: linux-block, Christoph Hellwig
On 15/06/2022 22:00, Bart Van Assche wrote:
> This patch prevents that test nvme/004 triggers the following:
>
> UBSAN: array-index-out-of-bounds in block/blk-mq.h:135:9
> index 512 is out of range for type 'long unsigned int [512]'
> Call Trace:
> show_stack+0x52/0x58
> dump_stack_lvl+0x49/0x5e
> dump_stack+0x10/0x12
> ubsan_epilogue+0x9/0x3b
> __ubsan_handle_out_of_bounds.cold+0x44/0x49
> blk_mq_alloc_request_hctx+0x304/0x310
> __nvme_submit_sync_cmd+0x70/0x200 [nvme_core]
> nvmf_connect_io_queue+0x23e/0x2a0 [nvme_fabrics]
> nvme_loop_connect_io_queues+0x8d/0xb0 [nvme_loop]
> nvme_loop_create_ctrl+0x58e/0x7d0 [nvme_loop]
> nvmf_create_ctrl+0x1d7/0x4d0 [nvme_fabrics]
> nvmf_dev_write+0xae/0x111 [nvme_fabrics]
> vfs_write+0x144/0x560
> ksys_write+0xb7/0x140
> __x64_sys_write+0x42/0x50
> do_syscall_64+0x35/0x80
> entry_SYSCALL_64_after_hwframe+0x44/0xae
>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Ming Lei <ming.lei@redhat.com>
> Fixes: 20e4d8139319 ("blk-mq: simplify queue mapping & schedule with each possisble CPU")
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
> block/blk-mq.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index 7a5558bbc7f6..1c09c6017ea9 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -579,6 +579,8 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q,
> if (!blk_mq_hw_queue_mapped(data.hctx))
> goto out_queue_exit;
> cpu = cpumask_first_and(data.hctx->cpumask, cpu_online_mask);
> + if (cpu >= nr_cpu_ids)
> + goto out_queue_exit;
Ming, Did you give up on this:
https://lore.kernel.org/linux-block/20210818144428.896216-1-ming.lei@redhat.com/
Thanks,
John
> data.ctx = __blk_mq_get_ctx(q, cpu);
>
> if (!q->elevator)
> .
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] block: Fix handling of offline queues in blk_mq_alloc_request_hctx()
2022-06-16 8:03 ` John Garry
@ 2022-06-16 8:23 ` Ming Lei
0 siblings, 0 replies; 6+ messages in thread
From: Ming Lei @ 2022-06-16 8:23 UTC (permalink / raw)
To: John Garry; +Cc: Bart Van Assche, Jens Axboe, linux-block, Christoph Hellwig
On Thu, Jun 16, 2022 at 09:03:52AM +0100, John Garry wrote:
> On 15/06/2022 22:00, Bart Van Assche wrote:
> > This patch prevents that test nvme/004 triggers the following:
> >
> > UBSAN: array-index-out-of-bounds in block/blk-mq.h:135:9
> > index 512 is out of range for type 'long unsigned int [512]'
> > Call Trace:
> > show_stack+0x52/0x58
> > dump_stack_lvl+0x49/0x5e
> > dump_stack+0x10/0x12
> > ubsan_epilogue+0x9/0x3b
> > __ubsan_handle_out_of_bounds.cold+0x44/0x49
> > blk_mq_alloc_request_hctx+0x304/0x310
> > __nvme_submit_sync_cmd+0x70/0x200 [nvme_core]
> > nvmf_connect_io_queue+0x23e/0x2a0 [nvme_fabrics]
> > nvme_loop_connect_io_queues+0x8d/0xb0 [nvme_loop]
> > nvme_loop_create_ctrl+0x58e/0x7d0 [nvme_loop]
> > nvmf_create_ctrl+0x1d7/0x4d0 [nvme_fabrics]
> > nvmf_dev_write+0xae/0x111 [nvme_fabrics]
> > vfs_write+0x144/0x560
> > ksys_write+0xb7/0x140
> > __x64_sys_write+0x42/0x50
> > do_syscall_64+0x35/0x80
> > entry_SYSCALL_64_after_hwframe+0x44/0xae
> >
> > Cc: Christoph Hellwig <hch@lst.de>
> > Cc: Ming Lei <ming.lei@redhat.com>
> > Fixes: 20e4d8139319 ("blk-mq: simplify queue mapping & schedule with each possisble CPU")
> > Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> > ---
> > block/blk-mq.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/block/blk-mq.c b/block/blk-mq.c
> > index 7a5558bbc7f6..1c09c6017ea9 100644
> > --- a/block/blk-mq.c
> > +++ b/block/blk-mq.c
> > @@ -579,6 +579,8 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q,
> > if (!blk_mq_hw_queue_mapped(data.hctx))
> > goto out_queue_exit;
> > cpu = cpumask_first_and(data.hctx->cpumask, cpu_online_mask);
> > + if (cpu >= nr_cpu_ids)
> > + goto out_queue_exit;
>
> Ming, Did you give up on this:
>
> https://lore.kernel.org/linux-block/20210818144428.896216-1-ming.lei@redhat.com/
Yeah, this approach has some big problem, see
https://lore.kernel.org/linux-block/20210722160654.GA8344@lst.de/#t
Thanks,
Ming
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] block: Fix handling of offline queues in blk_mq_alloc_request_hctx()
2022-06-15 21:00 [PATCH] block: Fix handling of offline queues in blk_mq_alloc_request_hctx() Bart Van Assche
` (2 preceding siblings ...)
2022-06-16 8:03 ` John Garry
@ 2022-06-16 20:46 ` Jens Axboe
3 siblings, 0 replies; 6+ messages in thread
From: Jens Axboe @ 2022-06-16 20:46 UTC (permalink / raw)
To: bvanassche; +Cc: Christoph Hellwig, ming.lei, linux-block
On Wed, 15 Jun 2022 14:00:04 -0700, Bart Van Assche wrote:
> This patch prevents that test nvme/004 triggers the following:
>
> UBSAN: array-index-out-of-bounds in block/blk-mq.h:135:9
> index 512 is out of range for type 'long unsigned int [512]'
> Call Trace:
> show_stack+0x52/0x58
> dump_stack_lvl+0x49/0x5e
> dump_stack+0x10/0x12
> ubsan_epilogue+0x9/0x3b
> __ubsan_handle_out_of_bounds.cold+0x44/0x49
> blk_mq_alloc_request_hctx+0x304/0x310
> __nvme_submit_sync_cmd+0x70/0x200 [nvme_core]
> nvmf_connect_io_queue+0x23e/0x2a0 [nvme_fabrics]
> nvme_loop_connect_io_queues+0x8d/0xb0 [nvme_loop]
> nvme_loop_create_ctrl+0x58e/0x7d0 [nvme_loop]
> nvmf_create_ctrl+0x1d7/0x4d0 [nvme_fabrics]
> nvmf_dev_write+0xae/0x111 [nvme_fabrics]
> vfs_write+0x144/0x560
> ksys_write+0xb7/0x140
> __x64_sys_write+0x42/0x50
> do_syscall_64+0x35/0x80
> entry_SYSCALL_64_after_hwframe+0x44/0xae
>
> [...]
Applied, thanks!
[1/1] block: Fix handling of offline queues in blk_mq_alloc_request_hctx()
commit: 14dc7a18abbe4176f5626c13c333670da8e06aa1
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-06-16 20:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-15 21:00 [PATCH] block: Fix handling of offline queues in blk_mq_alloc_request_hctx() Bart Van Assche
2022-06-16 1:39 ` Ming Lei
2022-06-16 6:18 ` Christoph Hellwig
2022-06-16 8:03 ` John Garry
2022-06-16 8:23 ` Ming Lei
2022-06-16 20:46 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).