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 71F4FCAC592 for ; Mon, 22 Sep 2025 12:27:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 83B7E8E000B; Mon, 22 Sep 2025 08:27:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7EB268E0001; Mon, 22 Sep 2025 08:27:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6D7D38E000B; Mon, 22 Sep 2025 08:27:18 -0400 (EDT) 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 550A98E0001 for ; Mon, 22 Sep 2025 08:27:18 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1518FC0617 for ; Mon, 22 Sep 2025 12:27:18 +0000 (UTC) X-FDA: 83916811356.19.9BBEC59 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf28.hostedemail.com (Postfix) with ESMTP id 414E2C0002 for ; Mon, 22 Sep 2025 12:27:16 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=fail ("body hash did not verify") header.d=linuxfoundation.org header.s=korg header.b="rCD/wfgr"; spf=pass (imf28.hostedemail.com: domain of gregkh@linuxfoundation.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1758544036; 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:dkim-signature; bh=lMM+fsJ0jDyq+riPADUdFHBm2CaypEwAEH21HjYio68=; b=u0KsIIYk1yxR+YPWcIX/rfcz54zV1lq1Xpx99SqZBUILLybRKRab1aYRXtrSnZ539X9g+E PnmB2LRoA6LUiTP9o10cIyE1f3y27WymW0svrnNsGKj42BfbYWPiy0AYWjHDQkbzh7ZBt5 0Mt+z7Zh2u/0P8FqDyAtpwf6xo23Uhc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1758544036; a=rsa-sha256; cv=none; b=xb45CQ3JFESRd3UXeb1RNBeXaR088axgQsjvPY8XGwxHy/ROeCBRmwMg7vKTlCPdJOn8uz PelxSal2yoqw/IvfPt0/Qyzg3XVK0Y50UWJlG+v+oUlUEPWa2KgohyxPzx/vkwDyZKz4Wy kE9JqGWZcCYlCyVd2VAiTYTsxG7tUm8= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=fail ("body hash did not verify") header.d=linuxfoundation.org header.s=korg header.b="rCD/wfgr"; spf=pass (imf28.hostedemail.com: domain of gregkh@linuxfoundation.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 42929409BB; Mon, 22 Sep 2025 12:27:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87A58C4CEF7; Mon, 22 Sep 2025 12:27:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1758544035; bh=8nxZHKCLMp4/qRvAUZL6R06d+fkmiHSPK3idQXLV5q8=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=rCD/wfgrmufPCvsNDRbJCFnkQa4h46LQuDrQ3AtmSp+TsD2tiSUM0m9xojEAt9dqR fQIZOeGsZE1Eit8tE738L/bcz6ZjHWhetEteI922CxzYh+tfLb0Irgb1MADTJ+HBPz M4yeDvKrXp6Zi6YpiXLJlgqQapTxZHznZwy4R0sw= Subject: Patch "minmax: don't use max() in situations that want a C constant expression" has been added to the 6.6-stable tree To: David.Laight@ACULAB.COM, David.Laight@aculab.com, Rodrigo.Siqueira@amd.com, Xinhui.Pan@amd.com, agk@redhat.com, airlied@gmail.com, akpm@linux-foundation.org, alexander.deucher@amd.com, alexandre.torgue@foss.st.com, amd-gfx@lists.freedesktop.org, andriy.shevchenko@linux.intel.com, anton.ivanov@cambridgegreys.com, arnd@kernel.org, artur.paszkiewicz@intel.com, bp@alien8.de, christian.koenig@amd.com, clm@fb.com, daniel@ffwll.ch, dave.hansen@linux.intel.com, davem@davemloft.net, dm-devel@lists.linux.dev, dmitry.torokhov@gmail.com, dri-devel@lists.freedesktop.org, dsahern@kernel.org, dsterba@suse.com, edumazet@google.com, evan.quan@amd.com, farbere@amazon.com, gregkh@linuxfoundation.org, harry.wentland@amd.com, hdegoede@redhat.com, hpa@zytor.com, ilpo.jarvinen@linux.intel.com, james.morse@arm.com, jdelvare@suse.com, jejb@linux.ibm.com, jernej.skrabec@gmail.com, joabreu@synopsys.com, johannes@sipsolutions.net, josef@toxicpanda.com, keescook@chromium.org, krzysztof.kozlowski@linaro.org, kuba@kernel.org, linus.walleij@linaro.org, l@kvack.org, inux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-staging@lists.linux.dev, linux-stm32@st-md-mailman.stormreply.com, linux-sunxi@lists.linux.dev, linux-um@lists.infradead.org, linux@rasmusvillemoes.dk, linux@roeck-us.net, lorenzo.stoakes@oracle.com, luc.vanoostenryck@gmail.com, luto@kernel.org, maarten.lankhorst@linux.intel.com, mailhol.vincent@wanadoo.fr, malattia@linux.it, markgross@kernel.org, martin.petersen@oracle.com, mchehab@kernel.org, mcoquelin.stm32@gmail.com, mhiramat@kernel.org, minchan@kernel.org, mingo@redhat.com, mkl@pengutronix.de, mripard@kernel.org, pabeni@redhat.com, peterz@infradead.org, pmladek@suse.com, qiuxu.zhuo@intel.com, richard@nod.at, rostedt@goodmis.org, rric@kernel.org, sakari.ailus@linux.intel.com, samuel@sholland.org, senozhatsky@chromium.org, shuah@kernel.org, snitzer@kernel.org, sunpeng.li@amd.com, tglx@linutronix.de, tony.luck@intel.com, torvalds@linux-foundation.org, tzimmermann@suse.de, wad@chromium.org, wens@csie.org, wg@grandegger.com, x86@kernel.org Cc: From: Date: Mon, 22 Sep 2025 14:26:59 +0200 In-Reply-To: <20250922103241.16213-7-farbere@amazon.com> Message-ID: <2025092259-viscosity-handoff-74f5@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-Stat-Signature: uymcwh81kzhjwaw71bodmj16p8oyqxfo X-Rspam-User: X-Rspamd-Queue-Id: 414E2C0002 X-Rspamd-Server: rspam10 X-HE-Tag: 1758544036-533928 X-HE-Meta: U2FsdGVkX1/UbO3tAT+N+JKBxlc6K+iKVbc+sa7qcg01mk/Edm/qvDT4KHXPabQ1mwRkfRWvftnuBCXRLJM+QI2xA4/WtuqCAncTC8odeSGyocy8fnqmiPkytJAppu9FRxSrVlm+pTDZu4qlfq2PVUYt90cUsjezZwoV5pg3KOLmnQ5YJTq92DorqcD/dafXEG7B9O3pRpapmfu0EqSpLnYdIN4FpRFQat7sZg4qyZqjA5VIlmkHvqXr1NCeKk9iRw6DUpZlAtXS2WZtzQWAixpx5l8XbTXvkfGsROcpRsT1Uj+w3OpMC0dZW7a00ilWYqYvASEJmTdMPyLbajVfgn9JXtNqVyM27GKKlqaMLqoblBl6fbThVD7p6LNjWu/ZAN7Mh2xP2i3AahQlOyPyxetUuvkVh5lg1RvuZwi3Hm4fjmKV3PvU3/xNfN1HJDSRs9VbSKRHGch0ZJR7ConkFAVME/kPvny6n6CzqFJIEPK+n2i7LT5BToFCK44r20nUdFbTm0VlZqzXewgI23ddPu9IOfREl5GgJFYfDrFXSHKJmRPuwwaRxqIqkZ8zcRcDCSkAo5b7w2YuN4VZdTRZWIjebqWhWxrJAEE8ZT5Gu0LSHbc0fy0SQz2fhrQiflVrbfsOsKgOcDTUDsfWLE49QvfBioeYJNBWpW/WeYA3m3IszpqTpE+vQ3yvv7XhsI+UMBdEyQwjNiXdoV8RV+63AqIUgD+3pZVmNkfiaG5OIL6OWjgaZG5OjVVV76ucJWXWJxJhbB/v/pUuljCDFAZmpRJXf0C0T0wxFtD4C0XGiARnS4cNlmELSc2lLbTF7aoT26P1PjOyPfof256XkcBxC2905injW4/1GGgxiET7xK5LcBAM8eIZBOKiTpSv/UagCN1nCdgaZ07WgmZ3XCUJMvx1fvp/+X8ADZawSZ7Y15CNEgJshCM+m2nK9U07LaOAe25xK0UheTP3PZwxEIJ lkA3zV+X ZtNqAbtPR+D+2EPy/JBXScq0zhKkSM2/rD9NNsly12jA7jHelw5JUEYp8YHn8cMaq6SeoAiDhlQrtKkg/gVTuxWGMC7pwyrbqt2pmaiwgi3Tx7RBDuH4596opXGnjEYG7/IBjL2r6drIKoMLn2ba4ECF0IOQ0OWkDkPtm4WKjvWDoIRUzD1ZEFC/j3j44usxxizFOS2jxTa5/Cm9ulWZ527kBSpqAkDUh0SOMrzx7eAHno0LZhhgPVlqA7JJ0iW4Rt89VIgogZKi8paxrhGgTtxXePtzrYAsGbMbn0I6euO0gw73HtLxzC3tQVn2Wuu/gXYcwunmMQcvsD1UBwklomS7LC4vJ249sgooLh1nU7fuXMf5QXiGmVPdbk4T9fvJMa2ERzRR9lttKnhqTp+9M6vHIVbLsR8TQhdfVQDbi1y/Kik5F1tUplrIuP3KTCG6VsIFOXxpEmlJ2Wsdi9clZZWNj7lhF8Z9krOdOGhNgfQi2Tpk4WAUi5yIiaiok3KnGOgnyXF30CYY8S0kCXoTB18AiaVdrN9kc5wHBhCG+mJVZhPHXtyez67/vjeUmDJsJAo6Si+N7xEZ+S0BN1fh3GNcKeSonUOZnfs7YhCjHCunW2ofU0BIY2RHXHfzdl0vy4mSGEVlqfgLLso9SzBmhQp/VTOnKf1MxnmAoi0IDCiI3Zacl/qSsx9BCIDi1aq7HeTVRJnVGCnmPplGRMvGkddgJItd426mlGUUahdm8P24Ojg9zJWMi3GQqPB6OQJYeGGBlvnjf/SsPZz6bpfjaJ9XnwH80LLpIYbEVJk03OJXsnZtWEAshE54ucHq4QqRsMTaZLtsNd3ARXi308g8K4/W/ES5NeIQ04zlnCZxoEK8kcFC07gLJD3jNQlXHHo/Ar3y1Y5sLNHo9vWRL8C1ozAq3GVqxSBJSISMHo01mkSFCgz5mhsiGyQkmw8V/by6eyigxheBslyqrOOyBrb7WIupJA7I+ meW5nVc/ xxPO1Vu21oquVNOS86oMj3hNa+JKMumxycL5YHPTcsME+j3/LFz3LPPqOUQy/d2fb1LQEVxCpT+3nX6UdUGwLYhwEzhM3dbUa0CKywHtWlnLfZ5GzsqJyFHiDalCUChlH1fk4m6rnUxiTz2oAAfVxYgMOFZMxsGwTBjHq6WzyuTY/mxJ5k8o16zN6x0tWeHuE4J9Y4oRkm8SbUtSISWuiSQ6nZ5FVBo4Vhd7VepEk7PAxfJaJja5WNeP06F9dVeen20BEjgCxWSsFx17WLLsRXkBwg/dQde2WmV0+OvO/MY3ETROrw7XNRwTJUnfLg7KEVsKQqDlKl7buIaQGOi815+zYqWvKEXXuJOrfJMHOw+NxQPwx5OiTTN4fc21nwFyZUYfJBQheC48d+ChIrD7d/ZztbA08a5Yu5BGneTRBzeaqiMVGgW9+oJGIPw+Ih5pKbO/wj4LxEVpgWIDP+L6yoYX7ngSAqsT/QI1rjE2MyS7U2ln+bR/IMMQDUva+DU1bAs3gtvFiMVZdTMULko8x0nxfCXUXpa6jFX+0VneO4RjWk5A9MfvmVGqhNzmNDq+7lWAgsjM0AVmKB7kjq6JwmPjulb3R01Pn2cTJIiMPlgf7aU1C1dOJE+xZTFbTs6LIe2O9Q87ybCZOWYCzYzfZHq8BE6EnBGdtBe+utuD78KizTnb0cXT+GpMwYNFg2JW0sFsSacbdoFQeQG3Vf5Q8AZv+CAzDMy+Kq7YgCpvYuW7ozMmd+JgfagsKKOyvE4Y6r3PvSsCJwp+9Ji+SnkC9OMQ8lFvRd6L5jjP3HbynAkSdDTxeJDfOxwPCbYYVd0z 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: This is a note to let you know that I've just added the patch titled minmax: don't use max() in situations that want a C constant expression to the 6.6-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: minmax-don-t-use-max-in-situations-that-want-a-c-constant-expression.patch and it can be found in the queue-6.6 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From linux-staging+bounces-34541-greg=kroah.com@lists.linux.dev Mon Sep 22 12:38:18 2025 From: Eliav Farber Date: Mon, 22 Sep 2025 10:32:32 +0000 Subject: minmax: don't use max() in situations that want a C constant expression To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Cc: Linus Torvalds , David Laight , Lorenzo Stoakes Message-ID: <20250922103241.16213-7-farbere@amazon.com> From: Linus Torvalds [ Upstream commit cb04e8b1d2f24c4c2c92f7b7529031fc35a16fed ] We only had a couple of array[] declarations, and changing them to just use 'MAX()' instead of 'max()' fixes the issue. This will allow us to simplify our min/max macros enormously, since they can now unconditionally use temporary variables to avoid using the argument values multiple times. Cc: David Laight Cc: Lorenzo Stoakes Signed-off-by: Linus Torvalds Signed-off-by: Eliav Farber Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 2 +- drivers/input/touchscreen/cyttsp4_core.c | 2 +- drivers/irqchip/irq-sun6i-r.c | 2 +- drivers/net/can/usb/etas_es58x/es58x_devlink.c | 2 +- fs/btrfs/tree-checker.c | 2 +- lib/vsprintf.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) --- a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c @@ -708,7 +708,7 @@ static const char *smu_get_feature_name( size_t smu_cmn_get_pp_feature_mask(struct smu_context *smu, char *buf) { - int8_t sort_feature[max(SMU_FEATURE_COUNT, SMU_FEATURE_MAX)]; + int8_t sort_feature[MAX(SMU_FEATURE_COUNT, SMU_FEATURE_MAX)]; uint64_t feature_mask; int i, feature_index; uint32_t count = 0; --- a/drivers/input/touchscreen/cyttsp4_core.c +++ b/drivers/input/touchscreen/cyttsp4_core.c @@ -871,7 +871,7 @@ static void cyttsp4_get_mt_touches(struc struct cyttsp4_touch tch; int sig; int i, j, t = 0; - int ids[max(CY_TMA1036_MAX_TCH, CY_TMA4XX_MAX_TCH)]; + int ids[MAX(CY_TMA1036_MAX_TCH, CY_TMA4XX_MAX_TCH)]; memset(ids, 0, si->si_ofs.tch_abs[CY_TCH_T].max * sizeof(int)); for (i = 0; i < num_cur_tch; i++) { --- a/drivers/irqchip/irq-sun6i-r.c +++ b/drivers/irqchip/irq-sun6i-r.c @@ -270,7 +270,7 @@ static const struct irq_domain_ops sun6i static int sun6i_r_intc_suspend(void) { - u32 buf[BITS_TO_U32(max(SUN6I_NR_TOP_LEVEL_IRQS, SUN6I_NR_MUX_BITS))]; + u32 buf[BITS_TO_U32(MAX(SUN6I_NR_TOP_LEVEL_IRQS, SUN6I_NR_MUX_BITS))]; int i; /* Wake IRQs are enabled during system sleep and shutdown. */ --- a/drivers/net/can/usb/etas_es58x/es58x_devlink.c +++ b/drivers/net/can/usb/etas_es58x/es58x_devlink.c @@ -215,7 +215,7 @@ static int es58x_devlink_info_get(struct struct es58x_sw_version *fw_ver = &es58x_dev->firmware_version; struct es58x_sw_version *bl_ver = &es58x_dev->bootloader_version; struct es58x_hw_revision *hw_rev = &es58x_dev->hardware_revision; - char buf[max(sizeof("xx.xx.xx"), sizeof("axxx/xxx"))]; + char buf[MAX(sizeof("xx.xx.xx"), sizeof("axxx/xxx"))]; int ret = 0; if (es58x_sw_version_is_valid(fw_ver)) { --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c @@ -614,7 +614,7 @@ static int check_dir_item(struct extent_ */ if (key->type == BTRFS_DIR_ITEM_KEY || key->type == BTRFS_XATTR_ITEM_KEY) { - char namebuf[max(BTRFS_NAME_LEN, XATTR_NAME_MAX)]; + char namebuf[MAX(BTRFS_NAME_LEN, XATTR_NAME_MAX)]; read_extent_buffer(leaf, namebuf, (unsigned long)(di + 1), name_len); --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1079,7 +1079,7 @@ char *resource_string(char *buf, char *e #define FLAG_BUF_SIZE (2 * sizeof(res->flags)) #define DECODED_BUF_SIZE sizeof("[mem - 64bit pref window disabled]") #define RAW_BUF_SIZE sizeof("[mem - flags 0x]") - char sym[max(2*RSRC_BUF_SIZE + DECODED_BUF_SIZE, + char sym[MAX(2*RSRC_BUF_SIZE + DECODED_BUF_SIZE, 2*RSRC_BUF_SIZE + FLAG_BUF_SIZE + RAW_BUF_SIZE)]; char *p = sym, *pend = sym + sizeof(sym); Patches currently in stable-queue which might be from farbere@amazon.com are queue-6.6/minmax-don-t-use-max-in-situations-that-want-a-c-constant-expression.patch queue-6.6/minmax-make-generic-min-and-max-macros-available-everywhere.patch queue-6.6/minmax-fix-up-min3-and-max3-too.patch queue-6.6/minmax-add-a-few-more-min_t-max_t-users.patch queue-6.6/minmax-improve-macro-expansion-and-type-checking.patch queue-6.6/minmax-avoid-overly-complicated-constant-expressions-in-vm-code.patch queue-6.6/minmax-simplify-min-max-clamp-implementation.patch queue-6.6/minmax-simplify-and-clarify-min_t-max_t-implementation.patch