packages/libcgroup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for multiple controllers on same mount point

Browse Source
This commit is contained in:
lipengyu 2024-12-08 20:15:53 +08:00
parent 3e65ce4749
commit ecc9cd8d6b
2 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
Add-support-for-multiple-controllers-on-same-mount-point.patch Normal file
View File

@ -0,0 +1,73 @@
From 1baa067a84d5f6e1ee00bf512f917aa8cd15d275 Mon Sep 17 00:00:00 2001
From: lipengyu <lipengyu@kylinos.cn>
Date: Fri, 6 Dec 2024 15:20:22 +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 3ffa263..734f267 100644
--- a/src/config.c
+++ b/src/config.c
@@ -625,6 +625,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.
@@ -653,6 +669,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) {
@@ -665,6 +684,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
@@ -677,7 +705,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

10
libcgroup.spec
View File

@ -5,7 +5,7 @@
Summary: Libcgroup is a library that abstracts the control group file system in Linux
Name: libcgroup
Version: 0.42.2
Release: 5
Release: 6
License: LGPLv2+
URL: http://libcg.sourceforge.net/
Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-v%{version}.tar.gz
@ -20,6 +20,7 @@ Patch3: libcgroup-0.40.rc1-fread.patch
Patch4: libcgroup-0.40.rc1-templates-fix.patch
Patch5: pam-cgroup-cgflags-no-usecache.patch
Patch6: 0006-Paralell-build-fix-7.patch
Patch7: Add-support-for-multiple-controllers-on-same-mount-point.patch
BuildRequires: autoconf, automake, libtool
BuildRequires: gcc,gcc-c++,byacc
@ -54,6 +55,7 @@ It provides helpful information for libcgroup-pam,libcgroup-devel,libcgroup-tool
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
autoreconf -vif
@ -144,6 +146,12 @@ getent group cgred >/dev/null || groupadd -r cgred
%attr(0644, root, root) %{_mandir}/man8/*
%changelog
* Tue Nov 26 2024 lipengyu <lipengyu@kylinos.cn> - 0.42.2-6
- Type: upadte
- Id:NA
- SUG:NA
- DESC:Add support for multiple controllers on same mount point
* Wed Dec 04 2024 liuxu <liuxu156@huawei.com> - 0.42.2-5
- Type:bugfix
- CVE:NA