From nobody Sun Feb 8 04:23:39 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 C2754200116; Tue, 4 Mar 2025 10:26:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741083983; cv=none; b=gDPtKJRNMmjcqLq5pf1X4k/e+LrURGyzlTZjs01UQHzkhfYe+5yYR05Iw3fRmsBuuG8SKtkFUf4jFGSTY14VVyiq/TafRFHttK2X1GW3Zxm0Kj20sz+qzvnRULIi6CIuMnz/+wlIm0GU4lfafLnuHwzqBRGduI3l/nFC6Lph3+s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741083983; c=relaxed/simple; bh=vBrb+Oz8bcqvvL4ypSdCCw61OZejiK/J1FjIiidFaMA=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=MAODiY2Xx5EwcALNjN66C/ZYtlrEIE8/0tQCObpmdqaIh0RTHOOrWz7v3aQyRZKjSvFGwK0Whu4nDMxWy0j0J/VJ5U7kur6YSBnHnlLUPEXfaju0sodo4nQRWN6HmJav/xldtijPz3JR7FSs/unOK7twfctOlUXV/aU2Rxpqb3g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=tnzlFKje; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=TBqceH/I; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="tnzlFKje"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="TBqceH/I" Date: Tue, 04 Mar 2025 10:26:19 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1741083980; h=from:from:sender:sender:reply-to: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:references; bh=GeXx0OWnyHxO2GxPmEiBoj5Ep+uTOage+OX9RzyzwFI=; b=tnzlFKjetIIabIKAeqX46tsMufquq1oU2CMXWT9LJWTIEcy4EPIEy2Z4/3GsvWcensvTj+ HVjbVDFMLQDGNnJDSVz7RuJ3aLFN+2MvGY+Xtc2EJVSgCaNgoOShEUezIuSPE3WFJHKhVh ub5mhRB+AeciFTK7OJT4E4+aQLbjFBymSgC8YtcLLqMM1/Y/wUCRXr3Yvi1O2KnteTkSlq CGrz+nLYgxejZn5ewBapTJx8XLEXK++PXh8Kz8VHVWSFehMYqqXgNLu7qYFqfRfJAFi0pl tkFMe7rayebfW7vesc9tHzPdIPjZN0kfUxEaizRqfqwZn85V+UBc0R0egatzAw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1741083980; h=from:from:sender:sender:reply-to: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:references; bh=GeXx0OWnyHxO2GxPmEiBoj5Ep+uTOage+OX9RzyzwFI=; b=TBqceH/I42k6e1M6rQYR1hpkF7BEe9Ud5fvS5xRiudxhNdvH19PG7dKRwrxkcn+4nnhFNa BWGc7Oi7NH007pBQ== From: "tip-bot2 for Ahmed S. Darwish" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cpu] x86/cpu: Use max() for CPUID leaf 0x2 TLB descriptors parsing Cc: "Ahmed S. Darwish" , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250304085152.51092-7-darwi@linutronix.de> References: <20250304085152.51092-7-darwi@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <174108397951.14745.14065199599095053809.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/cpu branch of tip: Commit-ID: cb5f4c76b2a9314c35e00c67c98ccd03542c2634 Gitweb: https://git.kernel.org/tip/cb5f4c76b2a9314c35e00c67c98ccd035= 42c2634 Author: Ahmed S. Darwish AuthorDate: Tue, 04 Mar 2025 09:51:17 +01:00 Committer: Ingo Molnar CommitterDate: Tue, 04 Mar 2025 11:17:33 +01:00 x86/cpu: Use max() for CPUID leaf 0x2 TLB descriptors parsing The conditional statement "if (x < y) { x =3D y; }" appears 22 times at the Intel leaf 0x2 descriptors parsing logic. Replace each of such instances with a max() expression to simplify the code. Signed-off-by: Ahmed S. Darwish Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20250304085152.51092-7-darwi@linutronix.de --- arch/x86/kernel/cpu/intel.c | 76 +++++++++++++----------------------- 1 file changed, 28 insertions(+), 48 deletions(-) diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 60b58b1..42a57b8 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include =20 @@ -700,7 +701,9 @@ static const struct _tlb_table intel_tlb_table[] =3D { =20 static void intel_tlb_lookup(const unsigned char desc) { + unsigned int entries; unsigned char k; + if (desc =3D=3D 0) return; =20 @@ -712,81 +715,58 @@ static void intel_tlb_lookup(const unsigned char desc) if (intel_tlb_table[k].tlb_type =3D=3D 0) return; =20 + entries =3D intel_tlb_table[k].entries; switch (intel_tlb_table[k].tlb_type) { case STLB_4K: - if (tlb_lli_4k[ENTRIES] < intel_tlb_table[k].entries) - tlb_lli_4k[ENTRIES] =3D intel_tlb_table[k].entries; - if (tlb_lld_4k[ENTRIES] < intel_tlb_table[k].entries) - tlb_lld_4k[ENTRIES] =3D intel_tlb_table[k].entries; + tlb_lli_4k[ENTRIES] =3D max(tlb_lli_4k[ENTRIES], entries); + tlb_lld_4k[ENTRIES] =3D max(tlb_lld_4k[ENTRIES], entries); break; case STLB_4K_2M: - if (tlb_lli_4k[ENTRIES] < intel_tlb_table[k].entries) - tlb_lli_4k[ENTRIES] =3D intel_tlb_table[k].entries; - if (tlb_lld_4k[ENTRIES] < intel_tlb_table[k].entries) - tlb_lld_4k[ENTRIES] =3D intel_tlb_table[k].entries; - if (tlb_lli_2m[ENTRIES] < intel_tlb_table[k].entries) - tlb_lli_2m[ENTRIES] =3D intel_tlb_table[k].entries; - if (tlb_lld_2m[ENTRIES] < intel_tlb_table[k].entries) - tlb_lld_2m[ENTRIES] =3D intel_tlb_table[k].entries; - if (tlb_lli_4m[ENTRIES] < intel_tlb_table[k].entries) - tlb_lli_4m[ENTRIES] =3D intel_tlb_table[k].entries; - if (tlb_lld_4m[ENTRIES] < intel_tlb_table[k].entries) - tlb_lld_4m[ENTRIES] =3D intel_tlb_table[k].entries; + tlb_lli_4k[ENTRIES] =3D max(tlb_lli_4k[ENTRIES], entries); + tlb_lld_4k[ENTRIES] =3D max(tlb_lld_4k[ENTRIES], entries); + tlb_lli_2m[ENTRIES] =3D max(tlb_lli_2m[ENTRIES], entries); + tlb_lld_2m[ENTRIES] =3D max(tlb_lld_2m[ENTRIES], entries); + tlb_lli_4m[ENTRIES] =3D max(tlb_lli_4m[ENTRIES], entries); + tlb_lld_4m[ENTRIES] =3D max(tlb_lld_4m[ENTRIES], entries); break; case TLB_INST_ALL: - if (tlb_lli_4k[ENTRIES] < intel_tlb_table[k].entries) - tlb_lli_4k[ENTRIES] =3D intel_tlb_table[k].entries; - if (tlb_lli_2m[ENTRIES] < intel_tlb_table[k].entries) - tlb_lli_2m[ENTRIES] =3D intel_tlb_table[k].entries; - if (tlb_lli_4m[ENTRIES] < intel_tlb_table[k].entries) - tlb_lli_4m[ENTRIES] =3D intel_tlb_table[k].entries; + tlb_lli_4k[ENTRIES] =3D max(tlb_lli_4k[ENTRIES], entries); + tlb_lli_2m[ENTRIES] =3D max(tlb_lli_2m[ENTRIES], entries); + tlb_lli_4m[ENTRIES] =3D max(tlb_lli_4m[ENTRIES], entries); break; case TLB_INST_4K: - if (tlb_lli_4k[ENTRIES] < intel_tlb_table[k].entries) - tlb_lli_4k[ENTRIES] =3D intel_tlb_table[k].entries; + tlb_lli_4k[ENTRIES] =3D max(tlb_lli_4k[ENTRIES], entries); break; case TLB_INST_4M: - if (tlb_lli_4m[ENTRIES] < intel_tlb_table[k].entries) - tlb_lli_4m[ENTRIES] =3D intel_tlb_table[k].entries; + tlb_lli_4m[ENTRIES] =3D max(tlb_lli_4m[ENTRIES], entries); break; case TLB_INST_2M_4M: - if (tlb_lli_2m[ENTRIES] < intel_tlb_table[k].entries) - tlb_lli_2m[ENTRIES] =3D intel_tlb_table[k].entries; - if (tlb_lli_4m[ENTRIES] < intel_tlb_table[k].entries) - tlb_lli_4m[ENTRIES] =3D intel_tlb_table[k].entries; + tlb_lli_2m[ENTRIES] =3D max(tlb_lli_2m[ENTRIES], entries); + tlb_lli_4m[ENTRIES] =3D max(tlb_lli_4m[ENTRIES], entries); break; case TLB_DATA_4K: case TLB_DATA0_4K: - if (tlb_lld_4k[ENTRIES] < intel_tlb_table[k].entries) - tlb_lld_4k[ENTRIES] =3D intel_tlb_table[k].entries; + tlb_lld_4k[ENTRIES] =3D max(tlb_lld_4k[ENTRIES], entries); break; case TLB_DATA_4M: case TLB_DATA0_4M: - if (tlb_lld_4m[ENTRIES] < intel_tlb_table[k].entries) - tlb_lld_4m[ENTRIES] =3D intel_tlb_table[k].entries; + tlb_lld_4m[ENTRIES] =3D max(tlb_lld_4m[ENTRIES], entries); break; case TLB_DATA_2M_4M: case TLB_DATA0_2M_4M: - if (tlb_lld_2m[ENTRIES] < intel_tlb_table[k].entries) - tlb_lld_2m[ENTRIES] =3D intel_tlb_table[k].entries; - if (tlb_lld_4m[ENTRIES] < intel_tlb_table[k].entries) - tlb_lld_4m[ENTRIES] =3D intel_tlb_table[k].entries; + tlb_lld_2m[ENTRIES] =3D max(tlb_lld_2m[ENTRIES], entries); + tlb_lld_4m[ENTRIES] =3D max(tlb_lld_4m[ENTRIES], entries); break; case TLB_DATA_4K_4M: - if (tlb_lld_4k[ENTRIES] < intel_tlb_table[k].entries) - tlb_lld_4k[ENTRIES] =3D intel_tlb_table[k].entries; - if (tlb_lld_4m[ENTRIES] < intel_tlb_table[k].entries) - tlb_lld_4m[ENTRIES] =3D intel_tlb_table[k].entries; + tlb_lld_4k[ENTRIES] =3D max(tlb_lld_4k[ENTRIES], entries); + tlb_lld_4m[ENTRIES] =3D max(tlb_lld_4m[ENTRIES], entries); break; case TLB_DATA_1G_2M_4M: - if (tlb_lld_2m[ENTRIES] < TLB_0x63_2M_4M_ENTRIES) - tlb_lld_2m[ENTRIES] =3D TLB_0x63_2M_4M_ENTRIES; - if (tlb_lld_4m[ENTRIES] < TLB_0x63_2M_4M_ENTRIES) - tlb_lld_4m[ENTRIES] =3D TLB_0x63_2M_4M_ENTRIES; + tlb_lld_2m[ENTRIES] =3D max(tlb_lld_2m[ENTRIES], TLB_0x63_2M_4M_ENTRIES); + tlb_lld_4m[ENTRIES] =3D max(tlb_lld_4m[ENTRIES], TLB_0x63_2M_4M_ENTRIES); fallthrough; case TLB_DATA_1G: - if (tlb_lld_1g[ENTRIES] < intel_tlb_table[k].entries) - tlb_lld_1g[ENTRIES] =3D intel_tlb_table[k].entries; + tlb_lld_1g[ENTRIES] =3D max(tlb_lld_1g[ENTRIES], entries); break; } }