X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fdbus-cgroup.c;h=4a9df06016e22600c8c0f5fbce144833a25dc807;hp=cf05f04ea1d5ccf83f5388f5f9e16ef22a6894c8;hb=5bd4b173605142c7be493aa4d958ebaef21f421d;hpb=7041efe9600e569da6089c36d00fa3ff58e33178
diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
index cf05f04ea..4a9df0601 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -19,150 +19,217 @@
along with systemd; If not, see .
***/
-#include
-
+#include "bus-util.h"
#include "path-util.h"
+#include "cgroup-util.h"
+#include "cgroup.h"
#include "dbus-cgroup.h"
-static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_cgroup_append_device_policy, cgroup_device_policy, CGroupDevicePolicy);
+static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy);
+
+static int property_get_blockio_device_weight(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ void *userdata,
+ sd_bus_error *error) {
-static int bus_cgroup_append_device_weights(DBusMessageIter *i, const char *property, void *data) {
- DBusMessageIter sub, sub2;
- CGroupContext *c = data;
+ CGroupContext *c = userdata;
CGroupBlockIODeviceWeight *w;
+ int r;
- assert(i);
- assert(property);
+ assert(bus);
+ assert(reply);
assert(c);
- if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(st)", &sub))
- return -ENOMEM;
+ r = sd_bus_message_open_container(reply, 'a', "(st)");
+ if (r < 0)
+ return r;
LIST_FOREACH(device_weights, w, c->blockio_device_weights) {
-
- if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) ||
- !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &w->path) ||
- !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &w->weight) ||
- !dbus_message_iter_close_container(&sub, &sub2))
- return -ENOMEM;
+ r = sd_bus_message_append(reply, "(st)", w->path, w->weight);
+ if (r < 0)
+ return r;
}
- if (!dbus_message_iter_close_container(i, &sub))
- return -ENOMEM;
-
- return 0;
+ return sd_bus_message_close_container(reply);
}
-static int bus_cgroup_append_device_bandwidths(DBusMessageIter *i, const char *property, void *data) {
- DBusMessageIter sub, sub2;
- CGroupContext *c = data;
+static int property_get_blockio_device_bandwidths(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ void *userdata,
+ sd_bus_error *error) {
+
+ CGroupContext *c = userdata;
CGroupBlockIODeviceBandwidth *b;
+ int r;
- assert(i);
- assert(property);
+ assert(bus);
+ assert(reply);
assert(c);
- if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(st)", &sub))
- return -ENOMEM;
+ r = sd_bus_message_open_container(reply, 'a', "(st)");
+ if (r < 0)
+ return r;
LIST_FOREACH(device_bandwidths, b, c->blockio_device_bandwidths) {
if (streq(property, "BlockIOReadBandwidth") != b->read)
continue;
- if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) ||
- !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &b->path) ||
- !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &b->bandwidth) ||
- !dbus_message_iter_close_container(&sub, &sub2))
- return -ENOMEM;
+ r = sd_bus_message_append(reply, "(st)", b->path, b->bandwidth);
+ if (r < 0)
+ return r;
}
- if (!dbus_message_iter_close_container(i, &sub))
- return -ENOMEM;
-
- return 0;
+ return sd_bus_message_close_container(reply);
}
-static int bus_cgroup_append_device_allow(DBusMessageIter *i, const char *property, void *data) {
- DBusMessageIter sub, sub2;
- CGroupContext *c = data;
+static int property_get_device_allow(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ void *userdata,
+ sd_bus_error *error) {
+
+ CGroupContext *c = userdata;
CGroupDeviceAllow *a;
+ int r;
- assert(i);
- assert(property);
+ assert(bus);
+ assert(reply);
assert(c);
- if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(ss)", &sub))
- return -ENOMEM;
+ r = sd_bus_message_open_container(reply, 'a', "(ss)");
+ if (r < 0)
+ return r;
LIST_FOREACH(device_allow, a, c->device_allow) {
- const char *rwm;
- char buf[4];
unsigned k = 0;
+ char rwm[4];
if (a->r)
- buf[k++] = 'r';
+ rwm[k++] = 'r';
if (a->w)
- buf[k++] = 'w';
+ rwm[k++] = 'w';
if (a->m)
- buf[k++] = 'm';
+ rwm[k++] = 'm';
- buf[k] = 0;
- rwm = buf;
+ rwm[k] = 0;
- if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) ||
- !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &a->path) ||
- !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &rwm) ||
- !dbus_message_iter_close_container(&sub, &sub2))
- return -ENOMEM;
+ r = sd_bus_message_append(reply, "(ss)", a->path, rwm);
+ if (r < 0)
+ return r;
}
- if (!dbus_message_iter_close_container(i, &sub))
- return -ENOMEM;
+ return sd_bus_message_close_container(reply);
+}
- return 0;
+static int property_get_ulong_as_u64(
+ sd_bus *bus,
+ const char *path,
+ const char *interface,
+ const char *property,
+ sd_bus_message *reply,
+ void *userdata,
+ sd_bus_error *error) {
+
+ unsigned long *ul = userdata;
+
+ assert(bus);
+ assert(reply);
+ assert(ul);
+
+ return sd_bus_message_append(reply, "t", *ul == (unsigned long) -1 ? (uint64_t) -1 : (uint64_t) *ul);
}
-const BusProperty bus_cgroup_context_properties[] = {
- { "CPUAccounting", bus_property_append_bool, "b", offsetof(CGroupContext, cpu_accounting) },
- { "CPUShares", bus_property_append_ul, "t", offsetof(CGroupContext, cpu_shares) },
- { "BlockIOAccounting", bus_property_append_bool, "b", offsetof(CGroupContext, blockio_accounting) },
- { "BlockIOWeight", bus_property_append_ul, "t", offsetof(CGroupContext, blockio_weight) },
- { "BlockIODeviceWeight", bus_cgroup_append_device_weights, "a(st)", 0 },
- { "BlockIOReadBandwidth", bus_cgroup_append_device_bandwidths, "a(st)", 0 },
- { "BlockIOWriteBandwidth", bus_cgroup_append_device_bandwidths, "a(st)", 0 },
- { "MemoryAccounting", bus_property_append_bool, "b", offsetof(CGroupContext, memory_accounting) },
- { "MemoryLimit", bus_property_append_uint64, "t", offsetof(CGroupContext, memory_limit) },
- { "MemorySoftLimit", bus_property_append_uint64, "t", offsetof(CGroupContext, memory_soft_limit) },
- { "DevicePolicy", bus_cgroup_append_device_policy, "s", offsetof(CGroupContext, device_policy) },
- { "DeviceAllow", bus_cgroup_append_device_allow, "a(ss)", 0 },
- {}
+const sd_bus_vtable bus_cgroup_vtable[] = {
+ SD_BUS_VTABLE_START(0),
+ SD_BUS_PROPERTY("Delegate", "b", bus_property_get_bool, offsetof(CGroupContext, delegate), 0),
+ SD_BUS_PROPERTY("CPUAccounting", "b", bus_property_get_bool, offsetof(CGroupContext, cpu_accounting), 0),
+ SD_BUS_PROPERTY("CPUShares", "t", property_get_ulong_as_u64, offsetof(CGroupContext, cpu_shares), 0),
+ SD_BUS_PROPERTY("StartupCPUShares", "t", property_get_ulong_as_u64, offsetof(CGroupContext, startup_cpu_shares), 0),
+ SD_BUS_PROPERTY("CPUQuotaPerSecUSec", "t", bus_property_get_usec, offsetof(CGroupContext, cpu_quota_per_sec_usec), 0),
+ SD_BUS_PROPERTY("BlockIOAccounting", "b", bus_property_get_bool, offsetof(CGroupContext, blockio_accounting), 0),
+ SD_BUS_PROPERTY("BlockIOWeight", "t", property_get_ulong_as_u64, offsetof(CGroupContext, blockio_weight), 0),
+ SD_BUS_PROPERTY("StartupBlockIOWeight", "t", property_get_ulong_as_u64, offsetof(CGroupContext, startup_blockio_weight), 0),
+ SD_BUS_PROPERTY("BlockIODeviceWeight", "a(st)", property_get_blockio_device_weight, 0, 0),
+ SD_BUS_PROPERTY("BlockIOReadBandwidth", "a(st)", property_get_blockio_device_bandwidths, 0, 0),
+ SD_BUS_PROPERTY("BlockIOWriteBandwidth", "a(st)", property_get_blockio_device_bandwidths, 0, 0),
+ SD_BUS_PROPERTY("MemoryAccounting", "b", bus_property_get_bool, offsetof(CGroupContext, memory_accounting), 0),
+ SD_BUS_PROPERTY("MemoryLimit", "t", NULL, offsetof(CGroupContext, memory_limit), 0),
+ SD_BUS_PROPERTY("DevicePolicy", "s", property_get_cgroup_device_policy, offsetof(CGroupContext, device_policy), 0),
+ SD_BUS_PROPERTY("DeviceAllow", "a(ss)", property_get_device_allow, 0, 0),
+ SD_BUS_VTABLE_END
};
-int bus_cgroup_set_property(
+static int bus_cgroup_set_transient_property(
Unit *u,
CGroupContext *c,
const char *name,
- DBusMessageIter *i,
+ sd_bus_message *message,
UnitSetPropertiesMode mode,
- DBusError *error) {
+ sd_bus_error *error) {
+ int r;
+
+ assert(u);
+ assert(c);
assert(name);
+ assert(message);
+
+ if (streq(name, "Delegate")) {
+ int b;
+
+ r = sd_bus_message_read(message, "b", &b);
+ if (r < 0)
+ return r;
+
+ if (mode != UNIT_CHECK) {
+ c->delegate = b;
+ unit_write_drop_in_private(u, mode, name, b ? "Delegate=yes" : "Delegate=no");
+ }
+
+ return 1;
+ }
+
+ return 0;
+}
+
+int bus_cgroup_set_property(
+ Unit *u,
+ CGroupContext *c,
+ const char *name,
+ sd_bus_message *message,
+ UnitSetPropertiesMode mode,
+ sd_bus_error *error) {
+
+ int r;
+
assert(u);
assert(c);
- assert(i);
+ assert(name);
+ assert(message);
if (streq(name, "CPUAccounting")) {
+ int b;
- if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_BOOLEAN)
- return -EINVAL;
+ r = sd_bus_message_read(message, "b", &b);
+ if (r < 0)
+ return r;
if (mode != UNIT_CHECK) {
- dbus_bool_t b;
- dbus_message_iter_get_basic(i, &b);
-
c->cpu_accounting = b;
- unit_write_drop_in_private_section(u, mode, "cpu-accounting", b ? "CPUAccounting=yes" : "CPUAccounting=no");
+ u->cgroup_realized_mask &= ~CGROUP_CPUACCT;
+ unit_write_drop_in_private(u, mode, name, b ? "CPUAccounting=yes" : "CPUAccounting=no");
}
return 1;
@@ -171,36 +238,79 @@ int bus_cgroup_set_property(
uint64_t u64;
unsigned long ul;
- if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_UINT64)
- return -EINVAL;
+ r = sd_bus_message_read(message, "t", &u64);
+ if (r < 0)
+ return r;
- dbus_message_iter_get_basic(i, &u64);
- ul = (unsigned long) u64;
-
- if (u64 <= 0 || u64 != (uint64_t) ul)
- return -EINVAL;
+ if (u64 == (uint64_t) -1)
+ ul = (unsigned long) -1;
+ else {
+ ul = (unsigned long) u64;
+ if (ul <= 0 || (uint64_t) ul != u64)
+ return sd_bus_error_set_errnof(error, EINVAL, "CPUShares value out of range");
+ }
if (mode != UNIT_CHECK) {
- char buf[sizeof("CPUShares=") + DECIMAL_STR_MAX(ul)];
c->cpu_shares = ul;
+ u->cgroup_realized_mask &= ~CGROUP_CPU;
+ unit_write_drop_in_private_format(u, mode, name, "CPUShares=%lu", ul);
+ }
+
+ return 1;
+
+ } else if (streq(name, "StartupCPUShares")) {
+ uint64_t u64;
+ unsigned long ul;
+
+ r = sd_bus_message_read(message, "t", &u64);
+ if (r < 0)
+ return r;
+
+ if (u64 == (uint64_t) -1)
+ ul = (unsigned long) -1;
+ else {
+ ul = (unsigned long) u64;
+ if (ul <= 0 || (uint64_t) ul != u64)
+ return sd_bus_error_set_errnof(error, EINVAL, "StartupCPUShares value out of range");
+ }
- sprintf(buf, "CPUShares=%lu", ul);
- unit_write_drop_in_private_section(u, mode, "cpu-shares", buf);
+ if (mode != UNIT_CHECK) {
+ c->startup_cpu_shares = ul;
+ u->cgroup_realized_mask &= ~CGROUP_CPU;
+ unit_write_drop_in_private_format(u, mode, name, "StartupCPUShares=%lu", ul);
}
return 1;
- } else if (streq(name, "BlockIOAccounting")) {
+ } else if (streq(name, "CPUQuotaPerSecUSec")) {
+ uint64_t u64;
- if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_BOOLEAN)
- return -EINVAL;
+ r = sd_bus_message_read(message, "t", &u64);
+ if (r < 0)
+ return r;
+
+ if (u64 <= 0)
+ return sd_bus_error_set_errnof(error, EINVAL, "CPUQuotaPerSecUSec value out of range");
if (mode != UNIT_CHECK) {
- dbus_bool_t b;
- dbus_message_iter_get_basic(i, &b);
+ c->cpu_quota_per_sec_usec = u64;
+ u->cgroup_realized_mask &= ~CGROUP_CPU;
+ unit_write_drop_in_private_format(u, mode, "CPUQuota", "CPUQuota=%0.f%%", (double) (c->cpu_quota_per_sec_usec / 10000));
+ }
+
+ return 1;
+
+ } else if (streq(name, "BlockIOAccounting")) {
+ int b;
+
+ r = sd_bus_message_read(message, "b", &b);
+ if (r < 0)
+ return r;
+ if (mode != UNIT_CHECK) {
c->blockio_accounting = b;
- unit_write_drop_in_private_section(u, mode, "block-io-accounting", b ? "BlockIOAccounting=yes" : "BlockIOAccounting=no");
+ u->cgroup_realized_mask &= ~CGROUP_BLKIO;
+ unit_write_drop_in_private(u, mode, name, b ? "BlockIOAccounting=yes" : "BlockIOAccounting=no");
}
return 1;
@@ -209,60 +319,239 @@ int bus_cgroup_set_property(
uint64_t u64;
unsigned long ul;
- if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_UINT64)
- return -EINVAL;
+ r = sd_bus_message_read(message, "t", &u64);
+ if (r < 0)
+ return r;
- dbus_message_iter_get_basic(i, &u64);
- ul = (unsigned long) u64;
+ if (u64 == (uint64_t) -1)
+ ul = (unsigned long) -1;
+ else {
+ ul = (unsigned long) u64;
+ if (ul < 10 || ul > 1000)
+ return sd_bus_error_set_errnof(error, EINVAL, "BlockIOWeight value out of range");
+ }
- if (u64 < 10 || u64 > 1000)
- return -EINVAL;
+ if (mode != UNIT_CHECK) {
+ c->blockio_weight = ul;
+ u->cgroup_realized_mask &= ~CGROUP_BLKIO;
+ unit_write_drop_in_private_format(u, mode, name, "BlockIOWeight=%lu", ul);
+ }
+
+ return 1;
+
+ } else if (streq(name, "StartupBlockIOWeight")) {
+ uint64_t u64;
+ unsigned long ul;
+
+ r = sd_bus_message_read(message, "t", &u64);
+ if (r < 0)
+ return r;
+
+ if (u64 == (uint64_t) -1)
+ ul = (unsigned long) -1;
+ else {
+ ul = (unsigned long) u64;
+ if (ul < 10 || ul > 1000)
+ return sd_bus_error_set_errnof(error, EINVAL, "StartupBlockIOWeight value out of range");
+ }
if (mode != UNIT_CHECK) {
- char buf[sizeof("BlockIOWeight=") + DECIMAL_STR_MAX(ul)];
- c->cpu_shares = ul;
+ c->startup_blockio_weight = ul;
+ u->cgroup_realized_mask &= ~CGROUP_BLKIO;
+ unit_write_drop_in_private_format(u, mode, name, "StartupBlockIOWeight=%lu", ul);
+ }
+
+ return 1;
+
+ } else if (streq(name, "BlockIOReadBandwidth") || streq(name, "BlockIOWriteBandwidth")) {
+ const char *path;
+ bool read = true;
+ unsigned n = 0;
+ uint64_t u64;
+
+ if (streq(name, "BlockIOWriteBandwidth"))
+ read = false;
+
+ r = sd_bus_message_enter_container(message, 'a', "(st)");
+ if (r < 0)
+ return r;
+
+ while ((r = sd_bus_message_read(message, "(st)", &path, &u64)) > 0) {
+
+ if (mode != UNIT_CHECK) {
+ CGroupBlockIODeviceBandwidth *a = NULL, *b;
+
+ LIST_FOREACH(device_bandwidths, b, c->blockio_device_bandwidths) {
+ if (path_equal(path, b->path) && read == b->read) {
+ a = b;
+ break;
+ }
+ }
- sprintf(buf, "BlockIOWeight=%lu", ul);
- unit_write_drop_in_private_section(u, mode, "blockio-weight", buf);
+ if (!a) {
+ a = new0(CGroupBlockIODeviceBandwidth, 1);
+ if (!a)
+ return -ENOMEM;
+
+ a->read = read;
+ a->path = strdup(path);
+ if (!a->path) {
+ free(a);
+ return -ENOMEM;
+ }
+
+ LIST_PREPEND(device_bandwidths, c->blockio_device_bandwidths, a);
+ }
+
+ a->bandwidth = u64;
+ }
+
+ n++;
+ }
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_exit_container(message);
+ if (r < 0)
+ return r;
+
+ if (mode != UNIT_CHECK) {
+ CGroupBlockIODeviceBandwidth *a, *next;
+ _cleanup_free_ char *buf = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
+ size_t size = 0;
+
+ if (n == 0) {
+ LIST_FOREACH_SAFE(device_bandwidths, a, next, c->blockio_device_bandwidths)
+ if (a->read == read)
+ cgroup_context_free_blockio_device_bandwidth(c, a);
+ }
+
+ u->cgroup_realized_mask &= ~CGROUP_BLKIO;
+
+ f = open_memstream(&buf, &size);
+ if (!f)
+ return -ENOMEM;
+
+ if (read) {
+ fputs("BlockIOReadBandwidth=\n", f);
+ LIST_FOREACH(device_bandwidths, a, c->blockio_device_bandwidths)
+ if (a->read)
+ fprintf(f, "BlockIOReadBandwidth=%s %" PRIu64 "\n", a->path, a->bandwidth);
+ } else {
+ fputs("BlockIOWriteBandwidth=\n", f);
+ LIST_FOREACH(device_bandwidths, a, c->blockio_device_bandwidths)
+ if (!a->read)
+ fprintf(f, "BlockIOWriteBandwidth=%s %" PRIu64 "\n", a->path, a->bandwidth);
+ }
+
+ fflush(f);
+ unit_write_drop_in_private(u, mode, name, buf);
}
return 1;
- } else if (streq(name, "MemoryAccounting")) {
+ } else if (streq(name, "BlockIODeviceWeight")) {
+ const char *path;
+ uint64_t u64;
+ unsigned n = 0;
- if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_BOOLEAN)
- return -EINVAL;
+ r = sd_bus_message_enter_container(message, 'a', "(st)");
+ if (r < 0)
+ return r;
+
+ while ((r = sd_bus_message_read(message, "(st)", &path, &u64)) > 0) {
+ unsigned long ul = u64;
+
+ if (ul < 10 || ul > 1000)
+ return sd_bus_error_set_errnof(error, EINVAL, "BlockIODeviceWeight out of range");
+
+ if (mode != UNIT_CHECK) {
+ CGroupBlockIODeviceWeight *a = NULL, *b;
+
+ LIST_FOREACH(device_weights, b, c->blockio_device_weights) {
+ if (path_equal(b->path, path)) {
+ a = b;
+ break;
+ }
+ }
+
+ if (!a) {
+ a = new0(CGroupBlockIODeviceWeight, 1);
+ if (!a)
+ return -ENOMEM;
+
+ a->path = strdup(path);
+ if (!a->path) {
+ free(a);
+ return -ENOMEM;
+ }
+ LIST_PREPEND(device_weights,c->blockio_device_weights, a);
+ }
+
+ a->weight = ul;
+ }
+
+ n++;
+ }
+
+ r = sd_bus_message_exit_container(message);
+ if (r < 0)
+ return r;
if (mode != UNIT_CHECK) {
- dbus_bool_t b;
- dbus_message_iter_get_basic(i, &b);
+ _cleanup_free_ char *buf = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
+ CGroupBlockIODeviceWeight *a;
+ size_t size = 0;
- c->memory_accounting = b;
- unit_write_drop_in_private_section(u, mode, "memory-accounting", b ? "MemoryAccounting=yes" : "MemoryAccounting=no");
+ if (n == 0) {
+ while (c->blockio_device_weights)
+ cgroup_context_free_blockio_device_weight(c, c->blockio_device_weights);
+ }
+
+ u->cgroup_realized_mask &= ~CGROUP_BLKIO;
+
+ f = open_memstream(&buf, &size);
+ if (!f)
+ return -ENOMEM;
+
+ fputs("BlockIODeviceWeight=\n", f);
+ LIST_FOREACH(device_weights, a, c->blockio_device_weights)
+ fprintf(f, "BlockIODeviceWeight=%s %lu\n", a->path, a->weight);
+
+ fflush(f);
+ unit_write_drop_in_private(u, mode, name, buf);
}
return 1;
- } else if (streq(name, "MemoryLimit") || streq(name, "MemorySoftLimit")) {
+ } else if (streq(name, "MemoryAccounting")) {
+ int b;
- if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_UINT64)
- return -EINVAL;
+ r = sd_bus_message_read(message, "b", &b);
+ if (r < 0)
+ return r;
if (mode != UNIT_CHECK) {
- uint64_t limit;
- char buf[sizeof("MemorySoftLimit=") + DECIMAL_STR_MAX(limit)];
+ c->memory_accounting = b;
+ u->cgroup_realized_mask &= ~CGROUP_MEMORY;
+ unit_write_drop_in_private(u, mode, name, b ? "MemoryAccounting=yes" : "MemoryAccounting=no");
+ }
- dbus_message_iter_get_basic(i, &limit);
+ return 1;
- if (streq(name, "MemoryLimit")) {
- c->memory_limit = limit;
- sprintf(buf, "MemoryLimit=%" PRIu64, limit);
- unit_write_drop_in_private_section(u, mode, "memory-limit", buf);
- } else {
- c->memory_soft_limit = limit;
- sprintf(buf, "MemorySoftLimit=%" PRIu64, limit);
- unit_write_drop_in_private_section(u, mode, "memory-soft-limit", buf);
- }
+ } else if (streq(name, "MemoryLimit")) {
+ uint64_t limit;
+
+ r = sd_bus_message_read(message, "t", &limit);
+ if (r < 0)
+ return r;
+
+ if (mode != UNIT_CHECK) {
+ c->memory_limit = limit;
+ u->cgroup_realized_mask &= ~CGROUP_MEMORY;
+ unit_write_drop_in_private_format(u, mode, name, "%s=%" PRIu64, name, limit);
}
return 1;
@@ -271,10 +560,10 @@ int bus_cgroup_set_property(
const char *policy;
CGroupDevicePolicy p;
- if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_STRING)
- return -EINVAL;
+ r = sd_bus_message_read(message, "s", &policy);
+ if (r < 0)
+ return r;
- dbus_message_iter_get_basic(i, &policy);
p = cgroup_device_policy_from_string(policy);
if (p < 0)
return -EINVAL;
@@ -283,68 +572,73 @@ int bus_cgroup_set_property(
char *buf;
c->device_policy = p;
+ u->cgroup_realized_mask &= ~CGROUP_DEVICE;
- buf = strappenda("DevicePolicy=", policy);
- unit_write_drop_in_private_section(u, mode, "device-policy", buf);
+ buf = strjoina("DevicePolicy=", policy);
+ unit_write_drop_in_private(u, mode, name, buf);
}
return 1;
} else if (streq(name, "DeviceAllow")) {
- DBusMessageIter sub;
+ const char *path, *rwm;
unsigned n = 0;
- if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_ARRAY ||
- dbus_message_iter_get_element_type(i) != DBUS_TYPE_STRUCT)
- return -EINVAL;
-
- dbus_message_iter_recurse(i, &sub);
- while (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRUCT) {
- DBusMessageIter sub2;
- const char *path, *rwm;
- CGroupDeviceAllow *a;
-
- dbus_message_iter_recurse(&sub, &sub2);
+ r = sd_bus_message_enter_container(message, 'a', "(ss)");
+ if (r < 0)
+ return r;
- if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &path, true) < 0 ||
- bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &rwm, false) < 0)
- return -EINVAL;
+ while ((r = sd_bus_message_read(message, "(ss)", &path, &rwm)) > 0) {
- if (!path_startswith(path, "/dev")) {
- dbus_set_error(error, DBUS_ERROR_INVALID_ARGS, "DeviceAllow= requires device node");
- return -EINVAL;
- }
+ if ((!startswith(path, "/dev/") &&
+ !startswith(path, "block-") &&
+ !startswith(path, "char-")) ||
+ strpbrk(path, WHITESPACE))
+ return sd_bus_error_set_errnof(error, EINVAL, "DeviceAllow= requires device node");
if (isempty(rwm))
rwm = "rwm";
- if (!in_charset(rwm, "rwm")) {
- dbus_set_error(error, DBUS_ERROR_INVALID_ARGS, "DeviceAllow= requires combination of rwm flags");
- return -EINVAL;
- }
-
- n++;
+ if (!in_charset(rwm, "rwm"))
+ return sd_bus_error_set_errnof(error, EINVAL, "DeviceAllow= requires combination of rwm flags");
if (mode != UNIT_CHECK) {
- a = new0(CGroupDeviceAllow, 1);
- if (!a)
- return -ENOMEM;
-
- a->path = strdup(path);
- if (!a->path) {
- free(a);
- return -ENOMEM;
+ CGroupDeviceAllow *a = NULL, *b;
+
+ LIST_FOREACH(device_allow, b, c->device_allow) {
+ if (path_equal(b->path, path)) {
+ a = b;
+ break;
+ }
+ }
+
+ if (!a) {
+ a = new0(CGroupDeviceAllow, 1);
+ if (!a)
+ return -ENOMEM;
+
+ a->path = strdup(path);
+ if (!a->path) {
+ free(a);
+ return -ENOMEM;
+ }
+
+ LIST_PREPEND(device_allow, c->device_allow, a);
}
a->r = !!strchr(rwm, 'r');
a->w = !!strchr(rwm, 'w');
a->m = !!strchr(rwm, 'm');
-
- LIST_PREPEND(CGroupDeviceAllow, device_allow, c->device_allow, a);
}
- dbus_message_iter_next(&sub);
+ n++;
}
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_exit_container(message);
+ if (r < 0)
+ return r;
if (mode != UNIT_CHECK) {
_cleanup_free_ char *buf = NULL;
@@ -357,6 +651,8 @@ int bus_cgroup_set_property(
cgroup_context_free_device_allow(c, c->device_allow);
}
+ u->cgroup_realized_mask &= ~CGROUP_DEVICE;
+
f = open_memstream(&buf, &size);
if (!f)
return -ENOMEM;
@@ -366,10 +662,18 @@ int bus_cgroup_set_property(
fprintf(f, "DeviceAllow=%s %s%s%s\n", a->path, a->r ? "r" : "", a->w ? "w" : "", a->m ? "m" : "");
fflush(f);
- unit_write_drop_in_private_section(u, mode, "device-allow", buf);
+ unit_write_drop_in_private(u, mode, name, buf);
}
return 1;
+
+ }
+
+ if (u->transient && u->load_state == UNIT_STUB) {
+ r = bus_cgroup_set_transient_property(u, c, name, message, mode, error);
+ if (r != 0)
+ return r;
+
}
return 0;