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 BE4F7CAC5BB for ; Wed, 8 Oct 2025 15:30:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 21B638E002C; Wed, 8 Oct 2025 11:30:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F2FE8E0002; Wed, 8 Oct 2025 11:30:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1081E8E002C; Wed, 8 Oct 2025 11:30:12 -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 F20F68E0002 for ; Wed, 8 Oct 2025 11:30:11 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7E932C060A for ; Wed, 8 Oct 2025 15:30:11 +0000 (UTC) X-FDA: 83975333022.14.8E5BAF1 Received: from pdx-out-014.esa.us-west-2.outbound.mail-perimeter.amazon.com (pdx-out-014.esa.us-west-2.outbound.mail-perimeter.amazon.com [35.83.148.184]) by imf10.hostedemail.com (Postfix) with ESMTP id 669F2C0006 for ; Wed, 8 Oct 2025 15:30:09 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazoncorp2 header.b=EkdX5s2t; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf10.hostedemail.com: domain of "prvs=36971892a=farbere@amazon.com" designates 35.83.148.184 as permitted sender) smtp.mailfrom="prvs=36971892a=farbere@amazon.com" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1759937409; a=rsa-sha256; cv=none; b=ptR4HdHMba0hSCsakazIcrva5SEJIMyHM4ojKfpvt5WCsl5vXiZOVD6Qx0Yo51WV26M8W5 jMjEN7uF2utoieEf2b/aqe25vzyV2l4/pyxMEJJnJ1SR9gy4qxF+49kCZbCGlfZbVsNUaD sqbLxk8f65KSzx04W8KpDK5MFjeTN9A= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazoncorp2 header.b=EkdX5s2t; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf10.hostedemail.com: domain of "prvs=36971892a=farbere@amazon.com" designates 35.83.148.184 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=1759937409; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=6cTKEV+ZWAzAeKhYDhuZKam17XzSPB7XFB7f4qhxTuM=; b=5mGuOAD91hzVkKyMoyzc6Olqkkno0xBXrgw7MsOGzk1wnCtQx2UqxRzk7ZtiiWcFDci6pJ 6hxn/rkFuiRTWxoyuAdHu4sp5bIVrcLHCMlxjRX+iP6vaZoqFtoec1HAvf4IZtPoa5X/Xm 2IgZKTiaio7vWBHaNT1pTm5yOmI5gug= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1759937409; x=1791473409; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=6cTKEV+ZWAzAeKhYDhuZKam17XzSPB7XFB7f4qhxTuM=; b=EkdX5s2tLbOjIdVoBR/fdVIPdFmvTQ3HokleyTqmIIYAbQFb7xCp0EBS ToyPi1EjghnPvrsB0QYA7H1RD3x1nlutb+vK8PiEVpTaLZtHJiquwa3D7 uASWKsPHvPteR9CD0Kq+pqP7GdThtycTgk+Yx93hqAxKKB1hyukWCF1L4 dqQjwr66JDWab9yTMFxGRx+dVYO6f+4Gk7rix5/u0Oe2/TaScMZOjqs3s FBcL2iaJ26yWluRRSB2ITJJbHPtBU9k/Zqowjrj4/EqhxJyXXk0O/yqgs kXb4X1ttPos/wzZiRgUS69mvbAl0C9DmbAdfeh3NsngYP/BoXp1s2UtS5 g==; X-CSE-ConnectionGUID: +r/ORJCDT3mdkeM9bLhVCA== X-CSE-MsgGUID: 5xwXbkFvQYqm5UYp+BBs7A== X-IronPort-AV: E=Sophos;i="6.19,213,1754956800"; d="scan'208";a="4330400" Received: from ip-10-5-6-203.us-west-2.compute.internal (HELO smtpout.naws.us-west-2.prod.farcaster.email.amazon.dev) ([10.5.6.203]) by internal-pdx-out-014.esa.us-west-2.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2025 15:30:06 +0000 Received: from EX19MTAUWC002.ant.amazon.com [10.0.38.20:22420] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.27.3:2525] with esmtp (Farcaster) id 93ca9f84-9d14-4911-90f5-a97300a639c2; Wed, 8 Oct 2025 15:30:06 +0000 (UTC) X-Farcaster-Flow-ID: 93ca9f84-9d14-4911-90f5-a97300a639c2 Received: from EX19D001UWA001.ant.amazon.com (10.13.138.214) by EX19MTAUWC002.ant.amazon.com (10.250.64.143) 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:30:05 +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:29:52 +0000 From: Eliav Farber To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v3 00/19 5.15.y] Backport minmax.h updates from v6.17-rc7 Date: Wed, 8 Oct 2025 15:29:25 +0000 Message-ID: <20251008152946.29285-1-farbere@amazon.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [172.19.116.181] X-ClientProxiedBy: EX19D032UWA001.ant.amazon.com (10.13.139.62) To EX19D001UWA001.ant.amazon.com (10.13.138.214) X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 669F2C0006 X-Stat-Signature: cwkiwt8pd35b4u3o8kcrq1ou1uyuwewt X-HE-Tag: 1759937409-76981 X-HE-Meta: U2FsdGVkX19tC1hDD6UpYGYRNne9VYcbMy62wCOu9JTzMZKrQX332ZqDQv3C2X7UQa2uGx6eVNUSps5VF1EdcaWepCrQZLMZs4TcV8bbRCqs6CzY5CKRNVk8AZVG5l3rPoFMw3/K8d47zpDjAtGnQpcoaDam5L+AH6k2nM3w8sPlyAiZ72KaTPh0NB6so4VVPz0/1JICvuIBhtbG9y8IoFCqOQxgDnLy5LPSQdVEAg1e6nvWwM4FTYjMg9C07QYfsU5VxJ3qnQmggFbdnltKik4eXCCo5VRCm3lj/PQHk7uaWKINql57Xyao0dtWC1w/3t49IEcij5juqr1rU+lOguT2QRIdMo1R3uv7358E6ePP6ra8Md4npDzL51zG/K5Z9UPt3MzvdHYMk3oXzd259XvaAYYI9T4SJAMLAp63f4HRQs9O1yeVQnyaPqqB90lPI4ELiXoCboXj20g1I4JR8iZXt4Ohk7oWnqsaGoUGNmRicC/2zWgdOSZfvoz/oxtLnwSNIS0rJMm6zJMDdIM/nH7jpyMkHxoSDt8uuEVKebBLcDyrebuntcgvrmwx9juXzYCn/lTcjbcWDsbZOW6i2OTk2xglQ8JlbZqDPoG4CtnxnYZ/PK+z4ETnRG3vR+CdvKPfosvB8tIUcHkoL+Po5i+ml9v6XLaxri/cZCkN+H7ahWpnRBclw2SmduzzLy27Qajpuz4t3OU9tnp/loqOKUx4DctAE0/IoU7DHc7XbTeOYn79OOdgHES8bG5ijzJteyGUF8Wvf1WAJA5iXW2kKb/zaoJV0XJbMZyKMjgiKnwt1EnOS5tiTEvDJfAeyngFur0Q8q4WTuqoAZKT5kWV8+En6sriLKqFI3PVjLaYCA0yhimlb5DF/Nyl5IrT2MOEYH8f1SUo9xr533XDqIMDJ8hFKAuxOLYY4K0WG10WJRQZx94Xjs9Dg+NnpxxI/C9heeKKSQ/ZG6TkBzlUr/X 1WMGpTPB zrxAA9czMWcuQ7qtDeUgpeD2RgTRy2hBAeZODfGqjZBsHx+J2gAV1z+4Z4mrjIe+pJKT1/FrKeDWqnmfW85XNGFSeQSVhRWj4oO69N7lNm7I3c8+y8/vvcgTCOR7iTu8SJprzyHgTm5/PJy6mD32HUehJclgKcTrtOfkI8wpLUdhCVcCORxDd11AtlSi8B+nYe8GRYTn1wgOlT9+0/vCKwZ4BOu44PP2J8+cj3qWlQNfn2+som7IMr6O8HySrNdkRxBz7HiRFt0Od3sn8i35DffeFc4Pdq6EbJAOLj6Npwx8xEUJdDachmMOwOJwM8eYSU7uX36mra9vu1ElMWcQaMwv6j5W3vbkMN6+bXwegOXNDEIBrk/5kVdLAZljiKP0OHDM43ZMHj48huzgYzdNRguftAirEmH3elX3mdUmA8FtVwDLGk8Bro6Yv0TeQRqESiV0nmeH7hc114YLIlmbtD0SpEInBU2QN7KWbM/z+Kjz8RlavMwrBKafw88EnyUUfKYpvYMzjEGQZa0B6ByGqHqRtp/96hFUaQjYKCHF4nEIDl9d1+l8zmPf2/a26Vz1QJwfsx5erI340tnFyLt6/AOcPjX/QxGLJecJVZ67dL/NfVIRvPqWKwlep3/WlpKqCqRaC8H0LgTL4n4NvwkycTXyMqUV8yGixFIBcEQYz6Ls+gu33qNWRsGuRWmMRYkQqI/RSrXICW4LKSDFa0eS78mD0cOm0SyykSv150em3bnwAtJCBadplpvvfLA== 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 series backports 19 patches to update minmax.h in the 5.15.y branch, aligning it with v6.17-rc7. The ultimate goal is to synchronize all longterm branches so that they include the full set of minmax.h changes. 6.12.y was already backported and changes are part of v6.12.49. 6.6.y was already backported and changes are part of v6.6.109. 6.1.y was already backported and changes are currently in the 6.1-stable tree. The key motivation is to bring in commit d03eba99f5bf ("minmax: allow min()/max()/clamp() if the arguments have the same signedness"), which is missing in kernel 5.10.y. In mainline, this change enables min()/max()/clamp() to accept mixed argument types, provided both have the same signedness. Without it, backported patches that use these forms may trigger compiler warnings, which escalate to build failures when -Werror is enabled. Changes in v3: - Fix fs/erofs/zdata.h in patch 06/19 to use MIN_T instead of min_t to fix build on the following patch (07/19): 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 - Increase test coverage using `make allyesconfig` and `make allmodconfig` for arm64, arm, x86_64 and i386 architectures. Changes in v2: - Fix the order of patches 6 - 10 according to order in mainline branch. - Use same style of [ Upstream commit ] in all patches. Andy Shevchenko (1): minmax: deduplicate __unconst_integer_typeof() David Laight (8): minmax: fix indentation of __cmp_once() and __clamp_once() minmax.h: add whitespace around operators and after commas minmax.h: update some comments minmax.h: reduce the #define expansion of min(), max() and clamp() minmax.h: use BUILD_BUG_ON_MSG() for the lo < hi test in clamp() minmax.h: move all the clamp() definitions after the min/max() ones minmax.h: simplify the variants of clamp() minmax.h: remove some #defines that are only expanded once Herve Codina (1): minmax: Introduce {min,max}_array() Linus Torvalds (8): minmax: avoid overly complicated constant expressions in VM code minmax: add a few more MIN_T/MAX_T users minmax: simplify and clarify min_t()/max_t() implementation minmax: make generic MIN() and MAX() macros available everywhere minmax: don't use max() in situations that want a C constant expression minmax: simplify min()/max()/clamp() implementation minmax: improve macro expansion and type checking minmax: fix up min3() and max3() too Matthew Wilcox (Oracle) (1): minmax: add in_range() macro arch/arm/mm/pageattr.c | 6 +- arch/um/drivers/mconsole_user.c | 2 + arch/x86/mm/pgtable.c | 2 +- drivers/edac/sb_edac.c | 4 +- drivers/edac/skx_common.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + .../drm/amd/display/modules/hdcp/hdcp_ddc.c | 2 + .../drm/amd/pm/powerplay/hwmgr/ppevvmath.h | 14 +- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 2 + .../drm/arm/display/include/malidp_utils.h | 2 +- .../display/komeda/komeda_pipeline_state.c | 24 +- drivers/gpu/drm/drm_color_mgmt.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 - drivers/gpu/drm/radeon/evergreen_cs.c | 2 + drivers/hwmon/adt7475.c | 24 +- drivers/input/touchscreen/cyttsp4_core.c | 2 +- drivers/irqchip/irq-sun6i-r.c | 2 +- drivers/md/dm-integrity.c | 4 +- drivers/media/dvb-frontends/stv0367_priv.h | 3 + .../net/ethernet/chelsio/cxgb3/cxgb3_main.c | 18 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- drivers/net/fjes/fjes_main.c | 4 +- drivers/nfc/pn544/i2c.c | 2 - drivers/platform/x86/sony-laptop.c | 1 - drivers/scsi/isci/init.c | 6 +- .../pci/hive_isp_css_include/math_support.h | 5 - drivers/virt/acrn/ioreq.c | 4 +- fs/btrfs/misc.h | 2 - fs/btrfs/tree-checker.c | 2 +- fs/erofs/zdata.h | 2 +- fs/ext2/balloc.c | 2 - fs/ext4/ext4.h | 2 - fs/ufs/util.h | 6 - include/linux/compiler.h | 9 + include/linux/minmax.h | 264 +++++++++++++----- kernel/trace/preemptirq_delay_test.c | 2 - lib/btree.c | 1 - lib/decompress_unlzma.c | 2 + lib/logic_pio.c | 3 - lib/vsprintf.c | 2 +- lib/zstd/zstd_internal.h | 2 - mm/zsmalloc.c | 1 - net/ipv4/proc.c | 2 +- net/ipv6/proc.c | 2 +- net/netfilter/nf_nat_core.c | 6 +- net/tipc/core.h | 2 +- net/tipc/link.c | 10 +- tools/testing/selftests/vm/mremap_test.c | 2 + 48 files changed, 290 insertions(+), 184 deletions(-) -- 2.47.3