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: 14000462 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 588B51FE469 for ; Tue, 4 Mar 2025 11:03:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741086213; cv=none; b=u/AS7O3kKfq7A+BE0u9XCcGPo7Ghg/IzwZtgwvUzZcjLnRlYPUJhTRydlw+gx4hCu79MauNguGQmlByp9BKbKiyvB6YK+6TBKTtCsUxNHug6F6d4C3ewrElJUVC7dLXRvODIkct2p4RVupfGH+D1SPPvY52hlJQ4HZbOkwv0gQE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741086213; c=relaxed/simple; bh=WMWcERJJfbqiD3z8oE5+hnpSPeiC/ts2lZLJl0kJDgw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=piiowy32An31GrRR5tbbQUQp4N7Vb2JfAQn6lze5x9HvSWT0qNA8LnmKe0lgR/duWBfE/zguqnDZcVPvRKzAr6oUJRRSlqR5IjKPWFWZINoSzZ3umk5DsAuqwqrWCG5Jhoj40wyHqEpejWDLMcofVmSOeeJPMTugfKIjPumCK6w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=shopee.com; spf=pass smtp.mailfrom=shopee.com; dkim=pass (2048-bit key) header.d=shopee.com header.i=@shopee.com header.b=NCYpASAD; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=shopee.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=shopee.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=shopee.com header.i=@shopee.com header.b="NCYpASAD" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-22355618fd9so92953615ad.3 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=vger.kernel.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=NCYpASADNuvRESIPIYSAyNqu/x2P/gpnp5pgmgeYpTdbzy4ZOANSsFd5jGuG++WrXI ocg67nmijefF4haDICHjBOlUNjiq9uVzHBPOXgAYS/cYtrRA2c+K5EcG50ZSOZPx2xFa 0qZ5gY514tjrfYNeVNKHYxAXnAjYdOY3Ar5jLWCIhEcsEehb+0LGYi6lNLtvHv4F9h7N W9QSQvNXTkmFRjv9jY8+rWAxk01qUQJ+gTaT1fSXPo2HBY290bhwb5VboFzidvAnuHKe 5hB4GV7svePRMG4iN6gMuKNagf+qwglnV8JCISrFWavzEto5DXfTUpOwZjH1fPAHK8SR Kpfg== 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=YkCaZ+ccK8hmjFnODuYPlEkM4ccslj5J+0xLw0d0m4slqaWDog4WgZx9I9Q4gLZDlG qCtvCh2YSjW6E9F+StoQvnf1BgPOwA6U+C5yJxTOLOzdxRAiSuGLkdWE9G5dAbRviNU9 NHZgDL935rBVw4S66TFZzYh/B6MBYDhZz8s57naKvpcbX5ZjiDVJIZA00nnT7OJZAPrE WoIlLyKzcacFS5yLcdJDpxARQPMvy7ZLA07Kdfl1B2Uip7nU4daUptO2DHgJl7IfFg8T If4WKgyT5QFjcy/F+YPkBEWa1CrnKik2M2dSQCkUYlAFAzp13/xEnO2s7h3Hcm55v5y2 le1Q== X-Forwarded-Encrypted: i=1; AJvYcCWIv5dp24Vk4TO9iXD/4fdoYl6gPlwmOKJMqEz9u5pcFZ7qoXcXJARmsE/rOw/MH3Bd8vMp0ZEUoqDSmTTC@vger.kernel.org X-Gm-Message-State: AOJu0YwF/bu/I97I+XHLgW4RBrIomf2z2QQ5Hu+GsMvtLy1h/RET7XMC ZkgdV3egvVY2O3KMRwnddyOy1OB2URce5B0dhVWtLXyBKw2IaK3w4PhTCjHeN+s= X-Gm-Gg: ASbGncsLsTN4+QAsocXGQwQvlziUAE0Q7SXavzQWwQR/KguPsCx28DLsY4QN/5UQ/N7 syCNZ1bbWegF9R2dnUXvassgYy4C8XX1N1WogTFNNlwwSoBDsUKaQaI4Nhq5chOpFNhnJbTs51A 8tFAhBamNWLVc0daG8z0FnPt4wqHrR/L0gSRNJpll4XbXsQ4qoj1bUxJAlNy4RRRZ+7rspr7nsS te5hkdLO6goNBpFBT3E8N4w7RcKSGIDiZz4prUIs+EmW9J1LS5OWT+TcZcLdQsazukgSg3wLKFT kdt2HvLL56FiWmVaQWjN2PratPeRCg== 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> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 14000463 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 48CC61FE469 for ; Tue, 4 Mar 2025 11:03:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741086215; cv=none; b=rS+O0fUS9WprZWPC+XpJEsWkAjrvqK98t4vRRH+2QQUZ/YnBQ3KbsncCJ50RCSJScrYUwk0NajObMzs1UPtuDrdYmw0BQlAdNOO3kkr04baSyRllMZUH4owgml1oHBA1S9+OAJUGz3UbYaslmf3BkvnND15KxBMbxTulnFMD+6s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741086215; c=relaxed/simple; bh=wFr310lePl+3sCKMgYEpa1cVuDPHCXJAKPYyZiwfkrE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iUikepKo5y5x3+e41fFRmU+cqw9TZLOBwCFVmmrxXVqsMqDpMP1fQz3bG7plEIIpMsMeLdVN7gMu5o/FMiHt2dWGa4M4lpIgID3OuNnTjsxcL0Q4PfV7Uf29BdTelAcMYH+LPIs+sTw33TyXufj5IxDJKtnckd2D8gKFLodQfkU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=shopee.com; spf=pass smtp.mailfrom=shopee.com; dkim=pass (2048-bit key) header.d=shopee.com header.i=@shopee.com header.b=W5Ft+z9H; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=shopee.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=shopee.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=shopee.com header.i=@shopee.com header.b="W5Ft+z9H" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2235189adaeso88599015ad.0 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=vger.kernel.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=W5Ft+z9HUGS6ScmyN3/pxQBoH1N4U4CJdER5cU6G7ZhjMdNEzwMBhZDi7k4Jlt73XX rXFFdDCEn+KoKcRodtnt/eMw5oC2hfJtgf1WP7cOGc6m5B4m0H7bL771mYSLNtpe964N 3i5CyYv3zuroTYOWQvX87ku9hkfEZxhJbR8z/8hBtwO27t5RAASQdTrsffXo6MDIR/R0 ZipgHZEeQ7Jka5xtAyOIg0UxstT01Mwf91hUpCUI/nDrCvT1BMdWNv3q6DhhcwcTnt37 XoOH8D++XRBRUObPwiXnzWDT7G5hwIcH7d2D7/onRdj15wn8XezuH1LCwNGN9N5Yebos 1ULw== 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=bYIDOnNugRyrYWyUTQx1G0AWVgnHeFOfDZq+BEwyjP70KNzJrHKG+TQ+jOAqYjfkAq t/AVnsJEoLWlEu00V9b5rX1i/kM+SA8JMfH4rD2rrNDX8yMJsnGQ7G0aeiqaCd1X9p1t V0tfakexZl2HyeGnxxnyM5N9edSPX8YqAOa1YI3LKq7Vxdr1vA/2KMrtEvIE+zJYGMkx 6pT0PNoBK9UYNkG8H4fBR6JE9qvo0HuGme/QF4usnRvufrAIUI5led0JknP+lM+pY8yY qjfHNkjl3KB5/0QcXswmpa+pgFqnoC2C1tTJfVFblwPX9Enif7abKq4y6yVy9EV1bQZn ImAA== X-Forwarded-Encrypted: i=1; AJvYcCXTjbZFO614vqa4AcyLkOY1q8CuNjvtNnUVmwywR0ljmURdrPQOR81rI6o1Wf2E9zvtNY62bUfkJzEE5iv8@vger.kernel.org X-Gm-Message-State: AOJu0YyWwJXM4WLamEaUyTeKGMtRsRD7Kmbs2K5szmLMIAuvyLtiD6vZ 9g3oTRpH6Kg9wvGh/hNHPJ9iiOnhPewabRfQCEgJHD3pseznbQxRQAdUlhDh0uE= X-Gm-Gg: ASbGnctOcyKQu8Dj8AjAjTiZr4xa0+kJcuefwEXjRiFD3rjwsT70ZPHXvxuBQjogD8B ihNnMNw90wcNSbsuFqc9/qgeekBCjTkEKSFDssINlRPMq4R1tnwPoY5ugt8sdenCUfHfhVSnlYo aLx7WfC2y3K3d5a6HjTsGXi3aGiubTYkSZOeg2RPdJl6GNEZbwTuJxf3jH4LM4m/Kxxblc9yoA1 uc8vh7Sej5Y7Pqn58Y2xTZidpnTQV/h0crU+hlIi6qPfuMuVR8y5z5tprwMZ+gFuX57+P2duplP IrYu7dbk80Zhuw4a1vGtFUMdOaCmng== 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> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 14000464 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02B871FFC46 for ; Tue, 4 Mar 2025 11:03:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741086220; cv=none; b=o54OeGdyMDNO1io+Dgikqo9NP1jAql1vzxJBxA3cqd7hZIk4A+h0gNrs9KPPuajaQ94O97P4SfqE8g3rYSwCh/3w3Hb+tafe1o/tjub9Imqvjej1MmhEZJ40ouNymahGBDfpAb4zY+ClMuj085RmfJnPKZ25PECD4VzUag5dt74= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741086220; c=relaxed/simple; bh=wzIi4HZXwqVOWENoquV+UIkh/r0UJZTDI0sJVxfYL0w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kSUNMCXTpnXG2x63m78TqWzy7Lh874fW/5irFI0/g0RrURckIyvPIWmTmSUW9xRhQMZtY0+hH0bxm5qqIZcWYk34+R+OgouD30HB5v4Ta2JoJkli49mFbINuCAYxBrbJsFoPqJRfc2GjxEAmwvqgSqqwGcInWADJM+tuwxDD2ks= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=shopee.com; spf=pass smtp.mailfrom=shopee.com; dkim=pass (2048-bit key) header.d=shopee.com header.i=@shopee.com header.b=Mxndf6Tz; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=shopee.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=shopee.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=shopee.com header.i=@shopee.com header.b="Mxndf6Tz" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-22382657540so53954365ad.2 for ; Tue, 04 Mar 2025 03:03:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1741086217; x=1741691017; darn=vger.kernel.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=Mxndf6TzleS+dRPLQMadyqWS9fol6eDBfKYTyFAP3FcRTlGK5Bdfnt2yRUWOI7NFv+ vm7I+i6koCEW9iBSc+/OkyzOKEYOVqX6pVPGJ9mg6eM/sucNWYZyYBgC+7ZOULQoaJEA tg2G/1/mbqP7jMdeh5gHuyVsN0e2IMU04CN9OxvBZOGTUNWs/B4JPSL8naJkAqLcW9HN WxqGW8FME4qh0WtGzYgeTNZSkoPPyQQ0XSMmG8XT07mMEiaslY0wG/q+jRP9nCkPUkPS TkSb7QjCEgApM3CxSio/GcNcPeHNOEgd5Wrf7bcemmfXoHUbD6/D8FvOJemXObW5b/XA iOLg== 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=EH8MXQZ9PuJk+wCIqt6rjEKNy2ZUDq5bf7praIqKZVqXaRngRaoOxn8aXOZW/B/Kcm X+Te4IBdHlikEUTLXKHgTbgUOQLZv7n5t7utlNMSnpAVPQazXajnZUS/LSsADtXbJZQQ XkIuxuwdHMdoN9Qah7KlXETve4i5oE5Ng5Q0W956sLk6zJtmpvo8BD3Az6UxErNfKDjG /X+laRhiJb9tv/QMAI77ooYdU1toZ+P59xZhQ76gv5yaX+deBLFZkyFmC6fxWhl19nGc 67n58ETwAH5PyZ1JmxKZC9TS1wa9yMz3SaiiIcayXUcfRyZSonKtkd4tY6Bc9cTWYblC Ixig== X-Forwarded-Encrypted: i=1; AJvYcCW+QXZck6aR00MbRmvYmEckma/aD96ob9CGAFfkYXXQzFGEiK4CxNrPucD9hAYZNOPuUPxXkgIarNiXYq+T@vger.kernel.org X-Gm-Message-State: AOJu0Yxk2HYwYnKsdPxS3aoKgyJX0g83nec/FshlfPhztuwHEM5FSCDI d3G4SXa1O6lPjLOGp6TAOqQKGajshsVir62d7ztKyuBON4OYlydd/nufVcBD4cQ= X-Gm-Gg: ASbGncvlHKwaDCbbguPA3liTeOLwilPUlCj5hLtLAfrFsIyU+2qpX3wABI52/E9mo0e tQmKeTyu0opF/aLR/JQ1HLoS9MstamQWSmRUvo9PcFn+Do/END8JowSJhytcKr32YAhBxs0IhaF nphaAEUQEQvJ6wn3p2cuHw759vaa+Un3AE58F/qS1pb7ychUUzyAqUqlCPOe+F60XvE3TMru2yf HX+nviAckbLuioNcG1MI/x+Wsol7+GzokhXNRaKeO/hPAzS0sNybs7vJV38c7xH+ejeDTi3fG9y hIfsUrEWKjRiBvVYLfju4tRM4YIPgQ== 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> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 */