Skip to content

Add --enable-nsdelegate flag to mount cgroups2 with nsdelegate option #682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add --enable-nsdelegate flag to mount cgroups2 with nsdelegate option #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/bindings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ struct lxcfs_opts {
bool swap_off;
bool use_pidfd;
bool use_cfs;
bool use_nsdelegate;
/*
* Ideally we'd version by size but because of backwards compatability
* and the use of bool instead of explicited __u32 and __u64 we can't.
Expand All @@ -130,10 +131,11 @@ struct lxcfs_opts {
};

typedef enum lxcfs_opt_t {
LXCFS_SWAP_ON = 0,
LXCFS_PIDFD_ON = 1,
LXCFS_CFS_ON = 2,
LXCFS_OPTS_MAX = LXCFS_CFS_ON,
LXCFS_SWAP_ON = 0,
LXCFS_PIDFD_ON = 1,
LXCFS_CFS_ON = 2,
LXCFS_NSDELEGATE_ON = 3,
LXCFS_OPTS_MAX = LXCFS_NSDELEGATE_ON,
} lxcfs_opt_t;


Expand Down Expand Up @@ -164,6 +166,8 @@ static inline bool lxcfs_has_opt(struct lxcfs_opts *opts, lxcfs_opt_t opt)
return opts->use_pidfd;
case LXCFS_CFS_ON:
return opts->use_cfs;
case LXCFS_NSDELEGATE_ON:
return opts->use_nsdelegate;
}

return false;
Expand Down
10 changes: 9 additions & 1 deletion src/cgroups/cgfsng.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <sys/types.h>
#include <unistd.h>

#include "../bindings.h"
#include "../macro.h"
#include "../memory_utils.h"
#include "../utils.h"
Expand Down Expand Up @@ -401,6 +402,12 @@ static int __cg_mount_direct(struct hierarchy *h, const char *controllerpath)
{
__do_free char *controllers = NULL;
char *fstype = "cgroup2";
const char *mount_opts = NULL;

const bool use_nsdelegate = lxcfs_has_opt(fuse_get_context()->private_data, LXCFS_NSDELEGATE_ON);
if (use_nsdelegate) {
mount_opts = "nsdelegate";
}
unsigned long flags = 0;
int ret;

Expand All @@ -414,9 +421,10 @@ static int __cg_mount_direct(struct hierarchy *h, const char *controllerpath)
if (!controllers)
return -ENOMEM;
fstype = "cgroup";
mount_opts = controllers;
}

ret = mount("cgroup", controllerpath, fstype, flags, controllers);
ret = mount("cgroup", controllerpath, fstype, flags, mount_opts);
if (ret < 0)
return -1;

Expand Down
5 changes: 5 additions & 0 deletions src/lxcfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,6 +1243,7 @@ static void usage(void)
lxcfs_info(" --enable-cfs Enable CPU virtualization via CPU shares");
lxcfs_info(" --enable-pidfd Use pidfd for process tracking");
lxcfs_info(" --enable-cgroup Enable cgroup emulation code");
lxcfs_info(" --enable-nsdelegate Enable cgroup nsdelegate mount option");
lxcfs_info(" --runtime-dir=DIR Path to use as the runtime directory.");
lxcfs_info(" Default is %s", DEFAULT_RUNTIME_PATH);
exit(EXIT_FAILURE);
Expand Down Expand Up @@ -1294,6 +1295,7 @@ static const struct option long_options[] = {
{"enable-cfs", no_argument, 0, 0 },
{"enable-pidfd", no_argument, 0, 0 },
{"enable-cgroup", no_argument, 0, 0 },
{"enable-nsdelegate", no_argument, 0, 0 },

{"pidfile", required_argument, 0, 'p' },
{"runtime-dir", required_argument, 0, 0 },
Expand Down Expand Up @@ -1367,6 +1369,7 @@ int main(int argc, char *argv[])
opts->swap_off = false;
opts->use_pidfd = false;
opts->use_cfs = false;
opts->use_nsdelegate = false;
opts->version = 2;

while ((c = getopt_long(argc, argv, "dulfhvso:p:", long_options, &idx)) != -1) {
Expand All @@ -1378,6 +1381,8 @@ int main(int argc, char *argv[])
opts->use_cfs = true;
else if (strcmp(long_options[idx].name, "enable-cgroup") == 0)
cgroup_is_enabled = true;
else if (strcmp(long_options[idx].name, "enable-nsdelegate") == 0)
opts->use_nsdelegate = true;
else if (strcmp(long_options[idx].name, "runtime-dir") == 0)
runtime_path_arg = optarg;
else
Expand Down