From patchwork Sun Feb 23 19:48:52 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: 13987228 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 01EADC021B6 for ; Sun, 23 Feb 2025 19:51:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 35C576B0093; Sun, 23 Feb 2025 14:51:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D92F96B009B; Sun, 23 Feb 2025 14:51:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 88C886B0083; Sun, 23 Feb 2025 14:51:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 073996B0083 for ; Sun, 23 Feb 2025 14:51:16 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A3079C027B for ; Sun, 23 Feb 2025 19:51:15 +0000 (UTC) X-FDA: 83152253310.10.5A6EC3F Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf05.hostedemail.com (Postfix) with ESMTP id 0B19610000D for ; Sun, 23 Feb 2025 19:51:13 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.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=1740340274; 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=ud0vGx8oATQ0be0uPlCDNBiGNtEWTktVDkLmzisbRls=; b=RdF22joJo2gRRIXYYmrgSIyNxvfIg2W7Mgj09jSwTijz0eucK3aWrEni3nxHnyMm3w3aiG E5V/iMFqHPepcTRPsT+wja7E8QtSqNIazQ4VCWgPQ1IhEfrUS967VzCdHYzr8Yv7CknxIQ KZ2j/rVaOKIDhLzMIxrNCvxjuHk5PDE= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.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=1740340274; a=rsa-sha256; cv=none; b=x9DfWr6lfk1CwANZ/5xS2RCXqulXDNnWt1WiPmAlLRldPtbRN6iYxfW9I7WI/GRbTJsCIA yMmVLuhzSPRCCQ68SrSBNUklDe+adHo8myFNMbSwZ2tvbq0mpP5eO1BewtKjUrkMfFK3V1 COtERu5KhulK5Yx06T036GSbBSbXBVI= 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 1tmHyy-000000001hX-3cb1; Sun, 23 Feb 2025 14:49:44 -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 v13 02/14] x86/mm: get INVLPGB count max from CPUID Date: Sun, 23 Feb 2025 14:48:52 -0500 Message-ID: <20250223194943.3518952-3-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250223194943.3518952-1-riel@surriel.com> References: <20250223194943.3518952-1-riel@surriel.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: sggta89muh1hhhro8tmssasxfpu6r8eu X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 0B19610000D X-HE-Tag: 1740340273-409866 X-HE-Meta: U2FsdGVkX1/mBzH2Bf/jgIPmxAreLhOJeokcIbvGrSkN2Eow9peeTtvGRWt76Ka/zgLKpoDlVXrAZMtj/kit1AAzpGxaBJNZnp4sjYOd80rmMeH2iQZ7hCh28oeYCtMDxEvUJJ7qK4Z+iqdKUpjP2Gr9I+KiBX5RQmCM7qS+9LGMChvfVPXw0mkf2YUx0gf/BD0jPilVbJI4YRf4Oow5Qf0nSWA0UoBN2EYQr/Gc/Cjok9chbk8OmYQSjlZ1QRCP6m4avpI08N9W0W34tjM3jEHb2W2VRmhH7XTHY2UT8KDa3nOTsn/IxeiJ/C8xb/raPMwycUIiJ+GuS7Gawimgozg5OO+qa7REdGQ9DymkOP9rbqaZA9G2R6pl0eBbrPqEZt1BjOrTOlLi32Ne2OPPAUdVXTDy5UAVooeX0JnMmlTS3Ma1LcYqL1N2b79qXa1KXbIJEu8VfDPE4eWPBvSqNpWcz1bO1hl1Kvf1x7ZO6QiLTO0sA5hPPl2uMfOKChZxgIgWShvmlqNvUiJsNODl9T8iqlRerFadzMwf5LsOLJGmmQyS2eR6wHjxQuY1xo2rUcn87Yl1Sqqv3VQPNVfkhgf5itSrlfpsO1nXG5bFfGJqPNsawq3zGZGfOlofVYJuZMnRTrcGOvaSCERlM0du82LZNIfard6LuhhRC+Bf+1D1wgI6PhKaZeXmKZNbNZHcKkEyuvY/5G6NXYoKw9ym+Mf0TqLShZiDPyH22mcyK/ZSZTa3Xd2snWFp8Emn5HYIC5+Ien6MYO2E2PEwA3M9px3iAqZj6a6Eisss9ObZ90AtnltnH4MGwuMtkBc91TQY6Pe5RlZkSuHlQD/2hKv0rKgF349oq8rRFUXvFVBzG5xK7Qf0HaSFvXASFeHXHEwVSeMciDyckkTSVJO1JYTnYiws1JRSBjfpT1TZkeDtkqGAP1RSBPuvSt6QtwcPeAoFPxfN6+Xo+Hrx6Q2IXTe yjR20eil RuY2CJvJiiURBcouT9lf3J8wMZcEo+nGm0UZx/98glEESjZEHEkgXZKuCKR07z/vIUhh31K0CE4O7PXYsCdqxzbGFrMP6tespRvyjFU4DTA3gfSY4O7h4FyHABNw8F6E5Yzn7/wKS2zuyKG5FcgZFK3C9wKAfinG9kp/PP0tKn8lTmgtK9iok9KibxclveZqSeoyI6Kn7BKVmmzv/VSOrA0A4pxl5n8tdEidkC+clBU5KQ1XZcrDeMeC176hl31xobUi+LggNp3NOG5vKxsAF62fON8HhxUWpAGruJMDApESVrbIQagkfPPXAA9COmH2YGMjWFze7xG3VuryaupTK9thj0kbNuJvC9hPqXGxDSpRzDNPC33/YhxUKC6uH5Tpu12FgrPjV+i9fMSw/GVzc9lP7heV1azSb46BFO2cgMvoRuCXjdWw4+bVg4t3Rdavpge1v+u2/lAooahFlXz4w4KSlsY0imIfN64xL 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 | 8 ++++++++ 4 files changed, 16 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..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/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 = {