Re: [PATCH] null_blk: boundary check queue_mode and irqmode

[Jens Axboe]

On 11/26/2014 08:02 AM, Matias BjÃrling wrote:
> When either queue_mode or irq_mode parameter is set outside its boundaries, the
> driver will not complete requests. This stalls driver initialization when
> partitions are probed. Fix by setting out of bound values to the parameters
> default.
>
> Signed-off-by: Matias BjÃrling <m@xxxxxxxxxxx>
> ---
>   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 = init_driver_queues(nullb);
>   		if (rv)
>   			goto out_cleanup_blk_queue;
> -	} else {
> +	} else if (queue_mode == NULL_Q_RQ) {
>   		nullb->q = blk_init_queue_node(null_request_fn, &nullb->lock, home_node);
>   		if (!nullb->q) {
>   			rv = -ENOMEM;
> @@ -574,6 +574,18 @@ static int __init null_init(void)
>   		bs = PAGE_SIZE;
>   	}
>
> +	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 = 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 = NULL_IRQ_SOFTIRQ;
> +	}

Lets fix these by using module_param_cb() instead to reject invalid 
values upfront.

--
Jens Axboe

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/