linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mm: memcontrol: do not miss MEMCG_MAX events for enforced allocations
@ 2022-07-02  3:35 Roman Gushchin
  2022-07-02  5:50 ` Shakeel Butt
  2022-07-04 15:12 ` Michal Hocko
  0 siblings, 2 replies; 22+ messages in thread
From: Roman Gushchin @ 2022-07-02  3:35 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Roman Gushchin, Yafang Shao, Johannes Weiner, Michal Hocko,
	Shakeel Butt, Muchun Song, cgroups, linux-mm, bpf

Yafang Shao reported an issue related to the accounting of bpf
memory: if a bpf map is charged indirectly for memory consumed
from an interrupt context and allocations are enforced, MEMCG_MAX
events are not raised.

It's not/less of an issue in a generic case because consequent
allocations from a process context will trigger the reclaim and
MEMCG_MAX events. However a bpf map can belong to a dying/abandoned
memory cgroup, so it might never happen. So the cgroup can
significantly exceed the memory.max limit without even triggering
MEMCG_MAX events.

Fix this by making sure that we never enforce allocations without
raising a MEMCG_MAX event.

Reported-by: Yafang Shao <laoar.shao@gmail.com>
Signed-off-by: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: cgroups@vger.kernel.org
Cc: linux-mm@kvack.org
Cc: bpf@vger.kernel.org
---
 mm/memcontrol.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 655c09393ad5..eb383695659a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2577,6 +2577,7 @@ static int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask,
 	bool passed_oom = false;
 	bool may_swap = true;
 	bool drained = false;
+	bool raised_max_event = false;
 	unsigned long pflags;
 
 retry:
@@ -2616,6 +2617,7 @@ static int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask,
 		goto nomem;
 
 	memcg_memory_event(mem_over_limit, MEMCG_MAX);
+	raised_max_event = true;
 
 	psi_memstall_enter(&pflags);
 	nr_reclaimed = try_to_free_mem_cgroup_pages(mem_over_limit, nr_pages,
@@ -2682,6 +2684,13 @@ static int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask,
 	if (!(gfp_mask & (__GFP_NOFAIL | __GFP_HIGH)))
 		return -ENOMEM;
 force:
+	/*
+	 * If the allocation has to be enforced, don't forget to raise
+	 * a MEMCG_MAX event.
+	 */
+	if (!raised_max_event)
+		memcg_memory_event(mem_over_limit, MEMCG_MAX);
+
 	/*
 	 * The allocation either can't fail or will lead to more memory
 	 * being freed very soon.  Allow memory usage go over the limit
-- 
2.36.1



^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2022-07-08  3:19 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-02  3:35 [PATCH] mm: memcontrol: do not miss MEMCG_MAX events for enforced allocations Roman Gushchin
2022-07-02  5:50 ` Shakeel Butt
2022-07-02 15:39   ` Roman Gushchin
2022-07-03  5:36     ` Shakeel Butt
2022-07-03 22:50       ` Roman Gushchin
2022-07-04 15:07     ` Michal Hocko
2022-07-04 15:30       ` Michal Hocko
2022-07-05 20:51         ` Roman Gushchin
2022-07-06  2:40           ` Yafang Shao
2022-07-07  7:47             ` Michal Hocko
2022-07-05 20:49       ` Roman Gushchin
2022-07-06  2:46         ` Yafang Shao
2022-07-06  3:28           ` Roman Gushchin
2022-07-06  3:42             ` Yafang Shao
2022-07-06  3:56               ` Roman Gushchin
2022-07-06  4:02                 ` Yafang Shao
2022-07-06  4:19                   ` Roman Gushchin
2022-07-06  4:33                     ` Yafang Shao
2022-07-07 22:41                 ` Alexei Starovoitov
2022-07-08  3:18                   ` Roman Gushchin
2022-07-04 15:12 ` Michal Hocko
2022-07-05 20:55   ` Roman Gushchin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).