From: Eliav Farber <farbere@amazon•com>
To: <gregkh@linuxfoundation•org>, <jdike@addtoit•com>,
<richard@nod•at>, <anton.ivanov@cambridgegreys•com>,
<dave.hansen@linux•intel.com>, <luto@kernel•org>,
<peterz@infradead•org>, <tglx@linutronix•de>, <mingo@redhat•com>,
<bp@alien8•de>, <x86@kernel•org>, <hpa@zytor•com>,
<tony.luck@intel•com>, <qiuxu.zhuo@intel•com>,
<james.morse@arm•com>, <rric@kernel•org>, <airlied@linux•ie>,
<daniel@ffwll•ch>, <maarten.lankhorst@linux•intel.com>,
<mripard@kernel•org>, <tzimmermann@suse•de>,
<robdclark@gmail•com>, <sean@poorly•run>, <jdelvare@suse•com>,
<linux@roeck-us•net>, <linus.walleij@linaro•org>,
<dmitry.torokhov@gmail•com>, <maz@kernel•org>, <wens@csie•org>,
<jernej.skrabec@gmail•com>, <agk@redhat•com>,
<snitzer@redhat•com>, <dm-devel@redhat•com>,
<davem@davemloft•net>, <kuba@kernel•org>,
<mcoquelin.stm32@gmail•com>, <krzysztof.kozlowski@canonical•com>,
<malattia@linux•it>, <hdegoede@redhat•com>,
<mgross@linux•intel.com>, <jejb@linux•ibm.com>,
<martin.petersen@oracle•com>, <sakari.ailus@linux•intel.com>,
<clm@fb•com>, <josef@toxicpanda•com>, <dsterba@suse•com>,
<jack@suse•com>, <tytso@mit•edu>, <adilger.kernel@dilger•ca>,
<dushistov@mail•ru>, <luc.vanoostenryck@gmail•com>,
<rostedt@goodmis•org>, <pmladek@suse•com>,
<senozhatsky@chromium•org>, <andriy.shevchenko@linux•intel.com>,
<linux@rasmusvillemoes•dk>, <minchan@kernel•org>,
<ngupta@vflare•org>, <akpm@linux-foundation•org>,
<yoshfuji@linux-ipv6•org>, <dsahern@kernel•org>,
<pablo@netfilter•org>, <kadlec@netfilter•org>, <fw@strlen•de>,
<jmaloy@redhat•com>, <ying.xue@windriver•com>, <shuah@kernel•org>,
<willy@infradead•org>, <farbere@amazon•com>, <sashal@kernel•org>,
<quic_akhilpo@quicinc•com>, <ruanjinjie@huawei•com>,
<David.Laight@ACULAB•COM>, <herve.codina@bootlin•com>,
<linux-arm-kernel@lists•infradead.org>,
<linux-kernel@vger•kernel.org>, <linux-um@lists•infradead.org>,
<linux-edac@vger•kernel.org>, <amd-gfx@lists•freedesktop.org>,
<dri-devel@lists•freedesktop.org>,
<linux-arm-msm@vger•kernel.org>,
<freedreno@lists•freedesktop.org>, <linux-hwmon@vger•kernel.org>,
<linux-input@vger•kernel.org>, <linux-sunxi@lists•linux.dev>,
<linux-media@vger•kernel.org>, <netdev@vger•kernel.org>,
<linux-stm32@st-md-mailman•stormreply.com>,
<platform-driver-x86@vger•kernel.org>,
<linux-scsi@vger•kernel.org>, <linux-staging@lists•linux.dev>,
<linux-btrfs@vger•kernel.org>, <linux-ext4@vger•kernel.org>,
<linux-sparse@vger•kernel.org>, <linux-mm@kvack•org>,
<netfilter-devel@vger•kernel.org>, <coreteam@netfilter•org>,
<tipc-discussion@lists•sourceforge.net>,
<linux-kselftest@vger•kernel.org>, <stable@vger•kernel.org>
Cc: Arnd Bergmann <arnd@kernel•org>,
Christoph Hellwig <hch@infradead•org>,
Dan Carpenter <dan.carpenter@linaro•org>,
"Jason A. Donenfeld" <Jason@zx2c4•com>,
Jens Axboe <axboe@kernel•dk>,
Lorenzo Stoakes <lorenzo.stoakes@oracle•com>,
Mateusz Guzik <mjguzik@gmail•com>,
"Pedro Falcato" <pedro.falcato@gmail•com>
Subject: [PATCH v2 17/19 5.15.y] minmax.h: move all the clamp() definitions after the min/max() ones
Date: Fri, 3 Oct 2025 13:00:04 +0000 [thread overview]
Message-ID: <20251003130006.41681-18-farbere@amazon.com> (raw)
In-Reply-To: <20251003130006.41681-1-farbere@amazon.com>
From: David Laight <David.Laight@ACULAB•COM>
[ Upstream commit c3939872ee4a6b8bdcd0e813c66823b31e6e26f7 ]
At some point the definitions for clamp() got added in the middle of the
ones for min() and max(). Re-order the definitions so they are more
sensibly grouped.
Link: https://lkml.kernel.org/r/8bb285818e4846469121c8abc3dfb6e2@AcuMS.aculab.com
Signed-off-by: David Laight <david.laight@aculab•com>
Cc: Andy Shevchenko <andriy.shevchenko@linux•intel.com>
Cc: Arnd Bergmann <arnd@kernel•org>
Cc: Christoph Hellwig <hch@infradead•org>
Cc: Dan Carpenter <dan.carpenter@linaro•org>
Cc: Jason A. Donenfeld <Jason@zx2c4•com>
Cc: Jens Axboe <axboe@kernel•dk>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle•com>
Cc: Mateusz Guzik <mjguzik@gmail•com>
Cc: Matthew Wilcox <willy@infradead•org>
Cc: Pedro Falcato <pedro.falcato@gmail•com>
Signed-off-by: Andrew Morton <akpm@linux-foundation•org>
Signed-off-by: Eliav Farber <farbere@amazon•com>
---
include/linux/minmax.h | 109 +++++++++++++++++++----------------------
1 file changed, 51 insertions(+), 58 deletions(-)
diff --git a/include/linux/minmax.h b/include/linux/minmax.h
index 91aa1b90c1bb..75fb7a6ad4c6 100644
--- a/include/linux/minmax.h
+++ b/include/linux/minmax.h
@@ -99,22 +99,6 @@
#define __careful_cmp(op, x, y) \
__careful_cmp_once(op, x, y, __UNIQUE_ID(x_), __UNIQUE_ID(y_))
-#define __clamp(val, lo, hi) \
- ((val) >= (hi) ? (hi) : ((val) <= (lo) ? (lo) : (val)))
-
-#define __clamp_once(val, lo, hi, uval, ulo, uhi) ({ \
- __auto_type uval = (val); \
- __auto_type ulo = (lo); \
- __auto_type uhi = (hi); \
- BUILD_BUG_ON_MSG(statically_true(ulo > uhi), \
- "clamp() low limit " #lo " greater than high limit " #hi); \
- BUILD_BUG_ON_MSG(!__types_ok3(uval, ulo, uhi), \
- "clamp("#val", "#lo", "#hi") signedness error"); \
- __clamp(uval, ulo, uhi); })
-
-#define __careful_clamp(val, lo, hi) \
- __clamp_once(val, lo, hi, __UNIQUE_ID(v_), __UNIQUE_ID(l_), __UNIQUE_ID(h_))
-
/**
* min - return minimum of two values of the same or compatible types
* @x: first value
@@ -170,6 +154,22 @@
#define max3(x, y, z) \
__careful_op3(max, x, y, z, __UNIQUE_ID(x_), __UNIQUE_ID(y_), __UNIQUE_ID(z_))
+/**
+ * min_t - return minimum of two values, using the specified type
+ * @type: data type to use
+ * @x: first value
+ * @y: second value
+ */
+#define min_t(type, x, y) __cmp_once(min, type, x, y)
+
+/**
+ * max_t - return maximum of two values, using the specified type
+ * @type: data type to use
+ * @x: first value
+ * @y: second value
+ */
+#define max_t(type, x, y) __cmp_once(max, type, x, y)
+
/**
* min_not_zero - return the minimum that is _not_ zero, unless both are zero
* @x: value1
@@ -180,6 +180,22 @@
typeof(y) __y = (y); \
__x == 0 ? __y : ((__y == 0) ? __x : min(__x, __y)); })
+#define __clamp(val, lo, hi) \
+ ((val) >= (hi) ? (hi) : ((val) <= (lo) ? (lo) : (val)))
+
+#define __clamp_once(val, lo, hi, uval, ulo, uhi) ({ \
+ __auto_type uval = (val); \
+ __auto_type ulo = (lo); \
+ __auto_type uhi = (hi); \
+ BUILD_BUG_ON_MSG(statically_true(ulo > uhi), \
+ "clamp() low limit " #lo " greater than high limit " #hi); \
+ BUILD_BUG_ON_MSG(!__types_ok3(uval, ulo, uhi), \
+ "clamp("#val", "#lo", "#hi") signedness error"); \
+ __clamp(uval, ulo, uhi); })
+
+#define __careful_clamp(val, lo, hi) \
+ __clamp_once(val, lo, hi, __UNIQUE_ID(v_), __UNIQUE_ID(l_), __UNIQUE_ID(h_))
+
/**
* clamp - return a value clamped to a given range with strict typechecking
* @val: current value
@@ -191,28 +207,30 @@
*/
#define clamp(val, lo, hi) __careful_clamp(val, lo, hi)
-/*
- * ..and if you can't take the strict
- * types, you can specify one yourself.
- *
- * Or not use min/max/clamp at all, of course.
- */
-
/**
- * min_t - return minimum of two values, using the specified type
- * @type: data type to use
- * @x: first value
- * @y: second value
+ * clamp_t - return a value clamped to a given range using a given type
+ * @type: the type of variable to use
+ * @val: current value
+ * @lo: minimum allowable value
+ * @hi: maximum allowable value
+ *
+ * This macro does no typechecking and uses temporary variables of type
+ * @type to make all the comparisons.
*/
-#define min_t(type, x, y) __cmp_once(min, type, x, y)
+#define clamp_t(type, val, lo, hi) __careful_clamp((type)(val), (type)(lo), (type)(hi))
/**
- * max_t - return maximum of two values, using the specified type
- * @type: data type to use
- * @x: first value
- * @y: second value
+ * clamp_val - return a value clamped to a given range using val's type
+ * @val: current value
+ * @lo: minimum allowable value
+ * @hi: maximum allowable value
+ *
+ * This macro does no typechecking and uses temporary variables of whatever
+ * type the input argument @val is. This is useful when @val is an unsigned
+ * type and @lo and @hi are literals that will otherwise be assigned a signed
+ * integer type.
*/
-#define max_t(type, x, y) __cmp_once(max, type, x, y)
+#define clamp_val(val, lo, hi) clamp_t(typeof(val), val, lo, hi)
/*
* Do not check the array parameter using __must_be_array().
@@ -257,31 +275,6 @@
*/
#define max_array(array, len) __minmax_array(max, array, len)
-/**
- * clamp_t - return a value clamped to a given range using a given type
- * @type: the type of variable to use
- * @val: current value
- * @lo: minimum allowable value
- * @hi: maximum allowable value
- *
- * This macro does no typechecking and uses temporary variables of type
- * @type to make all the comparisons.
- */
-#define clamp_t(type, val, lo, hi) __careful_clamp((type)(val), (type)(lo), (type)(hi))
-
-/**
- * clamp_val - return a value clamped to a given range using val's type
- * @val: current value
- * @lo: minimum allowable value
- * @hi: maximum allowable value
- *
- * This macro does no typechecking and uses temporary variables of whatever
- * type the input argument @val is. This is useful when @val is an unsigned
- * type and @lo and @hi are literals that will otherwise be assigned a signed
- * integer type.
- */
-#define clamp_val(val, lo, hi) clamp_t(typeof(val), val, lo, hi)
-
static inline bool in_range64(u64 val, u64 start, u64 len)
{
return (val - start) < len;
--
2.47.3
next prev parent reply other threads:[~2025-10-03 13:08 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-03 12:59 [PATCH v2 00/19 5.15.y] Backport minmax.h updates from v6.17-rc7 Eliav Farber
2025-10-03 12:59 ` [PATCH v2 01/19 5.15.y] minmax: add in_range() macro Eliav Farber
2025-10-03 12:59 ` [PATCH v2 02/19 5.15.y] minmax: Introduce {min,max}_array() Eliav Farber
2025-10-03 12:59 ` [PATCH v2 03/19 5.15.y] minmax: deduplicate __unconst_integer_typeof() Eliav Farber
2025-10-03 12:59 ` [PATCH v2 04/19 5.15.y] minmax: fix indentation of __cmp_once() and __clamp_once() Eliav Farber
2025-10-03 12:59 ` [PATCH v2 05/19 5.15.y] minmax: avoid overly complicated constant expressions in VM code Eliav Farber
2025-10-03 12:59 ` [PATCH v2 06/19 5.15.y] minmax: add a few more MIN_T/MAX_T users Eliav Farber
2025-10-03 12:59 ` [PATCH v2 07/19 5.15.y] minmax: simplify and clarify min_t()/max_t() implementation Eliav Farber
2025-10-06 10:47 ` Greg KH
2025-10-06 20:35 ` David Laight
2025-10-07 20:43 ` Farber, Eliav
2025-10-03 12:59 ` [PATCH v2 08/19 5.15.y] minmax: make generic MIN() and MAX() macros available everywhere Eliav Farber
2025-10-03 12:59 ` [PATCH v2 09/19 5.15.y] minmax: don't use max() in situations that want a C constant expression Eliav Farber
2025-10-03 12:59 ` [PATCH v2 10/19 5.15.y] minmax: simplify min()/max()/clamp() implementation Eliav Farber
2025-10-03 12:59 ` [PATCH v2 11/19 5.15.y] minmax: improve macro expansion and type checking Eliav Farber
2025-10-03 12:59 ` [PATCH v2 12/19 5.15.y] minmax: fix up min3() and max3() too Eliav Farber
2025-10-03 13:00 ` [PATCH v2 13/19 5.15.y] minmax.h: add whitespace around operators and after commas Eliav Farber
2025-10-03 13:00 ` [PATCH v2 14/19 5.15.y] minmax.h: update some comments Eliav Farber
2025-10-03 13:00 ` [PATCH v2 15/19 5.15.y] minmax.h: reduce the #define expansion of min(), max() and clamp() Eliav Farber
2025-10-03 13:00 ` [PATCH v2 16/19 5.15.y] minmax.h: use BUILD_BUG_ON_MSG() for the lo < hi test in clamp() Eliav Farber
2025-10-03 13:00 ` Eliav Farber [this message]
2025-10-03 13:00 ` [PATCH v2 18/19 5.15.y] minmax.h: simplify the variants of clamp() Eliav Farber
2025-10-03 13:00 ` [PATCH v2 19/19 5.15.y] minmax.h: remove some #defines that are only expanded once Eliav Farber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251003130006.41681-18-farbere@amazon.com \
--to=farbere@amazon$(echo .)com \
--cc=David.Laight@ACULAB$(echo .)COM \
--cc=Jason@zx2c4$(echo .)com \
--cc=adilger.kernel@dilger$(echo .)ca \
--cc=agk@redhat$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--cc=akpm@linux-foundation$(echo .)org \
--cc=amd-gfx@lists$(echo .)freedesktop.org \
--cc=andriy.shevchenko@linux$(echo .)intel.com \
--cc=anton.ivanov@cambridgegreys$(echo .)com \
--cc=arnd@kernel$(echo .)org \
--cc=axboe@kernel$(echo .)dk \
--cc=bp@alien8$(echo .)de \
--cc=clm@fb$(echo .)com \
--cc=coreteam@netfilter$(echo .)org \
--cc=dan.carpenter@linaro$(echo .)org \
--cc=daniel@ffwll$(echo .)ch \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=davem@davemloft$(echo .)net \
--cc=dm-devel@redhat$(echo .)com \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=dsahern@kernel$(echo .)org \
--cc=dsterba@suse$(echo .)com \
--cc=dushistov@mail$(echo .)ru \
--cc=freedreno@lists$(echo .)freedesktop.org \
--cc=fw@strlen$(echo .)de \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hch@infradead$(echo .)org \
--cc=hdegoede@redhat$(echo .)com \
--cc=herve.codina@bootlin$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jack@suse$(echo .)com \
--cc=james.morse@arm$(echo .)com \
--cc=jdelvare@suse$(echo .)com \
--cc=jdike@addtoit$(echo .)com \
--cc=jejb@linux$(echo .)ibm.com \
--cc=jernej.skrabec@gmail$(echo .)com \
--cc=jmaloy@redhat$(echo .)com \
--cc=josef@toxicpanda$(echo .)com \
--cc=kadlec@netfilter$(echo .)org \
--cc=krzysztof.kozlowski@canonical$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-arm-msm@vger$(echo .)kernel.org \
--cc=linux-btrfs@vger$(echo .)kernel.org \
--cc=linux-edac@vger$(echo .)kernel.org \
--cc=linux-ext4@vger$(echo .)kernel.org \
--cc=linux-hwmon@vger$(echo .)kernel.org \
--cc=linux-input@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-kselftest@vger$(echo .)kernel.org \
--cc=linux-media@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=linux-scsi@vger$(echo .)kernel.org \
--cc=linux-sparse@vger$(echo .)kernel.org \
--cc=linux-staging@lists$(echo .)linux.dev \
--cc=linux-stm32@st-md-mailman$(echo .)stormreply.com \
--cc=linux-sunxi@lists$(echo .)linux.dev \
--cc=linux-um@lists$(echo .)infradead.org \
--cc=linux@rasmusvillemoes$(echo .)dk \
--cc=linux@roeck-us$(echo .)net \
--cc=lorenzo.stoakes@oracle$(echo .)com \
--cc=luc.vanoostenryck@gmail$(echo .)com \
--cc=luto@kernel$(echo .)org \
--cc=maarten.lankhorst@linux$(echo .)intel.com \
--cc=malattia@linux$(echo .)it \
--cc=martin.petersen@oracle$(echo .)com \
--cc=maz@kernel$(echo .)org \
--cc=mcoquelin.stm32@gmail$(echo .)com \
--cc=mgross@linux$(echo .)intel.com \
--cc=minchan@kernel$(echo .)org \
--cc=mingo@redhat$(echo .)com \
--cc=mjguzik@gmail$(echo .)com \
--cc=mripard@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=netfilter-devel@vger$(echo .)kernel.org \
--cc=ngupta@vflare$(echo .)org \
--cc=pablo@netfilter$(echo .)org \
--cc=pedro.falcato@gmail$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=platform-driver-x86@vger$(echo .)kernel.org \
--cc=pmladek@suse$(echo .)com \
--cc=qiuxu.zhuo@intel$(echo .)com \
--cc=quic_akhilpo@quicinc$(echo .)com \
--cc=richard@nod$(echo .)at \
--cc=robdclark@gmail$(echo .)com \
--cc=rostedt@goodmis$(echo .)org \
--cc=rric@kernel$(echo .)org \
--cc=ruanjinjie@huawei$(echo .)com \
--cc=sakari.ailus@linux$(echo .)intel.com \
--cc=sashal@kernel$(echo .)org \
--cc=sean@poorly$(echo .)run \
--cc=senozhatsky@chromium$(echo .)org \
--cc=shuah@kernel$(echo .)org \
--cc=snitzer@redhat$(echo .)com \
--cc=stable@vger$(echo .)kernel.org \
--cc=tglx@linutronix$(echo .)de \
--cc=tipc-discussion@lists$(echo .)sourceforge.net \
--cc=tony.luck@intel$(echo .)com \
--cc=tytso@mit$(echo .)edu \
--cc=tzimmermann@suse$(echo .)de \
--cc=wens@csie$(echo .)org \
--cc=willy@infradead$(echo .)org \
--cc=x86@kernel$(echo .)org \
--cc=ying.xue@windriver$(echo .)com \
--cc=yoshfuji@linux-ipv6$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox