Skip to content

Commit e9b004f

Browse files
Yuto Ohnukiaxboe
authored andcommitted
blk-wbt: remove WARN_ON_ONCE from wbt_init_enable_default()
wbt_init_enable_default() uses WARN_ON_ONCE to check for failures from wbt_alloc() and wbt_init(). However, both are expected failure paths: - wbt_alloc() can return NULL under memory pressure (-ENOMEM) - wbt_init() can fail with -EBUSY if wbt is already registered syzbot triggers this by injecting memory allocation failures during MTD partition creation via ioctl(BLKPG), causing a spurious warning. wbt_init_enable_default() is a best-effort initialization called from blk_register_queue() with a void return type. Failure simply means the disk operates without writeback throttling, which is harmless. Replace WARN_ON_ONCE with plain if-checks, consistent with how wbt_set_lat() in the same file already handles these failures. Add a pr_warn() for the wbt_init() failure to retain diagnostic information without triggering a full stack trace. Reported-by: syzbot+71fcf20f7c1e5043d78c@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=71fcf20f7c1e5043d78c Fixes: 41afaee ("blk-wbt: fix possible deadlock to nest pcpu_alloc_mutex under q_usage_counter") Signed-off-by: Yuto Ohnuki <ytohnuki@amazon.com> Reviewed-by: Yu Kuai <yukuai@fnnas.com> Reviewed-by: Nilay Shroff <nilay@linux.ibm.com> Link: https://patch.msgid.link/20260316070358.65225-2-ytohnuki@amazon.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 320f9b1 commit e9b004f

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

block/blk-wbt.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -782,10 +782,11 @@ void wbt_init_enable_default(struct gendisk *disk)
782782
return;
783783

784784
rwb = wbt_alloc();
785-
if (WARN_ON_ONCE(!rwb))
785+
if (!rwb)
786786
return;
787787

788-
if (WARN_ON_ONCE(wbt_init(disk, rwb))) {
788+
if (wbt_init(disk, rwb)) {
789+
pr_warn("%s: failed to enable wbt\n", disk->disk_name);
789790
wbt_free(rwb);
790791
return;
791792
}

0 commit comments

Comments
 (0)