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 4B8EFCAC5B0 for ; Thu, 2 Oct 2025 20:51:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A322A8E0013; Thu, 2 Oct 2025 16:51:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9E1F98E0001; Thu, 2 Oct 2025 16:51:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8A97F8E0013; Thu, 2 Oct 2025 16:51:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 75C878E0001 for ; Thu, 2 Oct 2025 16:51:26 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3EFC859FC6 for ; Thu, 2 Oct 2025 20:51:26 +0000 (UTC) X-FDA: 83954369772.23.9F6A210 Received: from fra-out-014.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-014.esa.eu-central-1.outbound.mail-perimeter.amazon.com [18.199.210.3]) by imf02.hostedemail.com (Postfix) with ESMTP id E28538000B for ; Thu, 2 Oct 2025 20:51:23 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazoncorp2 header.b=eg0iRrAg; spf=pass (imf02.hostedemail.com: domain of "prvs=363ba725c=farbere@amazon.com" designates 18.199.210.3 as permitted sender) smtp.mailfrom="prvs=363ba725c=farbere@amazon.com"; dmarc=pass (policy=quarantine) header.from=amazon.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1759438284; 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=Kfmf1eR86DneIECHGSH+H/6X5m8V4vbHJIyEvg3W2cA=; b=sI8MTE4ShOBJ//HH8XVD03fjpVy6x+Q2jxUPcKPM2Vxq/P8RnHEUwJiWp78/p5TeqBi+bE AXFPEBfwVXPzYU1JnT0k5MqZiMFm/LKJ8kxcX6nMFlkEwi2dXvZJSooQxTcv1sQwQlO16b pXhC3063E3h6YWlaitsFEo7vXVNsYOc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1759438284; a=rsa-sha256; cv=none; b=ZaN76eVabllPd2vSu9uLrBiP+EU0htzj5AEyj3F59q3rf4yoqMABBmqNfBWTXwMXqkdH0q n9SyynAGT0g0nwAKEZAq+UFSc1enveg3Dqlerv7c2Oo8wX6DtUnBH+kak4KplUvWtWnvi/ BNyJpJ790RixOsjV41wMzIj27oULpBM= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazoncorp2 header.b=eg0iRrAg; spf=pass (imf02.hostedemail.com: domain of "prvs=363ba725c=farbere@amazon.com" designates 18.199.210.3 as permitted sender) smtp.mailfrom="prvs=363ba725c=farbere@amazon.com"; dmarc=pass (policy=quarantine) header.from=amazon.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1759438284; x=1790974284; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Kfmf1eR86DneIECHGSH+H/6X5m8V4vbHJIyEvg3W2cA=; b=eg0iRrAgtRnykMlZxSmWH++U3PgV2ckCJygxN+rkdOY3Nu6jDYmB5PHv JUK+FaMGnHCpSjvKiXRqtrxg297/mWt6QIWbsQsGif+sKKLh7zMYozBY6 5n1p/hsDHtsa3OJX7O0daMeqnV2dB4yo5cMCIAtaMWhKTOtEtWePQqtap Gs4p+kaK4PO30ObNh6UoO8antno09pl7jxTJQN6mP0OQZOOyW7qVCKQP9 fdFusgRJ9M8l7Vt914nCpgVLewhm4fhusWLQWT0hKvVQHLaHMfaYt5wCw RwFcu9k7km85cX1kXmg7IbhQIzA3YWn7jox0vEwDO+aRmfPnESTrrEYva A==; X-CSE-ConnectionGUID: fuZiH7GlTiasjdrbMXEjyQ== X-CSE-MsgGUID: w/Ti8JpuRhui0hZeF8ofOA== X-IronPort-AV: E=Sophos;i="6.18,310,1751241600"; d="scan'208";a="2924542" Received: from ip-10-6-6-97.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.6.97]) by internal-fra-out-014.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2025 20:51:22 +0000 Received: from EX19MTAEUB002.ant.amazon.com [54.240.197.232:22272] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.21.15:2525] with esmtp (Farcaster) id 0f5f4ae1-b71e-4459-81c9-b639781bf383; Thu, 2 Oct 2025 20:51:22 +0000 (UTC) X-Farcaster-Flow-ID: 0f5f4ae1-b71e-4459-81c9-b639781bf383 Received: from EX19D018EUA004.ant.amazon.com (10.252.50.85) by EX19MTAEUB002.ant.amazon.com (10.252.51.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Thu, 2 Oct 2025 20:51:17 +0000 Received: from dev-dsk-farbere-1a-46ecabed.eu-west-1.amazon.com (172.19.116.181) by EX19D018EUA004.ant.amazon.com (10.252.50.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Thu, 2 Oct 2025 20:50:51 +0000 From: Eliav Farber To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , CC: Linus Torvalds , David Laight , Lorenzo Stoakes Subject: [PATCH 07/19 5.15.y] minmax: add a few more MIN_T/MAX_T users Date: Thu, 2 Oct 2025 20:47:21 +0000 Message-ID: <20251002204733.35652-8-farbere@amazon.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251002204733.35652-1-farbere@amazon.com> References: <20251002204733.35652-1-farbere@amazon.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.19.116.181] X-ClientProxiedBy: EX19D035UWA001.ant.amazon.com (10.13.139.101) To EX19D018EUA004.ant.amazon.com (10.252.50.85) X-Rspamd-Queue-Id: E28538000B X-Stat-Signature: qetb3bwmtsadhr1yaz73bhooaxy415d9 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1759438283-152204 X-HE-Meta: U2FsdGVkX1/cVBoGcPiWQXtzLBC8zI/CCgXvzXwY1kzeDlzeH2Al8ftUjBXYdqA+C9yox3CzHFMBCy2IL+6YdLmpnMZMYX1GfhoQ8l0nLaOHBO7tjYq8BZpo230bIpQJsLGEwF3pp5mtTNbslEYccgAm9x/lDMVgrGX3GirAEe4CKyU2ze9WJ4imPRKSQjYxmSlr6Zbn8b6167zGrRwiLWmClNaE4rT1g/ERduCyfaWwPswq+QCD1+b+iQa0wN6Ocq8//5IQ6iNnp30xGT+7kmp8K85nrm0q0HrH9bJ9o+zLIwwihNs7x8uCOTAxUfdMtCQZ9oCGCaWRXldBNIJGvCPxEDoM0H24IimZN71zQ4s6tFz6hJYo6UtDM5GLqo1Q0Mj3miq+t7zPtPytqvEiXWsGAXsnbpaDft7CqfJJWp9s0+9uin2AqPY3hrV/ztGwqp6ch9bDsUNBtHkSHQPzrPF/Wm3KjdlLbZjsGzQDmQhPZACNuqsg1CiNAxCe6c0EmxP48UJsxSjdaq7dBRCAks/0JjlEdscCO3TEomrH/pX0gylRkKQnYY7f1K67QENikRVP5d68+pb8qvwz4ijXvZPVZWvURor8/EKCBHOjgseXEs4EyFILiNb3aFEIWQmVeE7lpFGv2H7V8ukbWvYKXEFresuHbmR661e1LW40TCplGUOjT3QLWOGuJGL/bbMN9cVS/LrvD4J5DTdOZnfkEv8sMim9sDa88iK1BTWr8hsjLG/fxew9jJVGEXnM8qL/zpAA9R5+sTvjbCk2mnz0Re9vweq421sJyr7OB+Ab/mBNeohOIoBptcoALssc9hlBb4Gw/fev6GklP3FsYwVzmDZugtBXm/Jv4+eE1igSnSq8mvkVjuOOvijj4j8qMs3m5X8GNZX3Oj7YR2C9AvPn23KUKA98vM+G5FVYCaE6nH0U/8SaN4ucB9VhRHLt5Uc8BwZzfjdp/A1/1u3Zslm oRbiHfG6 7KcUH1tkzEqNwxHRK2jiE2TfgWvm85h6vwW5dZAhIpD0WFz7bSwL8QmuTipcIzGxHtyvb0X/Dp6dza6FXJ3lp2EBZGSbH837UToiC7N6qwCa/sJ8KzOU3NfWLOY3+XWmtVBlBKgWPd7kAbFQrWTHPmGAufhvEi1FwQYOgZxBgji558V0Xy9wUlf54/FZOg4iHCuYiMYlMxwyDeS9WcqU04E6uti/cZPXeVsyI/1eRzqMTM5S/ABYJaVQHHGULdiWoblWj3okNMmjV4R1ikBKS4VQRl2xYyZW7WSqLeWCHDXITVDgtUg7dLAyXF5+X3goB2Wy9cuQh6K/0SZIMF7Cf8bclHMJ6EWKLj9w7fbxWLu5pZAynJbVVrJJ1csMxU/SUXYXrLkoTQktf9QdTdbnW/uQDEkxx/zf5BWDOMQuoX9cErB4nP29O9CkrZz4tu5xpRfb92JNr2iruj6OsS1jvshSqxnYLaCvPHHQlEOIaMtGGkzOAlT5r0Kzt1Av4NRUSDc46cnZBFOO16Go7dQw+bvEDswLwdzuIR6sn6PH90L42DgRFRj1JaoG0wEX4KKnHEsMoS1a/OlMXBVTgU++sCYt3Fe4ouc+F4aSUMXLZ9nc2MGDwUXLKq2+trVjdFrlnb6tGohNNKIdAby4HpgkjkpZ+P/BK8d+OiAIvoKF9N+yXo48vne283EoDJsFtxuMjAF37+QgI6Sug0FDL5py4W3fSDzFyudyZgv5+0PQm+6+FocCI6zbVC4JTNZstIazDhptIxRnNwiSlKjPETdGKjUE80niELQRKPN1BRkSO9fL22/csSvpeHnqv2QwiUK+hkbC6goSlt7CH8f7wH9NIA6koas8F1CgZXIAGeMo8i1PxI4l6jl8rcF1nYoDXkioIKUDTdxBRrezLqZMvp6p5AS0smPer1oea77OJ0Bu8+saXdt3JnafOtVRWI+0qz0qvky3ki3j9pLXDpBlGOVL+ED8+EFzU 3ggX2pr/ 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 commit 4477b39c32fdc03363affef4b11d48391e6dc9ff upstream. 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 --- 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 +- net/ipv4/proc.c | 2 +- net/ipv6/proc.c | 2 +- 7 files changed, 8 insertions(+), 8 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/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