External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

vircgroupv2: move task into cgroup before enabling controllers

Browse Source 
When we create a new child cgroup and the parent cgroup has any process
attached to it enabling controllers for the child cgroup fails with
error. We need to move the process into the child cgroup first before
enabling any controllers.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Pavel Hrdina 2020-11-04 19:55:44 +01:00
parent 5f56dd7c83
commit 382fa15cde
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/util/vircgroup.c
View File

@ -694,13 +694,14 @@ static int
virCgroupMakeGroup(virCgroupPtr parent,
virCgroupPtr group,
bool create,
pid_t pid,
unsigned int flags)
{
size_t i;
for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
if (group->backends[i] &&
group->backends[i]->makeGroup(parent, group, create, flags) < 0) {
group->backends[i]->makeGroup(parent, group, create, pid, flags) < 0) {
virCgroupRemove(group);
return -1;
}
@ -970,7 +971,7 @@ virCgroupNewPartition(const char *path,
return -1;
if (parent) {
if (virCgroupMakeGroup(parent, newGroup, create, VIR_CGROUP_NONE) < 0)
if (virCgroupMakeGroup(parent, newGroup, create, -1, VIR_CGROUP_NONE) < 0)
return -1;
}
@ -1033,7 +1034,7 @@ virCgroupNewDomainPartition(virCgroupPtr partition,
* a group for driver, is to avoid overhead to track
* cumulative usage that we don't need.
*/
if (virCgroupMakeGroup(partition, newGroup, true,
if (virCgroupMakeGroup(partition, newGroup, true, -1,
VIR_CGROUP_MEM_HIERACHY) < 0) {
return -1;
}
@ -1090,7 +1091,7 @@ virCgroupNewThread(virCgroupPtr domain,
if (virCgroupNewFromParent(domain, name, controllers, &newGroup) < 0)
return -1;
if (virCgroupMakeGroup(domain, newGroup, create, VIR_CGROUP_THREAD) < 0)
if (virCgroupMakeGroup(domain, newGroup, create, -1, VIR_CGROUP_THREAD) < 0)
return -1;
*group = g_steal_pointer(&newGroup);
@ -1192,7 +1193,7 @@ virCgroupEnableMissingControllers(char *path,
&tmp) < 0)
return -1;
if (virCgroupMakeGroup(parent, tmp, true, VIR_CGROUP_SYSTEMD) < 0)
if (virCgroupMakeGroup(parent, tmp, true, -1, VIR_CGROUP_SYSTEMD) < 0)
return -1;
virCgroupFree(parent);

1
src/util/vircgroupbackend.h
View File

@ -122,6 +122,7 @@ typedef int
(*virCgroupMakeGroupCB)(virCgroupPtr parent,
virCgroupPtr group,
bool create,
pid_t pid,
unsigned int flags);
typedef int

1
src/util/vircgroupv1.c
View File

@ -622,6 +622,7 @@ static int
virCgroupV1MakeGroup(virCgroupPtr parent,
virCgroupPtr group,
bool create,
pid_t pid G_GNUC_UNUSED,
unsigned int flags)
{
size_t i;

13
src/util/vircgroupv2.c
View File

@ -406,10 +406,17 @@ virCgroupV2EnableController(virCgroupPtr group,
}
static int
virCgroupV2AddTask(virCgroupPtr group,
pid_t pid,
unsigned int flags);
static int
virCgroupV2MakeGroup(virCgroupPtr parent,
virCgroupPtr group,
bool create,
pid_t pid,
unsigned int flags)
{
g_autofree char *path = NULL;
@ -455,6 +462,12 @@ virCgroupV2MakeGroup(virCgroupPtr parent,
}
} else {
size_t i;
if (pid > 0) {
if (virCgroupV2AddTask(group, pid, VIR_CGROUP_TASK_PROCESS) < 0)
return -1;
}
for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
int rc;