Skip to content

Commit a51d24a

Browse files
jc2870gregkh
authored andcommitted
block: restore default wbt enablement
commit 8f5845e upstream. The commit 245618f ("block: protect wbt_lat_usec using q->elevator_lock") protected wbt_enable_default() with q->elevator_lock; however, it also placed wbt_enable_default() before blk_queue_flag_set(QUEUE_FLAG_REGISTERED, q);, resulting in wbt failing to be enabled. Moreover, the protection of wbt_enable_default() by q->elevator_lock was removed in commit 78c2713 ("block: move wbt_enable_default() out of queue freezing from sched ->exit()"), so we can directly fix this issue by placing wbt_enable_default() after blk_queue_flag_set(QUEUE_FLAG_REGISTERED, q);. Additionally, this issue also causes the inability to read the wbt_lat_usec file, and the scenario is as follows: root@q:/sys/block/sda/queue# cat wbt_lat_usec cat: wbt_lat_usec: Invalid argument root@q:/data00/sjc/linux# ls /sys/kernel/debug/block/sda/rqos cannot access '/sys/kernel/debug/block/sda/rqos': No such file or directory root@q:/data00/sjc/linux# find /sys -name wbt /sys/kernel/debug/tracing/events/wbt After testing with this patch, wbt can be enabled normally. Signed-off-by: Julian Sun <sunjunchao@bytedance.com> Cc: stable@vger.kernel.org Fixes: 245618f ("block: protect wbt_lat_usec using q->elevator_lock") Reviewed-by: Nilay Shroff <nilay@linux.ibm.com> Reviewed-by: Yu Kuai <yukuai3@huawei.com> Reviewed-by: Ming Lei <ming.lei@redhat.com> Link: https://lore.kernel.org/r/20250812154257.57540-1-sunjunchao@bytedance.com Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 8b7b5f1 commit a51d24a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

block/blk-sysfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -876,9 +876,9 @@ int blk_register_queue(struct gendisk *disk)
876876

877877
if (queue_is_mq(q))
878878
elevator_set_default(q);
879-
wbt_enable_default(disk);
880879

881880
blk_queue_flag_set(QUEUE_FLAG_REGISTERED, q);
881+
wbt_enable_default(disk);
882882

883883
/* Now everything is ready and send out KOBJ_ADD uevent */
884884
kobject_uevent(&disk->queue_kobj, KOBJ_ADD);

0 commit comments

Comments
 (0)