From patchwork Wed Feb 26 03:00:37 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: 13991450 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 08612C021BF for ; Wed, 26 Feb 2025 03:02:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CDFF4280007; Tue, 25 Feb 2025 22:02:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C68F56B009C; Tue, 25 Feb 2025 22:02:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE6D2280007; Tue, 25 Feb 2025 22:02:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 88E066B009B for ; Tue, 25 Feb 2025 22:02:26 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3F3C5513E8 for ; Wed, 26 Feb 2025 03:02:26 +0000 (UTC) X-FDA: 83160597492.27.8D7E31B Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf29.hostedemail.com (Postfix) with ESMTP id B6ADE120005 for ; Wed, 26 Feb 2025 03:02:23 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf29.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=1740538944; 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=edKIssGg3DoRG9kOddrnz00jN+XS69uR3W13XEMd3UQ=; b=n5oKT2RUupoiuOr08S+z71t4l7KNqCYyRAdCoDeXbgxtOzj660yl1Rrk0rPcfUDNF4YYsF xKUS2Llwvr3Sevcc9+kZlv1cTs/V8xSqI+dY5enoG2ldYojgYbogaJDAsctNPKfyj4sZYg 4oic7ehjWgCz8vl6v9lKu1Gl6pPAKds= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf29.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=1740538944; a=rsa-sha256; cv=none; b=tTbGAVSgLsfgJXXgdr5mXc40VKMTM/bqM/d/FvodHvyEJlmUMA2QnkXEJ+gZbmB3gKIrCb qRX317X9ic3qY1J+G024E2B1dfvP8kP5y/IHuKSXqCvH0qRaAUbwyPNsUWFtsOddafeeyD XhbpNKmpevM1lgCBQv9xCCNGwb3J9TA= 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 1tn7fw-000000001Y5-0Swe; Tue, 25 Feb 2025 22:01:32 -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, mingo@kernel.org, Rik van Riel , Dave Hansen Subject: [PATCH v14 02/13] x86/mm: get INVLPGB count max from CPUID Date: Tue, 25 Feb 2025 22:00:37 -0500 Message-ID: <20250226030129.530345-3-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250226030129.530345-1-riel@surriel.com> References: <20250226030129.530345-1-riel@surriel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: B6ADE120005 X-Stat-Signature: xeqppewab95p51qm6cxi8afxucaykq7g X-HE-Tag: 1740538943-469575 X-HE-Meta: U2FsdGVkX1+xgE59GDlHltAHIO24aONZ4ZpkP3lpF1fimy8s4QD6l2en0X44CydASWRjQTTTh91Fb+11iO0jzyX19tCY92JoDuf6d3vroXoeGcHl7BCoJhReAf3wuB4APUomupE2q4/j8bZQh1Gul76MzppztwFa8EzPd9CTpNXwb7yMBzEiguWpC45bHfHTzI46zK+INrUEbUwvZ7le1VazObTbzIzgmoBowPjaGgBHm56g/7u4i4y7WuaDsS87y90Uuo3m4QEszzpLcr1S/NWEx7g6v07y7XT58geFhLT64KGfITHwAI/Vv6FI5Df1IcKFALsJr3j/XM7853WthgCwhZk7krIJsd3IlHu4SjdZsbbrj3kkIJ44CK/46WwVcFN5gX1sWsFAAHaR5+PrVYD+ZCiMY2J1MnhSQyweUB5qnsAqlT7YS0j6Ew7eBL3wdxukTdpyfOY/qWNJfk0IyPb4YMjVs0JBuc45WfmukF90sOUoZOrhkaALwNqzq3FXyptdOSYQ8BBIy3paVXINk1qKF6klheYmLNKlRmn/9VuLjEAd1OenylwBtEaU+ibWMAKsRNa6SXoPUJV2ruAUss0zeOK/7EaJbUGjP/ai9wj2zcS5XX+xxLHyAlOryT3jlXPV/ADsJE9OPNuL/n9crUqYxL+yRhio3OEG82tMuBSJXyhn52QKIsDmBkrufeJrT+YVk+5Euy6zez80by1dtfhVBOvUmJt7x5s/b8EtjECo3Unc+ULKD228K7HzukXoVZhBHzuudkFSYSTjQztCA6rAqu/7R0WaCh0aLYS4TE0RZk7bMcxgTXs+MejttkB67Recm7iL9zGHX3KD1Trp4z+4DC24owbE9FconmVgleLdM85ZM0EwtVnG8Nw6keT/U0vm3arSIwvwDJ/AA5MTOWWtn8tV35AdlNKTPwlMqQYiThHpRwIujyWdRgkBMF5QlIYHguv9dEtGqpxFlZ6 P1mGIJii CZeC99qKBJdEiWXeF06Q/PasjxVTFxDucYRvcTPPdSH40BNg6re3ep52yFZLhtwzWxtehWJz7CaFIQ/zOfIQrh048lDI1TkZhrhLQ5St00sQCmqIpJcuh6lIMfkY6sVJRoQ349aJ9VanMtDHg7ZBGAg0wGmf17+MtPPkaFnQF1mYpk5NzIHmzk8jfuVrMI8rS+KIFEkIG4MCOpT+NvyjFFpO47WGSexYnPd5yiBTqMlgwiuGoeY3vuH67fCa1HIwkXNWmriKZc5GIfsc3nb6UhAg+3h9wfi+cDQvKNSxkdvQRm/FO72SN6BhHLWWb5czJm0v2x3Op56HtKhyuQ/AbVrEWUPnibkOCTntahG7vffhMtab1mb3UAKBudyx9m13U6HkWbJvFLinjTHtDjlNFoyNtQfd6HySn6tkuhm0cV2FbxmrHBrf+FExXAFx1blZdlBGNPgHcbeFRpayKnpR/hCCq/CbfX4rCqIBq 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 --- arch/x86/Kconfig.cpu | 4 ++++ arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/tlbflush.h | 3 +++ arch/x86/kernel/cpu/amd.c | 6 ++++++ 4 files changed, 14 insertions(+) diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 2a7279d80460..981def9cbfac 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 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..855c13da2045 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 be invalidated with one INVLPGB. */ +extern u16 invlpgb_count_max; + extern void initialize_tlbstate_and_flush(void); /* diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 54194f5995de..3c75c174a274 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -29,6 +29,8 @@ #include "cpu.h" +u16 invlpgb_count_max __ro_after_init; + static inline int rdmsrl_amd_safe(unsigned msr, unsigned long long *p) { u32 gprs[8] = { 0 }; @@ -1139,6 +1141,10 @@ static void cpu_detect_tlb_amd(struct cpuinfo_x86 *c) tlb_lli_2m[ENTRIES] = eax & mask; tlb_lli_4m[ENTRIES] = tlb_lli_2m[ENTRIES] >> 1; + + /* Max number of pages INVLPGB can invalidate in one shot */ + if (boot_cpu_has(X86_FEATURE_INVLPGB)) + invlpgb_count_max = (cpuid_edx(0x80000008) & 0xffff) + 1; } static const struct cpu_dev amd_cpu_dev = {