From patchwork Thu Feb 13 16:13:55 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: 13973651 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 7810FC021A0 for ; Thu, 13 Feb 2025 16:21:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EF6D66B009A; Thu, 13 Feb 2025 11:21:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EA6B36B009B; Thu, 13 Feb 2025 11:21:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D954F280001; Thu, 13 Feb 2025 11:21:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id BD8076B009A for ; Thu, 13 Feb 2025 11:21:53 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 6FD091A1216 for ; Thu, 13 Feb 2025 16:21:52 +0000 (UTC) X-FDA: 83115437664.23.670DA5F Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf09.hostedemail.com (Postfix) with ESMTP id DBC60140007 for ; Thu, 13 Feb 2025 16:21:49 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf09.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=1739463709; 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=OY+og+lXtFxyGMzRlXc+ZRJtW63uV5BPolJ+Ud40Hvo=; b=2yHBRqOfENyPPVVhfdd4ytsaM+SOsCZftVBMVX22iEtKhOv0JORmBahrgE0EBz1cSEH4ix xTyPAfx2faYYSpAaeUsHynAgqK0/gkiwDUBEQyTeVgY6D79WNuBYFi93NsamY2ZHzdZTZn mQ2ysodEQ2rVG56IGevHHwN1z/qqHG4= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf09.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=1739463709; a=rsa-sha256; cv=none; b=W8fPQ4jQPjrJwq2X+Ie5kbKEXhRNHgRZJWny607zJXBSPb+wcD675XuclalOMzHYck0nJj TzyohhB9ODOIcl9ppwkOCvWuqOOKWTA7FrSPQySDbMgp2An9oxN1S8DweKzdGSbF3oVOx8 AOAqzzyLx1bOuuywGziDHwIZULluBwk= 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 1tibr7-000000003xx-0gKp; Thu, 13 Feb 2025 11:14:25 -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, Rik van Riel , Manali Shukla Subject: [PATCH v11 04/12] x86/mm: get INVLPGB count max from CPUID Date: Thu, 13 Feb 2025 11:13:55 -0500 Message-ID: <20250213161423.449435-5-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250213161423.449435-1-riel@surriel.com> References: <20250213161423.449435-1-riel@surriel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: DBC60140007 X-Stat-Signature: mx6g6aiohydgn6k6kca595k13s58poib X-HE-Tag: 1739463709-332680 X-HE-Meta: U2FsdGVkX1+mBNLHWbwlz8yhSG20Lrd/shZjCd3NS0GDBlGTxLX9ZMGAdPX1QEFzvnM5Q8WXu1qeHltbbpxclCqfjwaSqMcnzbIXoFlAs7chuB+VcgULv0dEKDBiGAZN2exe3p5JsXdHv3++wzUJ5m2dd5T02EdKHX93IK8nPttmoAfDYL9dRrJA8AbSWowFOkafzqYchi2agmZLY1pD3MyUgH/nBMZ9hWkOvVoc+qrZf0brx0hkwO9PbXanr08GCguqDBtYSU8s6u5js53pE7hl5FMCpov65V5xQoDwwFtjJexed/MEktxPjAbkxZGzZi+f62G9sDiG+o3bZHqKt6sH49i05A7fbUGaU1/b0hTkw3R0FCWCx42GHEb2ebwoFjQ67wvpD+z9lmQ+E6hmZjqK0KJl6hJAiqLyL2G/4PylVu4/zWKu+nMIdcOClWDjFxwbyTQSRgTI++RMJWt0+6ULAtd1WLz73CZR4tBrSZVswfKDrNkicC0VRT1l9sXialw/zPNn5pB5vMD8n6IFmLax3jSPgFEFH/q0rHNRKwqPSxQa3lUUKQY4w6zBhevhDeHJUGTajcOqmYv/TryNchlrVPWbULPQAx0ktW6Jcz6GlzW4L2+jCymFOs+ClZ8DP5BryemS/YTUYHh4rm8z1DJDueRyC7nVOgeS8Q/x+1KioGGKrNJmDJv70ZNzsYU9LEdIqHBfwDWv4VjDfx50sn+rqG1R76SW3UetjOYTrxKTRmgyMnLdG1WnsxTK1njhemAyvU0jGZSGpV3btp41cdURp7fa+/F0hYm/QStGxVzDKXHNuyJ4Iv5WAHwREBBVBV9c8igC4DjxiCiSYI+lt3rzvdxSe9l8MvopDJ77/OqdusTWq92/oj0cb/SDpbWMNqK5cxgoxWaJiDeO6mpGNZqO/MZmKlWcocL3eEr8YmJ25bHKeCTtRPYVDmg5D7fWpkEwyLEhOEPUZxsEmWa dAQe6mWt M6UVgLcX4adjIITtRAop//lPRvjZa3akqIFNMHhW+0F7atG31MW1COLpgOwlUy9FXLyD05jobMVdWQDqvKni4QTrBy/NpwV+ozLAWmoMk+zLTQIEwoeuN5H1x0jn+2TOp6IABOh6hHlE68ozUD1VHEzanJCQW9YIuCdWwzfJ7WKGJjH8LwAiNwuv21RuySewdM52ARQ+LIUKRRx2eapIYlD4zr6oUlVE8AICxLAd57XvT2EX1RIZddekfab10xyCaxqt1chnpf8BwvIg99CBBGejrecQiFjj7RXw3/T9iXrYEOYyZaq9qr2+bJfz/9vJ8BFt0htPHhiWf8xpiE2HUsWtbxyC7IszVe7b3/5hYMatKFJ/HHG+LPudB3RSvjBo5/jVvZEDdPhK3Ou1XLGfqItPbFweCmeqxKnMHIMo2h5Q1Tnvjlw/Nw/Lehkq9+8Z4cQlVQi+6mzW8Iewo2y0sxDpyk8la8KrpgHSRinjvV4+OogQa+28SqSZPevHdaAy5DDmzR9PG8O/sWHd8G6HdfR0GcJ7NWqTKz3wr 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 | 5 +++++ arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/tlbflush.h | 7 +++++++ arch/x86/kernel/cpu/amd.c | 8 ++++++++ 4 files changed, 21 insertions(+) diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 2a7279d80460..abe013a1b076 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -395,6 +395,10 @@ config X86_VMX_FEATURE_NAMES def_bool y depends on IA32_FEAT_CTL +config X86_BROADCAST_TLB_FLUSH + def_bool y + depends on CPU_SUP_AMD && 64BIT + menuconfig PROCESSOR_SELECT bool "Supported processor vendors" if EXPERT help @@ -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..e026a5cc388e 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h @@ -183,6 +183,13 @@ 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. */ +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH +extern u16 invlpgb_count_max; +#else +#define invlpgb_count_max 1 +#endif + 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..3e8180354303 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,12 @@ 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)) { + cpuid(0x80000008, &eax, &ebx, &ecx, &edx); + invlpgb_count_max = (edx & 0xffff) + 1; + } } static const struct cpu_dev amd_cpu_dev = {