Skip to content

Commit 9d3edf9

Browse files
shakeelbakpm00
authored andcommitted
memcg: add nmi-safe update for MEMCG_KMEM
The objcg based kmem charging and uncharging code path needs to update MEMCG_KMEM appropriately. Let's add support to update MEMCG_KMEM in nmi-safe way for those code paths. Link: https://lkml.kernel.org/r/20250519063142.111219-4-shakeel.butt@linux.dev Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev> Acked-by: Vlastimil Babka <vbabka@suse.cz> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Michal Hocko <mhocko@kernel.org> Cc: Muchun Song <muchun.song@linux.dev> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Roman Gushchin <roman.gushchin@linux.dev> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: Tejun Heo <tj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 940b01f commit 9d3edf9

1 file changed

Lines changed: 19 additions & 2 deletions

File tree

mm/memcontrol.c

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2715,6 +2715,23 @@ struct obj_cgroup *get_obj_cgroup_from_folio(struct folio *folio)
27152715
return objcg;
27162716
}
27172717

2718+
#ifdef CONFIG_MEMCG_NMI_SAFETY_REQUIRES_ATOMIC
2719+
static inline void account_kmem_nmi_safe(struct mem_cgroup *memcg, int val)
2720+
{
2721+
if (likely(!in_nmi())) {
2722+
mod_memcg_state(memcg, MEMCG_KMEM, val);
2723+
} else {
2724+
/* TODO: add to cgroup update tree once it is nmi-safe. */
2725+
atomic_add(val, &memcg->kmem_stat);
2726+
}
2727+
}
2728+
#else
2729+
static inline void account_kmem_nmi_safe(struct mem_cgroup *memcg, int val)
2730+
{
2731+
mod_memcg_state(memcg, MEMCG_KMEM, val);
2732+
}
2733+
#endif
2734+
27182735
/*
27192736
* obj_cgroup_uncharge_pages: uncharge a number of kernel pages from a objcg
27202737
* @objcg: object cgroup to uncharge
@@ -2727,7 +2744,7 @@ static void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg,
27272744

27282745
memcg = get_mem_cgroup_from_objcg(objcg);
27292746

2730-
mod_memcg_state(memcg, MEMCG_KMEM, -nr_pages);
2747+
account_kmem_nmi_safe(memcg, -nr_pages);
27312748
memcg1_account_kmem(memcg, -nr_pages);
27322749
if (!mem_cgroup_is_root(memcg))
27332750
refill_stock(memcg, nr_pages);
@@ -2755,7 +2772,7 @@ static int obj_cgroup_charge_pages(struct obj_cgroup *objcg, gfp_t gfp,
27552772
if (ret)
27562773
goto out;
27572774

2758-
mod_memcg_state(memcg, MEMCG_KMEM, nr_pages);
2775+
account_kmem_nmi_safe(memcg, nr_pages);
27592776
memcg1_account_kmem(memcg, nr_pages);
27602777
out:
27612778
css_put(&memcg->css);

0 commit comments

Comments
 (0)