From nobody Sun Feb 8 13:18:46 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 38211201016; Tue, 4 Mar 2025 10:26:20 +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=IkE+EIC5PR6/Oc4LWfuaTTaz2BJX28+0SebbAm0M5Y9+8FmupgP7risguT09eIYSuW0J9yxqb1p3CeRYdtp1DIum5yY8VvcmcA2xGhodBmXrOB6UAX4H1T0gvRJ7bMVVY0aYbQdcXPtWr2+PxFNObGAd3KeqMYe7F1i74kqdnts= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741083983; c=relaxed/simple; bh=WXtMylmVI/NPDwUMpWKQ2BF0g0ZulJqANd3gRldfiYY=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=cpj7MtMBruku0L3szc2Cv1N/6KmiasurPvt9zQwSBFWz1ZAKQvt94ZDF2no9h/aZr8ou90CpijcQA6OMTdmNzRnXk3/WUUUFuUt+/Dyj60FuzQ9EmO9d8I8nfvsnrY9DOQEDGyZpOdr5GG/XThaVg1yRRowmJaYP0O344JsN+aQ= 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=SAm446BE; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=xm3BUN1W; 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="SAm446BE"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="xm3BUN1W" Date: Tue, 04 Mar 2025 10:26:18 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1741083979; 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=xkA9np39flM0rXG9QDdUwrN5+2LqVRxpJVPFOs2YZ2U=; b=SAm446BE2asaduslzjqPmcH6tzjXXJyMFTjJMAjIA4xuBanfjtD3J/RVZNzWH9c0MnKN+H Qc2WLCzR7bnJsjophv8B0pJsedjPeDCVXd8iQ1ITEkU5CsPBsQIEDj9PkF2XMkTtS9IzOc oheBHclG0hq6ql3/7dYs4QPZO3WgtHiFi5ATtsCf6iQJFowPayHRa+NNRwjizvs/8Jm/Vi JOnwVmmK5IXbOgdKdezf85znWAWwQgqtiTa+uq+0hNhlew/k7aHGphOyEAwF/qcXbdM6b/ qeDvhWWRZVa7kLZCH8TB1Bs+JleBDkDS2gW3qOFF6RA3ULhM21HwZsg1oj14dg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1741083979; 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=xkA9np39flM0rXG9QDdUwrN5+2LqVRxpJVPFOs2YZ2U=; b=xm3BUN1W30+EZcNHkGS84vpfbSg+yhj7DHjrf7eOsr0Y7L/3Wc6OsEIJLEyrtifG4Fvvow taYorGeT645AfQBA== 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: Simplify TLB entry count storage Cc: "Ahmed S. Darwish" , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250304085152.51092-8-darwi@linutronix.de> References: <20250304085152.51092-8-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: <174108397872.14745.15360421189987409332.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: 8b7e54b542103753619a37cbb3216849a934872f Gitweb: https://git.kernel.org/tip/8b7e54b542103753619a37cbb3216849a= 934872f Author: Ahmed S. Darwish AuthorDate: Tue, 04 Mar 2025 09:51:18 +01:00 Committer: Ingo Molnar CommitterDate: Tue, 04 Mar 2025 11:17:33 +01:00 x86/cpu: Simplify TLB entry count storage Commit: e0ba94f14f74 ("x86/tlb_info: get last level TLB entry number of CPU") introduced u16 "info" arrays for each TLB type. Since 2012 and each array stores just one type of information: the number of TLB entries for its respective TLB type. Replace such arrays with simple variables. Signed-off-by: Ahmed S. Darwish Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20250304085152.51092-8-darwi@linutronix.de --- arch/x86/include/asm/processor.h | 19 ++++-------- arch/x86/kernel/cpu/amd.c | 18 ++++++------ arch/x86/kernel/cpu/common.c | 20 +++++-------- arch/x86/kernel/cpu/hygon.c | 16 +++++----- arch/x86/kernel/cpu/intel.c | 48 +++++++++++++++---------------- 5 files changed, 57 insertions(+), 64 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/proces= sor.h index c0cd101..0ea227f 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -60,18 +60,13 @@ struct vm86; # define ARCH_MIN_MMSTRUCT_ALIGN 0 #endif =20 -enum tlb_infos { - ENTRIES, - NR_INFO -}; - -extern u16 __read_mostly tlb_lli_4k[NR_INFO]; -extern u16 __read_mostly tlb_lli_2m[NR_INFO]; -extern u16 __read_mostly tlb_lli_4m[NR_INFO]; -extern u16 __read_mostly tlb_lld_4k[NR_INFO]; -extern u16 __read_mostly tlb_lld_2m[NR_INFO]; -extern u16 __read_mostly tlb_lld_4m[NR_INFO]; -extern u16 __read_mostly tlb_lld_1g[NR_INFO]; +extern u16 __read_mostly tlb_lli_4k; +extern u16 __read_mostly tlb_lli_2m; +extern u16 __read_mostly tlb_lli_4m; +extern u16 __read_mostly tlb_lld_4k; +extern u16 __read_mostly tlb_lld_2m; +extern u16 __read_mostly tlb_lld_4m; +extern u16 __read_mostly tlb_lld_1g; =20 /* * CPU type and hardware bug flags. Kept separately for each CPU. diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index d747515..3157664 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -1105,8 +1105,8 @@ static void cpu_detect_tlb_amd(struct cpuinfo_x86 *c) =20 cpuid(0x80000006, &eax, &ebx, &ecx, &edx); =20 - tlb_lld_4k[ENTRIES] =3D (ebx >> 16) & mask; - tlb_lli_4k[ENTRIES] =3D ebx & mask; + tlb_lld_4k =3D (ebx >> 16) & mask; + tlb_lli_4k =3D ebx & mask; =20 /* * K8 doesn't have 2M/4M entries in the L2 TLB so read out the L1 TLB @@ -1119,26 +1119,26 @@ static void cpu_detect_tlb_amd(struct cpuinfo_x86 *= c) =20 /* Handle DTLB 2M and 4M sizes, fall back to L1 if L2 is disabled */ if (!((eax >> 16) & mask)) - tlb_lld_2m[ENTRIES] =3D (cpuid_eax(0x80000005) >> 16) & 0xff; + tlb_lld_2m =3D (cpuid_eax(0x80000005) >> 16) & 0xff; else - tlb_lld_2m[ENTRIES] =3D (eax >> 16) & mask; + tlb_lld_2m =3D (eax >> 16) & mask; =20 /* a 4M entry uses two 2M entries */ - tlb_lld_4m[ENTRIES] =3D tlb_lld_2m[ENTRIES] >> 1; + tlb_lld_4m =3D tlb_lld_2m >> 1; =20 /* Handle ITLB 2M and 4M sizes, fall back to L1 if L2 is disabled */ if (!(eax & mask)) { /* Erratum 658 */ if (c->x86 =3D=3D 0x15 && c->x86_model <=3D 0x1f) { - tlb_lli_2m[ENTRIES] =3D 1024; + tlb_lli_2m =3D 1024; } else { cpuid(0x80000005, &eax, &ebx, &ecx, &edx); - tlb_lli_2m[ENTRIES] =3D eax & 0xff; + tlb_lli_2m =3D eax & 0xff; } } else - tlb_lli_2m[ENTRIES] =3D eax & mask; + tlb_lli_2m =3D eax & mask; =20 - tlb_lli_4m[ENTRIES] =3D tlb_lli_2m[ENTRIES] >> 1; + tlb_lli_4m =3D tlb_lli_2m >> 1; } =20 static const struct cpu_dev amd_cpu_dev =3D { diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 8eba9ca..3a1a957 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -846,13 +846,13 @@ void cpu_detect_cache_sizes(struct cpuinfo_x86 *c) c->x86_cache_size =3D l2size; } =20 -u16 __read_mostly tlb_lli_4k[NR_INFO]; -u16 __read_mostly tlb_lli_2m[NR_INFO]; -u16 __read_mostly tlb_lli_4m[NR_INFO]; -u16 __read_mostly tlb_lld_4k[NR_INFO]; -u16 __read_mostly tlb_lld_2m[NR_INFO]; -u16 __read_mostly tlb_lld_4m[NR_INFO]; -u16 __read_mostly tlb_lld_1g[NR_INFO]; +u16 __read_mostly tlb_lli_4k; +u16 __read_mostly tlb_lli_2m; +u16 __read_mostly tlb_lli_4m; +u16 __read_mostly tlb_lld_4k; +u16 __read_mostly tlb_lld_2m; +u16 __read_mostly tlb_lld_4m; +u16 __read_mostly tlb_lld_1g; =20 static void cpu_detect_tlb(struct cpuinfo_x86 *c) { @@ -860,12 +860,10 @@ static void cpu_detect_tlb(struct cpuinfo_x86 *c) this_cpu->c_detect_tlb(c); =20 pr_info("Last level iTLB entries: 4KB %d, 2MB %d, 4MB %d\n", - tlb_lli_4k[ENTRIES], tlb_lli_2m[ENTRIES], - tlb_lli_4m[ENTRIES]); + tlb_lli_4k, tlb_lli_2m, tlb_lli_4m); =20 pr_info("Last level dTLB entries: 4KB %d, 2MB %d, 4MB %d, 1GB %d\n", - tlb_lld_4k[ENTRIES], tlb_lld_2m[ENTRIES], - tlb_lld_4m[ENTRIES], tlb_lld_1g[ENTRIES]); + tlb_lld_4k, tlb_lld_2m, tlb_lld_4m, tlb_lld_1g); } =20 void get_cpu_vendor(struct cpuinfo_x86 *c) diff --git a/arch/x86/kernel/cpu/hygon.c b/arch/x86/kernel/cpu/hygon.c index c5191b0..6af4a4a 100644 --- a/arch/x86/kernel/cpu/hygon.c +++ b/arch/x86/kernel/cpu/hygon.c @@ -240,26 +240,26 @@ static void cpu_detect_tlb_hygon(struct cpuinfo_x86 *= c) =20 cpuid(0x80000006, &eax, &ebx, &ecx, &edx); =20 - tlb_lld_4k[ENTRIES] =3D (ebx >> 16) & mask; - tlb_lli_4k[ENTRIES] =3D ebx & mask; + tlb_lld_4k =3D (ebx >> 16) & mask; + tlb_lli_4k =3D ebx & mask; =20 /* Handle DTLB 2M and 4M sizes, fall back to L1 if L2 is disabled */ if (!((eax >> 16) & mask)) - tlb_lld_2m[ENTRIES] =3D (cpuid_eax(0x80000005) >> 16) & 0xff; + tlb_lld_2m =3D (cpuid_eax(0x80000005) >> 16) & 0xff; else - tlb_lld_2m[ENTRIES] =3D (eax >> 16) & mask; + tlb_lld_2m =3D (eax >> 16) & mask; =20 /* a 4M entry uses two 2M entries */ - tlb_lld_4m[ENTRIES] =3D tlb_lld_2m[ENTRIES] >> 1; + tlb_lld_4m =3D tlb_lld_2m >> 1; =20 /* Handle ITLB 2M and 4M sizes, fall back to L1 if L2 is disabled */ if (!(eax & mask)) { cpuid(0x80000005, &eax, &ebx, &ecx, &edx); - tlb_lli_2m[ENTRIES] =3D eax & 0xff; + tlb_lli_2m =3D eax & 0xff; } else - tlb_lli_2m[ENTRIES] =3D eax & mask; + tlb_lli_2m =3D eax & mask; =20 - tlb_lli_4m[ENTRIES] =3D tlb_lli_2m[ENTRIES] >> 1; + tlb_lli_4m =3D tlb_lli_2m >> 1; } =20 static const struct cpu_dev hygon_cpu_dev =3D { diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 42a57b8..61d3fd3 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -718,55 +718,55 @@ static void intel_tlb_lookup(const unsigned char desc) entries =3D intel_tlb_table[k].entries; switch (intel_tlb_table[k].tlb_type) { case STLB_4K: - tlb_lli_4k[ENTRIES] =3D max(tlb_lli_4k[ENTRIES], entries); - tlb_lld_4k[ENTRIES] =3D max(tlb_lld_4k[ENTRIES], entries); + tlb_lli_4k =3D max(tlb_lli_4k, entries); + tlb_lld_4k =3D max(tlb_lld_4k, entries); break; case STLB_4K_2M: - 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); + tlb_lli_4k =3D max(tlb_lli_4k, entries); + tlb_lld_4k =3D max(tlb_lld_4k, entries); + tlb_lli_2m =3D max(tlb_lli_2m, entries); + tlb_lld_2m =3D max(tlb_lld_2m, entries); + tlb_lli_4m =3D max(tlb_lli_4m, entries); + tlb_lld_4m =3D max(tlb_lld_4m, entries); break; case TLB_INST_ALL: - 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); + tlb_lli_4k =3D max(tlb_lli_4k, entries); + tlb_lli_2m =3D max(tlb_lli_2m, entries); + tlb_lli_4m =3D max(tlb_lli_4m, entries); break; case TLB_INST_4K: - tlb_lli_4k[ENTRIES] =3D max(tlb_lli_4k[ENTRIES], entries); + tlb_lli_4k =3D max(tlb_lli_4k, entries); break; case TLB_INST_4M: - tlb_lli_4m[ENTRIES] =3D max(tlb_lli_4m[ENTRIES], entries); + tlb_lli_4m =3D max(tlb_lli_4m, entries); break; case TLB_INST_2M_4M: - tlb_lli_2m[ENTRIES] =3D max(tlb_lli_2m[ENTRIES], entries); - tlb_lli_4m[ENTRIES] =3D max(tlb_lli_4m[ENTRIES], entries); + tlb_lli_2m =3D max(tlb_lli_2m, entries); + tlb_lli_4m =3D max(tlb_lli_4m, entries); break; case TLB_DATA_4K: case TLB_DATA0_4K: - tlb_lld_4k[ENTRIES] =3D max(tlb_lld_4k[ENTRIES], entries); + tlb_lld_4k =3D max(tlb_lld_4k, entries); break; case TLB_DATA_4M: case TLB_DATA0_4M: - tlb_lld_4m[ENTRIES] =3D max(tlb_lld_4m[ENTRIES], entries); + tlb_lld_4m =3D max(tlb_lld_4m, entries); break; case TLB_DATA_2M_4M: case TLB_DATA0_2M_4M: - tlb_lld_2m[ENTRIES] =3D max(tlb_lld_2m[ENTRIES], entries); - tlb_lld_4m[ENTRIES] =3D max(tlb_lld_4m[ENTRIES], entries); + tlb_lld_2m =3D max(tlb_lld_2m, entries); + tlb_lld_4m =3D max(tlb_lld_4m, entries); break; case TLB_DATA_4K_4M: - tlb_lld_4k[ENTRIES] =3D max(tlb_lld_4k[ENTRIES], entries); - tlb_lld_4m[ENTRIES] =3D max(tlb_lld_4m[ENTRIES], entries); + tlb_lld_4k =3D max(tlb_lld_4k, entries); + tlb_lld_4m =3D max(tlb_lld_4m, entries); break; case TLB_DATA_1G_2M_4M: - 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); + tlb_lld_2m =3D max(tlb_lld_2m, TLB_0x63_2M_4M_ENTRIES); + tlb_lld_4m =3D max(tlb_lld_4m, TLB_0x63_2M_4M_ENTRIES); fallthrough; case TLB_DATA_1G: - tlb_lld_1g[ENTRIES] =3D max(tlb_lld_1g[ENTRIES], entries); + tlb_lld_1g =3D max(tlb_lld_1g, entries); break; } }