memcg-make-memcg_rstat_updated-nmi-safe.patch removed from -mm tree
The quilt patch titled
Subject: memcg: make memcg_rstat_updated nmi safe
has been removed from the -mm tree. Its filename was
memcg-make-memcg_rstat_updated-nmi-safe.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Shakeel Butt <[email protected]>
Subject: memcg: make memcg_rstat_updated nmi safe
Date: Sun, 18 May 2025 23:31:42 -0700
Currently kernel maintains memory related stats updates per-cgroup to optimize stats flushing. The stats_updates is defined as atomic64_t which is not nmi-safe on some archs. Actually we don't really need 64bit atomic as the max value stats_updates can get should be less than nr_cpus * MEMCG_CHARGE_BATCH. A normal atomic_t should suffice.
Also the function cgroup_rstat_updated() is still not nmi-safe but there is parallel effort to make it nmi-safe, so until then let's ignore it in the nmi context.
---
mm/memcontrol.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~memcg-make-memcg_rstat_updated-nmi-safe +9 -7
@@ -531,7 +531,7 @@ struct memcg_vmstats {unsigned long events_pending[NR_MEMCG_EVENTS ];/* Stats updates since the last flush */ -atomic64_t stats_updates; +atomic_t stats_updates; };/*
@@ -557,7 +557,7 @@ static u64 flush_last_time;static bool memcg_vmstats_needs_flush (struct memcg_vmstats *vmstats) { -return atomic64_read (&vmstats->stats_updates) > +return atomic_read (&vmstats->stats_updates) >MEMCG_CHARGE_BATCH *num_online_cpus (); }
@@ -571,7 +571,9 @@ static inline void memcg_rstat_updated(sif (!val)return ; -cgroup_rstat_updated (memcg->css.cgroup, cpu); +/* TODO: add to cgroup update tree once it is nmi-safe. */ +if (!in_nmi ()) +cgroup_rstat_updated (memcg->css.cgroup, cpu); statc_pcpu = memcg->vmstats_percpu;for (; statc_pcpu; statc_pcpu = statc->parent_pcpu) { statc =this_cpu_ptr (statc_pcpu);
@@ -589,7 +591,7 @@ static inline void memcg_rstat_updated(scontinue ; stats_updates =this_cpu_xchg (statc_pcpu->stats_updates,0 ); -atomic64_add (stats_updates, &statc->vmstats->stats_updates); +atomic_add (stats_updates, &statc->vmstats->stats_updates); } }
@@ -597,7 +599,7 @@ static void __mem_cgroup_flush_stats(str {bool needs_flush =memcg_vmstats_needs_flush (memcg->vmstats); -trace_memcg_flush_stats (memcg,atomic64_read (&memcg->vmstats->stats_updates), +trace_memcg_flush_stats (memcg,atomic_read (&memcg->vmstats->stats_updates), force, needs_flush);if (!force && !needs_flush)
@@ -4119,8 +4121,8 @@ static void mem_cgroup_css_rstat_flush(s }WRITE_ONCE (statc->stats_updates,0 );/* We are in a per-cpu loop here, only do the atomic write once */ -if (atomic64_read (&memcg->vmstats->stats_updates)) -atomic64_set (&memcg->vmstats->stats_updates,0 ); +if (atomic_read (&memcg->vmstats->stats_updates)) +atomic_set (&memcg->vmstats->stats_updates,0 ); }static void mem_cgroup_fork (struct task_struct *task)
_
Patches currently in -mm which might be from [email protected] are