From patchwork Fri Jan 31 19:12:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 13955690 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 A9D85C0218F for ; Fri, 31 Jan 2025 19:13:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8A0D56B007B; Fri, 31 Jan 2025 14:13:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 851746B0082; Fri, 31 Jan 2025 14:13:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6F1666B0083; Fri, 31 Jan 2025 14:13:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 516466B007B for ; Fri, 31 Jan 2025 14:13:09 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B316D16103E for ; Fri, 31 Jan 2025 19:13:08 +0000 (UTC) X-FDA: 83068694856.12.FBB2D7C Received: from 009.lax.mailroute.net (009.lax.mailroute.net [199.89.1.12]) by imf05.hostedemail.com (Postfix) with ESMTP id D8B78100012 for ; Fri, 31 Jan 2025 19:13:06 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=acm.org header.s=mr01 header.b=ACGhI6h4; spf=pass (imf05.hostedemail.com: domain of bvanassche@acm.org designates 199.89.1.12 as permitted sender) smtp.mailfrom=bvanassche@acm.org; dmarc=pass (policy=reject) header.from=acm.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738350787; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=3+EWfzI9EkpgcORlThR+qZzNHW+UrQs9qvUIUsONGWw=; b=n11zmE14wT7rNGmSQklUxImkVx3XoyG+2z224b+VoM4DNPH/VxRgC4j5ETkhSeC9wBCNyo 21zFK899w3iACKICf44ENtcI5PO3zBh7hvoBVd9aIjg7Tf0dMgTEwOxMkAjHKQAjZAepNy QFwvg/ElLerUAiEg+1nnvgRj8Z2e6kc= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=acm.org header.s=mr01 header.b=ACGhI6h4; spf=pass (imf05.hostedemail.com: domain of bvanassche@acm.org designates 199.89.1.12 as permitted sender) smtp.mailfrom=bvanassche@acm.org; dmarc=pass (policy=reject) header.from=acm.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738350787; a=rsa-sha256; cv=none; b=rcAcdEqwFzTBnxGKhCMUZ9gU3ry55HCVmc/3Dbv00qr0qVL95hScRh/J7mhxCIpSgbO9Va JCVYnNgP7oml4/dLccH5pOzoYmQjQ/qTFjxCz2yiKmmXR9SJeOMAp8RrAuerWJYrSD3f0k 2ykHE7QcPyEDWEgFrPJa0G1kC3oPx3c= Received: from localhost (localhost [127.0.0.1]) by 009.lax.mailroute.net (Postfix) with ESMTP id 4Yl5Bn5H6pzlgTwB; Fri, 31 Jan 2025 19:13:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=acm.org; h= content-transfer-encoding:mime-version:x-mailer:message-id:date :date:subject:subject:from:from:received:received; s=mr01; t= 1738350775; x=1740942776; bh=3+EWfzI9EkpgcORlThR+qZzNHW+UrQs9qvU IUsONGWw=; b=ACGhI6h4xsedeeW0gs+JaE9EphYspSa17EfdRs+sSveVkSvFGR0 ysvRGw1QbKrdKbVsSagxgWLCN9UktjXeuPYrY3CBHwUHJTskd+733BoqMp5qh33Z m6uTyQoEoBNINiuzIdzVVY+hPs6PSdpsRFtropITGowM1JkHrDAgoGDm7eZf9MV1 JuT5P5pjFzEpCqcVZs7jHHz5h2/khWxfLFpbYN+zfZUcUK+7kSXNISTwFoXXUp9j 31jZhumLMYtJJmLtOR3sF+rrjiJyxzCL250tU6afBrODXsWkZZXYgQEOrQi59kYb sR41Yunx/B2ae1dm4uLfqsdBOCfn0Xy+BBw== X-Virus-Scanned: by MailRoute Received: from 009.lax.mailroute.net ([127.0.0.1]) by localhost (009.lax [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id 7_lqS-iTZdNM; Fri, 31 Jan 2025 19:12:55 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.204.82]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: bvanassche@acm.org) by 009.lax.mailroute.net (Postfix) with ESMTPSA id 4Yl5BV39PtzlgTvr; Fri, 31 Jan 2025 19:12:50 +0000 (UTC) From: Bart Van Assche To: Andrew Morton Cc: linux-mm@kvack.org, Bart Van Assche , Ivan Shapovalov , Vlastimil Babka , David Laight , Nathan Chancellor , Pasha Tatashin , David Rientjes , David Hildenbrand , Kaiyang Zhao , Joel Granados , Sourav Panda , Johannes Weiner Subject: [PATCH] mm: Fix clang W=1 compiler warnings Date: Fri, 31 Jan 2025 11:12:23 -0800 Message-ID: <20250131191231.1370466-1-bvanassche@acm.org> X-Mailer: git-send-email 2.48.1.362.g079036d154-goog MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: D8B78100012 X-Stat-Signature: 67yhgncndxqtqt3sugkmunz5rzr7m7kk X-HE-Tag: 1738350786-620701 X-HE-Meta: U2FsdGVkX194POI3ONpBsFQNpme9HP1moSIxnGRpKZceQ71Ht/tXZj5Xc71eHZakPkjOCJ0l6lOH+vnbPH0QvRyrUGPP94vXVU80eleJGuExh6nkXo+DEZnM3CHVeKvWOeAL3nXhW2LoLeGyQ6eEV5TbtKYOYCBvKOiqjn1FwkFzMOYKtGbDyDaA7FXoJK7hjR4GEb59W99JUjATRH7zE7+Pivns1t9i+vJvrkb2JRW90Xvnt1tQ5d9MlfVfBjL9YsXIJtAgq6ODZ9iqEDsUIQWPNfOHYdUwUsIECFvfPDARON2N07gm/bEpb9fjBu18sXLJXSe+F3gL7fV5Qe1j6bmd3n0wEiawmsDEfzF4VnF21VrvWlewyXJ8M09Ex9/zf4GY/vqrkIglxlE8Ive9JT5lcg8ZvWH/q0KdbBsN3915y/L5LkH7nV2W5aQ7vBOFbCHo/aosgkjK6sGbp9xKFcNy0X0LTBcj0gMUcl8QZteNl773XxemzxPPVzX2di88e35oX95Hre//VcjwdpcRs0FeO2vJ0kQuY0IMOcVBGlg2OKHTkwNwamEAJEuRF6kHX/jTMReHiBG6VB1KXuf9DNA67s6820KPkzzKNjrAd4DoyMUa8oJwt65V3oTp3Ha/pjgp6MAS5ZQ8CLayIjUILfh7RKoyWDn3yUJ0bCeS1H2MKD+IxvSU0ac9ny1bvsgE7aLJ3gjIce00scl24eSPfAt36xzKFCiYdXW564K4DXFCVUwlqWX2iXq2HdD84mFGioHjnRLU3tRvCUoIRDG4yp9e8Gsp5+4WHooqthxPVT0NXs21MX+FvP0HBQY+2Yf2krAA+eiTs6aWdO3uTc7vJfNZBQcA/pefwlELZcsN/3OYIHwzhHhjUgGAxO6daUa1FmSUvUjgG5wVSpBDQXSSkNhsN28xJpYl1MJqC0LpnV+TS5F3aoetwo7DAVWK0ud7M9wA5d7Blhql0Iz4SNQ rBifFo6d zNRapldc5kJU9MrBzNLIb3UVo8PP2+W00MMpZzLAo1V+Onbb4uvDR4HKNJQD9gbAC2hHUMT6YJBWXr20jTcuniR4sxCW5t8yrqWPB74sey99oyzQTB7kpOuj58FgYBuqf5xilZCvtL7EnVFg6Prkja0j9o5enBW4nhLE1mToc0zPP/VQIXHR+P+B4H57jCZ7QncQOtaU02boTSmmvKE3T25D8GVeAVTH45bIzbYSCqpIh1qw59IU+cVTWDVHu7fgP9A0pu+6b9AusGaFfpJCI5WoHrA9Mv9d23YCglYPfPqH4CrUKysfC0KMDJ0C5+f6Kj5qD 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: 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. Cc: Ivan Shapovalov Cc: Vlastimil Babka Cc: David Laight Signed-off-by: Bart Van Assche Acked-by: Vlastimil Babka --- include/linux/mmzone.h | 26 +++++++++++++++++++++----- include/linux/vmstat.h | 9 +++++++-- 2 files changed, 28 insertions(+), 7 deletions(-) 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)