74 lines
2.2 KiB
Diff
74 lines
2.2 KiB
Diff
|
From a20a50c1a133414f61d6cee0dc1b0cb66869bd95 Mon Sep 17 00:00:00 2001
|
||
|
|
From: lipengyu <lipengyu@kylinos.cn>
|
||
|
|
Date: Fri, 6 Dec 2024 15:07:10 +0800
|
||
|
|
Subject: [PATCH] Add support for multipe controllers on same mount point
|
||
|
|
|
||
|
|
---
|
||
|
|
src/config.c | 29 ++++++++++++++++++++++++++++-
|
||
|
|
1 file changed, 28 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/config.c b/src/config.c
|
||
|
|
index dfabbd1..d194b32 100644
|
||
|
|
--- a/src/config.c
|
||
|
|
+++ b/src/config.c
|
||
|
|
@@ -635,6 +635,22 @@ void cgroup_config_cleanup_namespace_table(void)
|
||
|
|
sizeof(struct cg_mount_table_s) * CG_CONTROLLER_MAX);
|
||
|
|
}
|
||
|
|
|
||
|
|
+static int is_valid_controller(char *ctrl)
|
||
|
|
+{
|
||
|
|
+ int i;
|
||
|
|
+
|
||
|
|
+ static const char *ctrl_list[] = { "blkio", "cpu", "cpuacct", "cpuset", "devices",
|
||
|
|
+ "freezer", "hugetlb", "memory", "misc", "net_cls",
|
||
|
|
+ "net_prio", "perf_event", "pids", "rdma", NULL };
|
||
|
|
+
|
||
|
|
+ for (i = 0; ctrl_list[i]; i++) {
|
||
|
|
+ if (strncmp(ctrl, ctrl_list[i], strlen(ctrl_list[i])) == 0)
|
||
|
|
+ return 1;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return 0;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
/**
|
||
|
|
* Add necessary options for mount. Currently only 'none' option is added
|
||
|
|
* for mounts with only 'name=xxx' and without real controller.
|
||
|
|
@@ -663,6 +679,9 @@ static int cgroup_config_ajdust_mount_options(struct cg_mount_table_s *mount,
|
||
|
|
break;
|
||
|
|
strncpy(mount->name, controller, sizeof(mount->name));
|
||
|
|
mount->name[sizeof(mount->name)-1] = '\0';
|
||
|
|
+ free(controller);
|
||
|
|
+ token = strtok_r(NULL, ",", &save);
|
||
|
|
+ continue;
|
||
|
|
}
|
||
|
|
|
||
|
|
if (strncmp(token, "nodev", strlen("nodev")) == 0) {
|
||
|
|
@@ -675,6 +694,15 @@ static int cgroup_config_ajdust_mount_options(struct cg_mount_table_s *mount,
|
||
|
|
*flags |= MS_NOSUID;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (is_valid_controller(token)) {
|
||
|
|
+ controller = strdup(token);
|
||
|
|
+ if (controller == NULL)
|
||
|
|
+ break;
|
||
|
|
+ strncat(mount->name, ",", FILENAME_MAX - strlen(mount->name)-1);
|
||
|
|
+ strncat(mount->name, controller, FILENAME_MAX - strlen(mount->name) - 1);
|
||
|
|
+ free(controller);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
} else if (!name_only) {
|
||
|
|
/*
|
||
|
|
* We have controller + name=, do the right thing, since
|
||
|
|
@@ -687,7 +715,6 @@ static int cgroup_config_ajdust_mount_options(struct cg_mount_table_s *mount,
|
||
|
|
token = strtok_r(NULL, ",", &save);
|
||
|
|
}
|
||
|
|
|
||
|
|
- free(controller);
|
||
|
|
free(opts);
|
||
|
|
|
||
|
|
if (name_only) {
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|