Received-SPF: pass (google.com: domain of linux-kernel+bounces-63512-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Tue, 13 Feb 2024 20:36:03 +0800
From: "Jan Kratochvil (Azul)" <jkratochvil@azul.com>
To: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-mm@kvack.org, Waiman Long <longman@redhat.com>,
	Michal Koutny <mkoutny@suse.com>
Subject: [PATCH v3] cgroup2: New memory.max.effective like cgroup1
 hierarchical_memory_limit
Message-ID: <ZctiM5RintD_D0Lt@host1.jankratochvil.net>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/2.2.12 (2023-09-09)
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?zvqERnlWzLYS7QUyZZehgVVj2q5SAc18ny6Xw4RZkZMc50S45/z9HVGUxZkg?=
 =?us-ascii?Q?mP1hOte7pWI9q32EJs5CXLsCPi0ouE2IiNC2X0HKP2Vnpcrc/xi02bLPmjdQ?=
 =?us-ascii?Q?rmuDu4pp+FUSscYe6AbpM0xnG7Nvqp3iriz52j6QAod6c3vSmhORCtmNNUtw?=
 =?us-ascii?Q?MV4G2HD8gNWAleZhn+G17exbxZCPREjf96ID1JXAtAHvvVLo4B0L/4mv5zra?=
 =?us-ascii?Q?+6KpJh3hRnS+uACwnTk94wv12aXDw3AVZaLfcYQAG/jp412UryA0bFYHgYmF?=
 =?us-ascii?Q?kyY4GjxP8pLwJpynkbplQSgZye7HNmlWe+dmk/oUjW6chPEcy/4EbjiCoZz6?=
 =?us-ascii?Q?E2TVxmvZ+wY8vkLj8MiNU30o1v9nc1DqGv1FQQT4q56OxNFlJh7grBj862bE?=
 =?us-ascii?Q?Z0sL+Wb2ynVDRu6+ZGUiedQKPnMfxmris6MPjAXP6yb20EktGhUs6c5i4RQJ?=
 =?us-ascii?Q?lsue0UUQsr0y3m73O9USOX7LxLAeXt0bMU9bLqOSJwRt3i7UmCM8ao2i9db5?=
 =?us-ascii?Q?J3t2/EQ/HRxuF50pQ1p9os2TqH2XPuPUoXMr2hW61Q6KZTMY2jR83k0vSROz?=
 =?us-ascii?Q?5TfLYImY74sJ8onQ0HrDDxePia1P9eybOJKQB72qR1Y9mj27XLlCNhKts8zo?=
 =?us-ascii?Q?12+D+mbJ6Li7ZjkPUsAYVXwCyBMlvuQDF1d5im32RAp7Onldh/Nke5kQrIPa?=
 =?us-ascii?Q?qxvOsXIXw6jCewuHCK473UZyggoPTL4O4wYZzZwXqXEI06PEiEq8qLC8g6sJ?=
 =?us-ascii?Q?Baox7B9sbcrc/qt6nHSFtSlZIrYA7cHneq7hc0qFeGUStHqXqrXIMHcnzAxq?=
 =?us-ascii?Q?D0IYNsWeQMtRYUI4a8g0PTevVZJiBWn1qSbppo7CmY2r9eENgQSOWRLs2vo4?=
 =?us-ascii?Q?uT6tJwN6+EjtkdTTyjqfD0K2TpOXfAjmjqacx7mK+aqtHfro6GzMy9/0EBlY?=
 =?us-ascii?Q?wrZOpfTd+M4fCgU7MluSsIWI+Se/w7GSJHMd+mFUk68yoM9r7CDlxXfiGD++?=
 =?us-ascii?Q?XocYO01hlzEdDKReM9B12gFv1vUl5QDlYHxJjuprxD5Ktbs8URY8mLVMIzts?=
 =?us-ascii?Q?YRQgaAxhUUGlMJwImgXccDAikzNjPYVaKozOngk+UFpSzM/1uJYwtm/6jFH/?=
 =?us-ascii?Q?0XXj1y31Tk+VNFVtweecR/g30Zgr3dtthA7OvV39RnwkCti6k29JfLep8sKq?=
 =?us-ascii?Q?PBNiPRMBRSIBY79/lCn28B5R25ewhfRrXz1BDRcahDi8X6A23G8AjcKz7J26?=
 =?us-ascii?Q?2ieMI16VkR0a7SbkbKcghi8+xBeCdYZetF3i/vVJjVkNbM2Y8Ha81XdnCNZN?=
 =?us-ascii?Q?cWrV+0Ubfgz1cR2NC85atx7EAS3eOaeYLWjE6QXZ3p/xV7QZtwzL9A3DZhz4?=
 =?us-ascii?Q?cbjCg8aB9rK57H+42+Aeb+/N6W4ViXrPHMT+UlN7rgQDFVjUP2GmbTNpruZy?=
 =?us-ascii?Q?0LHirO8NnmnLyXV1jdnFTuuNU+De881nFaRfz370n6Ge+TT3UndeSetp+s4s?=
 =?us-ascii?Q?K6rJe7jA/d9R8JtpYdJz7uZxEjLTNyWGLXMEBZRORcvmNxjCQt4tZ3bEVh8L?=
 =?us-ascii?Q?JQAUiTfPXUYkyZyGwE4AhiS4W+b0VDVDqtsk6hpwbs0ewd9vsEgq3DtW9f34?=
 =?us-ascii?Q?Bg=3D=3D?=
X-OriginatorOrg: azul.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dd5bd3cd-f809-4255-d45e-08dc2c905b06
X-MS-Exchange-CrossTenant-AuthSource: CH2PR11MB4342.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2024 12:36:09.4959
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: c480eb31-2b17-43d7-b4c7-9bcb20cc4bf2
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 4zlAwKsSkuTjHTBzkDhAjrAOX59PedNDE2QgBFec+I3281/I7S9QupMgYoQ2ZHbHU0zqr3UW0dneWX1PUFYLpg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6283

Hello,

cgroup1 (by function memcg1_stat_format) contains two lines
	hierarchical_memory_limit %llu
	hierarchical_memsw_limit %llu

which are useful for userland to easily and performance-wise find out the
effective cgroup limits being applied. Otherwise userland has to
open+read+close the file "memory.max" and/or "memory.swap.max" in multiple
parent directories of a nested cgroup.

For cgroup1 it was implemented by:
	memcg: show real limit under hierarchy mode
	https://github.com/torvalds/linux/commit/fee7b548e6f2bd4bfd03a1a45d3afd593de7d5e9
	Date:   Wed Jan 7 18:08:26 2009 -0800

But for cgroup2 it has been missing so far. Based on Michal Koutny's idea this
patch now implements "memory.max.effective" and "memory.swap.max.effective"
files similar to existing "cpuset.cpus.effective".


Jan Kratochvil


v3:
memory.stat fields -> *.max.effective separate files suggested by Michal Koutny
v2:
hierarchical_memsw_limit -> hierarchical_swap_limit fix found by Waiman Long
v1:
hierarchical_memory_limit && hierarchical_memsw_limit in memory.stat


Signed-off-by: Jan Kratochvil (Azul) <jkratochvil@azul.com>

 mm/memcontrol.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 1ed40f9d3..8c4cb5f60 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6845,6 +6845,19 @@ static ssize_t memory_max_write(struct kernfs_open_file *of,
 	return nbytes;
 }
 
+static int memory_max_effective_show(struct seq_file *m, void *v)
+{
+	unsigned long memory;
+	struct mem_cgroup *mi;
+
+	/* Hierarchical information */
+	memory = PAGE_COUNTER_MAX;
+	for (mi = mem_cgroup_from_seq(m); mi; mi = parent_mem_cgroup(mi))
+		memory = min(memory, READ_ONCE(mi->memory.max));
+
+	return seq_puts_memcg_tunable(m, memory);
+}
+
 /*
  * Note: don't forget to update the 'samples/cgroup/memcg_event_listener'
  * if any new events become available.
@@ -7038,6 +7051,11 @@ static struct cftype memory_files[] = {
 		.seq_show = memory_max_show,
 		.write = memory_max_write,
 	},
+	{
+		.name = "max.effective",
+		.flags = CFTYPE_NOT_ON_ROOT,
+		.seq_show = memory_max_effective_show,
+	},
 	{
 		.name = "events",
 		.flags = CFTYPE_NOT_ON_ROOT,
@@ -8040,6 +8058,19 @@ static ssize_t swap_max_write(struct kernfs_open_file *of,
 	return nbytes;
 }
 
+static int swap_max_effective_show(struct seq_file *m, void *v)
+{
+	unsigned long swap;
+	struct mem_cgroup *mi;
+
+	/* Hierarchical information */
+	swap = PAGE_COUNTER_MAX;
+	for (mi = mem_cgroup_from_seq(m); mi; mi = parent_mem_cgroup(mi))
+		swap = min(swap, READ_ONCE(mi->swap.max));
+
+	return seq_puts_memcg_tunable(m, swap);
+}
+
 static int swap_events_show(struct seq_file *m, void *v)
 {
 	struct mem_cgroup *memcg = mem_cgroup_from_seq(m);
@@ -8072,6 +8103,11 @@ static struct cftype swap_files[] = {
 		.seq_show = swap_max_show,
 		.write = swap_max_write,
 	},
+	{
+		.name = "swap.max.effective",
+		.flags = CFTYPE_NOT_ON_ROOT,
+		.seq_show = swap_max_effective_show,
+	},
 	{
 		.name = "swap.peak",
 		.flags = CFTYPE_NOT_ON_ROOT,