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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E44CACCA470 for ; Wed, 8 Oct 2025 15:31:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 442548E0030; Wed, 8 Oct 2025 11:31:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3F1BB8E0002; Wed, 8 Oct 2025 11:31:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2B9AF8E0030; Wed, 8 Oct 2025 11:31:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 165DE8E0002 for ; Wed, 8 Oct 2025 11:31:47 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id DAB791A05A6 for ; Wed, 8 Oct 2025 15:31:46 +0000 (UTC) X-FDA: 83975337012.08.249C0E4 Received: from pdx-out-005.esa.us-west-2.outbound.mail-perimeter.amazon.com (pdx-out-005.esa.us-west-2.outbound.mail-perimeter.amazon.com [52.13.214.179]) by imf05.hostedemail.com (Postfix) with ESMTP id A339A10000A for ; Wed, 8 Oct 2025 15:31:44 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazoncorp2 header.b=CHSYNIOZ; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf05.hostedemail.com: domain of "prvs=36971892a=farbere@amazon.com" designates 52.13.214.179 as permitted sender) smtp.mailfrom="prvs=36971892a=farbere@amazon.com" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1759937504; a=rsa-sha256; cv=none; b=F/6lMudpZtHMiePuHHLKmA1LVWhfDuL6mKXNgspGxStLdUOmHlwi5zRyfRyeBePyrOq019 IRDw9zce9pXeNIXAU2wNk9HwEZPowKDOhSGR9yXScQbg0ut26qkw/t4sEQE9AJngfooGgx xIDYss84CuI12FHRiqk3BA7k5yNwF7w= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazoncorp2 header.b=CHSYNIOZ; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf05.hostedemail.com: domain of "prvs=36971892a=farbere@amazon.com" designates 52.13.214.179 as permitted sender) smtp.mailfrom="prvs=36971892a=farbere@amazon.com" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1759937504; 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=HHo5PWe4LtvHDjkJQgFRKiGpts4xHP/caZrRDmAGqn0=; b=GDKjRV1mxhDE8yAZUzassxmF4tTnNNjPlir8D7YscnySGNbArlrdy5Yf0hjQm0pq7xNyea MDnRptERC+kzifJYIWdlv1eTjm8weJg9D1B5M0D09Y6pVYnAg+px3onYTGn/WM/5Jkiwn5 KKZEnhlC/FScAj2H3XhFKdNwVmotHRw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1759937504; x=1791473504; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HHo5PWe4LtvHDjkJQgFRKiGpts4xHP/caZrRDmAGqn0=; b=CHSYNIOZpZ6lMmouKS5Pn/P4RF4OM6Ke473t72ZpY7YExitvsqgWIDj8 o6HGhwzQnjP/USOqQF2mIZWmCUHysK3xki4czXFKrb/yJvwyCzRyDorxg KeFtRCmK/xY+iFKu8OwS3tJZWktmRBWlbvl2B3HAX+debEYj4AZYtKCHw zxl6g5JZwC/l7hurHL1DsfEc7LWWabz9iLSmYeu5PzN4oif+ui5NLgJRp RzvbK0Yx9FayjRcbNJyCUss1j8e+DfxbRz/kIV4RmFK4OLzDg25sKa/wW IpZMH8v+vww2egzPpKkU+icTrXROHY5yZ8WksuyDtNTUv4ZkyNmogQivS w==; X-CSE-ConnectionGUID: qOunANGnQdCOJtYflWxMdA== X-CSE-MsgGUID: o8RG+11STU2/PSRYpbgbGw== X-IronPort-AV: E=Sophos;i="6.19,213,1754956800"; d="scan'208";a="4531225" Received: from ip-10-5-12-219.us-west-2.compute.internal (HELO smtpout.naws.us-west-2.prod.farcaster.email.amazon.dev) ([10.5.12.219]) by internal-pdx-out-005.esa.us-west-2.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2025 15:31:41 +0000 Received: from EX19MTAUWA001.ant.amazon.com [10.0.21.151:52437] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.57.112:2525] with esmtp (Farcaster) id 1e7fe95c-108c-4ec7-ac08-fab91a63a8ba; Wed, 8 Oct 2025 15:31:41 +0000 (UTC) X-Farcaster-Flow-ID: 1e7fe95c-108c-4ec7-ac08-fab91a63a8ba Received: from EX19D001UWA001.ant.amazon.com (10.13.138.214) by EX19MTAUWA001.ant.amazon.com (10.250.64.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Wed, 8 Oct 2025 15:31:37 +0000 Received: from dev-dsk-farbere-1a-46ecabed.eu-west-1.amazon.com (172.19.116.181) by EX19D001UWA001.ant.amazon.com (10.13.138.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Wed, 8 Oct 2025 15:31:24 +0000 From: Eliav Farber To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , CC: Linus Torvalds , David Laight , Lorenzo Stoakes Subject: [PATCH v3 06/19 5.15.y] minmax: add a few more MIN_T/MAX_T users Date: Wed, 8 Oct 2025 15:29:31 +0000 Message-ID: <20251008152946.29285-7-farbere@amazon.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251008152946.29285-1-farbere@amazon.com> References: <20251008152946.29285-1-farbere@amazon.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [172.19.116.181] X-ClientProxiedBy: EX19D037UWC003.ant.amazon.com (10.13.139.231) To EX19D001UWA001.ant.amazon.com (10.13.138.214) X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: A339A10000A X-Stat-Signature: ghrkdkrqb8ieqkaefh17hgwxhpppo5s1 X-HE-Tag: 1759937504-11804 X-HE-Meta: U2FsdGVkX1+Q/mNin///BfxOHDjYueu9tpsFKYzH/jB46GSn8tT+IlGHYsOXiZRbtlFN+m3qoyK9K5s8ygLRmkYNWeZ/JK6zPQsOuY75axM9Q+vJ+SGu5Epqpsg02uti4cHR81V1d8K1HjG14pilRrEbQrSgyOvvr3vGDroq2jRxSQSMjYZ3z4dZUGQSgvZbWpODnjU3xTPHHJcYzzGKYR2Evw83nMVkInNHPljd/luoldAF/R6Rjl+VASlkgKebZJWSOri6XpKxebZq1w2qi1gbneotOKfysr8TSfbThGaQaClKn1ArhoNwFi72lEpqakWiYpf3LMdMm+9wXrIoAONyrjU9P0nfsQ5Q2OWBC0Knw9KUtzarYlKhST9zK9y+2sE9BHiC4MuXCkUj5saOVg8/LU/YnR7JqVno8dkcq30RBf4Szns+n2BQjYdbdHEOiL+g2LyH6QnMYidEZNIpVu8oVUxEL9sNfzjQ+3tSvsjap6RFeFZtlpvvbYEDeS71SofqwISw55+zrCmIOdKMwRsUzR3GMFkRlhqITO5g9jiImaNyINjMhuJ9Lf858UCaqzeykzP3PXJhlG/5hIJh+CIkO/0TqKIY908m8zm5z5v6z9qVVuLtL+IFNUdwmkEtm7OubHu8TfDgabzxdC7qrocM0hjk3HJ3uI0LmZ1gWyZFw4BTdEE6YxbC/PNoZ/mtwTRFIc9ke2Cmw74DUJP3D5ySvn6255VV/L9NdNY7gszT5v9CcbY+N8UYGlbN4XsjzBVzh83ps2qXAYo30BsJ7obq8xMC+a3EZRAIi25aB3rUeNECms4m5RUsdzyNDRgEh86mTK21xsbDZXLNDe1s8xCPqfRZN2Nzyp/w/lEDkIsMg/KTh5hl+I9SM1ImQzIzUU6UD2g6y5TknUbGQV4GFBaVQBt1N+V+mEtppDaHu2pe1iAe3LB6RaLH6RE+sAvRkLj6O7Igq7UeooLv7Yt Gsts3vwP eJBCI9N1omROQP0w6k6znDqCKTbmFK3HKEJfnkZwQbzuUAw712zEjzMZeRGBOnV6WWbBasDgb9B88pT4f7IFNNMajakNtexDDIy1OfmY/0rpKWd4xYDPaMYTdnF/7/zx4+4tXz++TdvE6x9yVV0E6t8ebMKciDMd/m1qZ9S2RcG1SrVaCwSkPWWhReb0X18WJa7gtpINkBVDdLn5w24NoUiX9SUKGd5Hl8H5OZtd1hka7g8bFF3alkYsK0kLilHYq79J5NoOz3J7d0TIFd1bgOpoiWp+w8yF9GCfn6CGM6G/aZynkiZM2ZuNqTWsBM7riZKGUjPAgAY5uBVABKdhO+omR6a2ujNQuxPPgvDd0mnuw1o3h+JjWcbFgtCpkE7DAgVNVdFhfzUaL9grPdvj0lpOVsDjIOFJgTCL7PkxXVDCFItnimTmwAaYQq/rAsH7YLeHu6YaXxABy1hbTii8h4Qw8tI82/AzSlFYER/7txymQYUUFT9XrJ2LdsX5j8cUwAFmCbGtDTGk4CWZ5B54SKIMMbHm56UvbcqgXvWyZtwNXFDUz4sHk7BebR/KQKwvvp481dN3jPaCUOLrxzf4jeTPAX4b7Ism6ilN9wNaCM9JmVXuTB5n3+0+9uSxrleas5r84eyqw623srD80BtG243Rl84fLPkwcLEaWwbvW4aR/6AMVoZDrt1zv/fZIf3VwwapzLLrRmTa6Hvc+srpfNq9B6oXLLXgXn3H/cyW48QPPX5VGZqeQKJBIuuknww5Gbk7Fxf51MLMO736p+yhDw8qimUo9GwhjM/QXBTQApwnuxig0b7osicJM17XASkVyRZJ/zEhKysg+V2SGTgY6nJn36r/j6BVDag5/829EmyRV3n9zH3fFyn2ZuLYh5DTZWVzulSyQEEkyfFL/cBvwls0E3VBJ71d3OFdTvwvPJf6BWjTWLXZT8xdU/Ox6ESQuYqowZqGn23zQrmBXtKPCxoVOXP7S 8a/bXWGW EwR6bPOOOQ0= 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: From: Linus Torvalds [ Upstream commit 4477b39c32fdc03363affef4b11d48391e6dc9ff ] Commit 3a7e02c040b1 ("minmax: avoid overly complicated constant expressions in VM code") added the simpler MIN_T/MAX_T macros in order to avoid some excessive expansion from the rather complicated regular min/max macros. The complexity of those macros stems from two issues: (a) trying to use them in situations that require a C constant expression (in static initializers and for array sizes) (b) the type sanity checking and MIN_T/MAX_T avoids both of these issues. Now, in the whole (long) discussion about all this, it was pointed out that the whole type sanity checking is entirely unnecessary for min_t/max_t which get a fixed type that the comparison is done in. But that still leaves min_t/max_t unnecessarily complicated due to worries about the C constant expression case. However, it turns out that there really aren't very many cases that use min_t/max_t for this, and we can just force-convert those. This does exactly that. Which in turn will then allow for much simpler implementations of min_t()/max_t(). All the usual "macros in all upper case will evaluate the arguments multiple times" rules apply. We should do all the same things for the regular min/max() vs MIN/MAX() cases, but that has the added complexity of various drivers defining their own local versions of MIN/MAX, so that needs another level of fixes first. Link: https://lore.kernel.org/all/b47fad1d0cf8449886ad148f8c013dae@AcuMS.aculab.com/ Cc: David Laight Cc: Lorenzo Stoakes Signed-off-by: Linus Torvalds Signed-off-by: Eliav Farber --- V2 -> V3: Fix fs/erofs/zdata.h to use MIN_T instead of min_t to fix build on the following patch: In file included from ./include/linux/kernel.h:16, from ./include/linux/list.h:9, from ./include/linux/wait.h:7, from ./include/linux/wait_bit.h:8, from ./include/linux/fs.h:6, from fs/erofs/internal.h:10, from fs/erofs/zdata.h:9, from fs/erofs/zdata.c:6: fs/erofs/zdata.c: In function ‘z_erofs_decompress_pcluster’: fs/erofs/zdata.h:185:61: error: ISO C90 forbids variable length array ‘pages_onstack’ [-Werror=vla] 185 | min_t(unsigned int, THREAD_SIZE / 8 / sizeof(struct page *), 96U) | ^~~~ ./include/linux/minmax.h:49:23: note: in definition of macro ‘__cmp_once_unique’ 49 | ({ type ux = (x); type uy = (y); __cmp(op, ux, uy); }) | ^ ./include/linux/minmax.h:164:27: note: in expansion of macro ‘__cmp_once’ 164 | #define min_t(type, x, y) __cmp_once(min, type, x, y) | ^~~~~~~~~~ fs/erofs/zdata.h:185:9: note: in expansion of macro ‘min_t’ 185 | min_t(unsigned int, THREAD_SIZE / 8 / sizeof(struct page *), 96U) | ^~~~~ fs/erofs/zdata.c:847:36: note: in expansion of macro ‘Z_EROFS_VMAP_ONSTACK_PAGES’ 847 | struct page *pages_onstack[Z_EROFS_VMAP_ONSTACK_PAGES]; | ^~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors V1 -> V2: Use `[ Upstream commit ]` instead of `commit upstream.` like in all other patches. arch/x86/mm/pgtable.c | 2 +- drivers/edac/sb_edac.c | 4 ++-- drivers/gpu/drm/drm_color_mgmt.c | 2 +- drivers/md/dm-integrity.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- fs/erofs/zdata.h | 2 +- net/ipv4/proc.c | 2 +- net/ipv6/proc.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 3481b35cb4ec..e649161eb6fc 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -107,7 +107,7 @@ static inline void pgd_list_del(pgd_t *pgd) #define UNSHARED_PTRS_PER_PGD \ (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD) #define MAX_UNSHARED_PTRS_PER_PGD \ - max_t(size_t, KERNEL_PGD_BOUNDARY, PTRS_PER_PGD) + MAX_T(size_t, KERNEL_PGD_BOUNDARY, PTRS_PER_PGD) static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm) diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 1522d4aa2ca6..714020e7405a 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -109,8 +109,8 @@ static const u32 knl_interleave_list[] = { 0x104, 0x10c, 0x114, 0x11c, /* 20-23 */ }; #define MAX_INTERLEAVE \ - (max_t(unsigned int, ARRAY_SIZE(sbridge_interleave_list), \ - max_t(unsigned int, ARRAY_SIZE(ibridge_interleave_list), \ + (MAX_T(unsigned int, ARRAY_SIZE(sbridge_interleave_list), \ + MAX_T(unsigned int, ARRAY_SIZE(ibridge_interleave_list), \ ARRAY_SIZE(knl_interleave_list)))) struct interleave_pkg { diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c index bb14f488c8f6..1ff572d8744e 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -528,7 +528,7 @@ int drm_plane_create_color_properties(struct drm_plane *plane, { struct drm_device *dev = plane->dev; struct drm_property *prop; - struct drm_prop_enum_list enum_list[max_t(int, DRM_COLOR_ENCODING_MAX, + struct drm_prop_enum_list enum_list[MAX_T(int, DRM_COLOR_ENCODING_MAX, DRM_COLOR_RANGE_MAX)]; int i, len; diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index e9d553eea9cd..8e2b00536c3e 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c @@ -2536,7 +2536,7 @@ static void do_journal_write(struct dm_integrity_c *ic, unsigned write_start, unlikely(from_replay) && #endif ic->internal_hash) { - char test_tag[max_t(size_t, HASH_MAX_DIGESTSIZE, MAX_TAG_SIZE)]; + char test_tag[MAX_T(size_t, HASH_MAX_DIGESTSIZE, MAX_TAG_SIZE)]; integrity_sector_checksum(ic, sec + ((l - j) << ic->sb->log2_sectors_per_block), (char *)access_journal_data(ic, i, l), test_tag); diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 2478caeec763..21cc8cd9e023 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2805,7 +2805,7 @@ static void stmmac_dma_interrupt(struct stmmac_priv *priv) u32 channels_to_check = tx_channel_count > rx_channel_count ? tx_channel_count : rx_channel_count; u32 chan; - int status[max_t(u32, MTL_MAX_TX_QUEUES, MTL_MAX_RX_QUEUES)]; + int status[MAX_T(u32, MTL_MAX_TX_QUEUES, MTL_MAX_RX_QUEUES)]; /* Make sure we never check beyond our status buffer. */ if (WARN_ON_ONCE(channels_to_check > ARRAY_SIZE(status))) diff --git a/fs/erofs/zdata.h b/fs/erofs/zdata.h index 3a008f1b9f78..43876fd8a2cb 100644 --- a/fs/erofs/zdata.h +++ b/fs/erofs/zdata.h @@ -182,7 +182,7 @@ static inline void z_erofs_onlinepage_endio(struct page *page) } #define Z_EROFS_VMAP_ONSTACK_PAGES \ - min_t(unsigned int, THREAD_SIZE / 8 / sizeof(struct page *), 96U) + MIN_T(unsigned int, THREAD_SIZE / 8 / sizeof(struct page *), 96U) #define Z_EROFS_VMAP_GLOBAL_PAGES 2048 #endif diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c index 4b9280a3b673..d849f61b7519 100644 --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c @@ -43,7 +43,7 @@ #include #include -#define TCPUDP_MIB_MAX max_t(u32, UDP_MIB_MAX, TCP_MIB_MAX) +#define TCPUDP_MIB_MAX MAX_T(u32, UDP_MIB_MAX, TCP_MIB_MAX) /* * Report socket allocation statistics [mea@utu.fi] diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index d6306aa46bb1..e07c43bd5cb0 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c @@ -27,7 +27,7 @@ #include #define MAX4(a, b, c, d) \ - max_t(u32, max_t(u32, a, b), max_t(u32, c, d)) + MAX_T(u32, MAX_T(u32, a, b), MAX_T(u32, c, d)) #define SNMP_MIB_MAX MAX4(UDP_MIB_MAX, TCP_MIB_MAX, \ IPSTATS_MIB_MAX, ICMP_MIB_MAX) -- 2.47.3