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 90080C02199 for ; Sat, 8 Feb 2025 00:49:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 93C99280004; Fri, 7 Feb 2025 19:49:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C61C280001; Fri, 7 Feb 2025 19:49:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 73EB9280004; Fri, 7 Feb 2025 19:49:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 52DD7280001 for ; Fri, 7 Feb 2025 19:49:31 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id AF7C31A1109 for ; Sat, 8 Feb 2025 00:49:30 +0000 (UTC) X-FDA: 83094944100.27.47D6AE2 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf29.hostedemail.com (Postfix) with ESMTP id 1E7BB120002 for ; Sat, 8 Feb 2025 00:49:28 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Tbom8z1a; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf29.hostedemail.com: domain of kuba@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=kuba@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738975769; a=rsa-sha256; cv=none; b=19N29Zf/iGlS3JOYgOKH+dzKXBMAxsGVXB7ojjtT3oWgWMtAL0SSOBU2cPHqrs407OEhYb +HWFn30T73xN/h1XTaIj2/6ZpsGOZ2MBU+LrQ7nMyb5hNm+AcIaUZcF52+5ywjDOTSdero YXT5D+LwwkbfSxSbiG3rjPlGtd/Vq6o= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Tbom8z1a; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf29.hostedemail.com: domain of kuba@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=kuba@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738975769; 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=JBnhG5V9ztMAOWw+02YY0E/3uALeDksQJomcf+YdpZI=; b=OYpgensJqVm+/hdnKflIeiHH+cvUrRWT12K5v3ZkqxOPWgM0AIGHuIqvb9l8sTI87vfIh1 l+rC3bUdeuhRSQQ1fPNTxhbZKjuYsK4mhX/eEETANSdPlHtsnaIDaVuwhwjtXES+3WSMJJ dL8LCm1BloeX7qOWq7ZDiJnXCMryg84= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 520A0A43EA9; Sat, 8 Feb 2025 00:47:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB63FC4CED1; Sat, 8 Feb 2025 00:49:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738975767; bh=ALb3bAmnRzT8E2Mot1QLvS+lS2DOm28F+WrbPB6J8/E=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Tbom8z1a3MgTPTja+QZFyQIxs4MWpvuiUBp0aJCGru2rL8mP5+5PVuPtXWvRPZga9 03zShsvsVvRCP8GqGPiHhyQfQGyPqSsnT2rKpglNm8hoeU3Za+8NTPysMtJ+gTtsQE oKyJJO9nQxj8Pt/PvAvmU2y1PYXcvkWjXXPRkTXPodvg5EsHap0z6BgJkfzEmWQB16 c0JEiVE7dFUQsonPYEZ9XWQIuJtaMJn9zK7tFupy7nJo+7aK2RnO/tgXR6nMRGQEtw 1dFf7LgGupwPi7JuHipSUnT7bX/PhqrdpzMEbnMuO97ahNr8cp6OwoqTUZj0718ibI s7Ss9xPzUBjZA== Date: Fri, 7 Feb 2025 16:49:26 -0800 From: Jakub Kicinski To: Andrew Morton , torvalds@linux-foundation.org Cc: Bart Van Assche , linux-mm@kvack.org, Ivan Shapovalov , Vlastimil Babka , David Laight , Nathan Chancellor , Pasha Tatashin , David Rientjes , David Hildenbrand , Kaiyang Zhao , Joel Granados , Sourav Panda , Johannes Weiner Subject: Re: [PATCH] mm: Fix clang W=1 compiler warnings Message-ID: <20250207164926.6daeac77@kernel.org> In-Reply-To: <20250131191231.1370466-1-bvanassche@acm.org> References: <20250131191231.1370466-1-bvanassche@acm.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 1E7BB120002 X-Stat-Signature: pajsdh81haciufn8pxjrh5qbu181tpnj X-Rspam-User: X-HE-Tag: 1738975768-746637 X-HE-Meta: U2FsdGVkX18/e+MBroQCTmw7N19rP2L2fjz+EKYDyVz/V4vaSEi6NJygePdkBjvDbU6H3i6ghhliPo0a/pd9jWqgUECRiBfVU3OUzx3GlUa8BFIDggr4/lOMz1xfaB0vQIovygPtibsYuvavaqVnFJWeNyFg0ZR5HuL9m9WMVWkzSTRogRVCaNEtL8DJmCMod4iINQZVZCZAgqKJkLGrEUEhfkg8P1OK+nvUDqrneltkdeCQsOlqtAJb6qf5O3fxidKNKRaYkdRMFLq+lT3ni+++2aMLS+yC4H10dz4fE2P9d3Ubwug486d5Repjy4Y49A9429qUADkCNx2/gN29hcSO7p9Rtn1Ewwp60K912O0dDvneel1R6ifuH8APUL1BzpwlPGG/C8fK+2U4j/KxcnWCimKZfKKDx3CLMU2C3TJLlqsF4V9ykRw89RxTI0xYohACt2LUVutYLAoXMiRRQyrAESCnTGL1BeWa3JgbUYZf35LWwqwKXveS4rs0XbpNqwPoWWm9JTEyFeoaGfTLzCwDy8cc8y1IaKssa3HenKl8/dodjSP7sBRk4WOQ3n1R65B5C9yv8Ys8gR1CserXdN99Q7GS9Blh9CCwTEZNCwylaeOregWYOJv+OEJhiPVfuUxwIJmPHlu+BCYJ9iqM4mO9gmTkgzFq+9Cti2c6h0SnwJhAT+tWo+ef6mPN1/pKKxwgj16cA2yqG9zDgTMC1e1eiuYb8DBGCWyTVW54+Qbq4feawIvySwA4g8/pV27YnXNs/nosZSzmxJfSrWgi8oQjIQhbBSMXu1qaJoJoPdj67WR7yYv9N+iBJ7zSle1ABwGW6+DV4zw4Z9XGSk0Y0gnflOiAtinhrqJSBzaUGxZp6hNnOc5s4vZTtnvWUyd3Dlciryq8Ru7CMtwlNlvg8qMfHiR3DYh1yvLqziLIlmlr8+iGZDLzzX/tTydYCTW3kyaJnPe+67TqJgVF6Sl GTKZ3fJb mn8UF/0+HAZ+scckZQWRdkNyGpEzADTOWtLnhIo2rKl+gKcb0EgHuR4RcUtygAoYbEgOzb9GQMWN6zqCGigrjA4x4MGHy9A7RSYEi5MEEEMInDZ4+hUNDGh7LhMdUa+XMbiUXscTivfCAT4HzmBOzl24ZOFPxH4OrFTncbzk7ienEDaHc3VPX2LUBI8RB4UpLqz50thwuPuOdbT6FyWcbU+6lA7qHZ7DCL9wKS6Bcsg/WBeFMJoPtpU3AkMPzE9JsaqnF 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 Fri, 31 Jan 2025 11:12:23 -0800 Bart Van Assche wrote: > Commit 30c2de0a267c ("mm/vmstat: fix a W=1 clang compiler warning") > suppresses some but not all compiler warnings that are reported by clang > when building mm/ with W=1. Hence revert commit 30c2de0a267c and instead > make NR_LRU_BASE and NR_ZONE_LRU_BASE integer constants instead of > enumeration constants. Additionally, convert the item##_NORMAL constants > from type enum vm_event_item into int before subtracting ZONE_NORMAL. The > latter constant has type enum zone_type. Could we possibly please still consider taking this in for 6.14? :( Since the warning comes from vmstat.h pretty much every object file generates this warning. clang 19 is getting more widely used now, its making it hard to see new warnings. > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h > index 9540b41894da..bc139c704538 100644 > --- a/include/linux/mmzone.h > +++ b/include/linux/mmzone.h > @@ -135,11 +135,20 @@ enum numa_stat_item { > #define NR_VM_NUMA_EVENT_ITEMS 0 > #endif > > +/* > + * NR_ZONE_LRU_BASE and NR_VM_ZONE_STAT_ITEMS are often added to enumeration > + * constants of another type than enum_zone_stat_item. Define these constants > + * as an integer instead of enum node_stat_item to prevent that the compiler > + * warns about enumeration type mismatches when these constants are used. > + */ > +#define NR_ZONE_LRU_BASE (__NR_ZONE_LRU_BASE + 0) > +#define NR_VM_ZONE_STAT_ITEMS (__NR_VM_ZONE_STAT_ITEMS + 0) > + > enum zone_stat_item { > /* First 128 byte cacheline (assuming 64 bit words) */ > NR_FREE_PAGES, > - NR_ZONE_LRU_BASE, /* Used only for compaction and reclaim retry */ > - NR_ZONE_INACTIVE_ANON = NR_ZONE_LRU_BASE, > + __NR_ZONE_LRU_BASE, /* Used only for compaction and reclaim retry */ > + NR_ZONE_INACTIVE_ANON = __NR_ZONE_LRU_BASE, > NR_ZONE_ACTIVE_ANON, > NR_ZONE_INACTIVE_FILE, > NR_ZONE_ACTIVE_FILE, > @@ -155,11 +164,18 @@ enum zone_stat_item { > #ifdef CONFIG_UNACCEPTED_MEMORY > NR_UNACCEPTED, > #endif > - NR_VM_ZONE_STAT_ITEMS }; > + __NR_VM_ZONE_STAT_ITEMS }; > + > +/* > + * enum lru_list constants are often added to NR_LRU_BASE. Define NR_LRU_BASE > + * as an integer instead of enum node_stat_item to prevent that the compiler > + * warns about enumeration type mismatches. > + */ > +#define NR_LRU_BASE (__NR_LRU_BASE + 0) > > enum node_stat_item { > - NR_LRU_BASE, > - NR_INACTIVE_ANON = NR_LRU_BASE, /* must match order of LRU_[IN]ACTIVE */ > + __NR_LRU_BASE, > + NR_INACTIVE_ANON = __NR_LRU_BASE, /*must match order of LRU_[IN]ACTIVE*/ > NR_ACTIVE_ANON, /* " " " " " */ > NR_INACTIVE_FILE, /* " " " " " */ > NR_ACTIVE_FILE, /* " " " " " */ > diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h > index 9f3a04345b86..72d1974ee81f 100644 > --- a/include/linux/vmstat.h > +++ b/include/linux/vmstat.h > @@ -135,8 +135,13 @@ static inline void vm_events_fold_cpu(int cpu) > #define count_vm_vma_lock_event(x) do {} while (0) > #endif > > +/* > + * item##_NORMAL has type enum vm_event_item while ZONE_NORMAL and zid have > + * type enum zone_type. Suppress compiler warnings about mixing different > + * enumeration types by converting item##_NORMAL into an int with '+ 0'. > + */ > #define __count_zid_vm_events(item, zid, delta) \ > - __count_vm_events(item##_NORMAL - ZONE_NORMAL + zid, delta) > + __count_vm_events((item##_NORMAL + 0) - ZONE_NORMAL + zid, delta) > > /* > * Zone and node-based page accounting with per cpu differentials. > @@ -515,7 +520,7 @@ static inline const char *node_stat_name(enum node_stat_item item) > > static inline const char *lru_list_name(enum lru_list lru) > { > - return node_stat_name(NR_LRU_BASE + (enum node_stat_item)lru) + 3; // skip "nr_" > + return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_" > } > > #if defined(CONFIG_VM_EVENT_COUNTERS) || defined(CONFIG_MEMCG) > >