Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2357340ybl; Thu, 19 Dec 2019 12:09:04 -0800 (PST) X-Google-Smtp-Source: APXvYqwUPntKVd2nWrT9L7rRUM8D4t14ObctpIAeN1Qa7/ZlL2sE8sfBvR8lEGhutJ4iRRYhg40h X-Received: by 2002:a05:6830:1047:: with SMTP id b7mr11076012otp.77.1576786144495; Thu, 19 Dec 2019 12:09:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576786144; cv=none; d=google.com; s=arc-20160816; b=O6KErFmbhEFiE7+M818oGiea3Ypv91Ya22CGZpEGrhxXdiPXyVPC2mNJy7BDtV2eX1 zTFFswbOI69j0tyKlL9J15jT0Xu52B6xqnPJ8KQQCmL7ENkq9jZIfuaU8iyq5oyWXfzl F//ptSIH6PeeG6ul0L4Bh069FAQgwTNLRC5hktpgm0AV0f4N6WPZjf1BnTzTZZouViXP jrSPXeM8DRus9NPi+usUTqm7VTA706C2m2CrQuu4YfWyA7muunQ6exUlLDFrYMuingID OSQMIaw+caXXNKSM2TD/yUprTXrP/jdrsG1Np3Xp8ffJqK3S4qSobTBrZcHZcImz+tYV DTAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xhnsM6+i6PGg0LZOZdtt3M5JWJhYXNMihWGbHtyPi9Y=; b=Ia+tkQaTNFL+OyPmM7V9L6uLEKHuH6UXUlkQnvkJexcQKiht4PRQhrr8YY4T+t5lSV zvMYV7mOSJeXC8m0BWJaGtaVVA/lG1541ZUnU9p4HI9L6NZ8FHpLkNBkOMni0BdiNuRo 1uGWgpBNV2sK4/dmttGRgrO+ktNXj35WzcegcwYmEIlJ7Lqv6jb2doXBrSrSk6ZQifuu kBcudITn4cyQIUMDutOG+ownlAzpERyNHI07ena35lQ9BVRcFERItEeEC4Jba11lw0TR oVK2jB/JupSR5MlSwbOYYaARGmOnAGcJZ/Ecn4dbg8VznwQJw3VylskP4hzaflNdK7I5 ADEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b=VgFrbe7V; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=cmpxchg.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s20si152589otq.28.2019.12.19.12.08.46; Thu, 19 Dec 2019 12:09:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b=VgFrbe7V; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=cmpxchg.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727278AbfLSUHn (ORCPT + 99 others); Thu, 19 Dec 2019 15:07:43 -0500 Received: from mail-qv1-f67.google.com ([209.85.219.67]:33334 "EHLO mail-qv1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727190AbfLSUHd (ORCPT ); Thu, 19 Dec 2019 15:07:33 -0500 Received: by mail-qv1-f67.google.com with SMTP id z3so2749031qvn.0 for ; Thu, 19 Dec 2019 12:07:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xhnsM6+i6PGg0LZOZdtt3M5JWJhYXNMihWGbHtyPi9Y=; b=VgFrbe7VG7KwWLfV/nS4/zUzfwC7Pf536oWSgQ2AOxOsw4Dnj5j8ToIT7+Ot3O5QBp WflITjv4O6Piy4b/Q0LskNKxVwFLGnGJTzZeqgzCm/2F6+kQVY7Q6eBGZK/cVmrPufXs 0/+ajn551IAgPhIIdMmMsjwv27wiwum2iJ+3jmiK0y2+7HNvxYj7NfwOvljQR7wzzU7A hGXL6fIt10IPRcF9uQLzMHPRysEoj3Gw5iMgQvahBunEZ+3aBAIgTNMXYMV7iE+UnLob k9sVJ+DqTCk1fSNDf4PwOf0kd0gQqypMQ2J3+m4KoOVA4GoG6eRdwqywxCHRJkYyE3zR uncA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xhnsM6+i6PGg0LZOZdtt3M5JWJhYXNMihWGbHtyPi9Y=; b=Znlkc4o62IHGNbaxGRHpUtiDgyNKd5ZySL1Vlm+URNKanXKU2gmZfucYxtOQS+oP50 qjieTRsB2edXxGwt1qsivk5FFk/At2PnIeiJXvquRe1xabin/zE9S/RToJmggMRc8Wpm 4MF4qDsq0ASxxprH30qn8dmb190Qc3D9AAmmKucRCAZrta5dBERSW2V3if7q+HwEP2h1 viGoe07w8lgq3PLgC6qz1HvPSE1xAQy/vrkv3/256vdTQoHxE+axuTZSVZJF6KOoe57S K2eV4KnyWFOYH0Hq02OKkiZEasa5P6RSBZZeTQxXOIKj3Pee1Iqkjih0KwUzvvKrxlmW lSFA== X-Gm-Message-State: APjAAAVQxptO0WRhOsVegqVDY0gaH1lCGFqwA+8l097mzTK2XI94AYeg xzQ5b04QJVoSXXoHEZ9aeCfCxQ== X-Received: by 2002:a0c:cdc4:: with SMTP id a4mr9500900qvn.21.1576786051943; Thu, 19 Dec 2019 12:07:31 -0800 (PST) Received: from localhost ([2620:10d:c091:500::91a1]) by smtp.gmail.com with ESMTPSA id g21sm1995500qkl.116.2019.12.19.12.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 12:07:31 -0800 (PST) From: Johannes Weiner To: Andrew Morton Cc: Roman Gushchin , Michal Hocko , Tejun Heo , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH v2 2/3] mm: memcontrol: clean up and document effective low/min calculations Date: Thu, 19 Dec 2019 15:07:17 -0500 Message-Id: <20191219200718.15696-3-hannes@cmpxchg.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219200718.15696-1-hannes@cmpxchg.org> References: <20191219200718.15696-1-hannes@cmpxchg.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The effective protection of any given cgroup is a somewhat complicated construct that depends on the ancestor's configuration, siblings' configurations, as well as current memory utilization in all these groups. It's done this way to satisfy hierarchical delegation requirements while also making the configuration semantics flexible and expressive in complex real life scenarios. Unfortunately, all the rules and requirements are sparsely documented, and the code is a little too clever in merging different scenarios into a single min() expression. This makes it hard to reason about the implementation and avoid breaking semantics when making changes to it. This patch documents each semantic rule individually and splits out the handling of the overcommit case from the regular case. Signed-off-by: Johannes Weiner --- mm/memcontrol.c | 190 ++++++++++++++++++++++++++---------------------- 1 file changed, 104 insertions(+), 86 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 874a0b00f89b..9c771c4d6339 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6204,65 +6204,55 @@ struct cgroup_subsys memory_cgrp_subsys = { .early_init = 0, }; -/** - * mem_cgroup_protected - check if memory consumption is in the normal range - * @root: the top ancestor of the sub-tree being checked - * @memcg: the memory cgroup to check - * - * WARNING: This function is not stateless! It can only be used as part - * of a top-down tree iteration, not for isolated queries. - * - * Returns one of the following: - * MEMCG_PROT_NONE: cgroup memory is not protected - * MEMCG_PROT_LOW: cgroup memory is protected as long there is - * an unprotected supply of reclaimable memory from other cgroups. - * MEMCG_PROT_MIN: cgroup memory is protected - * - * @root is exclusive; it is never protected when looked at directly +/* + * This function calculates an individual cgroup's effective + * protection which is derived from its own memory.min/low, its + * parent's and siblings' settings, as well as the actual memory + * distribution in the tree. * - * To provide a proper hierarchical behavior, effective memory.min/low values - * are used. Below is the description of how effective memory.low is calculated. - * Effective memory.min values is calculated in the same way. + * The following rules apply to the effective protection values: * - * Effective memory.low is always equal or less than the original memory.low. - * If there is no memory.low overcommittment (which is always true for - * top-level memory cgroups), these two values are equal. - * Otherwise, it's a part of parent's effective memory.low, - * calculated as a cgroup's memory.low usage divided by sum of sibling's - * memory.low usages, where memory.low usage is the size of actually - * protected memory. + * 1. At the first level of reclaim, effective protection is equal to + * the declared protection in memory.min and memory.low. * - * low_usage - * elow = min( memory.low, parent->elow * ------------------ ), - * siblings_low_usage + * 2. To enable safe delegation of the protection configuration, at + * subsequent levels the effective protection is capped to the + * parent's effective protection. * - * low_usage = min(memory.low, memory.current) + * 3. To make complex and dynamic subtrees easier to configure, the + * user is allowed to overcommit the declared protection at a given + * level. If that is the case, the parent's effective protection is + * distributed to the children in proportion to how much protection + * they have declared and how much of it they are utilizing. * + * This makes distribution proportional, but also work-conserving: + * if one cgroup claims much more protection than it uses memory, + * the unused remainder is available to its siblings. * - * Such definition of the effective memory.low provides the expected - * hierarchical behavior: parent's memory.low value is limiting - * children, unprotected memory is reclaimed first and cgroups, - * which are not using their guarantee do not affect actual memory - * distribution. + * Consider the following example tree: * - * For example, if there are memcgs A, A/B, A/C, A/D and A/E: + * A A/memory.low = 2G, A/memory.current = 6G + * //\\ + * BC DE B/memory.low = 3G B/memory.current = 2G + * C/memory.low = 1G C/memory.current = 2G + * D/memory.low = 0 D/memory.current = 2G + * E/memory.low = 10G E/memory.current = 0 * - * A A/memory.low = 2G, A/memory.current = 6G - * //\\ - * BC DE B/memory.low = 3G B/memory.current = 2G - * C/memory.low = 1G C/memory.current = 2G - * D/memory.low = 0 D/memory.current = 2G - * E/memory.low = 10G E/memory.current = 0 + * and memory pressure is applied, the following memory + * distribution is expected (approximately*): * - * and the memory pressure is applied, the following memory distribution - * is expected (approximately): + * A/memory.current = 2G + * B/memory.current = 1.3G + * C/memory.current = 0.6G + * D/memory.current = 0 + * E/memory.current = 0 * - * A/memory.current = 2G + * *assuming equal allocation rate and reclaimability * - * B/memory.current = 1.3G - * C/memory.current = 0.6G - * D/memory.current = 0 - * E/memory.current = 0 + * 4. Conversely, when the declared protection is undercommitted at a + * given level, the distribution of the larger parental protection + * budget is NOT proportional. A cgroup's protection from a sibling + * is capped to its own memory.min/low setting. * * These calculations require constant tracking of the actual low usages * (see propagate_protected_usage()), as well as recursive calculation of @@ -6272,12 +6262,63 @@ struct cgroup_subsys memory_cgrp_subsys = { * for next usage. This part is intentionally racy, but it's ok, * as memory.low is a best-effort mechanism. */ +static unsigned long effective_protection(unsigned long usage, + unsigned long setting, + unsigned long parent_effective, + unsigned long siblings_protected) +{ + unsigned long protected; + + protected = min(usage, setting); + /* + * If all cgroups at this level combined claim and use more + * protection then what the parent affords them, distribute + * shares in proportion to utilization. + * + * We are using actual utilization rather than the statically + * claimed protection in order to be work-conserving: claimed + * but unused protection is available to siblings that would + * otherwise get a smaller chunk than what they claimed. + */ + if (siblings_protected > parent_effective) + return protected * parent_effective / siblings_protected; + + /* + * Ok, utilized protection of all children is within what the + * parent affords them, so we know whatever this child claims + * and utilizes is effectively protected. + * + * If there is unprotected usage beyond this value, reclaim + * will apply pressure in proportion to that amount. + * + * If there is unutilized protection, the cgroup will be fully + * shielded from reclaim, but we do return a smaller value for + * protection than what the group could enjoy in theory. This + * is okay. With the overcommit distribution above, effective + * protection is always dependent on how memory is actually + * consumed among the siblings anyway. + */ + return protected; +} + +/** + * mem_cgroup_protected - check if memory consumption is in the normal range + * @root: the top ancestor of the sub-tree being checked + * @memcg: the memory cgroup to check + * + * WARNING: This function is not stateless! It can only be used as part + * of a top-down tree iteration, not for isolated queries. + * + * Returns one of the following: + * MEMCG_PROT_NONE: cgroup memory is not protected + * MEMCG_PROT_LOW: cgroup memory is protected as long there is + * an unprotected supply of reclaimable memory from other cgroups. + * MEMCG_PROT_MIN: cgroup memory is protected + */ enum mem_cgroup_protection mem_cgroup_protected(struct mem_cgroup *root, struct mem_cgroup *memcg) { struct mem_cgroup *parent; - unsigned long emin, parent_emin; - unsigned long elow, parent_elow; unsigned long usage; if (mem_cgroup_disabled()) @@ -6292,52 +6333,29 @@ enum mem_cgroup_protection mem_cgroup_protected(struct mem_cgroup *root, if (!usage) return MEMCG_PROT_NONE; - emin = memcg->memory.min; - elow = memcg->memory.low; - parent = parent_mem_cgroup(memcg); /* No parent means a non-hierarchical mode on v1 memcg */ if (!parent) return MEMCG_PROT_NONE; - if (parent == root) - goto exit; - - parent_emin = READ_ONCE(parent->memory.emin); - emin = min(emin, parent_emin); - if (emin && parent_emin) { - unsigned long min_usage, siblings_min_usage; - - min_usage = min(usage, memcg->memory.min); - siblings_min_usage = atomic_long_read( - &parent->memory.children_min_usage); - - if (min_usage && siblings_min_usage) - emin = min(emin, parent_emin * min_usage / - siblings_min_usage); + if (parent == root) { + memcg->memory.emin = memcg->memory.min; + memcg->memory.elow = memcg->memory.low; + goto out; } - parent_elow = READ_ONCE(parent->memory.elow); - elow = min(elow, parent_elow); - if (elow && parent_elow) { - unsigned long low_usage, siblings_low_usage; - - low_usage = min(usage, memcg->memory.low); - siblings_low_usage = atomic_long_read( - &parent->memory.children_low_usage); + memcg->memory.emin = effective_protection(usage, + memcg->memory.min, READ_ONCE(parent->memory.emin), + atomic_long_read(&parent->memory.children_min_usage)); - if (low_usage && siblings_low_usage) - elow = min(elow, parent_elow * low_usage / - siblings_low_usage); - } - -exit: - memcg->memory.emin = emin; - memcg->memory.elow = elow; + memcg->memory.elow = effective_protection(usage, + memcg->memory.low, READ_ONCE(parent->memory.elow), + atomic_long_read(&parent->memory.children_low_usage)); - if (usage <= emin) +out: + if (usage <= memcg->memory.emin) return MEMCG_PROT_MIN; - else if (usage <= elow) + else if (usage <= memcg->memory.elow) return MEMCG_PROT_LOW; else return MEMCG_PROT_NONE; -- 2.24.1