proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 16:18:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'lifeng68-remount_cgroup' into lxc/master

Browse Source
This commit is contained in:
Christian Brauner 2018-02-07 11:30:40 +01:00
commit 08fbe494cc
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/lxc/cgroups/cgfsng.c
View File

@ -1915,40 +1915,61 @@ static bool cg_mount_needs_subdirs(int type)
return true; return true;
} }
/* /* After $rootfs/sys/fs/container/controller/the/cg/path has been created,
* After $rootfs/sys/fs/container/controller/the/cg/path has been * remount controller ro if needed and bindmount the cgroupfs onto
* created, remount controller ro if needed and bindmount the * controll/the/cg/path.
* cgroupfs onto controll/the/cg/path
*/ */
static int do_secondstage_mounts_if_needed(int type, struct hierarchy *h, static int do_secondstage_mounts_if_needed(int type, struct hierarchy *h,
char *controllerpath, char *cgpath, char *controllerpath, char *cgpath,
const char *container_cgroup) const char *container_cgroup)
{ {
int ret;
char *sourcepath;
int flags = MS_BIND;
if (type == LXC_AUTO_CGROUP_RO || type == LXC_AUTO_CGROUP_MIXED) { if (type == LXC_AUTO_CGROUP_RO || type == LXC_AUTO_CGROUP_MIXED) {
if (mount(controllerpath, controllerpath, "cgroup", MS_BIND, NULL) < 0) { ret = mount(controllerpath, controllerpath, "cgroup", MS_BIND, NULL);
SYSERROR("Error bind-mounting %s", controllerpath); if (ret < 0) {
SYSERROR("Failed to bind mount \"%s\" onto \"%s\"",
controllerpath, controllerpath);
return -1; return -1;
} }
if (mount(controllerpath, controllerpath, "cgroup",
MS_REMOUNT | MS_BIND | MS_RDONLY, NULL) < 0) { ret = mount(controllerpath, controllerpath, "cgroup",
SYSERROR("Error remounting %s read-only", controllerpath); MS_REMOUNT | MS_BIND | MS_RDONLY, NULL);
if (ret < 0) {
SYSERROR("Failed to remount \"%s\" ro", controllerpath);
return -1; return -1;
} }
INFO("Remounted %s read-only", controllerpath); INFO("Remounted %s read-only", controllerpath);
} }
char *sourcepath = must_make_path(h->mountpoint, h->base_cgroup, container_cgroup, NULL);
int flags = MS_BIND; sourcepath = must_make_path(h->mountpoint, h->base_cgroup,
container_cgroup, NULL);
if (type == LXC_AUTO_CGROUP_RO) if (type == LXC_AUTO_CGROUP_RO)
flags |= MS_RDONLY; flags |= MS_RDONLY;
INFO("Mounting %s onto %s", sourcepath, cgpath);
if (mount(sourcepath, cgpath, "cgroup", flags, NULL) < 0) { ret = mount(sourcepath, cgpath, "cgroup", flags, NULL);
if (ret < 0) {
SYSERROR("Failed to mount \"%s\" onto \"%s\"", h->controllers[0], cgpath);
free(sourcepath); free(sourcepath);
SYSERROR("Error mounting cgroup %s onto %s", h->controllers[0],
cgpath);
return -1; return -1;
} }
INFO("Mounted \"%s\" onto \"%s\"", h->controllers[0], cgpath);
if (flags & MS_RDONLY) {
ret = mount(sourcepath, cgpath, "cgroup",
MS_REMOUNT | flags | MS_RDONLY, NULL);
if (ret < 0) {
SYSERROR("Failed to remount \"%s\" ro", cgpath);
free(sourcepath);
return -1;
}
}
free(sourcepath); free(sourcepath);
INFO("Completed second stage cgroup automounts for %s", cgpath); INFO("Completed second stage cgroup automounts for \"%s\"", cgpath);
return 0; return 0;
} }