Skip to content

Commit 87959fa

Browse files
committed
Revert "block: reduce kblockd_mod_delayed_work_on() CPU consumption"
This reverts commit cb2ac29. Alex and the kernel test robot report that this causes a significant performance regression with BFQ. I can reproduce that result, so let's revert this one as we're close to -rc6 and we there's no point in trying to rush a fix. Link: https://lore.kernel.org/linux-block/1639853092.524jxfaem2.none@localhost/ Link: https://lore.kernel.org/lkml/20211219141852.GH14057@xsang-OptiPlex-9020/ Reported-by: Alex Xu (Hello71) <[email protected]> Reported-by: kernel test robot <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent aa97f6c commit 87959fa

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

block/blk-core.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,8 +1484,6 @@ EXPORT_SYMBOL(kblockd_schedule_work);
14841484
int kblockd_mod_delayed_work_on(int cpu, struct delayed_work *dwork,
14851485
unsigned long delay)
14861486
{
1487-
if (!delay)
1488-
return queue_work_on(cpu, kblockd_workqueue, &dwork->work);
14891487
return mod_delayed_work_on(cpu, kblockd_workqueue, dwork, delay);
14901488
}
14911489
EXPORT_SYMBOL(kblockd_mod_delayed_work_on);

0 commit comments

Comments
 (0)