[LTP] [PATCH 1/2] tst_cgroup: Add "dmem" cgroup controller

Petr Vorel pvorel@suse.cz
Wed Apr 16 00:08:44 CEST 2025


"dmem" cgroup controller [1] was added in 6.14 [2]. Add it to fix cgroup_regression_test.sh:

cgroup_regression_test 1 TINFO: Tested kernel: Linux susetest 6.14.0-1-default #1 SMP PREEMPT_DYNAMIC Tue Mar 25 06:23:18 UTC 2025 (ab99d4c) x86_64 x86_64 x86_64 GNU/Linux
...
cgroup_regression_test 7 TBROK: 'tst_cgctl require' exited

New cgroup should be v2 only.

[1] https://docs.kernel.org/next/admin-guide/cgroup-v2.html#dmem
[2] https://kernelnewbies.org/Linux_6.14#dmem_cgroup_for_better_control_of_GPU_memory_resources

Reported-by: Avinesh Kumar <akumar@suse.de>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 lib/tst_cgroup.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/tst_cgroup.c b/lib/tst_cgroup.c
index 73b696c588..0cb7282113 100644
--- a/lib/tst_cgroup.c
+++ b/lib/tst_cgroup.c
@@ -84,6 +84,7 @@ enum cgroup_ctrl_indx {
 	CTRL_MEMORY = 1,
 	CTRL_CPU,
 	CTRL_CPUSET,
+	CTRL_DMEM,
 	CTRL_IO,
 	CTRL_PIDS,
 	CTRL_HUGETLB,
@@ -207,6 +208,12 @@ static const struct cgroup_file cpuset_ctrl_files[] = {
 	{ }
 };
 
+static const struct cgroup_file dmem_ctrl_files[] = {
+	{ "dmem.capacity", NULL, CTRL_DMEM },
+	{ "dmem.current", NULL, CTRL_DMEM },
+	{ }
+};
+
 static const struct cgroup_file io_ctrl_files[] = {
 	{ "io.stat", NULL, CTRL_IO },
 	{ }
@@ -218,6 +225,7 @@ static const struct cgroup_file pids_ctrl_files[] = {
 	{ }
 };
 
+
 static const struct cgroup_file hugetlb_ctrl_files[] = {
 	{ }
 };
@@ -289,6 +297,7 @@ static struct cgroup_ctrl controllers[] = {
 	CGROUP_CTRL_MEMBER(perf_event, CTRL_PERFEVENT),
 	CGROUP_CTRL_MEMBER(debug, CTRL_DEBUG),
 	CGROUP_CTRL_MEMBER(rdma, CTRL_RDMA),
+	CGROUP_CTRL_MEMBER(dmem, CTRL_DMEM),
 	CGROUP_CTRL_MEMBER(base, CTRL_BASE),
 	{ }
 };
-- 
2.49.0



More information about the ltp mailing list