Skip to content

L
lxc
Commit fb6c7616 by Serge Hallyn Committed by Stéphane Graber
Options

cgmanager: have cgm_set and cgm_get use absolute path when possible

This allows users to get/set cgroup settings when logged into a different session than that from which they started the container. There is no cgmanager command to do an _abs variant of cgmanager_get_value and cgmanager_set_value. So we fork off a new task, which enters the parent cgroup of the started container, then can get/set the value from there. The reason not to go straight into the container's cgroup is that if we are freezing the container, or the container is already frozen, we'll freeze as well :) The reason to fork off a new task is that if we are in a cgroup which is set to remove-on-empty, we may not be able to return to our original cgroup after making the change. This should fix https://github.com/lxc/lxc/issues/246Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com> Acked-by: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent 96324abb
Showing with 189 additions and 64 deletions
src/lxc/cgmanager.c
...@@ -701,52 +701,124 @@ static inline void free_abs_cgroup(char *cgroup) ...@@ -701,52 +701,124 @@ static inline void free_abs_cgroup(char *cgroup)
free(cgroup); free(cgroup);
} }
/* cgm_get is called to get container cgroup settings, not during startup */ static void do_cgm_get(const char *name, const char *lxcpath, const char *filename, int outp, bool sendvalue)
static int cgm_get(const char *filename, char *value, size_t len, const char *name, const char *lxcpath)
{ {
char *result, *controller, *key, *cgroup = NULL; char *controller, *key, *cgroup = NULL, *cglast;
size_t newlen; int len = -1;
int ret;
nih_local char *result = NULL;
controller = alloca(strlen(filename)+1); controller = alloca(strlen(filename)+1);
strcpy(controller, filename); strcpy(controller, filename);
key = strchr(controller, '.'); key = strchr(controller, '.');
if (!key) if (!key) {
return -1; ret = write(outp, &len, sizeof(len));
if (ret != sizeof(len))
WARN("Failed to warn cgm_get of error; parent may hang");
exit(1);
}
*key = '\0'; *key = '\0';
/* use the command interface to look for the cgroup */
cgroup = lxc_cmd_get_cgroup_path(name, lxcpath, controller);
if (!cgroup)
return -1;
if (!cgm_dbus_connect()) { if (!cgm_dbus_connect()) {
ERROR("Error connecting to cgroup manager"); ERROR("Error connecting to cgroup manager");
return -1; ret = write(outp, &len, sizeof(len));
if (ret != sizeof(len))
WARN("Failed to warn cgm_get of error; parent may hang");
exit(1);
} }
cgroup = try_get_abs_cgroup(name, lxcpath, subsystems[0]);
if (cgmanager_get_value_sync(NULL, cgroup_manager, controller, cgroup, filename, &result) != 0) { if (!cgroup) {
/* cgm_dbus_disconnect();
* must consume the nih error ret = write(outp, &len, sizeof(len));
* However don't print out an error as the key may simply not exist if (ret != sizeof(len))
* on the host WARN("Failed to warn cgm_get of error; parent may hang");
*/ exit(1);
}
cglast = strrchr(cgroup, '/');
if (!cglast) {
cgm_dbus_disconnect();
free_abs_cgroup(cgroup);
ret = write(outp, &len, sizeof(len));
if (ret != sizeof(len))
WARN("Failed to warn cgm_get of error; parent may hang");
exit(1);
}
*cglast = '\0';
if (!lxc_cgmanager_enter(getpid(), controller, cgroup, abs_cgroup_supported())) {
ERROR("Failed to enter container cgroup %s:%s", controller, cgroup);
ret = write(outp, &len, sizeof(len));
if (ret != sizeof(len))
WARN("Failed to warn cgm_get of error; parent may hang");
cgm_dbus_disconnect();
free_abs_cgroup(cgroup);
exit(1);
}
if (cgmanager_get_value_sync(NULL, cgroup_manager, controller, cglast+1, filename, &result) != 0) {
NihError *nerr; NihError *nerr;
nerr = nih_error_get(); nerr = nih_error_get();
nih_free(nerr); nih_free(nerr);
free(cgroup); free_abs_cgroup(cgroup);
cgm_dbus_disconnect(); cgm_dbus_disconnect();
return -1; ret = write(outp, &len, sizeof(len));
if (ret != sizeof(len))
WARN("Failed to warn cgm_get of error; parent may hang");
exit(1);
} }
free_abs_cgroup(cgroup);
cgm_dbus_disconnect(); cgm_dbus_disconnect();
free(cgroup); len = strlen(result);
newlen = strlen(result); ret = write(outp, &len, sizeof(len));
if (!len || !value) { if (ret != sizeof(len)) {
// user queries the size WARN("Failed to send length to parent");
nih_free(result); exit(1);
return newlen+1;
} }
if (!len || !sendvalue) {
exit(0);
}
ret = write(outp, result, len);
if (ret < 0)
exit(1);
exit(0);
}
strncpy(value, result, len); /* cgm_get is called to get container cgroup settings, not during startup */
static int cgm_get(const char *filename, char *value, size_t len, const char *name, const char *lxcpath)
{
pid_t pid;
int p[2], ret, newlen, readlen;
if (pipe(p) < 0)
return -1;
if ((pid = fork()) < 0) {
close(p[0]);
close(p[1]);
return -1;
}
if (!pid)
do_cgm_get(name, lxcpath, filename, p[1], len && value);
close(p[1]);
ret = read(p[0], &newlen, sizeof(newlen));
if (ret != sizeof(newlen)) {
close(p[0]);
return -1;
}
if (!len || !value) {
close(p[0]);
return newlen;
}
if (newlen < 0) { // child is reporting an error
close(p[0]);
return -1;
}
if (newlen == 0) { // empty read
close(p[0]);
return 0;
}
readlen = newlen > len ? len : newlen;
ret = read(p[0], value, readlen);
close(p[0]);
if (ret != readlen)
return -1;
if (newlen >= len) { if (newlen >= len) {
value[len-1] = '\0'; value[len-1] = '\0';
newlen = len-1; newlen = len-1;
...@@ -755,57 +827,106 @@ static int cgm_get(const char *filename, char *value, size_t len, const char *na ...@@ -755,57 +827,106 @@ static int cgm_get(const char *filename, char *value, size_t len, const char *na
value[newlen++] = '\n'; value[newlen++] = '\n';
value[newlen] = '\0'; value[newlen] = '\0';
} }
nih_free(result);
return newlen; return newlen;
} }
/* internal helper - call with cgmanager dbus connection open */ static void do_cgm_set(const char *name, const char *lxcpath, const char *filename, const char *value, int outp)
static int cgm_do_set(const char *controller, const char *file,
const char *cgroup, const char *value)
{ {
char *controller, *key, *cgroup = NULL;
int retval = 0; // value we are sending to the parent over outp
int ret; int ret;
ret = cgmanager_set_value_sync(NULL, cgroup_manager, controller, char *cglast;
cgroup, file, value);
if (ret != 0) { controller = alloca(strlen(filename)+1);
strcpy(controller, filename);
key = strchr(controller, '.');
if (!key) {
ret = write(outp, &retval, sizeof(retval));
if (ret != sizeof(retval))
WARN("Failed to warn cgm_set of error; parent may hang");
exit(1);
}
*key = '\0';
if (!cgm_dbus_connect()) {
ERROR("Error connecting to cgroup manager");
ret = write(outp, &retval, sizeof(retval));
if (ret != sizeof(retval))
WARN("Failed to warn cgm_set of error; parent may hang");
exit(1);
}
cgroup = try_get_abs_cgroup(name, lxcpath, subsystems[0]);
if (!cgroup) {
cgm_dbus_disconnect();
ret = write(outp, &retval, sizeof(retval));
if (ret != sizeof(retval))
WARN("Failed to warn cgm_set of error; parent may hang");
exit(1);
}
cglast = strrchr(cgroup, '/');
if (!cglast) {
cgm_dbus_disconnect();
free_abs_cgroup(cgroup);
ret = write(outp, &retval, sizeof(retval));
if (ret != sizeof(retval))
WARN("Failed to warn cgm_set of error; parent may hang");
exit(1);
}
*cglast = '\0';
if (!lxc_cgmanager_enter(getpid(), controller, cgroup, abs_cgroup_supported())) {
ERROR("Failed to enter container cgroup %s:%s", controller, cgroup);
ret = write(outp, &retval, sizeof(retval));
if (ret != sizeof(retval))
WARN("Failed to warn cgm_set of error; parent may hang");
cgm_dbus_disconnect();
free_abs_cgroup(cgroup);
exit(1);
}
if (cgmanager_set_value_sync(NULL, cgroup_manager, controller, cglast+1, filename, value) != 0) {
NihError *nerr; NihError *nerr;
nerr = nih_error_get(); nerr = nih_error_get();
ERROR("Error setting cgroup value %s for %s:%s", filename, controller, cgroup);
ERROR("call to cgmanager_set_value_sync failed: %s", nerr->message); ERROR("call to cgmanager_set_value_sync failed: %s", nerr->message);
nih_free(nerr); nih_free(nerr);
ERROR("Error setting cgroup %s limit %s", file, cgroup); free_abs_cgroup(cgroup);
cgm_dbus_disconnect();
ret = write(outp, &retval, sizeof(retval));
if (ret != sizeof(retval))
WARN("Failed to warn cgm_set of error; parent may hang");
exit(1);
} }
return ret; free_abs_cgroup(cgroup);
cgm_dbus_disconnect();
/* tell parent that we are done */
retval = 1;
ret = write(outp, &retval, sizeof(retval));
if (ret != sizeof(retval)) {
exit(1);
}
exit(0);
} }
/* cgm_set is called to change cgroup settings, not during startup */ /* cgm_set is called to change cgroup settings, not during startup */
static int cgm_set(const char *filename, const char *value, const char *name, const char *lxcpath) static int cgm_set(const char *filename, const char *value, const char *name, const char *lxcpath)
{ {
char *controller, *key, *cgroup = NULL; pid_t pid;
int ret; int p[2], ret, v;
controller = alloca(strlen(filename)+1); if (pipe(p) < 0)
strcpy(controller, filename);
key = strchr(controller, '.');
if (!key)
return -1; return -1;
*key = '\0'; if ((pid = fork()) < 0) {
close(p[1]);
/* use the command interface to look for the cgroup */ close(p[0]);
cgroup = lxc_cmd_get_cgroup_path(name, lxcpath, controller);
if (!cgroup) {
ERROR("Failed to get cgroup for controller %s for %s:%s",
controller, lxcpath, name);
return -1; return -1;
} }
if (!pid)
if (!cgm_dbus_connect()) { do_cgm_set(name, lxcpath, filename, value, p[1]);
ERROR("Error connecting to cgroup manager"); close(p[1]);
free(cgroup); ret = read(p[0], &v, sizeof(v));
return false; close(p[0]);
} if (ret != sizeof(v) || !v)
ret = cgm_do_set(controller, filename, cgroup, value); return -1;
cgm_dbus_disconnect(); return 0;
free(cgroup);
return ret;
} }
static void free_subsystems(void) static void free_subsystems(void)
...@@ -976,10 +1097,14 @@ static bool cgm_setup_limits(void *hdata, struct lxc_list *cgroup_settings, bool ...@@ -976,10 +1097,14 @@ static bool cgm_setup_limits(void *hdata, struct lxc_list *cgroup_settings, bool
p = strchr(controller, '.'); p = strchr(controller, '.');
if (p) if (p)
*p = '\0'; *p = '\0';
if (cgm_do_set(controller, cg->subsystem, d->cgroup_path if (cgmanager_set_value_sync(NULL, cgroup_manager, controller,
, cg->value) < 0) { d->cgroup_path, cg->subsystem, cg->value) != 0) {
ERROR("Error setting %s to %s for %s", NihError *nerr;
cg->subsystem, cg->value, d->name); nerr = nih_error_get();
ERROR("call to cgmanager_set_value_sync failed: %s", nerr->message);
nih_free(nerr);
ERROR("Error setting cgroup %s:%s limit type %s", controller,
d->cgroup_path, cg->subsystem);
goto out; goto out;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment