From nobody Wed Dec 17 19:38:04 2025 Received: from fra-out-008.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-008.esa.eu-central-1.outbound.mail-perimeter.amazon.com [35.158.23.94]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACCFF192D8A; Fri, 3 Oct 2025 13:04:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=35.158.23.94 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759496647; cv=none; b=gQRN4l+Vd/XKbGVVk86I2YHwgbZjmRbVRsab2Yg2cU2+jcmEjasrgfqkdR4O3x5T9w0y/W4Hwi1vsa806lpEaAcS6JWzVdcwRiXxFPeIIEnzAAbNhdmABhS0JbrOU2cGMYFZe4ytsF7P6Ng+RDH4JKtIg6xDb3GWvvUBnlaBMAM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759496647; c=relaxed/simple; bh=UF5HInXqvuEZDjvLFk9TJPIURvGdbWuJMNhMd8v9A0E=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=e31NDJedu8yoWQ/bF7W2golkami9AVVilDEPqIek3+9eYcW6mud64gb+GnchTy5KgZ/gZ//fBZ06AJe4ClfNMxUSaVNXTM8QsIp9gRzTgrUAiKyTYmxvUYC1X/yLPgACsq0LupSQPH/3C4Vk2c0SdZUsWDjOcnLL2sh2btey+ic= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com; spf=pass smtp.mailfrom=amazon.com; dkim=pass (2048-bit key) header.d=amazon.com header.i=@amazon.com header.b=lUSQnDnv; arc=none smtp.client-ip=35.158.23.94 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.com header.i=@amazon.com header.b="lUSQnDnv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1759496645; x=1791032645; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nWSej8xbBt1No+Mk4Q7cDNVqN1sPbiSh6ZSRtMK8qI8=; b=lUSQnDnvPMVJrgmVKdld2xWowpOzpNSd3ooxkh9tlQtO7d+RkDaam8FA 9/wGuXFc/xk+6W8mqzfEAYhat/Yn4nDDIuhqOLbF8xXdGVFsBiJZDn7wH yFcWslNvBj0L++03WdPrH7GsPxOX0u+vAvt6BOqGhhbut3+i6/ziCOC93 3Zo8zqXfnreFbgH4cFNjbZJVoCrRgHz9ziKDM0Kbkem/UjqX4XCZCj+pR PNEbF7xG/ne8Hi/j2YZgYAeYaEN9Tb/KZ/5wnkaS6YRnaK/7yctxHvtwW pKtGIDtlOVlbsXvOGW/yREF6aYM6NVAvozwOzxUDEcmvwZgvEdzGVcMDi Q==; X-CSE-ConnectionGUID: uauqHzzGT8CWLIxTZUCqPQ== X-CSE-MsgGUID: iLEH/C58S9uyrBI8b72WGw== X-IronPort-AV: E=Sophos;i="6.18,312,1751241600"; d="scan'208";a="3066489" Received: from ip-10-6-11-83.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.11.83]) by internal-fra-out-008.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2025 13:04:00 +0000 Received: from EX19MTAEUA001.ant.amazon.com [54.240.197.233:19702] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.22.27:2525] with esmtp (Farcaster) id 94a9e6c0-deea-40ff-8bf8-c2afea5d2574; Fri, 3 Oct 2025 13:04:00 +0000 (UTC) X-Farcaster-Flow-ID: 94a9e6c0-deea-40ff-8bf8-c2afea5d2574 Received: from EX19D018EUA004.ant.amazon.com (10.252.50.85) by EX19MTAEUA001.ant.amazon.com (10.252.50.223) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Fri, 3 Oct 2025 13:03:47 +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; Fri, 3 Oct 2025 13:03:22 +0000 From: Eliav Farber To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , CC: Linus Torvalds , David Laight , Lorenzo Stoakes Subject: [PATCH v2 07/19 5.15.y] minmax: simplify and clarify min_t()/max_t() implementation Date: Fri, 3 Oct 2025 12:59:54 +0000 Message-ID: <20251003130006.41681-8-farbere@amazon.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251003130006.41681-1-farbere@amazon.com> References: <20251003130006.41681-1-farbere@amazon.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: EX19D043UWA002.ant.amazon.com (10.13.139.53) To EX19D018EUA004.ant.amazon.com (10.252.50.85) Content-Type: text/plain; charset="utf-8" From: Linus Torvalds [ Upstream commit 017fa3e89187848fd056af757769c9e66ac3e93d ] This simplifies the min_t() and max_t() macros by no longer making them work in the context of a C constant expression. That means that you can no longer use them for static initializers or for array sizes in type definitions, but there were only a couple of such uses, and all of them were converted (famous last words) to use MIN_T/MAX_T instead. Cc: David Laight Cc: Lorenzo Stoakes Signed-off-by: Linus Torvalds Signed-off-by: Eliav Farber --- V1 -> V2: Use `[ Upstream commit ]` instead of `commit upstream.` like in all other patches. include/linux/minmax.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/include/linux/minmax.h b/include/linux/minmax.h index a7ef65f78933..9c2848abc804 100644 --- a/include/linux/minmax.h +++ b/include/linux/minmax.h @@ -45,17 +45,20 @@ =20 #define __cmp(op, x, y) ((x) __cmp_op_##op (y) ? (x) : (y)) =20 -#define __cmp_once(op, x, y, unique_x, unique_y) ({ \ - typeof(x) unique_x =3D (x); \ - typeof(y) unique_y =3D (y); \ +#define __cmp_once_unique(op, type, x, y, ux, uy) \ + ({ type ux =3D (x); type uy =3D (y); __cmp(op, ux, uy); }) + +#define __cmp_once(op, type, x, y) \ + __cmp_once_unique(op, type, x, y, __UNIQUE_ID(x_), __UNIQUE_ID(y_)) + +#define __careful_cmp_once(op, x, y) ({ \ static_assert(__types_ok(x, y), \ #op "(" #x ", " #y ") signedness error, fix types or consider u" #op "()= before " #op "_t()"); \ - __cmp(op, unique_x, unique_y); }) + __cmp_once(op, __auto_type, x, y); }) =20 #define __careful_cmp(op, x, y) \ __builtin_choose_expr(__is_constexpr((x) - (y)), \ - __cmp(op, x, y), \ - __cmp_once(op, x, y, __UNIQUE_ID(__x), __UNIQUE_ID(__y))) + __cmp(op, x, y), __careful_cmp_once(op, x, y)) =20 #define __clamp(val, lo, hi) \ ((val) >=3D (hi) ? (hi) : ((val) <=3D (lo) ? (lo) : (val))) @@ -158,7 +161,7 @@ * @x: first value * @y: second value */ -#define min_t(type, x, y) __careful_cmp(min, (type)(x), (type)(y)) +#define min_t(type, x, y) __cmp_once(min, type, x, y) =20 /** * max_t - return maximum of two values, using the specified type @@ -166,7 +169,7 @@ * @x: first value * @y: second value */ -#define max_t(type, x, y) __careful_cmp(max, (type)(x), (type)(y)) +#define max_t(type, x, y) __cmp_once(max, type, x, y) =20 /* * Do not check the array parameter using __must_be_array(). --=20 2.47.3