From patchwork Tue Jan 23 17:58:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 13527926 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC772C47258 for ; Tue, 23 Jan 2024 17:58:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 486656B0085; Tue, 23 Jan 2024 12:58:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4367C6B0087; Tue, 23 Jan 2024 12:58:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D7676B0089; Tue, 23 Jan 2024 12:58:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 1736D6B0085 for ; Tue, 23 Jan 2024 12:58:40 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A9E2E1C0EDC for ; Tue, 23 Jan 2024 17:58:39 +0000 (UTC) X-FDA: 81711335958.17.36027A2 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf17.hostedemail.com (Postfix) with ESMTP id 1B9A340006 for ; Tue, 23 Jan 2024 17:58:36 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=HxMlGxDI; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Er6rgKv4; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=HxMlGxDI; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Er6rgKv4; dmarc=none; spf=pass (imf17.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706032717; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=ZjAYddRoJjm/AdsSm5U0TY8TiC0zrK+IKe/4Cv1WMIs=; b=C7qoa9++s9s7CPigyruEjwDoi2kcCQeD1N8AqdPjU11FwIXMvlrPapcMlBhBPg5vhc7fbH SOBjFpoKjSbCauLIcDaOL8s0IqpbB/6GJtbcIWw+mgKljLOKpFthZO5zcDoFzTMLrZDzj3 6Xq4a3SoeYE1eQlcAlL2xTKrhmJn6O0= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=HxMlGxDI; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Er6rgKv4; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=HxMlGxDI; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Er6rgKv4; dmarc=none; spf=pass (imf17.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706032717; a=rsa-sha256; cv=none; b=sczm7ocAnQh3QTxhULETfnj8DJSVj/HmR77D/rZ2POYkwFTvEU8LLCm+LyRPx2W3aG9WS1 et2cnQ0EXCWrStlrI67OeMdQJbDWKLeMuWWzzqr+qislpSiX2JJiYi/7u5icYw72HH7ta5 KVqQKd2Z0ijTjmhXooxfEuJiFZSvATc= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id DF1B12229B; Tue, 23 Jan 2024 17:58:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706032714; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZjAYddRoJjm/AdsSm5U0TY8TiC0zrK+IKe/4Cv1WMIs=; b=HxMlGxDIe85OL5RU7U57wA3ufP5HCB5C8uID6j5eTJYEgdxaUXueZmjy3r6OmkFsa9ZQNI VhNrSPwX+M/2IrNMH7tGgZtqKts663nkKC74Jp4MhB1MViigNDRnqBQ3dGddzgSPpeC4e7 50cyeEcqpzlgeYfPbNwFPNmxtzWbFgw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706032714; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZjAYddRoJjm/AdsSm5U0TY8TiC0zrK+IKe/4Cv1WMIs=; b=Er6rgKv4P5qf2ERWCvjWR2fVGKXV6CVbKENrYNfH7jA9cbfHQxQZ+tgkG7tVs4V5A3ccsS 6E0zhiKpelNYBSAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706032714; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZjAYddRoJjm/AdsSm5U0TY8TiC0zrK+IKe/4Cv1WMIs=; b=HxMlGxDIe85OL5RU7U57wA3ufP5HCB5C8uID6j5eTJYEgdxaUXueZmjy3r6OmkFsa9ZQNI VhNrSPwX+M/2IrNMH7tGgZtqKts663nkKC74Jp4MhB1MViigNDRnqBQ3dGddzgSPpeC4e7 50cyeEcqpzlgeYfPbNwFPNmxtzWbFgw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706032714; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZjAYddRoJjm/AdsSm5U0TY8TiC0zrK+IKe/4Cv1WMIs=; b=Er6rgKv4P5qf2ERWCvjWR2fVGKXV6CVbKENrYNfH7jA9cbfHQxQZ+tgkG7tVs4V5A3ccsS 6E0zhiKpelNYBSAQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id CE24B136A4; Tue, 23 Jan 2024 17:58:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 3vULMkr+r2UVKAAAD6G6ig (envelope-from ); Tue, 23 Jan 2024 17:58:34 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 52A38A0803; Tue, 23 Jan 2024 18:58:34 +0100 (CET) From: Jan Kara To: Jens Axboe Cc: , , Jan Kara , stable@vger.kernel.org Subject: [PATCH] blk-wbt: Fix detection of dirty-throttled tasks Date: Tue, 23 Jan 2024 18:58:26 +0100 Message-Id: <20240123175826.21452-1-jack@suse.cz> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3970; i=jack@suse.cz; h=from:subject; bh=jpLoGydIB3tav2QE6M4GnD7Apq48ELE0E5GJMLGOCc4=; b=owEBbQGS/pANAwAIAZydqgc/ZEDZAcsmYgBlr/4IlwLEdVGJQTlCFa9sj6UVm5KCFerHaP+6XiHI OXTGhjyJATMEAAEIAB0WIQSrWdEr1p4yirVVKBycnaoHP2RA2QUCZa/+CAAKCRCcnaoHP2RA2Um7B/ 499x13YeG9oMijMrENiH8eWvlaAW6r15qa5/mQFniTSKNcvtqkzcaZ8ES78IJYbbbn3fdCd7R9UF4M UTKtn1/zarUpM3ac9sdtZ1MSAZRp4B1bBc8eQZ5IDhmai2KcfadVU0ycF8gCsc0KJkf1f0dEMloiW7 I1JLuWrRxvbS9EzOeONPJILgj9IZGDAyE7DDUW9ZDTtWIio2QasgL4PmGI3YZtUhvx2uLLpSV/+kSX VCaATee4g+oG692AxBchc/koFia1pBFlfSg4J9QBBiKV9NrHVBA1dU5+qPCfUZrl1JH49waDDtvQSl JrDWIkqh/K3N2/Q5tnElQFu2iofJi9 X-Developer-Key: i=jack@suse.cz; a=openpgp; fpr=93C6099A142276A28BBE35D815BC833443038D8C X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 1B9A340006 X-Stat-Signature: jppcziyd1uwt1qkcjrzq71i447wqb6r3 X-HE-Tag: 1706032716-832484 X-HE-Meta: U2FsdGVkX1/aDA25IvEHszZ9nmhLRRFgI6Kf68QD0yGdGOo4QWhxew8n6lNw0s0w6IvZHAeF/m84KAktrsqWVPcL6WBa7r46n6JmVtZ8Ysb2Mf+DzFkTHOITVa7OcrUlxWpz2LvmW1MDL6Ey7+7UyUbq1YZxMPj7UdK7DDqPpZp/4PvK6P6cldgoaRVgHkpLKRJ/m/pTBgsPQ9tOoqamTShA7KkaW08RO6FnSOqz3CusT6Na+ROM40r9v2InM7T1CVWT05TEWOES4mII1jgcK4hQdCGjTrWdLc6mtUm7YTWRaOSe63sS/fsQ4bGnm3IYK4ubMf+iNMKa2FLPvGwGnkJigUDE35qxTRtqcWbeYITGWlfKWksleozrfQmZxUm9xuMHwnqZZPZjrrlHxnHFH0EPA42EVSGakTjCY2j5Re2Z358MpXd+ISN4OewNC4p+d5AmxmYN+Yfpx5AAlr+PaO9BnIpoYn2MOyTWTODQE8G/1xyc6U3DTn657K4zLcT8DYKb0WP19BJ/p4sgs8MVZq567jAukfFsxBKF/b/rIK/jf2Vd3pSK8orqBppbBDWVNu9VBCYxUsz8ruDbrepRe4OvIzWf7xQayFP/DFkMkxqN9PscuQHKSvVUM8niMHvXjgiKnYMswriZ06ToDmjpVPpzt4iPsUmJXX9CeOgJ1IWbMTUIhEMVH8EhF4c9klVif8Bo88ncdRR5pSAqP36zEwrDP/VFOYMSlbL0baTsbrUI8OWD1jNJPqF8xMNLBN3Tk4YYTb8fdmXrAO4wpjbHXWAHoDUOK3B+9ocu6H9uhS/plmw2fppNwhY+2Ay8soJfd2+Ln31AshtqadosAo9XZjXTAlIGdaiebvp1O98wO2m0e+bd26z2kIb/jorThy5/R73OEKyW1I4TJI6FTLisV5xtzUMWyR3YaaNTwfZ1EZddm4Qg0rcMvIQ7DQwcrc4r1AOJXn4kXEO8m+BkT/o oWTK3bbG +RzZyDYwtXaAJNO1uc+B6ThKD8kosv+Blotl+PR3wqQX91w6HQLkkLuy1ojIKhPmo4+N97zpCAde7oZ/yOIqQ4WQviBzKo79tVhCBcX8ksiNDMCp1zPtwnFPD9Ag/iyq8oStYwDFkKGAbP8dpLpGk0zmQiTLMMCxHruox5m0u5KT4OUl00N+KF4c5TlJIiO6XQoRVxHVbhQHxkCyQ3J2WeZGbRAp5tSj8aWv580invTGG7Ox5fD7fXJ7P5nfQyCfIKIj5dcZqlXYPswQ= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The detection of dirty-throttled tasks in blk-wbt has been subtly broken since its beginning in 2016. Namely if we are doing cgroup writeback and the throttled task is not in the root cgroup, balance_dirty_pages() will set dirty_sleep for the non-root bdi_writeback structure. However blk-wbt checks dirty_sleep only in the root cgroup bdi_writeback structure. Thus detection of recently throttled tasks is not working in this case (we noticed this when we switched to cgroup v2 and suddently writeback was slow). Since blk-wbt has no easy way to get to proper bdi_writeback and furthermore its intention has always been to work on the whole device rather than on individual cgroups, just move the dirty_sleep timestamp from bdi_writeback to backing_dev_info. That fixes the checking for recently throttled task and saves memory for everybody as a bonus. CC: stable@vger.kernel.org Fixes: b57d74aff9ab ("writeback: track if we're sleeping on progress in balance_dirty_pages()") Signed-off-by: Jan Kara --- block/blk-wbt.c | 4 ++-- include/linux/backing-dev-defs.h | 7 +++++-- mm/backing-dev.c | 2 +- mm/page-writeback.c | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/block/blk-wbt.c b/block/blk-wbt.c index 5ba3cd574eac..0c0e270a8265 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -163,9 +163,9 @@ static void wb_timestamp(struct rq_wb *rwb, unsigned long *var) */ static bool wb_recent_wait(struct rq_wb *rwb) { - struct bdi_writeback *wb = &rwb->rqos.disk->bdi->wb; + struct backing_dev_info *bdi = rwb->rqos.disk->bdi; - return time_before(jiffies, wb->dirty_sleep + HZ); + return time_before(jiffies, bdi->last_bdp_sleep + HZ); } static inline struct rq_wait *get_rq_wait(struct rq_wb *rwb, diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h index ae12696ec492..ad17739a2e72 100644 --- a/include/linux/backing-dev-defs.h +++ b/include/linux/backing-dev-defs.h @@ -141,8 +141,6 @@ struct bdi_writeback { struct delayed_work dwork; /* work item used for writeback */ struct delayed_work bw_dwork; /* work item used for bandwidth estimate */ - unsigned long dirty_sleep; /* last wait */ - struct list_head bdi_node; /* anchored at bdi->wb_list */ #ifdef CONFIG_CGROUP_WRITEBACK @@ -179,6 +177,11 @@ struct backing_dev_info { * any dirty wbs, which is depended upon by bdi_has_dirty(). */ atomic_long_t tot_write_bandwidth; + /* + * Jiffies when last process was dirty throttled on this bdi. Used by + * blk-wbt. + */ + unsigned long last_bdp_sleep; struct bdi_writeback wb; /* the root writeback info for this bdi */ struct list_head wb_list; /* list of all wbs */ diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 1e3447bccdb1..e039d05304dd 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -436,7 +436,6 @@ static int wb_init(struct bdi_writeback *wb, struct backing_dev_info *bdi, INIT_LIST_HEAD(&wb->work_list); INIT_DELAYED_WORK(&wb->dwork, wb_workfn); INIT_DELAYED_WORK(&wb->bw_dwork, wb_update_bandwidth_workfn); - wb->dirty_sleep = jiffies; err = fprop_local_init_percpu(&wb->completions, gfp); if (err) @@ -921,6 +920,7 @@ int bdi_init(struct backing_dev_info *bdi) INIT_LIST_HEAD(&bdi->bdi_list); INIT_LIST_HEAD(&bdi->wb_list); init_waitqueue_head(&bdi->wb_waitq); + bdi->last_bdp_sleep = jiffies; return cgwb_bdi_init(bdi); } diff --git a/mm/page-writeback.c b/mm/page-writeback.c index cd4e4ae77c40..cc37fa7f3364 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -1921,7 +1921,7 @@ static int balance_dirty_pages(struct bdi_writeback *wb, break; } __set_current_state(TASK_KILLABLE); - wb->dirty_sleep = now; + bdi->last_bdp_sleep = jiffies; io_schedule_timeout(pause); current->dirty_paused_when = now + pause;