* [PATCH] null_blk: boundary check queue_mode and irqmode
@ 2014-11-26 15:02 Matias Bjørling
2014-11-26 15:21 ` Jens Axboe
0 siblings, 1 reply; 3+ messages in thread
From: Matias Bjørling @ 2014-11-26 15:02 UTC (permalink / raw)
To: axboe, linux-fsdevel, linux-kernel; +Cc: Matias Bjørling
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@bjorling.me>
---
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;
+ }
+
if (queue_mode == NULL_Q_MQ && use_per_node_hctx) {
if (submit_queues < nr_online_nodes) {
pr_warn("null_blk: submit_queues param is set to %u.",
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] null_blk: boundary check queue_mode and irqmode
2014-11-26 15:02 [PATCH] null_blk: boundary check queue_mode and irqmode Matias Bjørling
@ 2014-11-26 15:21 ` Jens Axboe
0 siblings, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2014-11-26 15:21 UTC (permalink / raw)
To: Matias Bjørling, axboe, linux-fsdevel, linux-kernel
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@bjorling.me>
> ---
> 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-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] null_blk: boundary check queue_mode and irqmode
@ 2014-11-26 15:21 ` Jens Axboe
0 siblings, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2014-11-26 15:21 UTC (permalink / raw)
To: Matias Bjørling, axboe, linux-fsdevel, linux-kernel
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@bjorling.me>
> ---
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-11-26 15:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-26 15:02 [PATCH] null_blk: boundary check queue_mode and irqmode Matias Bjørling
2014-11-26 15:21 ` Jens Axboe
2014-11-26 15:21 ` Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.