]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
blk-wbt: remove WARN_ON_ONCE from wbt_init_enable_default()
authorYuto Ohnuki <ytohnuki@amazon.com>
Mon, 16 Mar 2026 07:03:59 +0000 (07:03 +0000)
committerJens Axboe <axboe@kernel.dk>
Mon, 6 Apr 2026 18:54:03 +0000 (12:54 -0600)
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: 41afaeeda509 ("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>
block/blk-wbt.c

index 33006edfccd44a43eb83e375c2d80ef9a86150fe..dcc2438ca16dc77508cc722594139fc63dc0f3b2 100644 (file)
@@ -782,10 +782,11 @@ void wbt_init_enable_default(struct gendisk *disk)
                return;
 
        rwb = wbt_alloc();
-       if (WARN_ON_ONCE(!rwb))
+       if (!rwb)
                return;
 
-       if (WARN_ON_ONCE(wbt_init(disk, rwb))) {
+       if (wbt_init(disk, rwb)) {
+               pr_warn("%s: failed to enable wbt\n", disk->disk_name);
                wbt_free(rwb);
                return;
        }