[PATCH AUTOSEL 4.14 9/9] Revert "block: reduce kblockd_mod_delayed_work_on() CPU consumption"
From: Sasha Levin <sashal@kernel.org>
Date: 2021-12-21 02:06:46
Also in:
linux-block, lkml
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
From: Jens Axboe <axboe@kernel.dk> [ Upstream commit 87959fa16cfbcf76245c11559db1940069621274 ] 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/ (local) Link: https://lore.kernel.org/lkml/20211219141852.GH14057@xsang-OptiPlex-9020/ (local) Reported-by: Alex Xu (Hello71) <redacted> Reported-by: kernel test robot <redacted> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org> --- block/blk-core.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 1859490fa4ae1..2407c898ba7d8 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c@@ -3233,8 +3233,6 @@ EXPORT_SYMBOL(kblockd_schedule_work_on); 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);
--
2.34.1