Received-SPF: pass (google.com: domain of linux-kernel+bounces-64398-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Wed, 14 Feb 2024 05:56:20 +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 v4] cgroup2: New memory.max.effective like cgroup1
 hierarchical_memory_limit
Message-ID: <ZcvlhOZ4VBEX9raZ@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?XhSlqKCQV3V/Pv0WDyFuY/Opjq8vYyLFKUrVWF6npmMApSFWPhgKUIOmt9Dw?=
 =?us-ascii?Q?TlNALsyuiIjxuVqNYo0lbpifr6GpJsmn3q5XXqrdOjvf5RxklblEwdmM0piE?=
 =?us-ascii?Q?dLI0fuJJWVGJbu2D4djTD3bmb29m5lD88l7nqsvjDnm3ohdRE1zTngIs9FVm?=
 =?us-ascii?Q?/MrTulqU0wXIRn6RfLdDDwXVxYJHBaP6KGxIWewIzz94wZTckdW3VG+EK4cg?=
 =?us-ascii?Q?SqJA0HPLz4EcjoRiHUMEOIP8dx/PRWhhjBoGwhTq9qeuSBFPettFtwAOAkWM?=
 =?us-ascii?Q?jqLkM/uwHSWYJKxX4sfNJsu/UDSVaBcPZeUcBBeKPpVOYmR0ppIYsxhpKaGZ?=
 =?us-ascii?Q?aKqm7JdqfMWPkstLjsoYiQqBmsGCfP2msK9qsXlH6Kqvqs177N6bSsPkzLDF?=
 =?us-ascii?Q?MkdQk9CSxCRSPLdQdlSKHbK53SZCTbxFazSXt/r6ot98QECSxF96Y94HJt2c?=
 =?us-ascii?Q?OqPgL76Zg5fUfCg1DJf/wMaaohcbOFrFSoF2zBywk8fb74bsllnonufrcyrT?=
 =?us-ascii?Q?hVzv6QbBRlG9aa+/o7PCJml0Ik4Ce7qH3Tmy7iBRynkGtGxHt4pKpvojH6sT?=
 =?us-ascii?Q?TbWiRDXetqRc1rhwkvXZSPz0oHNMbWwtYlrRSrM8RAyYvxH9ozLtqXtZRN3U?=
 =?us-ascii?Q?hjknrIEXaPmRxDZkwk8WPqQwBBR2C5c/FOPgbDPj4nC7NhFzRa9nPSuPxIQD?=
 =?us-ascii?Q?SfBeoPSe3ZB1iPVgyZ2rjaPeFW4HTywZ0Es2lVeN2aDDmxZYBANVOvYlerEn?=
 =?us-ascii?Q?r7hnRreYpdNYqTnXm4hQ63k5XgYhqSMO77r5/vSbmRaKRPQU6eNKAlLvsZMf?=
 =?us-ascii?Q?DrnljPkRtfbG+idQ7sAmVTrzfwodPXfuhDRGC46uM29tjdv4W/7pERbGOp5R?=
 =?us-ascii?Q?AI4BW/TYuP8qYMgjuuTTnFCM4kgZhuLTqxc+Q+YzCX2WoSIFnv8uqOedHsCp?=
 =?us-ascii?Q?n9gvdPG4WXyA5zF6UWDiQzOiYoF4NZqSLD3E8gmzEACNzCX7hCgYR/45LTo7?=
 =?us-ascii?Q?sTDd6b7IaMwzUTN0dyhsBX5KvSDl7FrqOFBJ/Mljxv5nwpqe/mDn5kNIV7dX?=
 =?us-ascii?Q?gnuBQH8Dga3ALUd2Y3dnlrNvboarN/ew0eGBvt7m5Sn/4E0LL8vi4FYD+xBl?=
 =?us-ascii?Q?4/6yvVCuGSgoCY3qWWsL3JYjrppWFFuvrYAzqncCp8ZPOMcO65GsdW7vzRDD?=
 =?us-ascii?Q?iBvRmIL+RPFOa1DY6YwPBMPUY0/dCH+bA2AM2B4M0OkrGqJ6ty44tArB8Rkt?=
 =?us-ascii?Q?ArYx7EgvfzSal9WGt5gu80GF/01tZE3XKfo+m3bA2KQhYM30FdRoYPAx8QCG?=
 =?us-ascii?Q?7Jln1XKsYR2dghiDXezwZe7KHIw4PDH/7BD21KVZGDhnzHvNPtLPmoRebIMv?=
 =?us-ascii?Q?zOi8He/x3Sx5ZXU8suNhGl8TYpq1QOTCCJh2gkPZAPBNqVGdM/8aLz1PyeOv?=
 =?us-ascii?Q?ZQNvtqU0pT6VP4SDlhV+iYZ6mPzkoO+JYd+n2KA8nMJRKIiIFx+OsWHsOYB/?=
 =?us-ascii?Q?uM7urtymBjRSNkDMsLIyJXa49SOBHFGcP5xTCQBVmb6x2c5acJxoAsKuBpC7?=
 =?us-ascii?Q?UdKYHOBG9Do8ehPVP466O5xCAX2g6A4jnWdIRbeHS+oiRGvYHmsjwcGcraNi?=
 =?us-ascii?Q?fA=3D=3D?=
X-OriginatorOrg: azul.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bdf0a830-9b0a-4752-3a29-08dc2cdea05e
X-MS-Exchange-CrossTenant-AuthSource: CH2PR11MB4342.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2024 21:56:26.5762
 (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: Rh/r1UymEPVwhcVuWKGXv1jbx1ktq47ziXH/P02HbdZKTV0e2D5xq6Im1XISCeVsfZxoBpUtfqI311rTnQRLKA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR11MB5268

Implement cgroup2 "memory.max.effective" and "memory.swap.max.effective" files
similar to existing "cpuset.cpus.effective".

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.

v4:
Adjust the commit message.
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,