On Fri, Dec 13, 2019 at 02:21:58PM -0500, Johannes Weiner wrote:
> + if (cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_RECURSIVE_PROT) {
> + unsigned long unclaimed;
> + /*
> + * If the children aren't claiming (all of) the
> + * protection afforded to them by the parent,
> + * distribute the remainder in proportion to the
> + * (unprotected) size of each cgroup. That way,
> + * cgroups that aren't explicitly prioritized wrt each
> + * other compete freely over the allowance, but they
> + * are collectively protected from neighboring trees.
> + *
> + * We're using unprotected size for the weight so that
> + * if some cgroups DO claim explicit protection, we
> + * don't protect the same bytes twice.
> + */
> + unclaimed = parent_effective - siblings_protected;
> + unclaimed *= usage - protected;
> + unclaimed /= parent_usage - siblings_protected;
Brainfart I noticed just after sending it out - naturally. If there is
unclaimed protection in the parent, but the children use exactly how
much they claim, this will div0. We have to check for usage that isn't
explicitly protected in the child to which to apply the float. Fixlet
below. Doesn't change the overall logic, though.
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 2e352cd6c38d..8d7e9490740b 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6328,21 +6328,24 @@ static unsigned long effective_protection(unsigned long usage,
*/
ep = protected;
- if (cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_RECURSIVE_PROT) {
+ /*
+ * If the children aren't claiming (all of) the protection
+ * afforded to them by the parent, distribute the remainder in
+ * proportion to the (unprotected) size of each cgroup. That
+ * way, cgroups that aren't explicitly prioritized wrt each
+ * other compete freely over the allowance, but they are
+ * collectively protected from neighboring trees.
+ *
+ * We're using unprotected size for the weight so that if some
+ * cgroups DO claim explicit protection, we don't protect the
+ * same bytes twice.
+ */
+ if (!(cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_RECURSIVE_PROT))
+ return ep;
+
+ if (usage > protected && parent_effective > siblings_protected) {
unsigned long unclaimed;
- /*
- * If the children aren't claiming (all of) the
- * protection afforded to them by the parent,
- * distribute the remainder in proportion to the
- * (unprotected) size of each cgroup. That way,
- * cgroups that aren't explicitly prioritized wrt each
- * other compete freely over the allowance, but they
- * are collectively protected from neighboring trees.
- *
- * We're using unprotected size for the weight so that
- * if some cgroups DO claim explicit protection, we
- * don't protect the same bytes twice.
- */
+
unclaimed = parent_effective - siblings_protected;
unclaimed *= usage - protected;
unclaimed /= parent_usage - siblings_protected;
