From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH] null_blk: boundary check queue_mode and irqmode Date: Wed, 26 Nov 2014 16:02:58 +0100 Message-ID: <1417014178-13007-1-git-send-email-m@bjorling.me> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: axboe@fb.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org When either queue_mode or irq_mode parameter is set outside its boundar= ies, the driver will not complete requests. This stalls driver initialization wh= en partitions are probed. Fix by setting out of bound values to the parame= ters default. Signed-off-by: Matias Bj=C3=B8rling --- drivers/block/null_blk.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c index caa6121..efe9f76 100644 --- a/drivers/block/null_blk.c +++ b/drivers/block/null_blk.c @@ -506,7 +506,7 @@ static int null_add_dev(void) rv =3D init_driver_queues(nullb); if (rv) goto out_cleanup_blk_queue; - } else { + } else if (queue_mode =3D=3D NULL_Q_RQ) { nullb->q =3D blk_init_queue_node(null_request_fn, &nullb->lock, home= _node); if (!nullb->q) { rv =3D -ENOMEM; @@ -574,6 +574,18 @@ static int __init null_init(void) bs =3D PAGE_SIZE; } =20 + if (queue_mode < 0 || queue_mode > NULL_Q_MQ) { + pr_warn("null_blk: invalid queue mode\n"); + pr_warn("null_blk: defaults queue mode to multiqueue\n"); + queue_mode =3D NULL_Q_MQ; + } + + if (irqmode < 0 || irqmode > NULL_IRQ_TIMER) { + pr_warn("null_blk: invalid irq mode\n"); + pr_warn("null_blk: defauls irq mode to softirq\n"); + irqmode =3D NULL_IRQ_SOFTIRQ; + } + if (queue_mode =3D=3D NULL_Q_MQ && use_per_node_hctx) { if (submit_queues < nr_online_nodes) { pr_warn("null_blk: submit_queues param is set to %u.", --=20 1.9.1