Re: [PATCH] mm/vmstat: Fix build with MEMCG=y and VM_EVENT_COUNTERS=n

[Andrew Morton <akpm@linux-foundation.org>]

On Wed, 4 Jun 2025 11:56:42 +0200 Vlastimil Babka <vbabka@suse.cz> wrote:

> > There is no need to backport this fix to stable trees. Without the
> > strict BUILD_BUG_ON(), the issue is not harmful. The elements in
> > question would only be read by the memcg code, not by /proc/vmstat.
> > 
> > Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> > Reported-by: Randy Dunlap <rdunlap@infradead.org>
> > Fixes: ebc5d83d0443 ("mm/memcontrol: use vmstat names for printing statistics")
> 
> Well in that case I think we should put Fixes: to the BUILD_BUG_ON() change.
> And if it's not yet a stable sha1, squash that together with this?
> It doesn't seem ebc5d83d0443 alone needs this fix.

I shuffled things around.

I moved "mm: strictly check vmstat_text array size" from mm-hotfixes
and back into mm-new for the next cycle.

I reworked "mm/vmstat: fix build with MEMCG=y and VM_EVENT_COUNTERS=n"
so it precedes "mm: strictly check vmstat_text array size".

I reworked "mm/vmstat: utilize designated initializers for the
vmstat_text array" so it comes last.


So the applying order is now

mm-hotfixes:
mm-fix-vmstat-after-removing-nr_bounce.patch

mm-new:
mm-vmstat-fix-build-with-memcg=y-and-vm_event_counters=n.patch
mm-strictly-check-vmstat_text-array-size.patch
mm-vmstat-utilize-designated-initializers-for-the-vmstat_text-array.patch

and everything should land nicely.