summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2021-12-19 17:58:44 +0300
committerJens Axboe <axboe@kernel.dk>2021-12-19 17:58:44 +0300
commit87959fa16cfbcf76245c11559db1940069621274 (patch)
tree0284e8838cfa22daf84af6e43f221de3e2bb9883 /block
parentaa97f6cdb7e92909e17c8ca63e622fcb81d57a57 (diff)
downloadlinux-87959fa16cfbcf76245c11559db1940069621274.tar.xz
Revert "block: reduce kblockd_mod_delayed_work_on() CPU consumption"
This reverts commit cb2ac2912a9ca7d3d26291c511939a41361d2d83. 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) <alex_y_xu@yahoo.ca> Reported-by: kernel test robot <oliver.sang@intel.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index c1833f95cb97..1378d084c770 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1484,8 +1484,6 @@ EXPORT_SYMBOL(kblockd_schedule_work);
int kblockd_mod_delayed_work_on(int cpu, struct delayed_work *dwork,
unsigned long delay)
{
- if (!delay)
- return queue_work_on(cpu, kblockd_workqueue, &dwork->work);
return mod_delayed_work_on(cpu, kblockd_workqueue, dwork, delay);
}
EXPORT_SYMBOL(kblockd_mod_delayed_work_on);