summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wilck <mwilck@suse.com>2018-04-07 17:33:48 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-04-09 12:18:09 +0200
commitf398c546c6fc43121131f41acec56b5a851bd35e (patch)
tree137a3ed416398bd3eef371fc0c7e29a65dd41596
parent63e0c53ba0d2857967e12ad5d6037aa90f44018f (diff)
systemd-udevd: limit children-max by available memory (#8668)
Udev workers consume typically 50-100MiB virtual memory. On systems with lots of CPUs and relatively low memory, that may easily cause workers to be OOM-killed. This patch limits the number of workers to 8 per GiB memory. But don't let the limit drop below the smallest value we had without this patch (8 + 1 * 2 = 10); on small systems, udev's memory footprint is likely lower. (cherry picked from commit e438c57a640ac5afba366531be5e456b9fe22672)
-rw-r--r--src/udev/udevd.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 615c4ed3e2..daaab6417a 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1676,12 +1676,16 @@ int main(int argc, char *argv[]) {
if (arg_children_max == 0) {
cpu_set_t cpu_set;
+ unsigned long mem_limit;
arg_children_max = 8;
if (sched_getaffinity(0, sizeof(cpu_set), &cpu_set) == 0)
arg_children_max += CPU_COUNT(&cpu_set) * 2;
+ mem_limit = physical_memory() / (128LU*1024*1024);
+ arg_children_max = MAX(10U, MIN(arg_children_max, mem_limit));
+
log_debug("set children_max to %u", arg_children_max);
}