Skip to content

Commit d47f971

Browse files
Zhiguo Niuaxboe
authored andcommitted
block/mq-deadline: use correct way to throttling write requests
The original formula was inaccurate: dd->async_depth = max(1UL, 3 * q->nr_requests / 4); For write requests, when we assign a tags from sched_tags, data->shallow_depth will be passed to sbitmap_find_bit, see the following code: nr = sbitmap_find_bit_in_word(&sb->map[index], min_t (unsigned int, __map_depth(sb, index), depth), alloc_hint, wrap); The smaller of data->shallow_depth and __map_depth(sb, index) will be used as the maximum range when allocating bits. For a mmc device (one hw queue, deadline I/O scheduler): q->nr_requests = sched_tags = 128, so according to the previous calculation method, dd->async_depth = data->shallow_depth = 96, and the platform is 64bits with 8 cpus, sched_tags.bitmap_tags.sb.shift=5, sb.maps[]=32/32/32/32, 32 is smaller than 96, whether it is a read or a write I/O, tags can be allocated to the maximum range each time, which has not throttling effect. In addition, refer to the methods of bfg/kyber I/O scheduler, limit ratiois are calculated base on sched_tags.bitmap_tags.sb.shift. This patch can throttle write requests really. Fixes: 0775758 ("block/mq-deadline: Reserve 25% of scheduler tags for synchronous requests") Signed-off-by: Zhiguo Niu <zhiguo.niu@unisoc.com> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Link: https://lore.kernel.org/r/1691061162-22898-1-git-send-email-zhiguo.niu@unisoc.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 29802d7 commit d47f971

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

block/mq-deadline.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,9 @@ static void dd_depth_updated(struct blk_mq_hw_ctx *hctx)
646646
struct request_queue *q = hctx->queue;
647647
struct deadline_data *dd = q->elevator->elevator_data;
648648
struct blk_mq_tags *tags = hctx->sched_tags;
649+
unsigned int shift = tags->bitmap_tags.sb.shift;
649650

650-
dd->async_depth = max(1UL, 3 * q->nr_requests / 4);
651+
dd->async_depth = max(1U, 3 * (1U << shift) / 4);
651652

652653
sbitmap_queue_min_shallow_depth(&tags->bitmap_tags, dd->async_depth);
653654
}

0 commit comments

Comments
 (0)