Skip to content

Commit b5fcf78

Browse files
Kemeng Shiaxboe
authored andcommitted
sbitmap: correct wake_batch recalculation to avoid potential IO hung
Commit 180dccb ("blk-mq: fix tag_get wait task can't be awakened") mentioned that in case of shared tags, there could be just one real active hctx(queue) because of lazy detection of tag idle. Then driver tag allocation may wait forever on this real active hctx(queue) if wake_batch is > hctx_max_depth where hctx_max_depth is available tags depth for the actve hctx(queue). However, the condition wake_batch > hctx_max_depth is not strong enough to avoid IO hung as the sbitmap_queue_wake_up will only wake up one wait queue for each wake_batch even though there is only one waiter in the woken wait queue. After this, there is only one tag to free and wake_batch may not be reached anymore. Commit 180dccb ("blk-mq: fix tag_get wait task can't be awakened") methioned that driver tag allocation may wait forever. Actually, the inactive hctx(queue) will be truely idle after at most 30 seconds and will call blk_mq_tag_wakeup_all to wake one waiter per wait queue to break the hung. But IO hung for 30 seconds is also not acceptable. Set batch size to small enough that depth of the shared hctx(queue) is enough to wake up all of the queues like sbq_calc_wake_batch do to fix this potential IO hung. Although hctx_max_depth will be clamped to at least 4 while wake_batch recalculation does not do the clamp, the wake_batch will be always recalculated to 1 when hctx_max_depth <= 4. Fixes: 180dccb ("blk-mq: fix tag_get wait task can't be awakened") Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> Link: https://lore.kernel.org/r/20230116205059.3821738-6-shikemeng@huaweicloud.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 678418c commit b5fcf78

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

lib/sbitmap.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -457,13 +457,10 @@ void sbitmap_queue_recalculate_wake_batch(struct sbitmap_queue *sbq,
457457
unsigned int users)
458458
{
459459
unsigned int wake_batch;
460-
unsigned int min_batch;
461460
unsigned int depth = (sbq->sb.depth + users - 1) / users;
462461

463-
min_batch = sbq->sb.depth >= (4 * SBQ_WAIT_QUEUES) ? 4 : 1;
464-
465462
wake_batch = clamp_val(depth / SBQ_WAIT_QUEUES,
466-
min_batch, SBQ_WAKE_BATCH);
463+
1, SBQ_WAKE_BATCH);
467464

468465
WRITE_ONCE(sbq->wake_batch, wake_batch);
469466
}

0 commit comments

Comments
 (0)