From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 438F2C5B543 for ; Wed, 4 Jun 2025 10:21:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BAE896B0249; Wed, 4 Jun 2025 06:21:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B874F6B024A; Wed, 4 Jun 2025 06:21:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A761E6B024C; Wed, 4 Jun 2025 06:21:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 87DEC6B0249 for ; Wed, 4 Jun 2025 06:21:07 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2F3A7160E91 for ; Wed, 4 Jun 2025 10:21:07 +0000 (UTC) X-FDA: 83517325374.04.10B799C Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf23.hostedemail.com (Postfix) with ESMTP id E3CAE140003 for ; Wed, 4 Jun 2025 10:21:04 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=nDm4AHKU; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=WHdEUh1n; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=nDm4AHKU; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=WHdEUh1n; spf=pass (imf23.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749032465; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1jjyZmVb2kI0wJ/xwBd+UN6NcrjIdsAAEgibBT83Kx4=; b=Fck72f6ZeemB0NgWSH8J6/0cNxs0WkAStLO5u6OCFfmhXYcWWPH1+Cr7i5XaxBWxTLjvxV 8DfMPRInQgQnDdo/OUqCEmC+BQHd7sky1OvxMDvQztsEikV7h4yjhaSQBZNKx8eaSyCXCM 4N4o0fH/t4Vvgudhe3xR1CU/JbiCDQ0= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=nDm4AHKU; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=WHdEUh1n; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=nDm4AHKU; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=WHdEUh1n; spf=pass (imf23.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749032465; a=rsa-sha256; cv=none; b=YeaA+eCi7lxa9oaX5Xmd1RfosqEK0Eh25uXVSJxcWeRuB++QN5x9HX71vtwu11joFqq714 P5YtMPfkDG53roxZvYmX7n3djLUxE/45Dpy32fatdgjiIz3GWncQw37hO/NgWXWuK9JHZM JWq2OIpKIoMZqifZe8coKK7IjjZ7NT4= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 565BA5F993; Wed, 4 Jun 2025 09:56:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1749031002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=1jjyZmVb2kI0wJ/xwBd+UN6NcrjIdsAAEgibBT83Kx4=; b=nDm4AHKUVbsQhlSq/U90NBb1bblcevUHw4674wIXVoEjVtlYPEN07cOI/0cAHk0SaziQgs Msacas3qAilmtwhwGocAhgupoEg5S4SHjexOhy0vxhh2XelNBoNl4Y01LFlhaLlLZV1ACN xTK/3B5kN9vezkH4a54aO2NA+gbSi5k= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1749031002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=1jjyZmVb2kI0wJ/xwBd+UN6NcrjIdsAAEgibBT83Kx4=; b=WHdEUh1nWrWg3bcwwuBdeF+QRyGtFm9jDfeWDb3u3jgh4ls9UM7ai8UcJw8DeIP+jupdnB ADVbo4Cfps0ImPCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1749031002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=1jjyZmVb2kI0wJ/xwBd+UN6NcrjIdsAAEgibBT83Kx4=; b=nDm4AHKUVbsQhlSq/U90NBb1bblcevUHw4674wIXVoEjVtlYPEN07cOI/0cAHk0SaziQgs Msacas3qAilmtwhwGocAhgupoEg5S4SHjexOhy0vxhh2XelNBoNl4Y01LFlhaLlLZV1ACN xTK/3B5kN9vezkH4a54aO2NA+gbSi5k= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1749031002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=1jjyZmVb2kI0wJ/xwBd+UN6NcrjIdsAAEgibBT83Kx4=; b=WHdEUh1nWrWg3bcwwuBdeF+QRyGtFm9jDfeWDb3u3jgh4ls9UM7ai8UcJw8DeIP+jupdnB ADVbo4Cfps0ImPCw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 35C1113AD9; Wed, 4 Jun 2025 09:56:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id +cLEDFoYQGjAHAAAD6G6ig (envelope-from ); Wed, 04 Jun 2025 09:56:42 +0000 Message-ID: <6fffd2fe-0cee-405f-af78-b57b5e5d02e8@suse.cz> Date: Wed, 4 Jun 2025 11:56:42 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm/vmstat: Fix build with MEMCG=y and VM_EVENT_COUNTERS=n Content-Language: en-US To: "Kirill A. Shutemov" , Andrew Morton , David Hildenbrand Cc: lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, rppt@kernel.org, surenb@google.com, mhocko@suse.com, hannes@cmpxchg.org, shakeel.butt@linux.dev, muchun.song@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Randy Dunlap , Konstantin Khlebnikov References: <20250604095111.533783-1-kirill.shutemov@linux.intel.com> From: Vlastimil Babka Autocrypt: addr=vbabka@suse.cz; keydata= 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 m6M14QORSWTLRg== In-Reply-To: <20250604095111.533783-1-kirill.shutemov@linux.intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Action: no action X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: E3CAE140003 X-Stat-Signature: azhehsisz6z5hqcoshw7yj99qna9w9g7 X-Rspam-User: X-HE-Tag: 1749032464-35819 X-HE-Meta: U2FsdGVkX1+iVgLxTUMIusg4IEbRcRumqrJMXgLu/HZY4moSzNKUgu6rzKTR6czV6w1GMB4eyVaJGUE8bv2gzyI4RrUc4Dh46d9moY8xcTpe2ILd8425lM2Q/ImEJJ/cD0c+biwG86c4owxgd+0OZURfKNg1WmMds0+TcQ1m3+V+/ynbIoyTqIIfrOOzIUh2BqzECHPUzqKb4vtoLwJY4MJ1x4fT6IbbY0Xl789NfQU74NPmcuUpXXeyHKpLxpH18jopbV9FdFWTYUFO4GuB/FcWj8GrYvh1D8jF6S1IiMcjRnlhP/DsiiJ40IYArPnnzUC8nLA8ktx6i6lAMAGqwWmv+LlCZ29LHTedfG0T988lEahz5+IX+2Aj8YKaZZ+GX2382uPfS6ZNf4kJbWRiFOXjRneHztFgf+bTtKCj3pAbg+qVimNmib13D+hegNRkta9IqutwQ/KYeTQ5LK0X0PJORUZGjHEpFY9JFOe9dXZO2WFCFi/xQBIypskwk/JdCKc/4qMKxMeh6XPI6RY5nGHrABFGaDhej2vp2u3lVhitDu7LAsY3QWmux5SAuaHEIoTnI/kTc1KeG23+jRqGTP9B6YwbyCHXVmV8UHF7EE6GiNTj1QjaBzgYTBad0oP0yT4K98Q8m4CRd96itfC6GwnnyULAxhorPvoD1sYXgoDj3XaG9OK60wpi0nI2rhUzYClOK6Q4o1pUJqWNfoAh+bTO7aY2CUIAqpzCeW3in0Oc0TQee1fOTjaUMryXa7Ygp8T40nmQSMrdrbkJQcw7zPGonZjyydPTHbUJE8MOHurCOkRn7+twylDOniA89JkEFBxd6EDWkfb/rD4FVmsRC+MKqstQsXkEuwRDwziuIY8yDpPLN7jXiOLjvsdR7RGFhpNAO/+6A9Yrmn4XtR+dUKfsitJC5FDXqzFCo5T8LOWCgSuX4l+gO74Rk4c9dkqfYaxgdxM/A9VspS37g6/ rzj5Uj0j MbJz7ld4ROt2Xvuw= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 6/4/25 11:51, Kirill A. Shutemov wrote: > When compiling with MEMCG enabled but VM_EVENT_COUNTERS disabled, > BUILD_BUG_ON() is triggered in vmstat_start because the vmstat_text > array is larger than NR_VMSTAT_ITEMS. > > This issue arises because some elements of the vmstat_text array are > present when either MEMCG or VM_EVENT_COUNTERS is enabled, but > NR_VMSTAT_ITEMS only accounts for these elements if VM_EVENT_COUNTERS is > enabled. > > The recent change in the BUILD_BUG_ON() check made it more strict, > disallowing extra elements in the array, which revealed the issue. > > Instead of adjusting the NR_VMSTAT_ITEMS definition to account for > MEMCG, make MEMCG select VM_EVENT_COUNTERS. VM_EVENT_COUNTERS is > enabled in most configurations anyway. > > 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 > Reported-by: Randy Dunlap > 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. > Cc: Konstantin Khlebnikov Otherwise, Acked-by: Vlastimil Babka > --- > include/linux/vmstat.h | 4 ++-- > init/Kconfig | 1 + > mm/vmstat.c | 4 ++-- > 3 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h > index b2ccb6845595..c287998908bf 100644 > --- a/include/linux/vmstat.h > +++ b/include/linux/vmstat.h > @@ -507,7 +507,7 @@ static inline const char *lru_list_name(enum lru_list lru) > return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_" > } > > -#if defined(CONFIG_VM_EVENT_COUNTERS) || defined(CONFIG_MEMCG) > +#if defined(CONFIG_VM_EVENT_COUNTERS) > static inline const char *vm_event_name(enum vm_event_item item) > { > return vmstat_text[NR_VM_ZONE_STAT_ITEMS + > @@ -516,7 +516,7 @@ static inline const char *vm_event_name(enum vm_event_item item) > NR_VM_STAT_ITEMS + > item]; > } > -#endif /* CONFIG_VM_EVENT_COUNTERS || CONFIG_MEMCG */ > +#endif /* CONFIG_VM_EVENT_COUNTERS */ > > #ifdef CONFIG_MEMCG > > diff --git a/init/Kconfig b/init/Kconfig > index ab83abe0fd9d..dd332cac6036 100644 > --- a/init/Kconfig > +++ b/init/Kconfig > @@ -989,6 +989,7 @@ config MEMCG > select PAGE_COUNTER > select EVENTFD > select SLAB_OBJ_EXT > + select VM_EVENT_COUNTERS > help > Provides control over the memory footprint of tasks in a cgroup. > > diff --git a/mm/vmstat.c b/mm/vmstat.c > index 27dc37168cfd..c3114b8826e4 100644 > --- a/mm/vmstat.c > +++ b/mm/vmstat.c > @@ -1301,7 +1301,7 @@ const char * const vmstat_text[] = { > [I(NR_MEMMAP_BOOT_PAGES)] = "nr_memmap_boot_pages", > #undef I > > -#if defined(CONFIG_VM_EVENT_COUNTERS) || defined(CONFIG_MEMCG) > +#if defined(CONFIG_VM_EVENT_COUNTERS) > /* enum vm_event_item counters */ > #define I(x) (NR_VM_ZONE_STAT_ITEMS + NR_VM_NUMA_EVENT_ITEMS + \ > NR_VM_NODE_STAT_ITEMS + NR_VM_STAT_ITEMS + x) > @@ -1498,7 +1498,7 @@ const char * const vmstat_text[] = { > #endif > #endif > #undef I > -#endif /* CONFIG_VM_EVENT_COUNTERS || CONFIG_MEMCG */ > +#endif /* CONFIG_VM_EVENT_COUNTERS */ > }; > #endif /* CONFIG_PROC_FS || CONFIG_SYSFS || CONFIG_NUMA || CONFIG_MEMCG */ >