From patchwork Tue Mar 4 11:03:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tang Yizhou X-Patchwork-Id: 14000468 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 70677C282D0 for ; Tue, 4 Mar 2025 11:03:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 02338280004; Tue, 4 Mar 2025 06:03:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F16CE280001; Tue, 4 Mar 2025 06:03:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DB7E2280004; Tue, 4 Mar 2025 06:03:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B9DE2280001 for ; Tue, 4 Mar 2025 06:03:40 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 73027B7B19 for ; Tue, 4 Mar 2025 11:03:40 +0000 (UTC) X-FDA: 83183583000.29.EFCB5B5 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf17.hostedemail.com (Postfix) with ESMTP id 6B96B40020 for ; Tue, 4 Mar 2025 11:03:38 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=GTVoC9nn; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf17.hostedemail.com: domain of yizhou.tang@shopee.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=yizhou.tang@shopee.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741086218; a=rsa-sha256; cv=none; b=B5yNxhjgl1CDdLAsgm6sYJ6NK55uGoyCVtU8rYWqbPOT184AZqgds0czptUdy7vD/rJMTN nH+bcvbrhlYQSPuGU3cXf7Ke6im8VMTJAs/5Z0zp8HV/EA0yVceWd0U8rjPU/tXY97GTWO mU2fjTttnOL8BFRLQspVv2ERvOxNSak= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=GTVoC9nn; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf17.hostedemail.com: domain of yizhou.tang@shopee.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=yizhou.tang@shopee.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741086218; 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:in-reply-to:references:references:dkim-signature; bh=qGd6xUUug40ndWv/7UEStbMr4MjIVHoaP0yPiRkB0+c=; b=pD2Nm305ZiWPJL4UYPt5rm84ZHy9wgl0FNQPSFKHQR+MzwsPESWIeiOv9Sff51ytyqBW8u uPS0imM4xnm4e9dbp1e+DHw/zZTdR2fZBIUgGByReQw/qWbCcI/Sviygv0mtPo1/hVLlfR e0r66j5fSBB2/pGtACw8G39Pq2aN6Hc= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-22339936bbfso79609325ad.1 for ; Tue, 04 Mar 2025 03:03:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1741086217; x=1741691017; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qGd6xUUug40ndWv/7UEStbMr4MjIVHoaP0yPiRkB0+c=; b=GTVoC9nn6IvtRtq+03YEYem/uuCMx/KGRWEWiuBknyCKdCWszoWx7lZXVKowwy3okO Z934nW0+N07FvN58j4fKMHD1ZAz7wNeZgniCobdxWcaV2ExoklxPyYq60NQ4UPvcurGr TNKXkxhEphzs9wRyfdGZ460DL2cGc38CbX4hicmyVhraRL02XjLcWU5VoaaUW7eZMBzu cWku5V4hwlSl62G/4JUqcvo0STVoqqN0f2yDLbNpBH2UlUbj0DYv0uuxt+FXM5u7CO1/ Sr/AHfaDdwwZUhn9f+vzTUNuSW0S+xWyfQh8Gf79a7x/ngP8hx+DIRfQX3pI1jOn5/wM EX1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741086217; x=1741691017; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qGd6xUUug40ndWv/7UEStbMr4MjIVHoaP0yPiRkB0+c=; b=A4kZKt5ilv36fvI16VZAKiFYWalEVZacw02DTpBRZNJ3d9wzEEH54SuWGhbmthwU7Q u8lvmdHOsjub7A/9DY+QAcW9ggt092M22cLCXOBwWMtlpzNIjZzHXHhCl0Te1HwsTIz8 0BSgK0R06TxyW8y/ABwWju/nR0Amh8M3wzbrpTQSALuyUyFvArTzvVnnPfgxoMRNXsBn ilreMyuzDdMawMeyn2LK0kQzfFI3a5XQ2uiSqPZQiA3CfOCA2sgAwH71/yIbPUc33cm9 C3yf97yYFbbJZURirwjlHjvSpnVBewtkO4XaiRom+sBT6CI1gf8/iIAVxrDB1k5qWVYr oEyg== X-Forwarded-Encrypted: i=1; AJvYcCVusxSMbU9TeonZVfRDzX3yYdW4FV1AvxRn/BiTdgTVTvxMmIY+md2hnsQfgR6+Rw9Z6YAaxI9Ikw==@kvack.org X-Gm-Message-State: AOJu0YyVvAyAE4hFLWc4yOZoVD24g5kdGJl58l+1Kzua9GmC9+WODy18 A3iqCrheFUazBlXaCGqt79INCrGU8bIwmKulzCXULYBd7t8zGfrJPy7YxxyGLvk= X-Gm-Gg: ASbGncv7+IXJyiQucmILZMWqrxm423zvlUnIpPYwlCw+QBwe3+QovbqPJlMYlU8d8he c4OoM1b03h3mwdGlh3D2O2R3JEQLyXcf3/EI9q27N3P2NSotdEIK1tcPsbl/o61PMcuwJMWvIgK YTEUvCoLWDkpVirta4s0fDQ8/skUi8qthujx24BaLWF5jwjkQdQfTlRVh9rCgUJFNSZwpsu7guW blWY9dC/BzyZQy9QJqJRDR9BwGsOjRjui3Ftpzk+49cQ+wRJZCmLryRt3err1f6mKa6HAbCCWC6 CgZrl+Ucl0FecJ1T1uTTZwwLDFzpeA== X-Google-Smtp-Source: AGHT+IHC27naAV4G4mjua+6oLFQl9im5/HZZ3hI9l/b48C3Mb32O1UgWu/XF/2xkyJ8188GOgWiflw== X-Received: by 2002:a17:902:f990:b0:220:c911:3f60 with SMTP id d9443c01a7336-2236926a639mr179441625ad.47.1741086217307; Tue, 04 Mar 2025 03:03:37 -0800 (PST) Received: from localhost.localdomain ([143.92.64.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-223501d2778sm92764415ad.36.2025.03.04.03.03.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 03:03:36 -0800 (PST) From: Tang Yizhou X-Google-Original-From: Tang Yizhou To: tj@kernel.org, jack@suse.cz, brauner@kernel.org, willy@infradead.org, akpm@linux-foundation.org Cc: rostedt@goodmis.org, mhiramat@kernel.org, ast@kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Tang Yizhou Subject: [PATCH v2 3/3] writeback: Fix calculations in trace_balance_dirty_pages() for cgwb Date: Tue, 4 Mar 2025 19:03:18 +0800 Message-Id: <20250304110318.159567-4-yizhou.tang@shopee.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250304110318.159567-1-yizhou.tang@shopee.com> References: <20250304110318.159567-1-yizhou.tang@shopee.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 6B96B40020 X-Stat-Signature: w398utur4e1174gfigdg9wxewkxohm3f X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1741086218-82961 X-HE-Meta: U2FsdGVkX1+1bBOYhXrcS0BiJj0C7fVXAIPPaL6alYtlg1RDDtL0y/Up6X6lViXu7uMW0ySu07C5zZlMt6uOOzqDnGgFPloMj4txB5jCEP7pvTulhCumM0oqVb3h8TcN9jJfSH42WJOY6WNQjFi46owwzOndeYjBLSXMwjFMe/plUaovO76W6SSCOg8vzAvzjtJ4Cvs0Xa2cdN6BXAcTO7yodoz6ElS+1OHKdUja3M0hX6B+hLb7OvMDDPwd7mmKwcSlaL6Nwq9CfkSCRAMX6/sLUmB0XADdfACAA/DUsqEEuvnsnh5Wwm0vcUvQMC/4muWrudSbEvpMHSSDvzOrE0mwJN2rA9CjkFnBO0FqBAiiQe7lF2O60eM8sIvSgCfZsYR2Fq7kEjujGod90a424oGblaevOoh0h8ufDWR6APdaHZuploiSqVygmTb9RY2ElVK1ub951rlTM4rGZRwAommpBYgGqtL0MweR4Dz2hI9PqCwn3d72JD/vbWgKInl/jceIoeI+IHs/MwMsdhYJO7mQazt8vTgoG6sBFpEVX+iqAtb0zLgKnD7s27etIWlDIt0iXeKia2k/RhIVB+kKebtAYi3hlB5KH6LAwqC5rUm2jAxdyD9BhgdK3OPnrouFklGwO6W9bD+IzM+/NEnrEyXr/hDmHUBptemA+cq7jebPsZU55m3zubSoJeBO36LiTp+n3a8zKhJPOgbLKroFaP3vPOvdiGjx7Nwj6eVSbWjQIfQB1RJFiyU39UqS0xmXGdS3f3UB3Jhvkf/VwUP/DhCae51vAacO1lOffotUnORyCt7ejlEJCycQbh+3BMbH9qzfEr0Yigk6TVpHQaY0/JX5Rf8aFJ0/8V4cTaof9xRw2tBs5tzqDShsb4z7vmJACga1iesA+y+i3pLX1jNnO/LWOj5W68QnO8ZXFV+1wLQUKFaFjWBkFgpc8HDisfpuHjeRfvSn5XnncYjBbw2 b7RQnOh5 lNTuiJ35Guvs66raDbpMzShMXy7UrbpKjT2sh/4rdjz7JGzddCPaqjcwiWuKZH/4Omn7klM4BQY/ZydrVKafc95cJ6GolfO8MDaTdm0jG/ygh+Y56PnN49ZHVLNMZPMieq5RiM/GyT/QWSP9EQT3k3EwADbastC0nZD2tJoJFcJl1Vh//H8lopvJ5f+OS1iahpIaruNcszRcHcs6vH0JXKSzTYjc397AAhxL6hm8RyqZXwCNElT7E0iebVaYyR3LQWqGa9V8CBLll5XlTjLDXWsjsFgA43KvnAWBZ+XlB8kNBKWvGfihwOQ2wY0TkvhNecT0P+UP4oyZDYz62pku4xCVckIGCf/9yiAbt1LNhf+roVx1OqdlOQMJ42fBv78tpl/Jfzo9v3B68oH7OIdNgqryDqQ== 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: From: Tang Yizhou In the commit dcc25ae76eb7 ("writeback: move global_dirty_limit into wb_domain") of the cgroup writeback backpressure propagation patchset, Tejun made some adaptations to trace_balance_dirty_pages() for cgroup writeback. However, this adaptation was incomplete and Tejun missed further adaptation in the subsequent patches. In the cgroup writeback scenario, if sdtc in balance_dirty_pages() is assigned to mdtc, then upon entering trace_balance_dirty_pages(), __entry->limit should be assigned based on the dirty_limit of the corresponding memcg's wb_domain, rather than global_wb_domain. To address this issue and simplify the implementation, introduce a 'limit' field in struct dirty_throttle_control to store the hard_limit value computed in wb_position_ratio() by calling hard_dirty_limit(). This field will then be used in trace_balance_dirty_pages() to assign the value to __entry->limit. Fixes: dcc25ae76eb7 ("writeback: move global_dirty_limit into wb_domain") Acked-by: Tejun Heo Signed-off-by: Tang Yizhou --- include/linux/writeback.h | 1 + include/trace/events/writeback.h | 5 ++--- mm/page-writeback.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 32095928365c..58bda3347914 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h @@ -326,6 +326,7 @@ struct dirty_throttle_control { unsigned long dirty; /* file_dirty + write + nfs */ unsigned long thresh; /* dirty threshold */ unsigned long bg_thresh; /* dirty background threshold */ + unsigned long limit; /* hard dirty limit */ unsigned long wb_dirty; /* per-wb counterparts */ unsigned long wb_thresh; diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h index 3046ca6b08ea..0ff388131fc9 100644 --- a/include/trace/events/writeback.h +++ b/include/trace/events/writeback.h @@ -663,9 +663,8 @@ TRACE_EVENT(balance_dirty_pages, unsigned long freerun = (dtc->thresh + dtc->bg_thresh) / 2; strscpy_pad(__entry->bdi, bdi_dev_name(wb->bdi), 32); - __entry->limit = global_wb_domain.dirty_limit; - __entry->setpoint = (global_wb_domain.dirty_limit + - freerun) / 2; + __entry->limit = dtc->limit; + __entry->setpoint = (dtc->limit + freerun) / 2; __entry->dirty = dtc->dirty; __entry->wb_setpoint = __entry->setpoint * dtc->wb_thresh / (dtc->thresh + 1); diff --git a/mm/page-writeback.c b/mm/page-writeback.c index e980b2aec352..3147119a9a04 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -1072,7 +1072,7 @@ static void wb_position_ratio(struct dirty_throttle_control *dtc) struct bdi_writeback *wb = dtc->wb; unsigned long write_bw = READ_ONCE(wb->avg_write_bandwidth); unsigned long freerun = dirty_freerun_ceiling(dtc->thresh, dtc->bg_thresh); - unsigned long limit = hard_dirty_limit(dtc_dom(dtc), dtc->thresh); + unsigned long limit = dtc->limit = hard_dirty_limit(dtc_dom(dtc), dtc->thresh); unsigned long wb_thresh = dtc->wb_thresh; unsigned long x_intercept; unsigned long setpoint; /* dirty pages' target balance point */