Skip to content

Commit 22f7496

Browse files
laoartorvalds
authored andcommitted
mm, memcg: avoid stale protection values when cgroup is above protection
Patch series "mm, memcg: memory.{low,min} reclaim fix & cleanup", v4. This series contains a fix for a edge case in my earlier protection calculation patches, and a patch to make the area overall a little more robust to hopefully help avoid this in future. This patch (of 2): A cgroup can have both memory protection and a memory limit to isolate it from its siblings in both directions - for example, to prevent it from being shrunk below 2G under high pressure from outside, but also from growing beyond 4G under low pressure. Commit 9783aa9 ("mm, memcg: proportional memory.{low,min} reclaim") implemented proportional scan pressure so that multiple siblings in excess of their protection settings don't get reclaimed equally but instead in accordance to their unprotected portion. During limit reclaim, this proportionality shouldn't apply of course: there is no competition, all pressure is from within the cgroup and should be applied as such. Reclaim should operate at full efficiency. However, mem_cgroup_protected() never expected anybody to look at the effective protection values when it indicated that the cgroup is above its protection. As a result, a query during limit reclaim may return stale protection values that were calculated by a previous reclaim cycle in which the cgroup did have siblings. When this happens, reclaim is unnecessarily hesitant and potentially slow to meet the desired limit. In theory this could lead to premature OOM kills, although it's not obvious this has occurred in practice. Workaround the problem by special casing reclaim roots in mem_cgroup_protection. These memcgs are never participating in the reclaim protection because the reclaim is internal. We have to ignore effective protection values for reclaim roots because mem_cgroup_protected might be called from racing reclaim contexts with different roots. Calculation is relying on root -> leaf tree traversal therefore top-down reclaim protection invariants should hold. The only exception is the reclaim root which should have effective protection set to 0 but that would be problematic for the following setup: Let's have global and A's reclaim in parallel: | A (low=2G, usage = 3G, max = 3G, children_low_usage = 1.5G) |\ | C (low = 1G, usage = 2.5G) B (low = 1G, usage = 0.5G) for A reclaim we have B.elow = B.low C.elow = C.low For the global reclaim A.elow = A.low B.elow = min(B.usage, B.low) because children_low_usage <= A.elow C.elow = min(C.usage, C.low) With the effective values resetting we have A reclaim A.elow = 0 B.elow = B.low C.elow = C.low and global reclaim could see the above and then B.elow = C.elow = 0 because children_low_usage > A.elow Which means that protected memcgs would get reclaimed. In future we would like to make mem_cgroup_protected more robust against racing reclaim contexts but that is likely more complex solution than this simple workaround. [[email protected] - large part of the changelog] [[email protected] - workaround explanation] [[email protected] - retitle] Fixes: 9783aa9 ("mm, memcg: proportional memory.{low,min} reclaim") Signed-off-by: Yafang Shao <[email protected]> Signed-off-by: Chris Down <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Acked-by: Michal Hocko <[email protected]> Acked-by: Johannes Weiner <[email protected]> Acked-by: Chris Down <[email protected]> Acked-by: Roman Gushchin <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Link: http://lkml.kernel.org/r/044fb8ecffd001c7905d27c0c2ad998069fdc396.1594638158.git.chris@chrisdown.name Signed-off-by: Linus Torvalds <[email protected]>
1 parent d977aa9 commit 22f7496

File tree

3 files changed

+50
-3
lines changed

3 files changed

+50
-3
lines changed

include/linux/memcontrol.h

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,12 +355,49 @@ static inline bool mem_cgroup_disabled(void)
355355
return !cgroup_subsys_enabled(memory_cgrp_subsys);
356356
}
357357

358-
static inline unsigned long mem_cgroup_protection(struct mem_cgroup *memcg,
358+
static inline unsigned long mem_cgroup_protection(struct mem_cgroup *root,
359+
struct mem_cgroup *memcg,
359360
bool in_low_reclaim)
360361
{
361362
if (mem_cgroup_disabled())
362363
return 0;
363364

365+
/*
366+
* There is no reclaim protection applied to a targeted reclaim.
367+
* We are special casing this specific case here because
368+
* mem_cgroup_protected calculation is not robust enough to keep
369+
* the protection invariant for calculated effective values for
370+
* parallel reclaimers with different reclaim target. This is
371+
* especially a problem for tail memcgs (as they have pages on LRU)
372+
* which would want to have effective values 0 for targeted reclaim
373+
* but a different value for external reclaim.
374+
*
375+
* Example
376+
* Let's have global and A's reclaim in parallel:
377+
* |
378+
* A (low=2G, usage = 3G, max = 3G, children_low_usage = 1.5G)
379+
* |\
380+
* | C (low = 1G, usage = 2.5G)
381+
* B (low = 1G, usage = 0.5G)
382+
*
383+
* For the global reclaim
384+
* A.elow = A.low
385+
* B.elow = min(B.usage, B.low) because children_low_usage <= A.elow
386+
* C.elow = min(C.usage, C.low)
387+
*
388+
* With the effective values resetting we have A reclaim
389+
* A.elow = 0
390+
* B.elow = B.low
391+
* C.elow = C.low
392+
*
393+
* If the global reclaim races with A's reclaim then
394+
* B.elow = C.elow = 0 because children_low_usage > A.elow)
395+
* is possible and reclaiming B would be violating the protection.
396+
*
397+
*/
398+
if (root == memcg)
399+
return 0;
400+
364401
if (in_low_reclaim)
365402
return READ_ONCE(memcg->memory.emin);
366403

@@ -891,7 +928,8 @@ static inline void memcg_memory_event_mm(struct mm_struct *mm,
891928
{
892929
}
893930

894-
static inline unsigned long mem_cgroup_protection(struct mem_cgroup *memcg,
931+
static inline unsigned long mem_cgroup_protection(struct mem_cgroup *root,
932+
struct mem_cgroup *memcg,
895933
bool in_low_reclaim)
896934
{
897935
return 0;

mm/memcontrol.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6605,6 +6605,14 @@ enum mem_cgroup_protection mem_cgroup_protected(struct mem_cgroup *root,
66056605

66066606
if (!root)
66076607
root = root_mem_cgroup;
6608+
6609+
/*
6610+
* Effective values of the reclaim targets are ignored so they
6611+
* can be stale. Have a look at mem_cgroup_protection for more
6612+
* details.
6613+
* TODO: calculation should be more robust so that we do not need
6614+
* that special casing.
6615+
*/
66086616
if (memcg == root)
66096617
return MEMCG_PROT_NONE;
66106618

mm/vmscan.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2331,7 +2331,8 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc,
23312331
unsigned long protection;
23322332

23332333
lruvec_size = lruvec_lru_size(lruvec, lru, sc->reclaim_idx);
2334-
protection = mem_cgroup_protection(memcg,
2334+
protection = mem_cgroup_protection(sc->target_mem_cgroup,
2335+
memcg,
23352336
sc->memcg_low_reclaim);
23362337

23372338
if (protection) {

0 commit comments

Comments
 (0)