Message-ID: <20250922103241.16213-16-farbere@amazon.com>
Date: Mon, 22 Sep 2025 10:32:41 +0000
From: Eliav Farber <farbere@...zon.com>
To: <richard@....at>, <anton.ivanov@...bridgegreys.com>,
	<johannes@...solutions.net>, <dave.hansen@...ux.intel.com>,
	<luto@...nel.org>, <peterz@...radead.org>, <tglx@...utronix.de>,
	<mingo@...hat.com>, <bp@...en8.de>, <x86@...nel.org>, <hpa@...or.com>,
	<tony.luck@...el.com>, <qiuxu.zhuo@...el.com>, <james.morse@....com>,
	<mchehab@...nel.org>, <rric@...nel.org>, <harry.wentland@....com>,
	<sunpeng.li@....com>, <Rodrigo.Siqueira@....com>,
	<alexander.deucher@....com>, <christian.koenig@....com>,
	<Xinhui.Pan@....com>, <airlied@...il.com>, <daniel@...ll.ch>,
	<evan.quan@....com>, <maarten.lankhorst@...ux.intel.com>,
	<mripard@...nel.org>, <tzimmermann@...e.de>, <jdelvare@...e.com>,
	<linux@...ck-us.net>, <linus.walleij@...aro.org>,
	<dmitry.torokhov@...il.com>, <wens@...e.org>, <jernej.skrabec@...il.com>,
	<samuel@...lland.org>, <agk@...hat.com>, <snitzer@...nel.org>,
	<dm-devel@...ts.linux.dev>, <mailhol.vincent@...adoo.fr>,
	<wg@...ndegger.com>, <mkl@...gutronix.de>, <davem@...emloft.net>,
	<edumazet@...gle.com>, <kuba@...nel.org>, <pabeni@...hat.com>,
	<alexandre.torgue@...s.st.com>, <joabreu@...opsys.com>,
	<mcoquelin.stm32@...il.com>, <krzysztof.kozlowski@...aro.org>,
	<malattia@...ux.it>, <hdegoede@...hat.com>, <ilpo.jarvinen@...ux.intel.com>,
	<markgross@...nel.org>, <artur.paszkiewicz@...el.com>, <jejb@...ux.ibm.com>,
	<martin.petersen@...cle.com>, <sakari.ailus@...ux.intel.com>,
	<gregkh@...uxfoundation.org>, <clm@...com>, <josef@...icpanda.com>,
	<dsterba@...e.com>, <luc.vanoostenryck@...il.com>, <rostedt@...dmis.org>,
	<mhiramat@...nel.org>, <pmladek@...e.com>,
	<andriy.shevchenko@...ux.intel.com>, <linux@...musvillemoes.dk>,
	<senozhatsky@...omium.org>, <minchan@...nel.org>,
	<akpm@...ux-foundation.org>, <dsahern@...nel.org>, <shuah@...nel.org>,
	<keescook@...omium.org>, <wad@...omium.org>, <farbere@...zon.com>,
	<David.Laight@...LAB.COM>, <arnd@...nel.org>, <linux-um@...ts.infradead.org>,
	<linux-kernel@...r.kernel.org>, <linux-edac@...r.kernel.org>,
	<amd-gfx@...ts.freedesktop.org>, <dri-devel@...ts.freedesktop.org>,
	<linux-hwmon@...r.kernel.org>, <linux-input@...r.kernel.org>,
	<linux-arm-kernel@...ts.infradead.org>, <linux-sunxi@...ts.linux.dev>,
	<linux-media@...r.kernel.org>, <linux-can@...r.kernel.org>,
	<netdev@...r.kernel.org>, <linux-stm32@...md-mailman.stormreply.com>,
	<platform-driver-x86@...r.kernel.org>, <linux-scsi@...r.kernel.org>,
	<linux-staging@...ts.linux.dev>, <linux-btrfs@...r.kernel.org>,
	<linux-sparse@...r.kernel.org>, <linux-trace-kernel@...r.kernel.org>,
	<linux-mm@...ck.org>, <linux-kselftest@...r.kernel.org>,
	<bpf@...r.kernel.org>, <stable@...r.kernel.org>
CC: Christoph Hellwig <hch@...radead.org>, Dan Carpenter
	<dan.carpenter@...aro.org>, "Jason A. Donenfeld" <Jason@...c4.com>, "Jens
 Axboe" <axboe@...nel.dk>, Lorenzo Stoakes <lorenzo.stoakes@...cle.com>,
	Mateusz Guzik <mjguzik@...il.com>, Matthew Wilcox <willy@...radead.org>,
	Pedro Falcato <pedro.falcato@...il.com>
Subject: [PATCH 15/15 6.6.y] minmax.h: remove some #defines that are only expanded once

From: David Laight <David.Laight@...LAB.COM>

[ Upstream commit 2b97aaf74ed534fb838d09867d09a3ca5d795208 ]

The bodies of __signed_type_use() and __unsigned_type_use() are much the
same size as their names - so put the bodies in the only line that expands
them.

Similarly __signed_type() is defined separately for 64bit and then used
exactly once just below.

Change the test for __signed_type from CONFIG_64BIT to one based on gcc
defined macros so that the code is valid if it gets used outside of a
kernel build.

Link: https://lkml.kernel.org/r/9386d1ebb8974fbabbed2635160c3975@AcuMS.aculab.com
Signed-off-by: David Laight <david.laight@...lab.com>
Cc: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Cc: Arnd Bergmann <arnd@...nel.org>
Cc: Christoph Hellwig <hch@...radead.org>
Cc: Dan Carpenter <dan.carpenter@...aro.org>
Cc: Jason A. Donenfeld <Jason@...c4.com>
Cc: Jens Axboe <axboe@...nel.dk>
Cc: Lorenzo Stoakes <lorenzo.stoakes@...cle.com>
Cc: Mateusz Guzik <mjguzik@...il.com>
Cc: Matthew Wilcox <willy@...radead.org>
Cc: Pedro Falcato <pedro.falcato@...il.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Eliav Farber <farbere@...zon.com>
---
 include/linux/minmax.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/include/linux/minmax.h b/include/linux/minmax.h
index 2bbdd5b5e07e..eaaf5c008e4d 100644
--- a/include/linux/minmax.h
+++ b/include/linux/minmax.h
@@ -46,10 +46,8 @@
  * comparison, and these expressions only need to be careful to not cause
  * warnings for pointer use.
  */
-#define __signed_type_use(ux) (2 + __is_nonneg(ux))
-#define __unsigned_type_use(ux) (1 + 2 * (sizeof(ux) < 4))
 #define __sign_use(ux) (is_signed_type(typeof(ux)) ? \
-	__signed_type_use(ux) : __unsigned_type_use(ux))
+	(2 + __is_nonneg(ux)) : (1 + 2 * (sizeof(ux) < 4)))
 
 /*
  * Check whether a signed value is always non-negative.
@@ -57,7 +55,7 @@
  * A cast is needed to avoid any warnings from values that aren't signed
  * integer types (in which case the result doesn't matter).
  *
- * On 64-bit any integer or pointer type can safely be cast to 'long'.
+ * On 64-bit any integer or pointer type can safely be cast to 'long long'.
  * But on 32-bit we need to avoid warnings about casting pointers to integers
  * of different sizes without truncating 64-bit values so 'long' or 'long long'
  * must be used depending on the size of the value.
@@ -66,12 +64,12 @@
  * them, but we do not use s128 types in the kernel (we do use 'u128',
  * but they are handled by the !is_signed_type() case).
  */
-#ifdef CONFIG_64BIT
-  #define __signed_type(ux) long
+#if __SIZEOF_POINTER__ == __SIZEOF_LONG_LONG__
+#define __is_nonneg(ux) statically_true((long long)(ux) >= 0)
 #else
-  #define __signed_type(ux) typeof(__builtin_choose_expr(sizeof(ux) > 4, 1LL, 1L))
+#define __is_nonneg(ux) statically_true( \
+	(typeof(__builtin_choose_expr(sizeof(ux) > 4, 1LL, 1L)))(ux) >= 0)
 #endif
-#define __is_nonneg(ux) statically_true((__signed_type(ux))(ux) >= 0)
 
 #define __types_ok(ux, uy) \
 	(__sign_use(ux) & __sign_use(uy))
-- 
2.47.3

Powered by blists - more mailing lists