From patchwork Fri Feb 21 00:53:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rik van Riel X-Patchwork-Id: 13984679 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 047D1C021B3 for ; Fri, 21 Feb 2025 00:55:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3DD0D6B00AC; Thu, 20 Feb 2025 19:55:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E628028000C; Thu, 20 Feb 2025 19:55:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BAB6F28000B; Thu, 20 Feb 2025 19:55:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 445856B00AE for ; Thu, 20 Feb 2025 19:55:09 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C5E3148E27 for ; Fri, 21 Feb 2025 00:55:08 +0000 (UTC) X-FDA: 83142132696.06.46DCEF3 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf12.hostedemail.com (Postfix) with ESMTP id 2210B40013 for ; Fri, 21 Feb 2025 00:55:06 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf12.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740099307; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l+vicx6yTnFJ2B8TG3u6etT+xSitiRT+7lgNVkCj/zA=; b=sCt9yDj9dGWSHx4gRqv4w/XsWwAHPTjtSs2ipyaN9Vn/32tuwUDVkfVagNywbonIa7XX1P MidQTJdo8UGHYGDv/jsjg2VkuQQ2whoa3xum8bzk3n3sev/pfXPlPm/k7UY3ITgEnULtTD 83RNrHT6YKyoWC8KziRgy/Jvw65ULE4= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf12.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740099307; a=rsa-sha256; cv=none; b=2PTbeRY8SeQYGcNSy2b6J8G+Ko2h6F1sA/1eagd5b3Bs4+NCjw6v/AtjXkrSuOJs7g+Lur BdVqvTAo7HA4c6NbAFP5Ky7jTVpqA+w9noToLfhOVujd+NlHKuxOz0Is08F1fYueIYku+I GiJVWmISFOI6Kjl6jiqoosYjPrAEtZE= Received: from fangorn.home.surriel.com ([10.0.13.7]) by shelob.surriel.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1tlHIZ-000000003Qf-0tox; Thu, 20 Feb 2025 19:53:47 -0500 From: Rik van Riel To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, bp@alien8.de, peterz@infradead.org, dave.hansen@linux.intel.com, zhengqi.arch@bytedance.com, nadav.amit@gmail.com, thomas.lendacky@amd.com, kernel-team@meta.com, linux-mm@kvack.org, akpm@linux-foundation.org, jackmanb@google.com, jannh@google.com, mhklinux@outlook.com, andrew.cooper3@citrix.com, Manali.Shukla@amd.com, Rik van Riel , Dave Hansen Subject: [PATCH v12 04/16] x86/mm: get INVLPGB count max from CPUID Date: Thu, 20 Feb 2025 19:53:03 -0500 Message-ID: <20250221005345.2156760-5-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250221005345.2156760-1-riel@surriel.com> References: <20250221005345.2156760-1-riel@surriel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 2210B40013 X-Stat-Signature: o6oxxeuto749wjyaie6t88xs33sshi5b X-HE-Tag: 1740099306-121877 X-HE-Meta: U2FsdGVkX18tGR0zGAag1/oPsk0wUdGqDyydHc+5VpLeZ/Y9MkMckwfD8AXJEI9EAUeYjADH+4cvx8iJeA2NvAF8pXZUc8AWl0a9UfPSO9QBec5u8dKuPUaI5wx8CRSqrKWneXI0r/oE2rcEDTeS/Fp1BzcKoyJYOClYZ9cAyN/q1hisw8UGPJwUgWnx74EZj9xJ+NL1MDfro5WD5nh7w4wKQuz+eJE/bnaWNg8q6Yxvron5mlh5EWsyvSbZji5nEKDz25Vlph0uMGY925IALVWPyDwsBn/WNS4kh3qrFuD1U17XMk+gGxXpmRD7D/zNedm8jlguCUAO3k6ahhblD0yNZHJKkbWIvhHSRI40YsPIIy1KtDE+gMA8I3pI7PeUmMJI/YAqEGUOfos0K1E41FtOR6R/MLjB4/fXi9PRsvufhQCJPf3ZtwVK0R+Pw0OptM5A/FeZDjOGl2JaClsvRWTftTkQS6F4mypqylX6DQKr+vM80W80PuTLgkTlwNrE+MT2IIXcV64MF27ZzIATiV/ZAa9K8SXph9cK+XuhjHqScWMMpTv6AtQHQ6i5PHmmFxjviQkH7LI+lWJtf4iqqKIlYDEViO5FfY/Qw4xQ34AlOSeMmOzsWJ21krIX+TSpFo8885heCaNSViGVpxL7/YQK63IWz3GA/kan+lbuE91/voMMoq/JO3LKxirmSP8jGNar43UDhNd5BjlmAu5rTz5VhlB5NOgi2jcU39RbQHNvwR8d12S/FVgjTYUZjgW4Vi4xts7X3al+x0KZmX+0ikvcowkRNjZzt4quvp8hAiTn6xjr3fwgccWZtgSGNy1ExVtOE4xzE1xULpym2GUq9xiF4BkvVonr2Kvg6R021xjPUiHmU9XQTLitDEzfFMVXNHjUQar3T5yVgWFAYHR+sXb1yPib8pglZJ6KSoBXqpBwl05VKiLJ1nDxJWOd5nvLrqmJsIIPlGKGA176kg5 I8mn/7lo 7Rxmnnv2Y6K+OIuwUg3qtElhA4GX4AfNtjjnjSFEKhVdXHajjVGNYx2t9NnCICM0FCo7gB/Lqfo42J8y1cmg1X9As+CEuVSmmT9s7zrzWybZ7sBqajqWi/HCWjFJ+w0AvPJDhYpkbitA2sRMLrGk9aSY49IX0bsPctR6STh4k5AcVGjdjNf1WU/UlaOd5FEtTdWRq3isUD/FtGRsoKklt6cTrGfPz4HphxuRtztUozWAN/D/NMcrLzAqSHx6MlBFRGoIkrl4Kc4THb74fwt9+yLayGsFLZc8zjebQH8WF9ubJsceIEQdchh8FaxDhthn6I4UvC0z/v/IyLqBLvpxuqoP1pwkm5OxQxIUzcOMcD7sGMtgw3mF4BeBsV1OstOwafe+IJFwyoX3O4mucVREtjY6niNSuk8vTwnuALenjCjCWuZMwvgToBgb6b2eCg5P6axogkknqam1kDbrrPSWbFWirHPkxdvUKGa9g X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The CPU advertises the maximum number of pages that can be shot down with one INVLPGB instruction in the CPUID data. Save that information for later use. Signed-off-by: Rik van Riel Tested-by: Manali Shukla Tested-by: Brendan Jackman Tested-by: Michael Kelley Acked-by: Dave Hansen Signed-off-by: Rik van Riel Tested-by: Manali Shukla Tested-by: Brendan Jackman Tested-by: Michael Kelley Acked-by: Dave Hansen Signed-off-by: Rik van Riel Tested-by: Manali Shukla Tested-by: Brendan Jackman Tested-by: Michael Kelley Acked-by: Dave Hansen --- arch/x86/Kconfig.cpu | 5 +++++ arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/tlbflush.h | 3 +++ arch/x86/kernel/cpu/common.c | 3 +++ 4 files changed, 12 insertions(+) diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 2a7279d80460..bb6943c21b7f 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -401,6 +401,10 @@ menuconfig PROCESSOR_SELECT This lets you choose what x86 vendor support code your kernel will include. +config X86_BROADCAST_TLB_FLUSH + def_bool y + depends on CPU_SUP_AMD && 64BIT + config CPU_SUP_INTEL default y bool "Support Intel processors" if PROCESSOR_SELECT @@ -431,6 +435,7 @@ config CPU_SUP_CYRIX_32 config CPU_SUP_AMD default y bool "Support AMD processors" if PROCESSOR_SELECT + select X86_BROADCAST_TLB_FLUSH help This enables detection, tunings and quirks for AMD processors diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 508c0dad116b..b5c66b7465ba 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -338,6 +338,7 @@ #define X86_FEATURE_CLZERO (13*32+ 0) /* "clzero" CLZERO instruction */ #define X86_FEATURE_IRPERF (13*32+ 1) /* "irperf" Instructions Retired Count */ #define X86_FEATURE_XSAVEERPTR (13*32+ 2) /* "xsaveerptr" Always save/restore FP error pointers */ +#define X86_FEATURE_INVLPGB (13*32+ 3) /* INVLPGB and TLBSYNC instruction supported. */ #define X86_FEATURE_RDPRU (13*32+ 4) /* "rdpru" Read processor register at user level */ #define X86_FEATURE_WBNOINVD (13*32+ 9) /* "wbnoinvd" WBNOINVD instruction */ #define X86_FEATURE_AMD_IBPB (13*32+12) /* Indirect Branch Prediction Barrier */ diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h index 3da645139748..09463a2fb05f 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h @@ -183,6 +183,9 @@ static inline void cr4_init_shadow(void) extern unsigned long mmu_cr4_features; extern u32 *trampoline_cr4_features; +/* How many pages can we invalidate with one INVLPGB. */ +extern u16 invlpgb_count_max; + extern void initialize_tlbstate_and_flush(void); /* diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 7cce91b19fb2..742bdb0c4846 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -95,6 +95,8 @@ EXPORT_SYMBOL(__num_cores_per_package); unsigned int __num_threads_per_package __ro_after_init = 1; EXPORT_SYMBOL(__num_threads_per_package); +u16 invlpgb_count_max __ro_after_init; + static struct ppin_info { int feature; int msr_ppin_ctl; @@ -1030,6 +1032,7 @@ void get_cpu_cap(struct cpuinfo_x86 *c) if (c->extended_cpuid_level >= 0x80000008) { cpuid(0x80000008, &eax, &ebx, &ecx, &edx); c->x86_capability[CPUID_8000_0008_EBX] = ebx; + invlpgb_count_max = (edx & 0xffff) + 1; } if (c->extended_cpuid_level >= 0x8000000a)