From patchwork Tue Mar 4 11:03:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tang Yizhou X-Patchwork-Id: 14000466 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 EA40CC282D0 for ; Tue, 4 Mar 2025 11:03:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6FEF6280002; Tue, 4 Mar 2025 06:03:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6AFC6280001; Tue, 4 Mar 2025 06:03:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 50256280002; Tue, 4 Mar 2025 06:03:33 -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 2C05E280001 for ; Tue, 4 Mar 2025 06:03:33 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CA38B1A1B83 for ; Tue, 4 Mar 2025 11:03:32 +0000 (UTC) X-FDA: 83183582664.12.EF5D2A3 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf08.hostedemail.com (Postfix) with ESMTP id C01A5160014 for ; Tue, 4 Mar 2025 11:03:30 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b="N+J/aQ2h"; spf=pass (imf08.hostedemail.com: domain of yizhou.tang@shopee.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=yizhou.tang@shopee.com; dmarc=pass (policy=reject) header.from=shopee.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741086210; 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=0YawdmYDPWdB9hnNHcTCzRAEqbfP7zzuyOxM1DZL9r8=; b=QiFMXEdjx0bpuPaiXhZOzvJ+dfxHUYE7q7Pn8D73nhNd5kzMRyxR4orgBZUYjzqm9bnVoe isfLaBJOGBLhwudC0LA+pw3WoW+lnKeNUGCryxOV8Kvoj61DlXcs/cl/iWEgrF8svGV3yP loIW7X+aU4Hxp1HZuoIHiVSFiLfC8WQ= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b="N+J/aQ2h"; spf=pass (imf08.hostedemail.com: domain of yizhou.tang@shopee.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=yizhou.tang@shopee.com; dmarc=pass (policy=reject) header.from=shopee.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741086210; a=rsa-sha256; cv=none; b=1SJTxHjgEsBj6C3riOC3aYr/JeE9rXXF9TgKkgNFEKh/0HbfmYIp5VY29G/jEzlGMQRnk9 SLDTcoylg50zquQruI4Z/NH/qvP8KwzMtwFN/c+IWA4h4Zr96Rc9A28dDUmABBP0c9ufRE V0i2RQiN2hMJN2516+ivoU27JrvBnHU= Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-22382657540so53952235ad.2 for ; Tue, 04 Mar 2025 03:03:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1741086209; x=1741691009; 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=0YawdmYDPWdB9hnNHcTCzRAEqbfP7zzuyOxM1DZL9r8=; b=N+J/aQ2hdvlkPB5eaJxE3p+VsYVxdO5XsGQUJla4Itpo9YrnqkkHT93nS+0JkypbH/ /g4M2/nVR6VfNlFAYQJho+PKJGutLXPuR7jd5aWXGCNRN6EeyKIs45k/Wg01B65k8I2P J8XauBo/fwwjWasbxF1NminIIUXgLkUvzBJcIv9Zv5ACwImFzzxfHac2gwtnjKJJ5qzx KQbeQ2pBE2QLbWSj0XGl06hmt4j3wK9KXb+PqwbPTD5GwIrre6yItHSrQBtKK1vQo3g5 JBKK1TzfCQh3OO4qhx5YAZmlGwluhF/cRG6632NqWh9cwC+U3O7Dt16uxmMNxm0bgCYL B0hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741086209; x=1741691009; 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=0YawdmYDPWdB9hnNHcTCzRAEqbfP7zzuyOxM1DZL9r8=; b=n8+ntMR8T4Qvn/EfrES2THM0BtOALL6ZT2J4Po8LtE+kLzE1RDPJbSo/qOGWaGz254 1CJ/cLZFufhhOGWdIVe4eYcRZqgO/uKQsOMQWqtCezwsvEt5VTfjxzbw1p5dhDTOzFiC hU+VFduBPwnfrfBZTpgX4TCesMZ/riTs3IFqSDkTvfyl5WzIaCst2RmuCkThrtUotR+x TAYC5o9lFEQNFgQ5eL+lLm+Sl9aw7+/R0YhttuCHjrk3wzNROPfQ2nujNBqvV8DD24Ws grlI1IecEshlqJq7B87SZfc7vx4EMix8KgdeXaN8AOrB1AYQkijWU2gkxFNhFczu/rbe vM/A== X-Forwarded-Encrypted: i=1; AJvYcCXyahF5BNqhU+JZ3qJ7astvrnhQiLPRwMjM3TCMRPnxbpdN8OdAZTc0YtMg0iN3nb/XGn7A+RgiTg==@kvack.org X-Gm-Message-State: AOJu0YzzUvrDRsM8zHhN689rLkWoUN0kS6UnYg93rz9yhBGe2BKZhIh9 xR6bYsTi8zNmMlD0+uGVEps9ob+dbW2nGBxLkp9r996O26TofezHLLRvCIeQGkMLYdoRDdI6X4w h X-Gm-Gg: ASbGncs9Aqjx5eMLHaj37vFONqFM1VrE2v0+iDvAb+3ikK8WATNG3YLLj8mBK2nwJ8g OFTYoo5rula86LkKXyEWLyMnwUzv0mpICIvXzRlP6Qia0vum39UzsEUlHVqgDqWKWeS49tSdLmt u3pcdv00X66d5ihuArHZAAo/8Bz4SghkjnDycrQFCbmutB8Di8fCS5zDCqoo5TxV8IY6Q9FPjqI FmwiGrjpxURDiZnSiaVf53bJzHB7eQHK+uCZ9vYtmzghgWZZzi4N2DwlKb3EFdc4mEc/aIyAdFH Kl1SPIsDDJgW+ypMwg98tzJ1Z9pErg== X-Google-Smtp-Source: AGHT+IHcP3j8xP5tujxFcnjNnFi/BdlYDT5lDMwXz1AMbsqmlg8tbp0AtTG0gER04iSD5VopiJ2d7g== X-Received: by 2002:a17:902:d4cb:b0:21f:b6f:3f34 with SMTP id d9443c01a7336-22368f9d88fmr239812185ad.15.1741086209642; Tue, 04 Mar 2025 03:03:29 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 03:03:28 -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 1/3] writeback: Let trace_balance_dirty_pages() take struct dtc as parameter Date: Tue, 4 Mar 2025 19:03:16 +0800 Message-Id: <20250304110318.159567-2-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-Stat-Signature: 9zermnwm5tzsggdc3xfiij7ofdobqcs3 X-Rspamd-Queue-Id: C01A5160014 X-Rspamd-Server: rspam06 X-Rspam-User: X-HE-Tag: 1741086210-373336 X-HE-Meta: U2FsdGVkX184rEoJA4Dqur2MycESthPpj/gbB6ddJHCSEYETRl5Mtk5TZ7JGlnhZ80ZAKqrbwsKqx064Zp7CQUrH4XlvWCZGhc+Qftd9o0UHQzyHDs6TSglPfPODjayaUdgfyDxKEs/zxcgqzKPHxiIt2vbkt+gCMO95UUaa4g1k691U1Eqb4O9QYxr5x+IED3CteGTzNmY5TF5eu6O4r3uW7cFJy9muGxNx4KiPkTP7W/W+GFiJJ8OPgTRcWcEp+gw6nymhIPTIMb49Jf7T/2Z+vOvLel+AQ98ckth9W7bKiLZ4pv8n7371OtFmwtXLLGKlDw4qQ1F7HC9dw8xgBQat6QmOeACTuU9zr1/v4lkbBvCb3vOylJxIE8xDFUfH6JnfVMFrUA/JBth/LyRrMUh3mevOw6LtxiggO/LaHpUwl0OKzDTgaJdX3ZRqY2+PKHuv/L9sY0CU/CB2/NIQpRdc6XPyzJOwG1ZCsaoaFh15y+Qd8iemhxQh7V+RA+1YwXSe6mR3DpBwzoS7tqBTrczzZlFTsmMPjDJ3yjMksiVT6FEQv7jiWaCSHo3AVFWn1na4Grq+0NIKG4d7JmVHxvmLYHQJ7Do8G4RZLhdczyxA1rFTTKIkdB7xa0ZODjmgvOf8RS5wBP1B89SvRxNLr0QprDr9BDjI7DS5aUUNJIMGT7B+kZuitprjysHuo0Og+X1L+Icu8Z1DsIJRDxSIhaL3oXQqh3DvxLuSW6qGi5D7VPHSeVEJLty1wI4Sj5R6FthJ25hbHJMYWRU1hYu0l+GGNkedYqrQADrlZmiqWr2Cn25GTX0pl2TCl6/YQtejkAF2ItM5v0m8z/EWKiaXy+0QOskNxUBxjcNK0oEfJRbQGGZr0Lpu2J7grKvvdBY8cU7cdS/5GtmAP/gY007Kfrmvpreg/DmcNyBW8FQzdbGXqTiWcq29vV+v77gLZivi9Y6QuBwNv1397J7rhnW /6IES8av s9fu2pGzkLxWCIej82SnhrQ6YCkdZsylRfyKBhw3KVXx3JCvyELxAY5fOUjmvMuXYy+unb4O3L1XotZKUI7zxhmv/DMEityZ6WQtUO4/qbqJLfLX2W8WVCgK4xnfx2J3QnAwaoNqvcgVK8OK8QwpNQ2HdbkG8eGUBgz5RsisFoYLH0G/Bn/cu1X62Dx1fEePSZJvK7eIqCyZO1BVoFoNGNYJk/NAv6j6ghW8wXHr9NatJnFumSt7oDL6O0+dZWZMC5Rfb2xiyOPi4kdLuLNodLAuxv7JtClZAEeqjZ+kpfRkutH4D8C/0TyimhJ5qsAAAw1680pIyAn7gUYtolnKMQwuMJlU0J3lODy2Z0PYSY/dx6qW8+3CS+3BWNn5AvCKzctC+ X-Bogosity: Ham, tests=bogofilter, spamicity=0.000004, 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 Currently, trace_balance_dirty_pages() already has 12 parameters. In the patch #3, I initially attempted to introduce an additional parameter. However, in include/linux/trace_events.h, bpf_trace_run12() only supports up to 12 parameters and bpf_trace_run13() does not exist. To reduce the number of parameters in trace_balance_dirty_pages(), we can make it accept a pointer to struct dirty_throttle_control as a parameter. To achieve this, we need to move the definition of struct dirty_throttle_control from mm/page-writeback.c to include/linux/writeback.h. Signed-off-by: Tang Yizhou --- include/linux/writeback.h | 23 +++++++++++++++++++++ include/trace/events/writeback.h | 16 ++++++--------- mm/page-writeback.c | 35 ++------------------------------ 3 files changed, 31 insertions(+), 43 deletions(-) diff --git a/include/linux/writeback.h b/include/linux/writeback.h index d11b903c2edb..32095928365c 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h @@ -313,6 +313,29 @@ static inline void cgroup_writeback_umount(struct super_block *sb) /* * mm/page-writeback.c */ +/* consolidated parameters for balance_dirty_pages() and its subroutines */ +struct dirty_throttle_control { +#ifdef CONFIG_CGROUP_WRITEBACK + struct wb_domain *dom; + struct dirty_throttle_control *gdtc; /* only set in memcg dtc's */ +#endif + struct bdi_writeback *wb; + struct fprop_local_percpu *wb_completions; + + unsigned long avail; /* dirtyable */ + unsigned long dirty; /* file_dirty + write + nfs */ + unsigned long thresh; /* dirty threshold */ + unsigned long bg_thresh; /* dirty background threshold */ + + unsigned long wb_dirty; /* per-wb counterparts */ + unsigned long wb_thresh; + unsigned long wb_bg_thresh; + + unsigned long pos_ratio; + bool freerun; + bool dirty_exceeded; +}; + void laptop_io_completion(struct backing_dev_info *info); void laptop_sync_completion(void); void laptop_mode_timer_fn(struct timer_list *t); diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h index a261e86e61fa..3213b9023794 100644 --- a/include/trace/events/writeback.h +++ b/include/trace/events/writeback.h @@ -629,11 +629,7 @@ TRACE_EVENT(bdi_dirty_ratelimit, TRACE_EVENT(balance_dirty_pages, TP_PROTO(struct bdi_writeback *wb, - unsigned long thresh, - unsigned long bg_thresh, - unsigned long dirty, - unsigned long bdi_thresh, - unsigned long bdi_dirty, + struct dirty_throttle_control *dtc, unsigned long dirty_ratelimit, unsigned long task_ratelimit, unsigned long dirtied, @@ -641,7 +637,7 @@ TRACE_EVENT(balance_dirty_pages, long pause, unsigned long start_time), - TP_ARGS(wb, thresh, bg_thresh, dirty, bdi_thresh, bdi_dirty, + TP_ARGS(wb, dtc, dirty_ratelimit, task_ratelimit, dirtied, period, pause, start_time), @@ -664,16 +660,16 @@ TRACE_EVENT(balance_dirty_pages, ), TP_fast_assign( - unsigned long freerun = (thresh + bg_thresh) / 2; + 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->dirty = dirty; + __entry->dirty = dtc->dirty; __entry->bdi_setpoint = __entry->setpoint * - bdi_thresh / (thresh + 1); - __entry->bdi_dirty = bdi_dirty; + dtc->wb_thresh / (dtc->thresh + 1); + __entry->bdi_dirty = dtc->wb_dirty; __entry->dirty_ratelimit = KBps(dirty_ratelimit); __entry->task_ratelimit = KBps(task_ratelimit); __entry->dirtied = dirtied; diff --git a/mm/page-writeback.c b/mm/page-writeback.c index eb55ece39c56..e980b2aec352 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -120,29 +120,6 @@ EXPORT_SYMBOL(laptop_mode); struct wb_domain global_wb_domain; -/* consolidated parameters for balance_dirty_pages() and its subroutines */ -struct dirty_throttle_control { -#ifdef CONFIG_CGROUP_WRITEBACK - struct wb_domain *dom; - struct dirty_throttle_control *gdtc; /* only set in memcg dtc's */ -#endif - struct bdi_writeback *wb; - struct fprop_local_percpu *wb_completions; - - unsigned long avail; /* dirtyable */ - unsigned long dirty; /* file_dirty + write + nfs */ - unsigned long thresh; /* dirty threshold */ - unsigned long bg_thresh; /* dirty background threshold */ - - unsigned long wb_dirty; /* per-wb counterparts */ - unsigned long wb_thresh; - unsigned long wb_bg_thresh; - - unsigned long pos_ratio; - bool freerun; - bool dirty_exceeded; -}; - /* * Length of period for aging writeout fractions of bdis. This is an * arbitrarily chosen number. The longer the period, the slower fractions will @@ -1962,11 +1939,7 @@ static int balance_dirty_pages(struct bdi_writeback *wb, */ if (pause < min_pause) { trace_balance_dirty_pages(wb, - sdtc->thresh, - sdtc->bg_thresh, - sdtc->dirty, - sdtc->wb_thresh, - sdtc->wb_dirty, + sdtc, dirty_ratelimit, task_ratelimit, pages_dirtied, @@ -1991,11 +1964,7 @@ static int balance_dirty_pages(struct bdi_writeback *wb, pause: trace_balance_dirty_pages(wb, - sdtc->thresh, - sdtc->bg_thresh, - sdtc->dirty, - sdtc->wb_thresh, - sdtc->wb_dirty, + sdtc, dirty_ratelimit, task_ratelimit, pages_dirtied, From patchwork Tue Mar 4 11:03:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tang Yizhou X-Patchwork-Id: 14000467 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 93F2DC282D0 for ; Tue, 4 Mar 2025 11:03:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 26CDA280003; Tue, 4 Mar 2025 06:03:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 21C6C280001; Tue, 4 Mar 2025 06:03:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 094AF280003; Tue, 4 Mar 2025 06:03:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id DD1B8280001 for ; Tue, 4 Mar 2025 06:03:36 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8B331121ADF for ; Tue, 4 Mar 2025 11:03:36 +0000 (UTC) X-FDA: 83183582832.05.4380338 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf17.hostedemail.com (Postfix) with ESMTP id 9872C40020 for ; Tue, 4 Mar 2025 11:03:34 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=lHuAWNDs; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf17.hostedemail.com: domain of yizhou.tang@shopee.com designates 209.85.214.170 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=1741086214; 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=3lES0apB7zPp5Y1gMLsCJ52oXjFeABBbwB1psLGF4yI=; b=qkDqjcWq4AddRN/somRzkAFoHMBSz8LrrjFf9OrF2eCno9O3LMO7J6BX+pCEDNfD9EH7cm KAJ8yGZh1eI2zd+DfT8GH6dSv0qjjkCTaD2KjnvoAOMgA+1iUyq9BbKYxsLwNEH7nEvEJv SLfS7DBfuEU1KFKaEyrJh3uhF/zGI1U= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=lHuAWNDs; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf17.hostedemail.com: domain of yizhou.tang@shopee.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=yizhou.tang@shopee.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741086214; a=rsa-sha256; cv=none; b=QWkheNFIzhPY+nY8CEf3AhN6UI4HUnqYyNR5TrdhOAgmjlxxeyKA6Gbta2GIUbFlFxqCcP nSt6RNqzSHSePwCyiIHNPA+kQghTm+aCrTD3dvY6BvjZr+h/ioGeZf4nZFQv0mu2cxfnq8 RY5thcEmtVj/eVTB6subNCXwikr/AvI= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-223a3c035c9so32732615ad.1 for ; Tue, 04 Mar 2025 03:03:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1741086213; x=1741691013; 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=3lES0apB7zPp5Y1gMLsCJ52oXjFeABBbwB1psLGF4yI=; b=lHuAWNDsyjY524xZC0hYYfgnx6pHz+8FziCK/yv5fRJmcBRFJX8gYWlu4uU6YZjeWx 0h3Z7hXdTpRQhZ5nVF0dEhMgwfrXbSP/auKGbDZuiP4muYE3qbtJHQr/mH/fMzBfuVtZ FrRzjR8AVHzzHPlSHhA4GXx17srKzjMiPKoDXlsYWg9QIDMQEM6NtlNUuGU/JcL4X4U8 SFGD25rNYLkmqEZ8kN6mk3LFwfi0U8OGfZYobxRXbYx7g8INui7bd547tkwGbpec7pjd vobigq0XwwKi+du/zyOb8SG/W34cM74nsDt2SlgfxoUpkyxsviOgxGizDr4l4lQ1+Ztw G7jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741086213; x=1741691013; 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=3lES0apB7zPp5Y1gMLsCJ52oXjFeABBbwB1psLGF4yI=; b=Uw6ifnDPAYRbF5vuoYVIFmKn8ZYaxHX1Zj61hOsfagdJOtlCChZvBaF9GgpFCwpLY7 j6HciabMr97VJ5n/UgZKE8Ovx8hyUDl/l1sG7ftl+EOgban3cZycy5T2bhBLaNEUmMeN 8LvM1t7QemPp4mrIXZQZ3gNTtMVFIxSPKiz90aiNApM9quP3eZwFrSBd6h5o0CLJwgEW ruoj4b40IcQRJ6IZIEXQJzhv0AQGrIvWQ6Yooeaco8SOh6G/d7ky+c8wWNOPNjueBlnx Jdanz+egy8oXAUPzHKhJsgPGWJQ1y+nu5EVGYUoGJxA9BsaKFQKUzjFwtnWc2Gys3Xes sybg== X-Forwarded-Encrypted: i=1; AJvYcCWD1jzU5nYVR1DYipvA1rAOSv6HhaaD87SKbHluGPPoYkIX6ltlpdxs6UVO/zvt1/VZfF9uQTiRfw==@kvack.org X-Gm-Message-State: AOJu0YwyLpfpW05bhQny6X8tJJnBPuialx7aNZ/aDbGbUny9Dyicv5P0 Qic+yaMDbUYqr/SEm0328f2fw67f4m6ZwFeaW/lKq9Ch6ZXTQinWvaP28mog238= X-Gm-Gg: ASbGncsz/0LU/D3iJfrvXJR+YWMlVBgxrX1oBozv+DEZfglAt/mkSK4wb3M4zedzRgF 8e9hOpfSkeRsj+IKHf73FZAt5xv9rCuioBp+5PRtGrntqXln4dnaIO80fg1VdUHw3CagThqKk7+ 1AWPyjx8S8mOS6VgAOrrrtSVLq6x6tyJCBKCzM6SBN25qkmI5emvY2YSwDHT6GWQDgb0eQ8iWSO yqnSEL1fMHlxn1Ms5iEYOKw3BBp7Z9PM/JkuPv0uWOZFKTBfRO/SvWcPhUcebFRF/JlyZB/lV08 Ci6RuDDh1Mg6dMTwg8aHPF9mW+ENSg== X-Google-Smtp-Source: AGHT+IEx0Bo+gN1RIbUhA8tGm6rA4iMJsFaRlXeDO7JP3HXXARwvvotVyI8kAbe7AiglMeVqNhDPfA== X-Received: by 2002:a17:902:fc45:b0:221:2d4b:b4c6 with SMTP id d9443c01a7336-223d978eefdmr47027275ad.17.1741086213564; Tue, 04 Mar 2025 03:03:33 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 03:03:32 -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 2/3] writeback: Rename variables in trace_balance_dirty_pages() Date: Tue, 4 Mar 2025 19:03:17 +0800 Message-Id: <20250304110318.159567-3-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-Server: rspam04 X-Rspamd-Queue-Id: 9872C40020 X-Rspam-User: X-Stat-Signature: sk1uz16w9mwdfa1ue8igk93r5rtqpj5i X-HE-Tag: 1741086214-216628 X-HE-Meta: U2FsdGVkX1/PbzUk75bvYRmIvfbnkWMya/3Lflc5vSQaRblVdajZw1PyHxqbRsg5+dqBMVMjwWVaXeC+I0nqACa/qkTl8yEu7+ax5o0MYddsC3eUfqow2gTrN67b2eZcCHyNMUKak+0RgdfSz3OjJly21QM3GCU6NIddB1XQq5D/EV2EYssQxTodK55cJzxIkpqVnac6n/bfjbAKGmhJxZDoHQT7zPWxeIoAMW1vrsbkiTLlyIGwTF4VouvEJ2tzV1jEpNVQStNw6Ck7wapSauQ0xMZEyvR9ZYWV7TGqSPhWanJXxlqm7gALHtmK/Gt+jlGI25umtR4dj7zV7AY2d/fmh5Ub5YrqGhs+65MpvucAmMSIWPAIdfXWq/Q3Q9MDDTESMLlG81KZN2EmKC/6k1Aqsa6fvVz9liFZ7ueuj0CiMe8fj4lVo+BuntU01Cjm6M3aC0l2/wv+XU8Sb2mc0n6k1b+hpuCc9s3DZAIKTiP6Z8RLa1BrXs1W1Yvy73OCC9TEWM0Fu3DNHMEwGl1BDXaT+GgxrwWRocq7mHHNkd611zITBQtK/5SuYsipZsn0h65B3JMHEyHF2H7ryF232XuJ2vUfs1X15XiZCkmj1drML7ocunOtzJUG1CLFmwoxGLn4to28s1DGsyDBaaDrwwA0lgDDrIe4NKcUraUnIcTIdsi1fiKb4m30G3Wz2dsC4bBTgeH0+k5yu9A7FJEzC35Xn0Q+dM3yvs6qDVonE88l6SWrPkWltnkYc0dQk4mP5UJGCB6KjyWhnBLsQZ89InehgbYP/j27LbujpGVTNTPdvRI+8BHSRikX+CKLKpxkv/FcvCb1WlGWVCFpy8rcNFIvOEkCg/QLco5QMMmaPj543bVJduV5BHzb0LgNMTwVLuL0XLVAVs40ISlPWNzed7ujLBtgkpkt3vEhGxOiph09K9RlIZNxNGlEysze5VKw6b9BHInTBaNpr+1jwl9 ShytEPLt jNdioZ+Gr+Od0zQY5ZMEFEOlZ2OJaXcJQkEj9TyDLDScsr4V30+bWEM26QVsZ0D7RojgmjFO5qaZmwIoVd6IVBS270PdFZVgF1t3Ki2oo/zdasZFMWnLqUD9IhgeDhxjWrpr/LIgjJymo1ImW4f4qWjsBdK7N/aNNpELLczArV6fIpz/8WBN7WUvZgmfgo8WARCdtheJESAF00DTb03yu2aLfrh6Ln8BA4Siil4ZvFNgD3p7B2rQt//gcn0o5DLlhL2O3JwprmM3TZSfHyqUs1Qs4uV0y/5GyMMFmzpeMc5kiRXUjvnURj+DJKQx4hdbzXmWYZCCILMWQ1GlLhByEt0Ku2Um1Y2MBe/vYtrTr+mqwyEL67pHzXrq1js4Jz/Jx7lEw X-Bogosity: Ham, tests=bogofilter, spamicity=0.000056, 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 Rename bdi_setpoint and bdi_dirty in the tracepoint to wb_setpoint and wb_dirty, respectively. These changes were omitted by Tejun in the cgroup writeback patchset. Signed-off-by: Tang Yizhou --- include/trace/events/writeback.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h index 3213b9023794..3046ca6b08ea 100644 --- a/include/trace/events/writeback.h +++ b/include/trace/events/writeback.h @@ -646,8 +646,8 @@ TRACE_EVENT(balance_dirty_pages, __field(unsigned long, limit) __field(unsigned long, setpoint) __field(unsigned long, dirty) - __field(unsigned long, bdi_setpoint) - __field(unsigned long, bdi_dirty) + __field(unsigned long, wb_setpoint) + __field(unsigned long, wb_dirty) __field(unsigned long, dirty_ratelimit) __field(unsigned long, task_ratelimit) __field(unsigned int, dirtied) @@ -667,9 +667,9 @@ TRACE_EVENT(balance_dirty_pages, __entry->setpoint = (global_wb_domain.dirty_limit + freerun) / 2; __entry->dirty = dtc->dirty; - __entry->bdi_setpoint = __entry->setpoint * + __entry->wb_setpoint = __entry->setpoint * dtc->wb_thresh / (dtc->thresh + 1); - __entry->bdi_dirty = dtc->wb_dirty; + __entry->wb_dirty = dtc->wb_dirty; __entry->dirty_ratelimit = KBps(dirty_ratelimit); __entry->task_ratelimit = KBps(task_ratelimit); __entry->dirtied = dirtied; @@ -685,7 +685,7 @@ TRACE_EVENT(balance_dirty_pages, TP_printk("bdi %s: " "limit=%lu setpoint=%lu dirty=%lu " - "bdi_setpoint=%lu bdi_dirty=%lu " + "wb_setpoint=%lu wb_dirty=%lu " "dirty_ratelimit=%lu task_ratelimit=%lu " "dirtied=%u dirtied_pause=%u " "paused=%lu pause=%ld period=%lu think=%ld cgroup_ino=%lu", @@ -693,8 +693,8 @@ TRACE_EVENT(balance_dirty_pages, __entry->limit, __entry->setpoint, __entry->dirty, - __entry->bdi_setpoint, - __entry->bdi_dirty, + __entry->wb_setpoint, + __entry->wb_dirty, __entry->dirty_ratelimit, __entry->task_ratelimit, __entry->dirtied, 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 */