From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C528CC433EF for ; Tue, 21 Dec 2021 02:00:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234676AbhLUCA6 (ORCPT ); Mon, 20 Dec 2021 21:00:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233902AbhLUB75 (ORCPT ); Mon, 20 Dec 2021 20:59:57 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06684C061396; Mon, 20 Dec 2021 17:59:57 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 46BDAB81117; Tue, 21 Dec 2021 01:59:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3D898C36AEA; Tue, 21 Dec 2021 01:59:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1640051992; bh=4NstbWwjeGR3iQXpkLh+E2nNuJKYvIhCedk/rv76M7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rY2UcsqJUM/rT/9wpEXI90FP5fFGqE2RZeiy96tQ6nOMnXyg3wOXMzzZfd9g6/6Yf 6D3i2RaTMno61cKJ9KbJ0AIoR3b6P7SZ5oXZNMhf2Jd4tzdGIc5v+7PPyy59lw1CaC NrJY4OffQZhMjPqHkLFGwYiF6+zIhb21/OX6C7WrAWmVxvIuLO1+nXoOqjCfEva7S4 /M2VOOgDe0XY9PQx3O2hRTxZ8b1uY0FjwJRbX5aEM2Sq6Y8wM6Ye2PNd/cnD+/f6mc TAStBR/6usrm4BmySuZUHMB1mcB194nk3mebTuCB7QLyQA4HCtB72wHfD5/KuNAf24 bDN66w18VTu6Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jens Axboe , Alex Xu , kernel test robot , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 19/19] Revert "block: reduce kblockd_mod_delayed_work_on() CPU consumption" Date: Mon, 20 Dec 2021 20:59:14 -0500 Message-Id: <20211221015914.116767-19-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211221015914.116767-1-sashal@kernel.org> References: <20211221015914.116767-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jens Axboe [ 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/ Link: https://lore.kernel.org/lkml/20211219141852.GH14057@xsang-OptiPlex-9020/ Reported-by: Alex Xu (Hello71) Reported-by: kernel test robot Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-core.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 4f4e286198660..26664f2a139eb 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1657,8 +1657,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); -- 2.34.1