lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 21 Aug 2013 17:27:07 +0200 From: Alexander Gordeev <agordeev@...hat.com> To: Jens Axboe <axboe@...nel.dk> Cc: linux-kernel@...r.kernel.org, Tejun Heo <tj@...nel.org>, "Nicholas A. Bellinger" <nab@...ux-iscsi.org>, Mike Christie <michaelc@...wisc.edu>, Shaohua Li <shli@...ionio.com> Subject: [PATCH 4/5] blk-mq: Do not fail blk_mq_reg::queue_depth value of zero Zero value of blk_mq_reg::queue_depth defaults to BLK_MQ_MAX_DEPTH. Commit 1ffd49b ("blk-mq: Check queue depth is valid") broke this default. This fix restores the previous behaviour. Signed-off-by: Alexander Gordeev <agordeev@...hat.com> --- block/blk-mq.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index a8b4c79..6c2533a 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1308,8 +1308,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_reg *reg, if (!reg->nr_hw_queues || !reg->ops->queue_rq || !reg->ops->map_queue || - !reg->ops->alloc_hctx || !reg->ops->free_hctx || - (reg->queue_depth < (reg->reserved_tags + BLK_MQ_TAG_MIN))) + !reg->ops->alloc_hctx || !reg->ops->free_hctx) return ERR_PTR(-EINVAL); if (!reg->queue_depth) @@ -1319,6 +1318,9 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_reg *reg, reg->queue_depth = BLK_MQ_MAX_DEPTH; } + if (reg->queue_depth < (reg->reserved_tags + BLK_MQ_TAG_MIN)) + return ERR_PTR(-EINVAL); + ctx = alloc_percpu(struct blk_mq_ctx); if (!ctx) return ERR_PTR(-ENOMEM); -- 1.7.7.6 -- Regards, Alexander Gordeev agordeev@...hat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists