2016-03-19 10:32:19

by Thomas Gleixner

Subject: [PATCH] blk-mq: Use proper cpumask iterator

queue_for_each_ctx() iterates over per_cpu variables under the assumption that
the possible cpu mask cannot have holes. That's wrong as all cpumasks can have
holes. In case there are holes the iteration ends up accessing uninitialized
memory and crashing as a result.

Replace the macro by a proper for_each_possible_cpu() loop and drop the unused
macro blk_ctx_sum() which references queue_for_each_ctx().

Reported-by: Xiong Zhou <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
---
block/blk-mq-sysfs.c | 6 ++++--
block/blk-mq.c | 3 ++-
include/linux/blk-mq.h | 14 --------------
3 files changed, 6 insertions(+), 17 deletions(-)

--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -416,12 +416,14 @@ void blk_mq_hctx_kobj_init(struct blk_mq
static void blk_mq_sysfs_init(struct request_queue *q)
{
struct blk_mq_ctx *ctx;
- int i;
+ int cpu;

kobject_init(&q->mq_kobj, &blk_mq_ktype);

- queue_for_each_ctx(q, ctx, i)
+ for_each_possible_cpu(cpu) {
+ ctx = per_cpu_ptr(q->queue_ctx, cpu);
kobject_init(&ctx->kobj, &blk_mq_ctx_ktype);
+ }
}

int blk_mq_register_disk(struct gendisk *disk)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1798,11 +1798,12 @@ static void blk_mq_map_swqueue(struct re
/*
* Map software to hardware queues
*/
- queue_for_each_ctx(q, ctx, i) {
+ for_each_possible_cpu(i) {
/* If the cpu isn't online, the cpu is mapped to first hctx */
if (!cpumask_test_cpu(i, online_mask))
continue;

+ ctx = per_cpu_ptr(q->queue_ctx, i);
hctx = q->mq_ops->map_queue(q, i);

cpumask_set_cpu(i, hctx->cpumask);
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -263,22 +263,8 @@ static inline void *blk_mq_rq_to_pdu(str
for ((i) = 0; (i) < (q)->nr_hw_queues && \
({ hctx = (q)->queue_hw_ctx[i]; 1; }); (i)++)

-#define queue_for_each_ctx(q, ctx, i) \
- for ((i) = 0; (i) < (q)->nr_queues && \
- ({ ctx = per_cpu_ptr((q)->queue_ctx, (i)); 1; }); (i)++)
-
#define hctx_for_each_ctx(hctx, ctx, i) \
for ((i) = 0; (i) < (hctx)->nr_ctx && \
({ ctx = (hctx)->ctxs[(i)]; 1; }); (i)++)

-#define blk_ctx_sum(q, sum) \
-({ \
- struct blk_mq_ctx *__x; \
- unsigned int __ret = 0, __i; \
- \
- queue_for_each_ctx((q), __x, __i) \
- __ret += sum; \
- __ret; \
-})
-
#endif

2016-03-20 15:33:55

by Jens Axboe

Subject: Re: [PATCH] blk-mq: Use proper cpumask iterator

On 03/19/2016 04:30 AM, Thomas Gleixner wrote:
> queue_for_each_ctx() iterates over per_cpu variables under the assumption that
> the possible cpu mask cannot have holes. That's wrong as all cpumasks can have
> holes. In case there are holes the iteration ends up accessing uninitialized
> memory and crashing as a result.
>
> Replace the macro by a proper for_each_possible_cpu() loop and drop the unused
> macro blk_ctx_sum() which references queue_for_each_ctx().

Thanks Thomas, applied.

--
Jens Axboe