From patchwork Sun Feb 23 19:48:51 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: 13987234 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 34401C021B2 for ; Sun, 23 Feb 2025 20:10:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BD5866B007B; Sun, 23 Feb 2025 15:10:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B852A6B0082; Sun, 23 Feb 2025 15:10:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A4C8E6B0083; Sun, 23 Feb 2025 15:10:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 879986B007B for ; Sun, 23 Feb 2025 15:10:21 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 376CCC02B1 for ; Sun, 23 Feb 2025 20:10:21 +0000 (UTC) X-FDA: 83152301442.01.16EB2A4 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf14.hostedemail.com (Postfix) with ESMTP id A656A100002 for ; Sun, 23 Feb 2025 20:10:19 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf14.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=1740341419; 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=/LW6VSvXPGSjnBKvbbdw0SlEWW24iiSz41LQZQ3zF1s=; b=SnUrNcfwPM8u7d722mSdFqDdqslkjhrnuVp6DFcS1SDK4WNFQwSgqK+8VbIvEVdYimjZDd lcLXGM1S9we/WI9VszanoKzBvmFvRziO7mYmeBRRoz2jBU8ttZDKALuXLWJlJ1Hl+/oXs2 g6PmpafEOD/cO9Z+SHodOxGPs+Apn4U= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740341419; a=rsa-sha256; cv=none; b=dIlj6gE/QPtF7ODH5tRFlZOoS1NP45jUI1EBUj9bSgLiDFErs3r1WDOcDBnwVYbpwR3ppa T2Iiuw8tNULttZnyk4ePLozPuEJoFs/DibrVXT8AROlUfaPDsJU6rwa9xk5X2Hnoy4Q0mx sSYs6TuhNhzPUcaDszkhkvp3+XQUDvY= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf14.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com 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-3X7k; 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 01/14] x86/mm: consolidate full flush threshold decision Date: Sun, 23 Feb 2025 14:48:51 -0500 Message-ID: <20250223194943.3518952-2-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-Rspamd-Queue-Id: A656A100002 X-Rspamd-Server: rspam07 X-Stat-Signature: czq1t8t9f41uuta33w7wsysoga3ayd8k X-HE-Tag: 1740341419-235554 X-HE-Meta: U2FsdGVkX19774f3wa1uz2e+yjyVHwOSOyCLhF0mNR1F2X8Volyz4aK2O3qIi7E7iNDiVpSaoeCUHAAOzUyMiL0uf1q+XPPlU1XdGwmJD27dBuLgnRQ7CdtUfawK3hFngdZOQkcgPP+IdGNREG6Kcc52OXQDn1E+MWsTVbOEiqiQ7T+P8PNdRWPeZsXDzWGAb491QbFU41RPnUvfxaDp9nWHUi4Q+gbdymQPRbdQyqlqqbv6kJK2Rsi69Kpgsf7SUOv61NMbPpoSszUp35USLSt1+gQrxP45GTLTkcvs7iYWLZNC1IxRJQQJCbqVedLvdKWl4UREr0UFepcmZSypzbanP/uiBIAL4XsFYs2/N4kWhVibqv8NHvAaLy4rzAHUsOgFotLgBkIpzCkUXD0mceGjOvXXODWFG1poe0fmgRzwip2dJ/L5ukYpX8WnHZ0viOAoUcTsm6/pgChX53qnIVR6DcbZsZSO2V/YtKT4Kdj7YnorkBEbUBKJ9X74KoS/64kDGks6Et6DTVfh6cDb9kMVbWXzdMpDY+czKsMs6qWLHiJ/3o+bSZ3LfFAMFj+98gl5mtJbUtzVuwq69h1y+kmhVPXI4fnM6jS31BQE049Opui3ZuHVM2S91zyGe6cFcWDfXICnYYlg1yJEaVeujnlK1UL1c5O3s6Gv9xfNjOWS17NnpGzwuigAVxT0Q2oyL+fmpv611UawQR+2InZNbiKE0cObvjj6q5xB7+jS6Y+P3EwhDWBPsZ/b6D//+tc2M85q5WcWuVb+z9Pl+EOZOBXG1i9oBxlP0mY2eITZ4mCdb0Oqe35YciGtECvnirrnArdRKxPrxA6HKVSoxH4a1hMl54FvaeRQoZzz+C/wW1dZ5r9M+mYEsS9xUa1hN8Y9HTrC9rapqFgEEtV8EVehIZiW4YnfWFbfHtdoIAUev1t+uNg1Ru8QhPGCsCUlMMSdi05MvYnSANsL496/pTK yklKsurl BWhBlm0OGdJkk14ZyRSqX85SWUhwXYnFbmfiTYeb9RfLxPVgvkefhbix5RUYmJUzqOmzWaPGf3jVkwAx8fneLRjzQXVHNuMES6Biip2MzKVZvueWN2fFkBQeHB7X4hZ7UHVBMCPL8wmu+OtFpoccG/i0qPLTjYRhqVtzfk57yr4o0IX3yQeaUI/RFkLG72QAb8PRYUyKlv8gSOBaZQAQdIMdXEjTcOFY6gswEERK8h5Efw+U/B7EjdaljyU+kxP4T3AOYE6do1x6hS/PbHyycxfYxRg6ehq/QcKPqCNMzvIJecpPSI+D7ccfxOh2rqKIYIh0Z/UhIW21y7Z6BBvM0xCSD99ERRCJL8LYR52AjsrOUzbmgUNg9mNSjYh3dW5W4HlJEmxADjsPlnjTSQVdCDyNSoS8nFdWIcM4EUO7G79dWz5s/cT40uyAdtg== 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: Reduce code duplication by consolidating the decision point for whether to do individual invalidations or a full flush inside get_flush_tlb_info. Signed-off-by: Rik van Riel Suggested-by: Dave Hansen Tested-by: Michael Kelley Acked-by: Dave Hansen --- arch/x86/mm/tlb.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index ffc25b348041..dbcb5c968ff9 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -1000,6 +1000,15 @@ static struct flush_tlb_info *get_flush_tlb_info(struct mm_struct *mm, BUG_ON(this_cpu_inc_return(flush_tlb_info_idx) != 1); #endif + /* + * If the number of flushes is so large that a full flush + * would be faster, do a full flush. + */ + if ((end - start) >> stride_shift > tlb_single_page_flush_ceiling) { + start = 0; + end = TLB_FLUSH_ALL; + } + info->start = start; info->end = end; info->mm = mm; @@ -1026,17 +1035,8 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, bool freed_tables) { struct flush_tlb_info *info; + int cpu = get_cpu(); u64 new_tlb_gen; - int cpu; - - cpu = get_cpu(); - - /* Should we flush just the requested range? */ - if ((end == TLB_FLUSH_ALL) || - ((end - start) >> stride_shift) > tlb_single_page_flush_ceiling) { - start = 0; - end = TLB_FLUSH_ALL; - } /* This is also a barrier that synchronizes with switch_mm(). */ new_tlb_gen = inc_mm_tlb_gen(mm); @@ -1089,22 +1089,19 @@ static void do_kernel_range_flush(void *info) void flush_tlb_kernel_range(unsigned long start, unsigned long end) { - /* Balance as user space task's flush, a bit conservative */ - if (end == TLB_FLUSH_ALL || - (end - start) > tlb_single_page_flush_ceiling << PAGE_SHIFT) { - on_each_cpu(do_flush_tlb_all, NULL, 1); - } else { - struct flush_tlb_info *info; + struct flush_tlb_info *info; + + guard(preempt)(); - preempt_disable(); - info = get_flush_tlb_info(NULL, start, end, 0, false, - TLB_GENERATION_INVALID); + info = get_flush_tlb_info(NULL, start, end, PAGE_SHIFT, false, + TLB_GENERATION_INVALID); + if (info->end == TLB_FLUSH_ALL) + on_each_cpu(do_flush_tlb_all, NULL, 1); + else on_each_cpu(do_kernel_range_flush, info, 1); - put_flush_tlb_info(); - preempt_enable(); - } + put_flush_tlb_info(); } /* 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 = { From patchwork Sun Feb 23 19:48:53 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: 13987229 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 37878C021B3 for ; Sun, 23 Feb 2025 19:51:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63B226B0098; Sun, 23 Feb 2025 14:51:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 338256B0085; 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 AFE1A6B0085; Sun, 23 Feb 2025 14:51:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3162B6B0096 for ; Sun, 23 Feb 2025 14:51:16 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D9FC98028E for ; Sun, 23 Feb 2025 19:51:15 +0000 (UTC) X-FDA: 83152253310.21.CBD061B Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf04.hostedemail.com (Postfix) with ESMTP id 4DAD140002 for ; Sun, 23 Feb 2025 19:51:14 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf04.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=FDNW7A3jW76TJvTwQhr2RDVesMXpIDtxJIAfA8ejwZs=; b=VewRmgT4Dw/0QZrGgJKtARJfUDtEP/d4/Pfbimo7tIuAjacS8gLiz5/CNGZ6FQx874byrW /dcsBVwzDcTO30wbMuHWGFgI1IB22EkFiT8Vy5EvvVNpCbbCX8qE4u7jiPpStLHTJCXnww IrDSxLq3PLuunuAM3A3tX3RqWKdF8/E= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740340274; a=rsa-sha256; cv=none; b=A0IblRKILXyqiyopjKxxidDkngh7UaWFcDXJNkGaa9o5hMTML0l24PxTGb46oH5swe8O9R /aOdEcTDAS/QDjssSXueQ/ogMAriFbjiCymnCmEUAqyHMw6zReMf8Niz2TJJxiQPhQ7CE+ 99udDsGT4gRKR/RxJAlcNLBA9hA525Y= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf04.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com 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-3i4A; 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 03/14] x86/mm: add INVLPGB support code Date: Sun, 23 Feb 2025 14:48:53 -0500 Message-ID: <20250223194943.3518952-4-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-Rspamd-Queue-Id: 4DAD140002 X-Rspamd-Server: rspam07 X-Stat-Signature: 9x6eg3rpdyriksmfp3s5wrz5fjxbfxw7 X-HE-Tag: 1740340274-151047 X-HE-Meta: U2FsdGVkX19/JX4z1aptF0LSN3B5aQmaDmHmGYNL1CK1LvSqc4mg9dY1nquuCh7wO5HMiSdL9jY2yW1qf2TNdDjsllADoeefHmM7Y+4BcOF1cNkBRZwANp8BjgoEr/vALkm74yjjxEq4GpOjg2D/EcGxx5qpENmLl6OVR+g7Cwe5l1zU4u6uxO2ZhRgxJsCr120SHqSQ+CRjlnTwb5tR2eMttSxUNZUh/grRRWlLVIzwJNKJN/RaQNwj2TZTEt8uZDfOnfmbbi1sv+k77OcujVMCt78sZNwA0ZHzf8HPN/lXhtJUTuR8v89asyF09NcpAOiTSYekc88FnEUUMXY/Eb8oQT3t6UztA7iaefXyBoTGxQJLBXEUL2Dg08kqPlgw2iU0pUtVcMFpWMhj+wzD5RIcfXJlnJfoi0aEh/na7XUW6T82sBy5KxIXtimSXqSmGI+DF8Wu++QnjIGJMfdJ0b9DsiqsOwmAgQ24zSt0A7+jbKNKRRNQUDYkRv2kJWAmz0dVKrUo34qm9Z68Thrhk/WIiSjt2VSU4t1r88u6nDAr7HDz0SOzV+vikWgQz0whNQ+We87ZUekGJRrRKQp3UBZGaQP2rpAq4zMPp0Jkw00MrVtEASF5QAD0tUV845c84iLJOXF2X/mkOiv3P2FGU4TiwcaSSufJYXxFW6J31AzqCX6GJ18RSMLQAFUP88dhJYZUrvKuoPSpPwQsswMCuj0t9It1Y3Ihm9cigv/ar7RZlmrQr/RYNHSHlIfTCzY7VPLB14cTDV9vE5oa8hWQPmiQJoh5ivh9FfgWTocBeZQWucKZN4FFvz1jZZDWQomiiQTsvwDZsSK9ei6PDOuUWx3NtjLOwd62biRT3AygJAXKfYkF4MJ0/6iuzGXOnYJ0irItxH/tABgbKUNoFobFPgiPsAXxmE7N3yIchCn0uDJHqK0qJP58iIsyRs4AxYX9SVcHlsDFVc2haXizoNK h5kFbaIN MsjFIl22YPEI6aFYwddDjJWK1dVWjU7GBwGbnTxt7xNFovwVCRBPQTul/6VpvqBMHCVTpg2J3c9k2D0wq4ksDn6NWXIiP9NpNPrgInirbPAATBkvMJzOeM0w2+D2bz7CRmN0uYqKHMwMDl8zidukIY3/KU1J6C/TesYzg2oiiKyaMJyBe9XrE7R3baxdak+uaa3z3nJv0Y4qzi8uPgQmRcYcD/86qIljb/of2SpegilgI1nVcKu2Vpf8iDaGWNazcepPwG9YDrQAb0V4USWFq/xqFr/+X3vGHu2GX/aax4pHVOnxnydHrTS685EC1U5TftGPPPf8fvHRx815F9vBF4W4JlwPyl1md0F2i11nD+EXLtbSDMo+tlZWLRibw+LPz88JqLJLvoqJpDk6tfB0pYxoeWr3Q1lO80NFSEpj+Ghv+emra4/EH2FZeF/PtPI70a+PbHN4TxCBVbpseMyoByJY6nV7wAi/E2cdj 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: Add invlpgb.h with the helper functions and definitions needed to use broadcast TLB invalidation on AMD EPYC 3 and newer CPUs. All the functions defined in invlpgb.h are used later in the series. Compile time disabling X86_FEATURE_INVLPGB when the config option is not set allows the compiler to omit unnecessary code. Signed-off-by: Rik van Riel Tested-by: Manali Shukla Tested-by: Brendan Jackman Tested-by: Michael Kelley Acked-by: Dave Hansen --- arch/x86/include/asm/disabled-features.h | 9 ++- arch/x86/include/asm/tlb.h | 92 ++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h index c492bdc97b05..95997caf0935 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -129,6 +129,13 @@ #define DISABLE_SEV_SNP (1 << (X86_FEATURE_SEV_SNP & 31)) #endif +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH +#define DISABLE_INVLPGB 0 +#else +/* Keep 32 bit kernels smaller by compiling out the INVLPGB code. */ +#define DISABLE_INVLPGB (1 << (X86_FEATURE_INVLPGB & 31)) +#endif + /* * Make sure to add features to the correct mask */ @@ -146,7 +153,7 @@ #define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \ DISABLE_CALL_DEPTH_TRACKING|DISABLE_USER_SHSTK) #define DISABLED_MASK12 (DISABLE_FRED|DISABLE_LAM) -#define DISABLED_MASK13 0 +#define DISABLED_MASK13 (DISABLE_INVLPGB) #define DISABLED_MASK14 0 #define DISABLED_MASK15 0 #define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57|DISABLE_UMIP| \ diff --git a/arch/x86/include/asm/tlb.h b/arch/x86/include/asm/tlb.h index 77f52bc1578a..b3cd521e5e2f 100644 --- a/arch/x86/include/asm/tlb.h +++ b/arch/x86/include/asm/tlb.h @@ -6,6 +6,9 @@ static inline void tlb_flush(struct mmu_gather *tlb); #include +#include +#include +#include static inline void tlb_flush(struct mmu_gather *tlb) { @@ -25,4 +28,93 @@ static inline void invlpg(unsigned long addr) asm volatile("invlpg (%0)" ::"r" (addr) : "memory"); } + +/* + * INVLPGB does broadcast TLB invalidation across all the CPUs in the system. + * + * The INVLPGB instruction is weakly ordered, and a batch of invalidations can + * be done in a parallel fashion. + * + * The instruction takes the number of extra pages to invalidate, beyond + * the first page, while __invlpgb gets the more human readable number of + * pages to invalidate. + * + * TLBSYNC is used to ensure that pending INVLPGB invalidations initiated from + * this CPU have completed. + */ +static inline void __invlpgb(unsigned long asid, unsigned long pcid, + unsigned long addr, u16 nr_pages, + bool pmd_stride, u8 flags) +{ + u32 edx = (pcid << 16) | asid; + u32 ecx = (pmd_stride << 31) | (nr_pages - 1); + u64 rax = addr | flags; + + /* The low bits in rax are for flags. Verify addr is clean. */ + VM_WARN_ON_ONCE(addr & ~PAGE_MASK); + + /* INVLPGB; supported in binutils >= 2.36. */ + asm volatile(".byte 0x0f, 0x01, 0xfe" : : "a" (rax), "c" (ecx), "d" (edx)); +} + +/* Wait for INVLPGB originated by this CPU to complete. */ +static inline void __tlbsync(void) +{ + cant_migrate(); + /* TLBSYNC: supported in binutils >= 0.36. */ + asm volatile(".byte 0x0f, 0x01, 0xff" ::: "memory"); +} + +/* + * INVLPGB can be targeted by virtual address, PCID, ASID, or any combination + * of the three. For example: + * - INVLPGB_VA | INVLPGB_INCLUDE_GLOBAL: invalidate all TLB entries at the address + * - INVLPGB_PCID: invalidate all TLB entries matching the PCID + * + * The first can be used to invalidate (kernel) mappings at a particular + * address across all processes. + * + * The latter invalidates all TLB entries matching a PCID. + */ +#define INVLPGB_VA BIT(0) +#define INVLPGB_PCID BIT(1) +#define INVLPGB_ASID BIT(2) +#define INVLPGB_INCLUDE_GLOBAL BIT(3) +#define INVLPGB_FINAL_ONLY BIT(4) +#define INVLPGB_INCLUDE_NESTED BIT(5) + +static inline void invlpgb_flush_user_nr_nosync(unsigned long pcid, + unsigned long addr, + u16 nr, + bool pmd_stride) +{ + __invlpgb(0, pcid, addr, nr, pmd_stride, INVLPGB_PCID | INVLPGB_VA); +} + +/* Flush all mappings for a given PCID, not including globals. */ +static inline void invlpgb_flush_single_pcid_nosync(unsigned long pcid) +{ + __invlpgb(0, pcid, 0, 1, 0, INVLPGB_PCID); +} + +/* Flush all mappings, including globals, for all PCIDs. */ +static inline void invlpgb_flush_all(void) +{ + __invlpgb(0, 0, 0, 1, 0, INVLPGB_INCLUDE_GLOBAL); + __tlbsync(); +} + +/* Flush addr, including globals, for all PCIDs. */ +static inline void invlpgb_flush_addr_nosync(unsigned long addr, u16 nr) +{ + __invlpgb(0, 0, addr, nr, 0, INVLPGB_INCLUDE_GLOBAL); +} + +/* Flush all mappings for all PCIDs except globals. */ +static inline void invlpgb_flush_all_nonglobals(void) +{ + __invlpgb(0, 0, 0, 1, 0, 0); + __tlbsync(); +} + #endif /* _ASM_X86_TLB_H */ From patchwork Sun Feb 23 19:48:54 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: 13987223 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 D0F18C021B2 for ; Sun, 23 Feb 2025 19:51:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1EDCF6B0088; Sun, 23 Feb 2025 14:51:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D7D26B008A; Sun, 23 Feb 2025 14:51:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BE8046B0092; Sun, 23 Feb 2025 14:51:15 -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 7C1066B0088 for ; Sun, 23 Feb 2025 14:51:15 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3919312029D for ; Sun, 23 Feb 2025 19:51:15 +0000 (UTC) X-FDA: 83152253310.07.9C491E4 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf22.hostedemail.com (Postfix) with ESMTP id A35EBC0002 for ; Sun, 23 Feb 2025 19:51:13 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf22.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=1740340273; a=rsa-sha256; cv=none; b=SRM3REqxkUmHgRCjQPaTnMkXKkP0x8vSQyak2vw2W5dqJBY5kpnJ2pJ0KElbO5GTfxpEb0 2AGYEk2tqBkbTuXgThVD5RcpuAQaV8otqLMWmV0bDCJRMKkuqiTFGq6Tcz3v82w/hA56dR p2c4qG9nYqiqg1JKdZhhtVMx2Z3Wogk= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf22.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=1740340273; 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=hF8xMwU6gtFHerZ+8FO0Ift86ipYBUao4K8kpXc1fTk=; b=UnhvxbNexmKI9ZBtQkLt0lT3cx1E5ndjyyiPePm2eZJAz3NFlyohYDTdZ8mgaxslqE6OWc R1cEkGSmC/Lil8CSfHUXe2YPHN+H+jSP3J94EC7+C98m+m92xEYtWAc8ugTWrCIqknqhbn mQUlnbH2o4e+WD5t7a7iwERhnvvyBB0= 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-3o7T; 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 Subject: [PATCH v13 04/14] x86/mm: use INVLPGB for kernel TLB flushes Date: Sun, 23 Feb 2025 14:48:54 -0500 Message-ID: <20250223194943.3518952-5-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-Rspamd-Queue-Id: A35EBC0002 X-Rspamd-Server: rspam12 X-Stat-Signature: 671y5n354det66s4e1naycyxu1ubeyju X-HE-Tag: 1740340273-840112 X-HE-Meta: U2FsdGVkX18sFPyytIyb3bddT7lGtN0A9BnXMGPNuTmxix5US/xcrDdFp6783/7QNsX1nkLXxwCaH7FdiBYxYqW5TLf87uejne46Ika1m1ovWcm6IFHluvfG71T9CY2hbU6VF+rDEbAJMntxVJvl5KkoCfWHLdMAMmUmjlGpWbMOEqxl3h2wNnnC60uOreUZMtcyDhToDwr8OysotnLiRbssSy2JTFjm/qOsIIsCeygBoB3HWBGQhKkgK/vE9vJKGQ6+Rnk63FDVD6cjiuGT6oR2Hfwfo+3YTObFXxRnHNdThz4iub+WNXGnm4TmFt6oYmTwYEjK3QI64tUv6pDDUQdRMze8iNmDaK8QvWs7/rehpJQjz5+bnAMLPyCbpw0s9hS5J2uA5837moQ99W8a9kBJVeBGFttG2kJIzcWmQX8sV4CkfWYeb8loJPCmG+vmXI7QODBE21KFQv0+hs1OIJclUMJpo4oSaqC2gVUgk8mLD3rwxMHcTBFQDUF605Ux84dIhw0ZEpRsfCjt5HI6Jr6XGlDmNDUL55x6x1YbuflX1hEl0KhjrN/me108jT7eZhjdxcg7NZ0YZiKD/mt6XoyfEuY1TFSDxyv3U8UM/tfgO2HKjtT0JM3moYDQaHx1em90MXi5jYsDumNb7/atARaRL26pqG/00eMG6KGu87bFmZZPqm4Akj12oqeUZCPC5qUtWSFLfV4NOmOM6pAGiAKW+MVnqAOr2SjWtfeYtNA9+AumqglKVT5TfJGyBJVv5Uu0J/IL4Vq6AV7xJsg9v2+WeIswkQYsraj3cFYBHoe7SCSgOu7ZMq7war5zXLuAOdBqYeVCRocUt6C1sj5Ti00YR9ukpOtaS4ATjDxRubJPPCTDIqNaJZgsd301B0S5gGUccDQltRKUOsLXluVJTxcE4W0qbXX8I1P5iFPFrsQ/RG2kl3dVhCFmhIZ7McyNe260c8K4XfzLLniUO6A eBgO8PRZ X7fyQQ/M2RgZc9gPlwOX8sZckQ61AUizHqR3yYd/RNLvVnJHUBHmHdqborFV52uDDHVa8xxinrZNXLynDCM9BUavhx9/fzwtidtztAePiJADsjXmt0Kz2hCHW0C2QmjIdIaYBkOXDFRoFhzGu0GfEBwqVko9qP3e0MHV6bX3OQPMm+gii4NPqD9fbssX7B8oU9x4w9QnYhOOY5UdMdo3dAVBQ2r61XAVRi03NPodqX70ud++/sWwXdfDbvWn8w9c15/Ss3DF9KVwLNBo/Rt0Y3wyx8l2brEtm+ikzPlCIM4WeeDZlJ3liYPFsHxbBIp2F8aV6e1I5mZmLyL8zdGCWhrVxIvoGZIyzoFHGgZAwhhU96phb6/LhK9fHO6v2IDYM9+uQXpjgJm3RczieibRlWZsex7Axc/4e10YGF3me7y3LE9GU3xJDcRaaSM+0Tr9jDutYoGpeqlj3cNuV35d5M0Xn9miWPgCa1xw9 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: Use broadcast TLB invalidation for kernel addresses when available. Remove the need to send IPIs for kernel TLB flushes. Signed-off-by: Rik van Riel Reviewed-by: Nadav Amit Tested-by: Manali Shukla Tested-by: Brendan Jackman Tested-by: Michael Kelley --- arch/x86/mm/tlb.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index dbcb5c968ff9..59396a3c6e9c 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -1077,6 +1077,20 @@ void flush_tlb_all(void) on_each_cpu(do_flush_tlb_all, NULL, 1); } +static bool invlpgb_kernel_range_flush(struct flush_tlb_info *info) +{ + unsigned long addr; + unsigned long nr; + + for (addr = info->start; addr < info->end; addr += nr << PAGE_SHIFT) { + nr = (info->end - addr) >> PAGE_SHIFT; + nr = clamp_val(nr, 1, invlpgb_count_max); + invlpgb_flush_addr_nosync(addr, nr); + } + __tlbsync(); + return true; +} + static void do_kernel_range_flush(void *info) { struct flush_tlb_info *f = info; @@ -1087,6 +1101,22 @@ static void do_kernel_range_flush(void *info) flush_tlb_one_kernel(addr); } +static void kernel_tlb_flush_all(struct flush_tlb_info *info) +{ + if (cpu_feature_enabled(X86_FEATURE_INVLPGB)) + invlpgb_flush_all(); + else + on_each_cpu(do_flush_tlb_all, NULL, 1); +} + +static void kernel_tlb_flush_range(struct flush_tlb_info *info) +{ + if (cpu_feature_enabled(X86_FEATURE_INVLPGB)) + invlpgb_kernel_range_flush(info); + else + on_each_cpu(do_kernel_range_flush, info, 1); +} + void flush_tlb_kernel_range(unsigned long start, unsigned long end) { struct flush_tlb_info *info; @@ -1097,9 +1127,9 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end) TLB_GENERATION_INVALID); if (info->end == TLB_FLUSH_ALL) - on_each_cpu(do_flush_tlb_all, NULL, 1); + kernel_tlb_flush_all(info); else - on_each_cpu(do_kernel_range_flush, info, 1); + kernel_tlb_flush_range(info); put_flush_tlb_info(); } From patchwork Sun Feb 23 19:48: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: 13987222 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 67C82C021B6 for ; Sun, 23 Feb 2025 19:51:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC4086B0089; Sun, 23 Feb 2025 14:51:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A10616B008A; Sun, 23 Feb 2025 14:51:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6DE786B0083; Sun, 23 Feb 2025 14:51:15 -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 3A8816B0082 for ; Sun, 23 Feb 2025 14:51:15 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A77F9120291 for ; Sun, 23 Feb 2025 19:51:14 +0000 (UTC) X-FDA: 83152253268.11.270E337 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf27.hostedemail.com (Postfix) with ESMTP id 2341E40005 for ; Sun, 23 Feb 2025 19:51:12 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; spf=pass (imf27.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740340272; 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=H8e1q/ijWxutZBBUZ4egEFqPViZpFe2V2vsQQKwVkPs=; b=f7p6RSmis9yBQCzn8b0bG3G62T9Uq4CxrWDmK4YxWwK1oefCH99buHW74qAwpjgxzPJ3qR d7qUnZRvOGPlh7yS2QJgVKELR460HwkJQOhGAniC1ol+3R5UvIDBopfC2HFOASALRXwvGB xMIYxmiDCk5aExDKlmoGBINEtchfyiM= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; spf=pass (imf27.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740340272; a=rsa-sha256; cv=none; b=OSC2g8p2VTx15GLsERFKcsGc/yzMG9rKwyljSlQdl9KMLAr/qWMPZPejRc3dkuFEcK36HI 9IbrUS/nl54VQmvYMEeAYdWtQnmuXDw97XePnaj8IuQjT0s9LHloavLdN4ztXcy4P+L+wa 69Tmfqz35FMFOhi8u07phTkSEMCRJEQ= 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-3tae; 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 Subject: [PATCH v13 05/14] x86/mm: use INVLPGB in flush_tlb_all Date: Sun, 23 Feb 2025 14:48:55 -0500 Message-ID: <20250223194943.3518952-6-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-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 2341E40005 X-Stat-Signature: 75e81m815c1gerczg3b9nnkssp83fbaj X-Rspam-User: X-HE-Tag: 1740340272-858071 X-HE-Meta: U2FsdGVkX1/T5j7ypYVlFSLgXbYBKehXg0tq/wPFUNx1MFHEf0/Ajpso4kTUqFN/rg+0pahd1olZd1iHJRwcPQ6BIrwpKtAtZO1Q9x0v0qo1iBYt9303V/hKvH8UylQUMdTLeoQj3HrGRBRQRwLW3b3Nx+nrcyVcSoKVpXAUozhc+4Mn+9pk3lElz/nD7N70oCQq5gd5pHVOxmPneRQi0CgxdpQprr3LLHWcCxwM1s2z4sljFOXSozvQVdYNZlD6tI+8GlYYwjU26oIYHTG848XR8fgPsgX0b+pebGugZU3hqM+aTpcciuNXN+nbBKqwVlpJ5/UYeAZvTxe2uBPBtFVK992GllxbEVUrrGiHNx8RlcesZlpRZ61Hi3SyTiqNJ8X6A7Yked2oTGhHevF18a5Aevqli6cXfQNzJMJws0Inn1Ve/PTQJn+zJKxAK6mqwM6exo2yMlnP/65cHk0WbkkepUYG8xoZ0RgJOuPwrALzYzHLA+t2H6rrb4ZfgR6qGUe1P5/EMFQsYs29Y3IP91yw9GTCD2PgmS/AcMZjRCwihS5QTp0rrVA42Hh5Ba74ZZUnfbpQIzBET0fW4KB1fdJcjBagKX0c1SAKXx9hTeM/G7BH8IXjpWDR1p+D1xRZSRp0uAJFJR4kDXRBISbbbXyBwGNsQHt6hy7kaPb6injF4Ya43bpv0++5jA9ypkgfFfBYFZbS2Tg4O2HjSXbwgegu11C7VGvXVVy5ZAFmkWdRUcIFHS9FP+LWo+r7hBTRBVdtatVRChRxQsOLVIA+KqLV7XnJHqGhSkCU3CXofewQS87EM2gDWGZXe8WzxqbWohBc4AbZ8ifTxbE4+r4NrrtvvOQ6mcJ+FJAR650KqlB4/iOirufypFHEm6FD3X9KdVNoUbgjFq2d8X7fQO020wOI6xXYXeG/OvxwKmHcmSqNSmXbU4UyhvuXB4j8OazncKk+5NzJgYNACYViZoT +Bl5PD0u V35OeED7acNy2h6g1tnzPrnNNdWG/ecmUpGVBsawj2S3sqfRFIITQQOqtpDtz22YNmoN1ntQYZuCLEPjDVrA0aYEdfDvRSEfHKJVhAAKJGID1HfFHuO9KZcg85L8Kr8Qddm3IjIJ2SjMtUjSwXhJmMTxa5kiv0qCbkGQoQWL+31GN2ZCo3QqWmluULjmDwLdDqQMNY1adCUytRYvnBvD4EMxSYSyPlcFkRPAaXbfrMk7jjDz64l1lnWbnhOTzbMLdC7Kmk/Fd+IOTr3277wosdEiKi2wBxZe/reugVi8clnhUv8QXqROgbvFywR8s+bP/0hNsdABI7uSdWAQFiIujhPVIXtj2EU5dM+1Y0gNBrEvwLGrvQs9vQ0IfInQTm4WIYiIwyUpv7Z/KTMAuW5ur+WEBOlnc/kSjUkkM69vmL2QEkv8IlwO4BRvTEHjRz+u1e5ZqUoNF7HziGl7eoFPFfdSvy5+nu4aoqK2og6EOJ/y/n8gmsbgO2mtisw== 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 flush_tlb_all() function is not used a whole lot, but we might as well use broadcast TLB flushing there, too. Signed-off-by: Rik van Riel Tested-by: Manali Shukla Tested-by: Brendan Jackman Tested-by: Michael Kelley --- arch/x86/mm/tlb.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 59396a3c6e9c..2d7ed0fda61f 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -1065,6 +1065,16 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, } +static bool broadcast_flush_tlb_all(void) +{ + if (!cpu_feature_enabled(X86_FEATURE_INVLPGB)) + return false; + + guard(preempt)(); + invlpgb_flush_all(); + return true; +} + static void do_flush_tlb_all(void *info) { count_vm_tlb_event(NR_TLB_REMOTE_FLUSH_RECEIVED); @@ -1074,6 +1084,12 @@ static void do_flush_tlb_all(void *info) void flush_tlb_all(void) { count_vm_tlb_event(NR_TLB_REMOTE_FLUSH); + + /* First try (faster) hardware-assisted TLB invalidation. */ + if (broadcast_flush_tlb_all()) + return; + + /* Fall back to the IPI-based invalidation. */ on_each_cpu(do_flush_tlb_all, NULL, 1); } From patchwork Sun Feb 23 19:48:56 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: 13987232 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 B5D3EC021B2 for ; Sun, 23 Feb 2025 19:51:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D85AF6B007B; Sun, 23 Feb 2025 14:51:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AB55F6B009B; Sun, 23 Feb 2025 14:51:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 840E26B0096; Sun, 23 Feb 2025 14:51:17 -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 A13E96B0098 for ; Sun, 23 Feb 2025 14:51:16 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 65D271202A2 for ; Sun, 23 Feb 2025 19:51:16 +0000 (UTC) X-FDA: 83152253352.12.EB7C592 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf06.hostedemail.com (Postfix) with ESMTP id C6B27180007 for ; Sun, 23 Feb 2025 19:51:14 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf06.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=7uCipucRdu7Gkm1/EnHGSyHRiXJsjk2Y+3yYRgs6bBZtcH/SDt9DiRuWEOot3vmSYf+cGY 7LKpHAyuBCuxThiTpPe5WMpaxxBe5tkREeAX4IdEKh70LjPbBrYU98DQrvMmjOc3/YYWYK mmMaKkd1Up8D7Kro4vNUet3Q66sjxes= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf06.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=HJW3QmIpSlqNaI883v50yEcBcnAci6RjnvBZXp2DQnU=; b=4Zr/MpAvf5K7p6j8KY94PevOvk2WDFKPoCrJ1kVvigUb2sbNNzFTOLwnXvnLSNVWkxZe5f vQarCJCo1eCKNmQhPgKOLcpy90xQzsU1JmwAjkvjyZRFQU0ZxUsWn5o34y8Z/7kIg8WIbw xwGHG6kaOrozjlhNJJFCcSpjdVjo63E= 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-3yln; 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 Subject: [PATCH v13 06/14] x86/mm: use broadcast TLB flushing for page reclaim TLB flushing Date: Sun, 23 Feb 2025 14:48:56 -0500 Message-ID: <20250223194943.3518952-7-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-Rspamd-Queue-Id: C6B27180007 X-Stat-Signature: mgd9q1q7y8d1har4f8eo4up1pn1oh9aq X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1740340274-418391 X-HE-Meta: U2FsdGVkX1/oZV2oh3BFeydCn3ad2+G9vbLrStJ8uZQbGSz7vldF95TtnyWjMpuhIu1STWn26D24Zp7bKYqT+HfPVMpCzUZ1nNjkWNw2ISeR/fgOEeVHHJqtB2ZH6lUdZbq1p+vRKUzaE7M77MQmIEeZg/IxksXlPROeulRfz3ptxvrvEMroGkxG+xVJJtsb/Bvp09zzUqH0McfIpSr7LEnMR9eV5DWNWeSrtWvXKqx+q+ILGsJtbyunlBN9mBh7Kv8s93LMv8zfrGUxNtDYLHxpAdqH24sitlO1iLnHuMwJB8p4go1QouAzMBjfIxqxJaCciKz2FtB/MnCeA+Q7R6SBMoiZ+AEO73onm38TvBBjgQhz7yPPcua0TPL/nSWZshEsFkTWqsvlYwXCEHfc7Iqx69fqnQMdrVh+a88OxHpYHWnO+apsKtqHtZHkVwJk9kkRyGrjd7CTq6o1rio69Ye9b4gbSdHhNVa8psdGcYiAbhjY6IlgLWheq91jhDnXhQA4AiWlL6qG+10B8m/azfFNHgZS2Wn88mPf6ZmO4JVPXgwwxs0b/9Qmvk4jKvGmZtU4FCHCnEKHTXG1qAgCe3aZQmYR6LSRgmuTWMS4MO9SGMgTj2Inf3Lggxi8ZKMQc5MofzEiu+lKi0iIxxI42hWyOLCGX6jfWnWB3NqKSQtXJq+JfX0z/gPkUtqSTqdyOJ5f/NrkyK6XLx3b2WSDV2BOhJ5moBtABRmt3I1KxXpO/YWq8c3Cn72hq14eGfeQey6CAjmngA2z/zMIUNacUYV2OV/1C0+2H1fgNZyJOfyvOfr3vmN/bimN75xMkBN3veLMSRlSsrP85RiBLVP0s4/TRaLsRXuVoY9gm9NfFQyJUQmBe9BucKRXjTvzywClyNtmGw7pt5LGdzpfbwyNWXfbFw4ldxlUV1z0LJ1mv4vtBi+DTkPLXNPf0G6dWXX6E3ACRiPEzBR0u9kesO6 DvBwp+Z3 FbEqdg1/YR3USTevmdPGnGDpOdxq3qdx44yliOUrrsQ0NnAkjxpK5PrdbbvDSUe2ztCehj9RmcVcee5GYw5FR1hyWSnQ4iiCBLBaGwpNNAGzmEv8lpUA3v3V0WwTr0JG6CHVkj2/1rlWgKZIzPX621F+FvPV/7djOrBfVP3oY3XTUv3kOTZgYnq1JUOK8W692n+/BPGjupUJ0OI+gwJ/52LHEdn/bqotektV+PU4oHHIp5O1KpjwHczSz1m6lwVSicg8VCo888USekUAUWaSoa5dcORgGn6LmDrUX2Dlhc4SsI/5tfjIUEAkXw7aIp4on8vVRzw/ONvXrdCBZkuA1sLYbZ0ySiU2frKnWTTr2uCUmKkfW1k5Sk+W3wpaWbvfEGn1kcX2kiYABtCz7/jlblxxionSZZq6sVJ8mQzV5SkwMpPStUXe2trV9wVY236H7zgm6mHVJSvzuYrY= 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: In the page reclaim code, we only track the CPU(s) where the TLB needs to be flushed, rather than all the individual mappings that may be getting invalidated. Use broadcast TLB flushing when that is available. This is a temporary hack to ensure that the PCID context for tasks in the next patch gets properly flushed from the page reclaim code, because the IPI based flushing in arch_tlbbatch_flush only flushes the currently loaded TLB context on each CPU. Patch 10 replaces this with the actual mechanism used to do broadcast TLB flushing from the page reclaim code. Signed-off-by: Rik van Riel Tested-by: Manali Shukla Tested-by: Brendan Jackman Tested-by: Michael Kelley --- arch/x86/mm/tlb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 2d7ed0fda61f..16839651f67f 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -1326,7 +1326,9 @@ void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch) * a local TLB flush is needed. Optimize this use-case by calling * flush_tlb_func_local() directly in this case. */ - if (cpumask_any_but(&batch->cpumask, cpu) < nr_cpu_ids) { + if (cpu_feature_enabled(X86_FEATURE_INVLPGB)) { + invlpgb_flush_all_nonglobals(); + } else if (cpumask_any_but(&batch->cpumask, cpu) < nr_cpu_ids) { flush_tlb_multi(&batch->cpumask, info); } else if (cpumask_test_cpu(cpu, &batch->cpumask)) { lockdep_assert_irqs_enabled(); From patchwork Sun Feb 23 19:48:57 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: 13987225 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 6E3D3C021B3 for ; Sun, 23 Feb 2025 19:51:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A7156B008C; Sun, 23 Feb 2025 14:51:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5CE9F6B0098; 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 0273C6B0093; Sun, 23 Feb 2025 14:51:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id A636A6B0083 for ; Sun, 23 Feb 2025 14:51:15 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4A02680292 for ; Sun, 23 Feb 2025 19:51:15 +0000 (UTC) X-FDA: 83152253310.02.31143FA Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf25.hostedemail.com (Postfix) with ESMTP id A32B7A0009 for ; Sun, 23 Feb 2025 19:51:13 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf25.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=1740340273; a=rsa-sha256; cv=none; b=EgMzQNiWYThqLXhsxr/n7aUyUKUI0JrYTreJpTBCH6JiFpivOSSQHP+MP7rM/ZgwRv8XV+ 9zA8VB1SuX81L6+EGeHlw0A7uSJKMxBlFG4KvqVKPRlOyybtpTju1hwfcIc36RjyDPSBBQ 4QK51UWglfVoJ/Wk4tWKx86iN7IqjQk= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf25.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=1740340273; 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=Rog+SzG8Vb9jzhiROu/3rA2Us/dyT8c7ly5MvOLWqtg=; b=dfpVK0QrjB/Db67KpprWkCyaQQvFH+4gYu1uFIeyILV5NJXT2Fi+Y0lbrOriQcsHglvg6S m3NFwqw8gQcbLb60JgFKUL3Sx63u4eATO745ea0hmGAHBTFTUXfqkf5Tbc5QHkkTqjvowS Zgg8oc/EEBd2zvuSJYac9Ax7ub/eQGc= 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-43q3; 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 Subject: [PATCH v13 07/14] x86/mm: global ASID allocation helper functions Date: Sun, 23 Feb 2025 14:48:57 -0500 Message-ID: <20250223194943.3518952-8-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-Rspamd-Queue-Id: A32B7A0009 X-Rspamd-Server: rspam12 X-Stat-Signature: 1xmwcegh63593wmqsy4jk48e95d5su4p X-HE-Tag: 1740340273-187399 X-HE-Meta: U2FsdGVkX1899jX2A72l8HNL0TAglREXuz7o0rd+JxTlGwAOW4Kjiin7o0h7WkfO4uPkJ07WWDaXk1DlFi0BsDj/EdOwU2wGyEyBDv/mWxx1qXeHLAFIhOsm3uhu6DiHeMrUKPSzWtGNYJdJv4G0hc6WdI2ve8e3a2HDMZtSSNoGu5qGTe4JVFI1/vKAe+nQpDeMpgUXo9qH7l0+qAe6hhHQZMKSEMafhLWVmCeSan1xv6HEAtPG60gkUUKNkfskX9FjLO57fwwqtIFHrSfc0OwmVkmYvjd9Rv2VnNIa2mtAHiHzsQ0FcLVf7srYeDF+PpWu9legElMGWuHQ9SNUBa8yRf5hATF0DTBLdHO8M0e/ci7KAIPgiO0gHn8ENBAbidImS5kS3aTnPD2K1s3Pxjxfrca3k5Am1q6SpmkYPjrmRvgLlcqQidZlTtvsWr5IkSpgqksu2m0An2qnEQLwktoZFV/o/kc8cdpALqJx3l9l0EV3gfeXEh0Gw/L+MkbOA7KBcalxhHvKlUYCTmFnOwWeZaLVHaoUD/xY5K0rtUwcO64BMWKkufKupgX/ifjIaCn9Pqyay4x2qYaqcvjSdKy5wsa6RWwJzwifH2cVh/NZjp5N0d1L4TBfXMJ/Qe/BmmMHvKxUOYP8Xhg46vD0Ag4J4ZcMsGsmYJQwEaJY42nq3MElHyLlCxIcwymrT1cjvdYfXKh15ZrILKRn1iX8ZqzusRG87flipTB02VOCiE+4QD2Ch4HrXXTBar/yzdQerkujua0jj3s4wx/0msdc+/F0OAIZJNEuCs7MOuEPWl6ZfLPtALXJkC91xoCYnhdhPJMfeAGa1w1fYsjGfefpNNO6qGgx5tgvfOVR5ODtWHpTeJ0Lp3lFDo3W6Q+tqVszwZTs0gYgY+/XIckHLkUJK69FiHnSw5Ep87k3zkgnVce3PgbK8QO6b6RF29oUEtenyiS6nRC6JjJqVZabUSb hAYdoY7e TfzwNv5RFa+KR4QP846C1/qJ0yKPkPHgMURzLlH6gnRd1dax/q2RcLz6itBS920NwXfmHwmk6cUxEHhQH+XBsMeAVjPhJr1C/dsWuTzRxVy/Wf3XUngwzk28sBp9QDiyA5KiX9SiKc/xpLcVQw0B2jmNRbnm/RcLBVY1ZEnfhh11sKIu37bCWgbThgeffpuUsnnR4+C2czXdEER4ezE2NixFqxcRgs4Ak12Az4KwgQPg+1iZG4jbR9utgULzkXWKAw/SxEX2hCkCOXWdt7aaIpnTjEtuTNTAC86jEkfGyLGL7qZxrz+vQpoy4z3QxTlbSrt5VElDuCnGMXJLNRQj2AXQAI1hvc61VOph/BxEa9Roo4QjM8VR3K/ioCRBxSi5kvlt0YQyHRyJuRyYXdR+zS4hT5qjxN8Y73+a6xC4jRNVinrstdTttGiy3UNKPz5DG0uAEzGW1iSGddOI7M5MViACJXAsJc1DNv3dAOZG7mU0biK4= 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: Functions to manage global ASID space. Multithreaded processes that are simultaneously active on 4 or more CPUs can get a global ASID, resulting in the same PCID being used for that process on every CPU. This in turn will allow the kernel to use hardware-assisted TLB flushing through AMD INVLPGB or Intel RAR for these processes. Helper functions split out by request. Signed-off-by: Rik van Riel Reviewed-by: Nadav Amit Tested-by: Manali Shukla Tested-by: Brendan Jackman Tested-by: Michael Kelley --- arch/x86/include/asm/mmu.h | 11 +++ arch/x86/include/asm/tlbflush.h | 43 ++++++++++ arch/x86/mm/tlb.c | 144 +++++++++++++++++++++++++++++++- 3 files changed, 195 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h index 3b496cdcb74b..edb5942d4829 100644 --- a/arch/x86/include/asm/mmu.h +++ b/arch/x86/include/asm/mmu.h @@ -69,6 +69,17 @@ typedef struct { u16 pkey_allocation_map; s16 execute_only_pkey; #endif + +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH + /* + * The global ASID will be a non-zero value when the process has + * the same ASID across all CPUs, allowing it to make use of + * hardware-assisted remote TLB invalidation like AMD INVLPGB. + */ + u16 global_asid; + /* The process is transitioning to a new global ASID number. */ + bool asid_transition; +#endif } mm_context_t; #define INIT_MM_CONTEXT(mm) \ diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h index 09463a2fb05f..83f1da2f1e4a 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -234,6 +235,48 @@ void flush_tlb_one_kernel(unsigned long addr); void flush_tlb_multi(const struct cpumask *cpumask, const struct flush_tlb_info *info); +static inline bool is_dyn_asid(u16 asid) +{ + return asid < TLB_NR_DYN_ASIDS; +} + +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH +static inline u16 mm_global_asid(struct mm_struct *mm) +{ + u16 asid; + + if (!cpu_feature_enabled(X86_FEATURE_INVLPGB)) + return 0; + + asid = smp_load_acquire(&mm->context.global_asid); + + /* mm->context.global_asid is either 0, or a global ASID */ + VM_WARN_ON_ONCE(asid && is_dyn_asid(asid)); + + return asid; +} + +static inline void assign_mm_global_asid(struct mm_struct *mm, u16 asid) +{ + /* + * Notably flush_tlb_mm_range() -> broadcast_tlb_flush() -> + * finish_asid_transition() needs to observe asid_transition = true + * once it observes global_asid. + */ + mm->context.asid_transition = true; + smp_store_release(&mm->context.global_asid, asid); +} +#else +static inline u16 mm_global_asid(struct mm_struct *mm) +{ + return 0; +} + +static inline void assign_mm_global_asid(struct mm_struct *mm, u16 asid) +{ +} +#endif + #ifdef CONFIG_PARAVIRT #include #endif diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 16839651f67f..405630479b90 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -74,13 +74,15 @@ * use different names for each of them: * * ASID - [0, TLB_NR_DYN_ASIDS-1] - * the canonical identifier for an mm + * the canonical identifier for an mm, dynamically allocated on each CPU + * [TLB_NR_DYN_ASIDS, MAX_ASID_AVAILABLE-1] + * the canonical, global identifier for an mm, identical across all CPUs * - * kPCID - [1, TLB_NR_DYN_ASIDS] + * kPCID - [1, MAX_ASID_AVAILABLE] * the value we write into the PCID part of CR3; corresponds to the * ASID+1, because PCID 0 is special. * - * uPCID - [2048 + 1, 2048 + TLB_NR_DYN_ASIDS] + * uPCID - [2048 + 1, 2048 + MAX_ASID_AVAILABLE] * for KPTI each mm has two address spaces and thus needs two * PCID values, but we can still do with a single ASID denomination * for each mm. Corresponds to kPCID + 2048. @@ -251,6 +253,142 @@ static void choose_new_asid(struct mm_struct *next, u64 next_tlb_gen, *need_flush = true; } +/* + * Global ASIDs are allocated for multi-threaded processes that are + * active on multiple CPUs simultaneously, giving each of those + * processes the same PCIDs on every CPU, for use with hardware-assisted + * TLB shootdown on remote CPUs, like AMD INVLPGB or Intel RAR. + * + * These global ASIDs are held for the lifetime of the process. + */ +static DEFINE_RAW_SPINLOCK(global_asid_lock); +static u16 last_global_asid = MAX_ASID_AVAILABLE; +static DECLARE_BITMAP(global_asid_used, MAX_ASID_AVAILABLE); +static DECLARE_BITMAP(global_asid_freed, MAX_ASID_AVAILABLE); +static int global_asid_available = MAX_ASID_AVAILABLE - TLB_NR_DYN_ASIDS - 1; + +/* + * When the search for a free ASID in the global ASID space reaches + * MAX_ASID_AVAILABLE, a global TLB flush guarantees that previously + * freed global ASIDs are safe to re-use. + * + * This way the global flush only needs to happen at ASID rollover + * time, and not at ASID allocation time. + */ +static void reset_global_asid_space(void) +{ + lockdep_assert_held(&global_asid_lock); + + invlpgb_flush_all_nonglobals(); + + /* + * The TLB flush above makes it safe to re-use the previously + * freed global ASIDs. + */ + bitmap_andnot(global_asid_used, global_asid_used, + global_asid_freed, MAX_ASID_AVAILABLE); + bitmap_clear(global_asid_freed, 0, MAX_ASID_AVAILABLE); + + /* Restart the search from the start of global ASID space. */ + last_global_asid = TLB_NR_DYN_ASIDS; +} + +static u16 allocate_global_asid(void) +{ + u16 asid; + + lockdep_assert_held(&global_asid_lock); + + /* The previous allocation hit the edge of available address space */ + if (last_global_asid >= MAX_ASID_AVAILABLE - 1) + reset_global_asid_space(); + + asid = find_next_zero_bit(global_asid_used, MAX_ASID_AVAILABLE, last_global_asid); + + if (asid >= MAX_ASID_AVAILABLE) { + /* This should never happen. */ + VM_WARN_ONCE(1, "Unable to allocate global ASID despite %d available\n", + global_asid_available); + return 0; + } + + /* Claim this global ASID. */ + __set_bit(asid, global_asid_used); + last_global_asid = asid; + global_asid_available--; + return asid; +} + +/* + * Check whether a process is currently active on more than "threshold" CPUs. + * This is a cheap estimation on whether or not it may make sense to assign + * a global ASID to this process, and use broadcast TLB invalidation. + */ +static bool mm_active_cpus_exceeds(struct mm_struct *mm, int threshold) +{ + int count = 0; + int cpu; + + /* This quick check should eliminate most single threaded programs. */ + if (cpumask_weight(mm_cpumask(mm)) <= threshold) + return false; + + /* Slower check to make sure. */ + for_each_cpu(cpu, mm_cpumask(mm)) { + /* Skip the CPUs that aren't really running this process. */ + if (per_cpu(cpu_tlbstate.loaded_mm, cpu) != mm) + continue; + + if (per_cpu(cpu_tlbstate_shared.is_lazy, cpu)) + continue; + + if (++count > threshold) + return true; + } + return false; +} + +/* + * Assign a global ASID to the current process, protecting against + * races between multiple threads in the process. + */ +static void use_global_asid(struct mm_struct *mm) +{ + u16 asid; + + guard(raw_spinlock_irqsave)(&global_asid_lock); + + /* This process is already using broadcast TLB invalidation. */ + if (mm_global_asid(mm)) + return; + + /* The last global ASID was consumed while waiting for the lock. */ + if (!global_asid_available) { + VM_WARN_ONCE(1, "Ran out of global ASIDs\n"); + return; + } + + asid = allocate_global_asid(); + if (!asid) + return; + + assign_mm_global_asid(mm, asid); +} + +void destroy_context_free_global_asid(struct mm_struct *mm) +{ + if (!mm_global_asid(mm)) + return; + + guard(raw_spinlock_irqsave)(&global_asid_lock); + + /* The global ASID can be re-used only after flush at wrap-around. */ + __set_bit(mm->context.global_asid, global_asid_freed); + + mm->context.global_asid = 0; + global_asid_available++; +} + /* * Given an ASID, flush the corresponding user ASID. We can delay this * until the next time we switch to it. From patchwork Sun Feb 23 19:48:58 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: 13987233 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 F2FE2C021B2 for ; Sun, 23 Feb 2025 20:00:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D7066B0093; Sun, 23 Feb 2025 15:00:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 587CB6B0096; Sun, 23 Feb 2025 15:00:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 44E9F6B009A; Sun, 23 Feb 2025 15:00:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 28E856B0093 for ; Sun, 23 Feb 2025 15:00:16 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CDA3F4925C for ; Sun, 23 Feb 2025 20:00:15 +0000 (UTC) X-FDA: 83152275990.28.42914DA Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf02.hostedemail.com (Postfix) with ESMTP id 328D88001A for ; Sun, 23 Feb 2025 20:00:14 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf02.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=1740340814; a=rsa-sha256; cv=none; b=vwobE50JLWE+DZWHiMJYROvIe3DgRcOIyVh6IPkyeHH1osSXsXb7fGpyamFbOrKp1Pu91U tD6HGkfEd7GSr3RRWnHiKxxYhm22IlSHKRy1zIqfh28aaaDQzhP7jevV6tyloqpVaE6P8j unFEYCLJSgzmMuc7gmSo8zRfBA19a2M= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf02.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=1740340814; 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=17PDbuRCdkaIeeTY7aYrDnI9ea5aT6YMVNZgYdZsgdg=; b=OrMlcSfopJEaJKg807nIMyCeyGHTR/a+7+MnDBOYeMNMPJNas37Mq/muw42PQupanmaLDN nIT01XVo6Q0aE7Vs8ITixx2aMvAdg4ap2wx7CoRnU4nJF37NGPFUOaSz96ioGJrt0WEjA1 RP1DQNqg2U3fdjnAAfR6xnrM+vfMR90= 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-49bB; 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 Subject: [PATCH v13 08/14] x86/mm: global ASID context switch & TLB flush handling Date: Sun, 23 Feb 2025 14:48:58 -0500 Message-ID: <20250223194943.3518952-9-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-Rspamd-Queue-Id: 328D88001A X-Stat-Signature: t8fyea3xxoq63bhie3y6n3zprahg67h5 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1740340814-1874 X-HE-Meta: U2FsdGVkX18njoHP4hfDiNdzOYq6vLe6mfQ8cJbYThdvR5fLXH6/n8pNaPC7nVl1wedrPp1dmS3p3meWZ6+a9nMmj1ZwSHxZi+hjMP5+PFpQiLGTSTU4KGHhoejPHvdncmRsOhvAX7F/kqVNZrruS5zMZlmZA2W0FVyESqATripFvmrb+vJjK4RWHiQLfiBWZ2pGymNxDQThpUZP9fjQObKPJ1wFAAYGvst9x2TsplZcgSx6GvVJZImla+c4mw76Vs37fDKIiFNqCf+Lao8WdnJe+7S4xI6qlFJ14kLkMqN1bXWyD3nKJSwYjpwOusKt62fSnS//KWvWtmrZxkJ8bjiAB3ho/N2vbnaSRB9/u3d26ack76ll5c/3CoahVE/s4Syp/PcBtp9blFh0zrZsLh1DPdwKiBm+A/8ma04+fdHFWymqqHnCSsmQ/D1NjrkukiJmh0/Ia6D2vRPYNo8BCkIZlDNlynbQcdpYMnblN5QmeYOltET30ioD30YBk/vAwEHVIEhGXwy/arKPrIHpiaZ+2DlOpXRqxt1omz3TQF8im1MSUfnzNBTlkcSM5vtLIF6xU9cO61dUcQNg0Qg3GTnfWQsKxro9gFlROrWIjdoqV5kfcgxQeyuMcxshZqnXWr8K3wRVAPmR1/uZ79wq+nmqnm4OBTcFTt3b9KzV8fAb1/Rw+ZIiLrCa/qZ2VxPiH4ZSM5yqv3GtvJB4f7twHOufgIhjgLh9Db9u+DQZgjctc9JnBJ9Qpkexxk0l0pRARuVYsYLA3rcofxbsJesRp0JU+k0lmLI2u38w4pnD/qIb8bNSJO3XwSIgmvcr/a9qGcIl6dKZoU07l89OTX2v7BOg8LVZ82kxtPMOj9aj2Li/M8eLXLgEPRbtaDzo02amfv2Xm1JnztLnedgRooJKwEi29zc7ofW44JWbF6YZQpeLUw+nYFKP2bxaYvHgae7QMBGDznfuTMxrC8AgQ0E HbqliHMt rCrgL1Pn3SNV4QlehigQuaKct2N795G/UP9DK8LAeDQS0o54PCEp+dQkt2VX8JZ6e0LX4VV+E8+hAFIZcWhT3vJS5KnNHiGj81L0tkEjhf6L6QhJ20ffdTYF8jqwqoT9JTrfLiiyPWLwqjAXGsrmR61iEwYfAGcmxjWdwTZ4WEnhF4r4ECthG2QjyKTiLX9BXIpxYp8MlXAI9b2hEbP1R2ke7kZaEwy3uz/b7NRHpLjzEYjDeffQYhwX3/6FR+8zSGtOYW0rDqRr+WhYKHAzT7BPSpffGY95ZTwleeRxOyMRLFEyA8oLLNB0te+FRBOLs3t0YGK1WZtjX6tUEK8SyzX9UlCrBgaS72eKCFISzibZXXNQnrfJu6REeKS7oQnH9gWbuu9gLyXiYSsY= 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: Context switch and TLB flush support for processes that use a global ASID & PCID across all CPUs. At both context switch time and TLB flush time, we need to check whether a task is switching to a global ASID, and reload the TLB with the new ASID as appropriate. In both code paths, we also short-circuit the TLB flush if we are using a global ASID, because the global ASIDs are always kept up to date across CPUs, even while the process is not running on a CPU. Signed-off-by: Rik van Riel --- arch/x86/include/asm/tlbflush.h | 13 ++++++ arch/x86/mm/tlb.c | 77 ++++++++++++++++++++++++++++++--- 2 files changed, 83 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h index 83f1da2f1e4a..f1f82571249b 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h @@ -240,6 +240,19 @@ static inline bool is_dyn_asid(u16 asid) return asid < TLB_NR_DYN_ASIDS; } +static inline bool is_global_asid(u16 asid) +{ + return !is_dyn_asid(asid); +} + +static inline bool in_asid_transition(struct mm_struct *mm) +{ + if (!cpu_feature_enabled(X86_FEATURE_INVLPGB)) + return false; + + return mm && READ_ONCE(mm->context.asid_transition); +} + #ifdef CONFIG_X86_BROADCAST_TLB_FLUSH static inline u16 mm_global_asid(struct mm_struct *mm) { diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 405630479b90..d8a04e398615 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -227,6 +227,20 @@ static void choose_new_asid(struct mm_struct *next, u64 next_tlb_gen, return; } + /* + * TLB consistency for global ASIDs is maintained with hardware assisted + * remote TLB flushing. Global ASIDs are always up to date. + */ + if (static_cpu_has(X86_FEATURE_INVLPGB)) { + u16 global_asid = mm_global_asid(next); + + if (global_asid) { + *new_asid = global_asid; + *need_flush = false; + return; + } + } + if (this_cpu_read(cpu_tlbstate.invalidate_other)) clear_asid_other(); @@ -389,6 +403,23 @@ void destroy_context_free_global_asid(struct mm_struct *mm) global_asid_available++; } +/* + * Is the mm transitioning from a CPU-local ASID to a global ASID? + */ +static bool needs_global_asid_reload(struct mm_struct *next, u16 prev_asid) +{ + u16 global_asid = mm_global_asid(next); + + if (!static_cpu_has(X86_FEATURE_INVLPGB)) + return false; + + /* Process is transitioning to a global ASID */ + if (global_asid && prev_asid != global_asid) + return true; + + return false; +} + /* * Given an ASID, flush the corresponding user ASID. We can delay this * until the next time we switch to it. @@ -694,7 +725,8 @@ void switch_mm_irqs_off(struct mm_struct *unused, struct mm_struct *next, */ if (prev == next) { /* Not actually switching mm's */ - VM_WARN_ON(this_cpu_read(cpu_tlbstate.ctxs[prev_asid].ctx_id) != + VM_WARN_ON(is_dyn_asid(prev_asid) && + this_cpu_read(cpu_tlbstate.ctxs[prev_asid].ctx_id) != next->context.ctx_id); /* @@ -711,6 +743,20 @@ void switch_mm_irqs_off(struct mm_struct *unused, struct mm_struct *next, !cpumask_test_cpu(cpu, mm_cpumask(next)))) cpumask_set_cpu(cpu, mm_cpumask(next)); + /* Check if the current mm is transitioning to a global ASID */ + if (needs_global_asid_reload(next, prev_asid)) { + next_tlb_gen = atomic64_read(&next->context.tlb_gen); + choose_new_asid(next, next_tlb_gen, &new_asid, &need_flush); + goto reload_tlb; + } + + /* + * Broadcast TLB invalidation keeps this PCID up to date + * all the time. + */ + if (is_global_asid(prev_asid)) + return; + /* * If the CPU is not in lazy TLB mode, we are just switching * from one thread in a process to another thread in the same @@ -744,6 +790,13 @@ void switch_mm_irqs_off(struct mm_struct *unused, struct mm_struct *next, */ cond_mitigation(tsk); + /* + * Let nmi_uaccess_okay() and finish_asid_transition() + * know that we're changing CR3. + */ + this_cpu_write(cpu_tlbstate.loaded_mm, LOADED_MM_SWITCHING); + barrier(); + /* * Leave this CPU in prev's mm_cpumask. Atomic writes to * mm_cpumask can be expensive under contention. The CPU @@ -758,14 +811,12 @@ void switch_mm_irqs_off(struct mm_struct *unused, struct mm_struct *next, next_tlb_gen = atomic64_read(&next->context.tlb_gen); choose_new_asid(next, next_tlb_gen, &new_asid, &need_flush); - - /* Let nmi_uaccess_okay() know that we're changing CR3. */ - this_cpu_write(cpu_tlbstate.loaded_mm, LOADED_MM_SWITCHING); - barrier(); } +reload_tlb: new_lam = mm_lam_cr3_mask(next); if (need_flush) { + VM_WARN_ON_ONCE(is_global_asid(new_asid)); this_cpu_write(cpu_tlbstate.ctxs[new_asid].ctx_id, next->context.ctx_id); this_cpu_write(cpu_tlbstate.ctxs[new_asid].tlb_gen, next_tlb_gen); load_new_mm_cr3(next->pgd, new_asid, new_lam, true); @@ -884,7 +935,7 @@ static void flush_tlb_func(void *info) const struct flush_tlb_info *f = info; struct mm_struct *loaded_mm = this_cpu_read(cpu_tlbstate.loaded_mm); u32 loaded_mm_asid = this_cpu_read(cpu_tlbstate.loaded_mm_asid); - u64 local_tlb_gen = this_cpu_read(cpu_tlbstate.ctxs[loaded_mm_asid].tlb_gen); + u64 local_tlb_gen; bool local = smp_processor_id() == f->initiating_cpu; unsigned long nr_invalidate = 0; u64 mm_tlb_gen; @@ -907,6 +958,16 @@ static void flush_tlb_func(void *info) if (unlikely(loaded_mm == &init_mm)) return; + /* Reload the ASID if transitioning into or out of a global ASID */ + if (needs_global_asid_reload(loaded_mm, loaded_mm_asid)) { + switch_mm_irqs_off(NULL, loaded_mm, NULL); + loaded_mm_asid = this_cpu_read(cpu_tlbstate.loaded_mm_asid); + } + + /* Broadcast ASIDs are always kept up to date with INVLPGB. */ + if (is_global_asid(loaded_mm_asid)) + return; + VM_WARN_ON(this_cpu_read(cpu_tlbstate.ctxs[loaded_mm_asid].ctx_id) != loaded_mm->context.ctx_id); @@ -924,6 +985,8 @@ static void flush_tlb_func(void *info) return; } + local_tlb_gen = this_cpu_read(cpu_tlbstate.ctxs[loaded_mm_asid].tlb_gen); + if (unlikely(f->new_tlb_gen != TLB_GENERATION_INVALID && f->new_tlb_gen <= local_tlb_gen)) { /* @@ -1091,7 +1154,7 @@ STATIC_NOPV void native_flush_tlb_multi(const struct cpumask *cpumask, * up on the new contents of what used to be page tables, while * doing a speculative memory access. */ - if (info->freed_tables) + if (info->freed_tables || in_asid_transition(info->mm)) on_each_cpu_mask(cpumask, flush_tlb_func, (void *)info, true); else on_each_cpu_cond_mask(should_flush_tlb, flush_tlb_func, From patchwork Sun Feb 23 19:48:59 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: 13987235 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 E89C2C021B2 for ; Sun, 23 Feb 2025 20:20:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5EC046B007B; Sun, 23 Feb 2025 15:20:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 59BD26B0082; Sun, 23 Feb 2025 15:20:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4638A6B0083; Sun, 23 Feb 2025 15:20:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 292A36B007B for ; Sun, 23 Feb 2025 15:20:15 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CC94C1402A6 for ; Sun, 23 Feb 2025 20:20:14 +0000 (UTC) X-FDA: 83152326348.09.A94C270 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf15.hostedemail.com (Postfix) with ESMTP id 52871A0006 for ; Sun, 23 Feb 2025 20:20:13 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf15.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=1740342013; 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=tnXJUoKhnm5h8EohtTt/G8qJOME70FGJFaEsjMY4Igo=; b=mlFs1DCOBruPDY5xO1egTdJBy3clvvTuocFYU5PDcwOiEPVYprSfC8K40NnjnxVEwix9DZ jRN03T3dIfQHSiI3Ssu2aEeWin1o78087YvYp6rcEkTz6SMAFDGWtJe5kXEyvrrbSIOzsz Jc3cYcBvthc6SwdjcMuXnYjEwI1qfag= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf15.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=1740342013; a=rsa-sha256; cv=none; b=PDXQVx3csoKk9CLooYvlhiOmJVG9aE22J18UIgHJFK/V7joqjEziqbajT+CRvCe0HjKnfW pAcpZjTpESQUrpnAJCxb9yU3gHjjGLKpTtHOLW9v0nrpQpXz6IhfTszhNZg9hoidXrE+9d +dvJVR/33Fa9KJJLh3czJ3AiBYE938w= 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 1tmHyz-000000001hX-03Bc; Sun, 23 Feb 2025 14:49:45 -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 Subject: [PATCH v13 09/14] x86/mm: global ASID process exit helpers Date: Sun, 23 Feb 2025 14:48:59 -0500 Message-ID: <20250223194943.3518952-10-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-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 52871A0006 X-Stat-Signature: hnr8p19jf5ppsyxoo16yxdk5xgy6ha8h X-HE-Tag: 1740342013-450360 X-HE-Meta: U2FsdGVkX18n6aRn/HEveM7ohlHb76cPVeJ6vxv99Hck1oJ7Y9hX/ffPDIfwXA7Bjwr04/RLWJLpsOh1ldOrHUwGJQU4yDEQ55DPUfM4Po7KYHRJMsGtPFxk8aT8FVlnD7rX2+FGKaDBaGGpQfs1N0F4m8K7U7xCcIdtTvpkvEFLl1f9fNJ/AxJdCNcEukLsGlwhRLKi4BLo1PdfdZPHGUJnvun0UCiszBv9/XMxzfNT1/ojVcmnYk/YHjitmCeZ5HFLpnPIvAt7RDHzOfjdJzWp8+oiwR+QYggzU8NaVN9z1i4fPxaqMVRKeJDqgMr+tZmnsC+W/u2bz+EIu/s4J96SrQWtVs0TNYUw4+Ld3bXW5uQO46uxLqfGjIQ12ZvM0jUNsarWhOzYYWWemj6BL8LFrrlk4b4UuQ1rFcUK3dbn+OLn9TERvANdt8oxkGWmfHtLkvy6QOFzyKWjBTva/GL2vXXzDNqHozTc0UddsfzToG1ofV2+XD/i+eLU0wXHpdnwO1kOOTdWqKMhV/Je0duYHrn8W6peOk+COf2hg23NGehJPDI6jxJ2gMjEsPEZMihzEXe6SKI65AUK6e8MaZwyWsfuOZFQKpEKcdDB9g/umFITXGNze9Qnn+4khqIrhN7mdMMkKrmU3R6QP6Gp7Ev9M41fxKEhd1NL7TeZJ73gQqQ1nBRD9WXGvbb+mmHL/FSft6omOgEgVL/eSf72vS2G4Fg/pI9r8KFL8GAaCMpUmT+DMUZLdh3AzxysYK0e7K1UxKYqdvfWKYHRSqkN9YFl/HsEq7+Df7OYLzS9iqi0qtZB8vuPIcDb+xFzBh0a1i7cJJReYn6mPyY7/jM3qFifUVFAQGpihN+HwhK3VtyBTV+izVHRtMDWkk0bSokBOLwfN2dLCIuQ2sVCEe1wk5VSt5r6k9m4dQlrlB/8UVZWcVTjLSFgrw/r63L0q15mnJ/2/8PHXPWcn4jGYWL hyJD+mxX wxRy45MXviR46Gq17spXYv+XrzrnuXJU/UXcGBNiu2z9i2zNnElGnbBqDdi/2URuywRpyln2YhOPhJVwZfG23I5m8zJqBxUHoZuUK1bxhviWUUXDjbPhJzid/fH0rXqdOrKS3y29tMr4ds6QMk/OhcHO6WOm6zvINT9Pb2wavzWuRkfydBS8gX7VhQoS2pX02PM3Fgt0zSOieKBIVyj/z4rjiRe8r9zeG2BLrOHK8biNH/KAN3kP/DDCOhhrCg5iseqWDWqtk7OFW0P7dAomJfLev5yzr5xM7lERdR60M1Fl1PoMxy5Ux68IYBY/YCVvi2tUoNgjRAq8Z/9YsYjVXDwCosNpGIwq2fiV7qjg32CfUbIeQGkWn+GOFjSzWVC5TmSVlFa/0AllpoUs= 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: A global ASID is allocated for the lifetime of a process. Free the global ASID at process exit time. Signed-off-by: Rik van Riel --- arch/x86/include/asm/mmu_context.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h index 795fdd53bd0a..d670699d32c2 100644 --- a/arch/x86/include/asm/mmu_context.h +++ b/arch/x86/include/asm/mmu_context.h @@ -139,6 +139,8 @@ static inline void mm_reset_untag_mask(struct mm_struct *mm) #define enter_lazy_tlb enter_lazy_tlb extern void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk); +extern void destroy_context_free_global_asid(struct mm_struct *mm); + /* * Init a new mm. Used on mm copies, like at fork() * and on mm's that are brand-new, like at execve(). @@ -161,6 +163,14 @@ static inline int init_new_context(struct task_struct *tsk, mm->context.execute_only_pkey = -1; } #endif + +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH + if (cpu_feature_enabled(X86_FEATURE_INVLPGB)) { + mm->context.global_asid = 0; + mm->context.asid_transition = false; + } +#endif + mm_reset_untag_mask(mm); init_new_context_ldt(mm); return 0; @@ -170,6 +180,10 @@ static inline int init_new_context(struct task_struct *tsk, static inline void destroy_context(struct mm_struct *mm) { destroy_context_ldt(mm); +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH + if (cpu_feature_enabled(X86_FEATURE_INVLPGB)) + destroy_context_free_global_asid(mm); +#endif } extern void switch_mm(struct mm_struct *prev, struct mm_struct *next, From patchwork Sun Feb 23 19:49:00 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: 13987231 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 B3638C021B2 for ; Sun, 23 Feb 2025 19:51:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B3B716B0092; Sun, 23 Feb 2025 14:51:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 903C66B007B; Sun, 23 Feb 2025 14:51:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D1446B009A; Sun, 23 Feb 2025 14:51:17 -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 17A4F6B009C for ; Sun, 23 Feb 2025 14:51:17 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D62091A0296 for ; Sun, 23 Feb 2025 19:51:16 +0000 (UTC) X-FDA: 83152253352.15.2670EF6 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf11.hostedemail.com (Postfix) with ESMTP id 517D140003 for ; Sun, 23 Feb 2025 19:51:15 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740340275; 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=jWuIUMPQFT+3IXsjrqIYDtGl6v9cnE+rEQO8OGup9co=; b=og0Eg8Xv9GzQH0BS0WSyK6AKJG9hm3Q7iCWOtf3dPExJQG0l1feO+BytCN7IZ6kn+fhHUY xMyQAHZd0Sme1XpHvT1Ab4OVIG1x0h3RD1WLhCSibnAcSFPdvNsvm6XPI+B58jygr6qF1U RIpfFA5Pu5NvYk1vUQHRaUXQcrOPwo4= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740340275; a=rsa-sha256; cv=none; b=C0YFQHKpIJRKMMEtClm2/hmJGZkavVfXURuYMjjqVsnXn+Hnj4oxPJ8asSPKJrIGi26Rbs 3rZnghEl8jPZdQZd6/gxRsaMr+jh5JaqkotOdS5o+L0UAQX2ImK+ovG9Xntpb2+O/P2adA 3h4ni9xQuP5oWXzzb1QHZtmCpl2uGeM= 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 1tmHyz-000000001hX-08Iv; Sun, 23 Feb 2025 14:49:45 -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 Subject: [PATCH v13 10/14] x86/mm: enable broadcast TLB invalidation for multi-threaded processes Date: Sun, 23 Feb 2025 14:49:00 -0500 Message-ID: <20250223194943.3518952-11-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-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 517D140003 X-Stat-Signature: 333ur55dmou1d4ozqr8magdsjtpeh1qy X-HE-Tag: 1740340275-975073 X-HE-Meta: U2FsdGVkX18PcQbjqEtShry6623MdWNoLVC80F4FmDZ6BunLgRLHYH0C+H3vVDJ7AYL22502EMTvBdXITVezuQaLTMquIwLTSpIy5AF4lLwshFD/3Lf2ChzeIhaxQ0NZhxmIFqycyJLjH+b4KEDJISGhSDu20U9hVE6aS3JG1eWoSk1Sf8pqVMzKWRwfX0bSJsmuYc70kVdscrDfD6F9vu7xIkgayOTNw6tPF5cHjZXmuI2jstaYbMVGhmRv56TKM7LKDZA35y2pbW2obrqKi3DE8+iyRJN5gn92Mb/w8INFrcSbo4IJuQmUo1Ns3Q6blmtgbA98nZZKUJW+Swnm0CEBGi1Q4uPoiGRzl6/UH3Uy84P2oK3fFBT09PG5FOw95aFW/pIPpk+c7OKGeIZj0B2FkyP57cIHRDpCbmESNIVkbGY1P87s5LSZhUuf6B2BDwKD6m31rsbRX6dpz2ASHrsxEXVDjBd3AW0gQbdjMWJ2EILXK/3fFmJmyKMkCTkwh9O8m1zM8fdavewbMlAvJi6sB5PiEqzFcKckht9E+CjxrAz/OA0FSPzr/K0GGFfjBacromArigc7YYQ5oFwUlnq64efc5Gw4ftE4hxyez3zcy5CbXsX8/NSDUfnaM8FhIPq+za+mENPiBi5fcnqKzUZ8DRI7DxQSW0XZCGSEZpFB6zDCJhXnF2S5eI6UVjzt7rP6iBji8IjcNvacneiQFhIU4sXtykrIxY7gaXF3yaOzkGqynIzGE/wJ60f1tCVfFum7DORUJ+DG6JSxDrgV4QJuTKxpupbsmRR1G9W6LK7tyZctjO85O4Qhzzj8+0BkMwhZRdQ2ZWBqgm6YsR/C34xRV12R0rlttq+4FACZteNp/ql5MKO2gwW3puqOeXjMGrS1n2Jawj9BKXZ0gwZhQ3Io/Y7MExWKJgwdt82luYN0vkTwQn+x+7BDaFVh5wtb2p4aQ38cnP+bFqkMzFZ b1QSQkJV rPA7sdrBl0DhYi3A+dGRoH8HOm1ivcbNCr20qeB2r3FGVw89jGQpDFVjRLLYVbNR2C9rLaNx/H+tkf9G+3jdFNA2SBYpx4i1F+6ZAEke2RUnlqkkvJlvt0JDRg5kkUY6w5SiZwKIgmwa6jKRvtJtI5AmA4skAqxmSKBUg+FJCvsH50eFOjWTRafXni7rbKmhAICgJ6Y/ojcywSiDSmLnr5cwR8eCBqokGaMR2KZSULeKXzwkFh9/erhmC1nbP7CiQ+ezwAoo+s3mhfjW7aLL70upwWkmDFheCtUjBc4Y1yHyCPwK7mzk3YUMUZjxF57NY4xTx+GkTWqIQml7fD9dV5DH4TnWyrL4Nq6piOum1FZbgLMhmd39Cbz/OX9UaLZ9ZM0xHBpFFp0tBHzZ6R557OIA9CeVgQrp0ROZo7EE1VDlIDJ8QqkCoTUzJby1aRDbc4gzRBULzcM7fs9MSedTYmNv3yF41Snyij6ZxWhgWoRVy5tfQs+DHmjUl2TBZj/0orAk6F2Tu6eN5vmeC2xbzACA3SEMXFFRBXFVcDzzZjQBME0x9RZfQt5fQ4xHlofA6DiH+v+LdgPJR73Fxb1vdUJma7w== 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: Use broadcast TLB invalidation, using the INVPLGB instruction. There is not enough room in the 12-bit ASID address space to hand out broadcast ASIDs to every process. Only hand out broadcast ASIDs to processes when they are observed to be simultaneously running on 4 or more CPUs. This also allows single threaded process to continue using the cheaper, local TLB invalidation instructions like INVLPGB. Combined with the removal of unnecessary lru_add_drain calls (see https://lkml.org/lkml/2024/12/19/1388) this results in a nice performance boost for the will-it-scale tlb_flush2_threads test on an AMD Milan system with 36 cores: - vanilla kernel: 527k loops/second - lru_add_drain removal: 731k loops/second - only INVLPGB: 527k loops/second - lru_add_drain + INVLPGB: 1157k loops/second Profiling with only the INVLPGB changes showed while TLB invalidation went down from 40% of the total CPU time to only around 4% of CPU time, the contention simply moved to the LRU lock. Fixing both at the same time about doubles the number of iterations per second from this case. Comparing will-it-scale tlb_flush2_threads with several different numbers of threads on a 72 CPU AMD Milan shows similar results. The number represents the total number of loops per second across all the threads: threads tip invlpgb 1 315k 304k 2 423k 424k 4 644k 1032k 8 652k 1267k 16 737k 1368k 32 759k 1199k 64 636k 1094k 72 609k 993k 1 and 2 thread performance is similar with and without invlpgb, because invlpgb is only used on processes using 4 or more CPUs simultaneously. The number is the median across 5 runs. Some numbers closer to real world performance can be found at Phoronix, thanks to Michael: https://www.phoronix.com/news/AMD-INVLPGB-Linux-Benefits Signed-off-by: Rik van Riel Reviewed-by: Nadav Amit Tested-by: Manali Shukla Tested-by: Brendan Jackman Tested-by: Michael Kelley --- arch/x86/mm/tlb.c | 107 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index d8a04e398615..01a5edb51ebe 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -420,6 +420,108 @@ static bool needs_global_asid_reload(struct mm_struct *next, u16 prev_asid) return false; } +/* + * x86 has 4k ASIDs (2k when compiled with KPTI), but the largest + * x86 systems have over 8k CPUs. Because of this potential ASID + * shortage, global ASIDs are handed out to processes that have + * frequent TLB flushes and are active on 4 or more CPUs simultaneously. + */ +static void consider_global_asid(struct mm_struct *mm) +{ + if (!static_cpu_has(X86_FEATURE_INVLPGB)) + return; + + /* Check every once in a while. */ + if ((current->pid & 0x1f) != (jiffies & 0x1f)) + return; + + if (!READ_ONCE(global_asid_available)) + return; + + /* + * Assign a global ASID if the process is active on + * 4 or more CPUs simultaneously. + */ + if (mm_active_cpus_exceeds(mm, 3)) + use_global_asid(mm); +} + +static void finish_asid_transition(struct flush_tlb_info *info) +{ + struct mm_struct *mm = info->mm; + int bc_asid = mm_global_asid(mm); + int cpu; + + if (!READ_ONCE(mm->context.asid_transition)) + return; + + for_each_cpu(cpu, mm_cpumask(mm)) { + /* + * The remote CPU is context switching. Wait for that to + * finish, to catch the unlikely case of it switching to + * the target mm with an out of date ASID. + */ + while (READ_ONCE(per_cpu(cpu_tlbstate.loaded_mm, cpu)) == LOADED_MM_SWITCHING) + cpu_relax(); + + if (READ_ONCE(per_cpu(cpu_tlbstate.loaded_mm, cpu)) != mm) + continue; + + /* + * If at least one CPU is not using the global ASID yet, + * send a TLB flush IPI. The IPI should cause stragglers + * to transition soon. + * + * This can race with the CPU switching to another task; + * that results in a (harmless) extra IPI. + */ + if (READ_ONCE(per_cpu(cpu_tlbstate.loaded_mm_asid, cpu)) != bc_asid) { + flush_tlb_multi(mm_cpumask(info->mm), info); + return; + } + } + + /* All the CPUs running this process are using the global ASID. */ + WRITE_ONCE(mm->context.asid_transition, false); +} + +static void broadcast_tlb_flush(struct flush_tlb_info *info) +{ + bool pmd = info->stride_shift == PMD_SHIFT; + unsigned long asid = info->mm->context.global_asid; + unsigned long addr = info->start; + + /* + * TLB flushes with INVLPGB are kicked off asynchronously. + * The inc_mm_tlb_gen() guarantees page table updates are done + * before these TLB flushes happen. + */ + if (info->end == TLB_FLUSH_ALL) { + invlpgb_flush_single_pcid_nosync(kern_pcid(asid)); + /* Do any CPUs supporting INVLPGB need PTI? */ + if (static_cpu_has(X86_FEATURE_PTI)) + invlpgb_flush_single_pcid_nosync(user_pcid(asid)); + } else do { + unsigned long nr = 1; + + if (info->stride_shift <= PMD_SHIFT) { + nr = (info->end - addr) >> info->stride_shift; + nr = clamp_val(nr, 1, invlpgb_count_max); + } + + invlpgb_flush_user_nr_nosync(kern_pcid(asid), addr, nr, pmd); + if (static_cpu_has(X86_FEATURE_PTI)) + invlpgb_flush_user_nr_nosync(user_pcid(asid), addr, nr, pmd); + + addr += nr << info->stride_shift; + } while (addr < info->end); + + finish_asid_transition(info); + + /* Wait for the INVLPGBs kicked off above to finish. */ + __tlbsync(); +} + /* * Given an ASID, flush the corresponding user ASID. We can delay this * until the next time we switch to it. @@ -1250,9 +1352,12 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, * a local TLB flush is needed. Optimize this use-case by calling * flush_tlb_func_local() directly in this case. */ - if (cpumask_any_but(mm_cpumask(mm), cpu) < nr_cpu_ids) { + if (mm_global_asid(mm)) { + broadcast_tlb_flush(info); + } else if (cpumask_any_but(mm_cpumask(mm), cpu) < nr_cpu_ids) { info->trim_cpumask = should_trim_cpumask(mm); flush_tlb_multi(mm_cpumask(mm), info); + consider_global_asid(mm); } else if (mm == this_cpu_read(cpu_tlbstate.loaded_mm)) { lockdep_assert_irqs_enabled(); local_irq_disable(); From patchwork Sun Feb 23 19:49:01 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: 13987226 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 F16DAC021B6 for ; Sun, 23 Feb 2025 19:51:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B4B056B0095; Sun, 23 Feb 2025 14:51:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7CAF86B009A; 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 3D6F86B0092; Sun, 23 Feb 2025 14:51:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id AD07D6B008C for ; Sun, 23 Feb 2025 14:51:15 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4E0F1AFFDC for ; Sun, 23 Feb 2025 19:51:15 +0000 (UTC) X-FDA: 83152253310.28.F668BE4 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf03.hostedemail.com (Postfix) with ESMTP id B37B12000E for ; Sun, 23 Feb 2025 19:51:13 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf03.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=1740340273; 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=LdvwmofdFF3hDY0t7ucFzvQKImtHH2rUisVGBSrpDs4=; b=vDGwLP+Nl6x+HAnBGo2gjP6nnl/8OQtdPi9SA7H/YaZL/ywleQetInUu7meoE2jI7uc+AI W5jK+MfUv/saaYGMmQ7qu03TqMOZMIgi4qPblu56osqfJ/hOxC7F1fWinWJtnUh6gZwD8K y+Y9TKWK/75lOQYhQYA3zIcjKTirO7k= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf03.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=1740340273; a=rsa-sha256; cv=none; b=HtV7fA17gk0iW/HR/Sy9FvuFsnyOIUQC7xAbtDCBAcejEFtCthPJKFA2Rzq6/HFnkDs6x/ b5zUtrzhJN6p2kmiP+54M7mt6ndLzZvAkc0biYlspFt17oC4TyiJ3ZYZFjOhOgb7sngp8i lMb3A38dYfeUMyRYHUbRv9isiJOnPQo= 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 1tmHyz-000000001hX-0E6O; Sun, 23 Feb 2025 14:49:45 -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 Subject: [PATCH v13 11/14] x86/mm: do targeted broadcast flushing from tlbbatch code Date: Sun, 23 Feb 2025 14:49:01 -0500 Message-ID: <20250223194943.3518952-12-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-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: B37B12000E X-Stat-Signature: p6jn6s5dc7jdq8xbcpj39kyzq9o8ymue X-HE-Tag: 1740340273-373754 X-HE-Meta: U2FsdGVkX185tHXjgR0qGxuVns6iqEnErTenKLDB99PYDwy3hIPPntZOcIxtJqwveLUD2uO2uCa+WbYZy1XMvg2knXU5bR1uHrNoZG6RAC4AQRVPbGj2jG0OJbtjfhFgN8TT++Is/eitq4o0RnKnGD5pwCwjU8UAGcUvSU7KzU9Px3TZkUCQXN/5LTvCD1gNa4a6bAR5fLVj8yFoWjlv8SCxdbmAiljC4XfIVqCuFKx8e2LI8S99zTyR0v4k5xiGSN3qEdBCwildecUwy7xj9D4tNo7+npo/rNwY0G/Odsi2MhFDuSfCMIf5bkBiIzycqUsS34z9tkPnJPR7S+yPK0p3x+3atsopTLtuy83V1ke81CncswZIy8+3WTXQiH5YiQQGw0eZ1n5ukLN6UnRpzxm0vjQkS/VaEiDdf+4jAkcvSAc7i3HM3bTBqca3Q/WFmDPd/fMv7EDnW5APc61BbyIQ/y9pOov4Y9rF3vy20XMRB1As0czBk3sxcT4p6e78R3zM7wjU8JVRyp8tDyvvqVz3EEuKxhXzEonbFVTa0xbhH7XwTKgjV0YUDalQjPdQMtPG9sHvXiHfRiJa4c7K/MakpTtOLkch5NXNBrs8HqVJD4neZiyKsNxp7ilmlXG2KlguoLy0EJqSGXJEncupy8nJs6NMHd6kJpD2vbStp+4LOC2Yiu60AQmlRTdYUPNFb99tVixiqXiW1OUasn07M6/fRVSrLsV2mp7hAY3ZRyvCIETE61rjbPepurUK/OddVl+m/zELcZqaPRYBP5OXCBWrJAsrxxEdwqXSMJv4rtuHeB4F+oFEtmgPavGiP2yR7OgRenSPJyRrGK0iIChNaRP+tewOvjU3sGsq4IZ7NUpEmzC9bnq88oZPAYEZ3PxJfV7Fdf6OoFdrRG6ea5PKIYN+ArtDXd5u7G5wVmAlYh+/NdCUh+X21/etAr4QAlcx9BVyHn8KfWJm9ip7g09 jOBC46H0 WbEHydvpd+DWEGzPrPQLiuu7BKw1lKBJZgpsrYPwqNwGksSbCUuokIYhipSil+s45uWxC875Wd5MN//uPu5tz/otV1+9u8Bsaj0J3LGE+30ILi5OkFQJTFwnPQvCUoTGdrV1inGezC52pfG8ku+eA8STBmfUOaBYlwDxhrk2eWOojw9X2xS+eoAsRUOWLqkszXX4kvXTZzjyMXDRDgzrPVvss3312u1dI97hHI4nuoWmn4LYHQQ52z/c6xdHApK44DrHQbCPa1CRYjz7MpjoyzrF3OXKRhGK0cPMgp/K0dJtBYoXUuox8w/TbrvbcfGlhQjt/4nABkzVDO5S7RbjjUfYYnM7mWUI06+lR6g2j3R248O4BSWqn4eb3cL8H7Dfq1rq2RH2fWVo+lsFiDXWlJ1afPkR63BZPdZgnlAfGdW3ffEepg17I1nrVB/dl7E/Bcv89MXn7wSyj/pk= 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: Instead of doing a system-wide TLB flush from arch_tlbbatch_flush, queue up asynchronous, targeted flushes from arch_tlbbatch_add_pending. This also allows us to avoid adding the CPUs of processes using broadcast flushing to the batch->cpumask, and will hopefully further reduce TLB flushing from the reclaim and compaction paths. Signed-off-by: Rik van Riel Tested-by: Manali Shukla Tested-by: Brendan Jackman Tested-by: Michael Kelley --- arch/x86/include/asm/tlb.h | 12 ++--- arch/x86/include/asm/tlbflush.h | 19 ++++---- arch/x86/mm/tlb.c | 79 +++++++++++++++++++++++++++++++-- 3 files changed, 92 insertions(+), 18 deletions(-) diff --git a/arch/x86/include/asm/tlb.h b/arch/x86/include/asm/tlb.h index b3cd521e5e2f..f69b243683e1 100644 --- a/arch/x86/include/asm/tlb.h +++ b/arch/x86/include/asm/tlb.h @@ -83,16 +83,16 @@ static inline void __tlbsync(void) #define INVLPGB_FINAL_ONLY BIT(4) #define INVLPGB_INCLUDE_NESTED BIT(5) -static inline void invlpgb_flush_user_nr_nosync(unsigned long pcid, - unsigned long addr, - u16 nr, - bool pmd_stride) +static inline void __invlpgb_flush_user_nr_nosync(unsigned long pcid, + unsigned long addr, + u16 nr, + bool pmd_stride) { __invlpgb(0, pcid, addr, nr, pmd_stride, INVLPGB_PCID | INVLPGB_VA); } /* Flush all mappings for a given PCID, not including globals. */ -static inline void invlpgb_flush_single_pcid_nosync(unsigned long pcid) +static inline void __invlpgb_flush_single_pcid_nosync(unsigned long pcid) { __invlpgb(0, pcid, 0, 1, 0, INVLPGB_PCID); } @@ -105,7 +105,7 @@ static inline void invlpgb_flush_all(void) } /* Flush addr, including globals, for all PCIDs. */ -static inline void invlpgb_flush_addr_nosync(unsigned long addr, u16 nr) +static inline void __invlpgb_flush_addr_nosync(unsigned long addr, u16 nr) { __invlpgb(0, 0, addr, nr, 0, INVLPGB_INCLUDE_GLOBAL); } diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h index f1f82571249b..241fa1435375 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h @@ -105,6 +105,9 @@ struct tlb_state { * need to be invalidated. */ bool invalidate_other; +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH + bool need_tlbsync; +#endif #ifdef CONFIG_ADDRESS_MASKING /* @@ -288,6 +291,10 @@ static inline u16 mm_global_asid(struct mm_struct *mm) static inline void assign_mm_global_asid(struct mm_struct *mm, u16 asid) { } + +static inline void tlbsync(void) +{ +} #endif #ifdef CONFIG_PARAVIRT @@ -337,21 +344,15 @@ static inline u64 inc_mm_tlb_gen(struct mm_struct *mm) return atomic64_inc_return(&mm->context.tlb_gen); } -static inline void arch_tlbbatch_add_pending(struct arch_tlbflush_unmap_batch *batch, - struct mm_struct *mm, - unsigned long uaddr) -{ - inc_mm_tlb_gen(mm); - cpumask_or(&batch->cpumask, &batch->cpumask, mm_cpumask(mm)); - mmu_notifier_arch_invalidate_secondary_tlbs(mm, 0, -1UL); -} - static inline void arch_flush_tlb_batched_pending(struct mm_struct *mm) { flush_tlb_mm(mm); } extern void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch); +extern void arch_tlbbatch_add_pending(struct arch_tlbflush_unmap_batch *batch, + struct mm_struct *mm, + unsigned long uaddr); static inline bool pte_flags_need_flush(unsigned long oldflags, unsigned long newflags, diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 01a5edb51ebe..9ca22c504f82 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -485,6 +485,37 @@ static void finish_asid_transition(struct flush_tlb_info *info) WRITE_ONCE(mm->context.asid_transition, false); } +static inline void tlbsync(void) +{ + if (!this_cpu_read(cpu_tlbstate.need_tlbsync)) + return; + __tlbsync(); + this_cpu_write(cpu_tlbstate.need_tlbsync, false); +} + +static inline void invlpgb_flush_user_nr_nosync(unsigned long pcid, + unsigned long addr, + u16 nr, bool pmd_stride) +{ + __invlpgb_flush_user_nr_nosync(pcid, addr, nr, pmd_stride); + if (!this_cpu_read(cpu_tlbstate.need_tlbsync)) + this_cpu_write(cpu_tlbstate.need_tlbsync, true); +} + +static inline void invlpgb_flush_single_pcid_nosync(unsigned long pcid) +{ + __invlpgb_flush_single_pcid_nosync(pcid); + if (!this_cpu_read(cpu_tlbstate.need_tlbsync)) + this_cpu_write(cpu_tlbstate.need_tlbsync, true); +} + +static inline void invlpgb_flush_addr_nosync(unsigned long addr, u16 nr) +{ + __invlpgb_flush_addr_nosync(addr, nr); + if (!this_cpu_read(cpu_tlbstate.need_tlbsync)) + this_cpu_write(cpu_tlbstate.need_tlbsync, true); +} + static void broadcast_tlb_flush(struct flush_tlb_info *info) { bool pmd = info->stride_shift == PMD_SHIFT; @@ -783,6 +814,8 @@ void switch_mm_irqs_off(struct mm_struct *unused, struct mm_struct *next, if (IS_ENABLED(CONFIG_PROVE_LOCKING)) WARN_ON_ONCE(!irqs_disabled()); + tlbsync(); + /* * Verify that CR3 is what we think it is. This will catch * hypothetical buggy code that directly switches to swapper_pg_dir @@ -959,6 +992,8 @@ void switch_mm_irqs_off(struct mm_struct *unused, struct mm_struct *next, */ void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) { + tlbsync(); + if (this_cpu_read(cpu_tlbstate.loaded_mm) == &init_mm) return; @@ -1632,9 +1667,7 @@ void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch) * a local TLB flush is needed. Optimize this use-case by calling * flush_tlb_func_local() directly in this case. */ - if (cpu_feature_enabled(X86_FEATURE_INVLPGB)) { - invlpgb_flush_all_nonglobals(); - } else if (cpumask_any_but(&batch->cpumask, cpu) < nr_cpu_ids) { + if (cpumask_any_but(&batch->cpumask, cpu) < nr_cpu_ids) { flush_tlb_multi(&batch->cpumask, info); } else if (cpumask_test_cpu(cpu, &batch->cpumask)) { lockdep_assert_irqs_enabled(); @@ -1643,12 +1676,52 @@ void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch) local_irq_enable(); } + /* + * If we issued (asynchronous) INVLPGB flushes, wait for them here. + * The cpumask above contains only CPUs that were running tasks + * not using broadcast TLB flushing. + */ + tlbsync(); + cpumask_clear(&batch->cpumask); put_flush_tlb_info(); put_cpu(); } +void arch_tlbbatch_add_pending(struct arch_tlbflush_unmap_batch *batch, + struct mm_struct *mm, + unsigned long uaddr) +{ + u16 asid = mm_global_asid(mm); + + if (asid) { + invlpgb_flush_user_nr_nosync(kern_pcid(asid), uaddr, 1, false); + /* Do any CPUs supporting INVLPGB need PTI? */ + if (static_cpu_has(X86_FEATURE_PTI)) + invlpgb_flush_user_nr_nosync(user_pcid(asid), uaddr, 1, false); + + /* + * Some CPUs might still be using a local ASID for this + * process, and require IPIs, while others are using the + * global ASID. + * + * In this corner case we need to do both the broadcast + * TLB invalidation, and send IPIs. The IPIs will help + * stragglers transition to the broadcast ASID. + */ + if (in_asid_transition(mm)) + asid = 0; + } + + if (!asid) { + inc_mm_tlb_gen(mm); + cpumask_or(&batch->cpumask, &batch->cpumask, mm_cpumask(mm)); + } + + mmu_notifier_arch_invalidate_secondary_tlbs(mm, 0, -1UL); +} + /* * Blindly accessing user memory from NMI context can be dangerous * if we're in the middle of switching the current user task or From patchwork Sun Feb 23 19:49:02 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: 13987227 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 7B87BC021B2 for ; Sun, 23 Feb 2025 19:51:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E14D46B0083; Sun, 23 Feb 2025 14:51:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C47C6B007B; 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 3E2896B0095; Sun, 23 Feb 2025 14:51:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id E64376B007B for ; Sun, 23 Feb 2025 14:51:15 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A2D238027E for ; Sun, 23 Feb 2025 19:51:15 +0000 (UTC) X-FDA: 83152253310.02.4A8EAEA Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf18.hostedemail.com (Postfix) with ESMTP id 115081C0015 for ; Sun, 23 Feb 2025 19:51:13 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com; dmarc=none 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=oh1XTOganrHAXrn6/YqDJlPae8gxQKo7DQ7P4yE2UVs=; b=R7bqJ+JaZFzpP7oJBYUG0Fgk9UI+djJOKSodx8TZsdW2cfXMbQATo7wo/zw/cL675s48M1 nUJoOi4ZbCeW1HYbGvsVSbIvcLXqZ0lXu7XkQUb7PSy5JCq5ikMGNYnxqWXBCZE/Mdfg1t dtXPuhm3sHLU/UpWLuMmj35Cp5FlOK0= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740340274; a=rsa-sha256; cv=none; b=XU3bu/1nYg16nObU0iSgUgOwGis7xCmB9l9OoFMIiI+UQzuSl1Q2AS9xFc6qezfNBeXSes NXpUcXqYyE+9WH40/fMt2T9KFW9qzEk0397XwipozaI5yFrc1mxr458idE8vfzJ18EWvM7 a+FfN/ZC+3IiSIjGQgdNkOiO+VLwAEc= 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 1tmHyz-000000001hX-0Lxz; Sun, 23 Feb 2025 14:49:45 -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 Subject: [PATCH v13 12/14] x86/mm: enable AMD translation cache extensions Date: Sun, 23 Feb 2025 14:49:02 -0500 Message-ID: <20250223194943.3518952-13-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-Rspamd-Queue-Id: 115081C0015 X-Stat-Signature: icmnsbgabbry1nxouhn1qpndqi4f16hs X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1740340273-190674 X-HE-Meta: U2FsdGVkX19oThujpZnpSE9urIK89xiPn2740EiMMknXbTMhqu74syMU7j86Xo8dxXkFGIL7mBuSObse6Tn17zNvUE1g43T573Y4teE/K7R6GyXJBGKewpVzm7j12/vizh9VrIGsEJ+bp6ThxNfykwX9WNBudfg1z/S6InLHgnIP+mfITI1Q0anUUdJsWm4/yrlQcayq6qo3EFNyAEEecasciH3PVVLkmeNW5hUa8pEST65eDg05YZ7X9iFFM3Or0VXkj3d2wEML9nFyEfH+1cx0P06v0jhi6gFOxDElrOPxnCdjvKMlvTxpIbWirzOuKptuML1G8/yZa41q0j+GUOFs4PJnOTLSNAOgY6cpY4MlW33thpL+6CUulnCdb360el8l3CxOZJhjoiPbhsaic9JGZmWp0BiB2IX19PNlMaRA9s+f2dDXYZ/J0ZGYZHKUaCIe07KCnT5/ZuN9CL8xeI9S1B2dYX47rKro49aE1P9N7BDpBPKFLjMjKoL2hwYs2R+craSKObcNsRnUtgSuBN5hOQcmsF4MDHbEAzzzduZz0i1nemDuIrfTmbxhLvXR/ZQ0nHWE74iBIXKz3B9APmcRIQQhrgMe2bruW8VRsDrohQXCW7sQdrL/tzeHg/SxTTyYR4AfLLB8Pd3gp3xhQfmLchBiSi0jyi63JJJh9ljedLm1H6JjlTuAgqmH1c1VndPunOzLQX7fU+jeV++OhymllcodTov3jiqHkB5GkKJ2jawamd6S5Y2XhCrONl3AP8NeJi9Gexp3Fz5YV7uj3/mRNlybAfuraxuKYJ/6HAKrCeuCnf5Mnm5kNPsM5sCNyFe0Sl7gGYlaCic9n2FWxPjiXFWASYv9LsRlPpH+Hziz9TUeAwvjEQrCZhShAn892rur7CNhALEMxCN5s3KsLvspxtWZ7nPvOG7z+yGxsG5dfJ7HbDGsN8s7VMY1WsPb11GvvuDSMGdfmTKlZcQ mo1R79I5 ngBFjG3EN9Fqx7FN3DK+1WxhA5pIcdOSi/2x16L83G2oXH3hSK7cYw9t0rBiz2qdWJhTfpYWXG1lEXACqVExt2YYqcx2CN6DJLI4oi2X14+ajMaPByZcYSNNSOP7m2dcEvazsFbC43jHJAkMfDjbSGYhCy4Y/XX9qjvsyEfpZChAIURHb/mwfReWNTBoNCAV2McIWOpNvD183s8nbESDUlUycgjfBeBTGjGuSAI3y76OCHHuVNGYb5ebi214O2QHv3ZHTE02nVNaZjw1lOPHzIuFTfD5gPXaB2rV1hgHxtKpJtoieG0+RgFK6NOpR4c5e6WrmxUi4A8XRLSnjhB91q1qpxnTMv4twlPX3N5HF5n48yPqeYtmH2UglvC7LV5aC1yzQ/mEUMB2xillqywVFCS+y43/T7mfQ537M9ldY6JgfbQWAFVTdjYXxxiqNXiR7SoyFOtAX8CjlKsI= 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: With AMD TCE (translation cache extensions) only the intermediate mappings that cover the address range zapped by INVLPG / INVLPGB get invalidated, rather than all intermediate mappings getting zapped at every TLB invalidation. This can help reduce the TLB miss rate, by keeping more intermediate mappings in the cache. From the AMD manual: Translation Cache Extension (TCE) Bit. Bit 15, read/write. Setting this bit to 1 changes how the INVLPG, INVLPGB, and INVPCID instructions operate on TLB entries. When this bit is 0, these instructions remove the target PTE from the TLB as well as all upper-level table entries that are cached in the TLB, whether or not they are associated with the target PTE. When this bit is set, these instructions will remove the target PTE and only those upper-level entries that lead to the target PTE in the page table hierarchy, leaving unrelated upper-level entries intact. Signed-off-by: Rik van Riel Tested-by: Manali Shukla Tested-by: Brendan Jackman Tested-by: Michael Kelley --- arch/x86/include/asm/msr-index.h | 2 ++ arch/x86/kernel/cpu/amd.c | 4 ++++ tools/arch/x86/include/asm/msr-index.h | 2 ++ 3 files changed, 8 insertions(+) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 9a71880eec07..a7ea9720ba3c 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -25,6 +25,7 @@ #define _EFER_SVME 12 /* Enable virtualization */ #define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ #define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ +#define _EFER_TCE 15 /* Enable Translation Cache Extensions */ #define _EFER_AUTOIBRS 21 /* Enable Automatic IBRS */ #define EFER_SCE (1<<_EFER_SCE) @@ -34,6 +35,7 @@ #define EFER_SVME (1<<_EFER_SVME) #define EFER_LMSLE (1<<_EFER_LMSLE) #define EFER_FFXSR (1<<_EFER_FFXSR) +#define EFER_TCE (1<<_EFER_TCE) #define EFER_AUTOIBRS (1<<_EFER_AUTOIBRS) /* diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 3e8180354303..38f454671c88 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -1075,6 +1075,10 @@ static void init_amd(struct cpuinfo_x86 *c) /* AMD CPUs don't need fencing after x2APIC/TSC_DEADLINE MSR writes. */ clear_cpu_cap(c, X86_FEATURE_APIC_MSRS_FENCE); + + /* Enable Translation Cache Extension */ + if (cpu_feature_enabled(X86_FEATURE_TCE)) + msr_set_bit(MSR_EFER, _EFER_TCE); } #ifdef CONFIG_X86_32 diff --git a/tools/arch/x86/include/asm/msr-index.h b/tools/arch/x86/include/asm/msr-index.h index 3ae84c3b8e6d..dc1c1057f26e 100644 --- a/tools/arch/x86/include/asm/msr-index.h +++ b/tools/arch/x86/include/asm/msr-index.h @@ -25,6 +25,7 @@ #define _EFER_SVME 12 /* Enable virtualization */ #define _EFER_LMSLE 13 /* Long Mode Segment Limit Enable */ #define _EFER_FFXSR 14 /* Enable Fast FXSAVE/FXRSTOR */ +#define _EFER_TCE 15 /* Enable Translation Cache Extensions */ #define _EFER_AUTOIBRS 21 /* Enable Automatic IBRS */ #define EFER_SCE (1<<_EFER_SCE) @@ -34,6 +35,7 @@ #define EFER_SVME (1<<_EFER_SVME) #define EFER_LMSLE (1<<_EFER_LMSLE) #define EFER_FFXSR (1<<_EFER_FFXSR) +#define EFER_TCE (1<<_EFER_TCE) #define EFER_AUTOIBRS (1<<_EFER_AUTOIBRS) /* From patchwork Sun Feb 23 19:49: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: 13987230 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 C9A9EC021B6 for ; Sun, 23 Feb 2025 19:51:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 927056B0085; Sun, 23 Feb 2025 14:51:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 61C7B6B0092; Sun, 23 Feb 2025 14:51:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1193C6B0092; Sun, 23 Feb 2025 14:51:16 -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 554176B0093 for ; Sun, 23 Feb 2025 14:51:16 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 093811202A1 for ; Sun, 23 Feb 2025 19:51:16 +0000 (UTC) X-FDA: 83152253352.10.672AF83 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf30.hostedemail.com (Postfix) with ESMTP id 76A768000A for ; Sun, 23 Feb 2025 19:51:14 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com; dmarc=none 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=fp6wnG9ZVIwshrx2d7IT/TxCw+AbmdtrIYTrFxOaFoo=; b=dNwnrC4k0gaMOERb7VRA73+UkUv7p2+7B6ZQMUKZNWcvTrQyJXhyRMfaILbLcfvQIGfaPx xRmMccYpMhucpmTsFfOxOfxuGNbhsruqELgp0SeryDZwZdtE+8R+zidKoU7uPlDWAs6vgZ AOK2ne5e1FwrBxEmxXhTiiYCfJ5WHXc= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of riel@shelob.surriel.com designates 96.67.55.147 as permitted sender) smtp.mailfrom=riel@shelob.surriel.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740340274; a=rsa-sha256; cv=none; b=BCjSMb4yifLqYyETJzA2CeU0ZCtHU+y57tDGLJJvokOj8xbnvt4jv4fwu7d2feMx+7Os5C YyqhYH66C3awLsubfErAcJ3uK5xoVAiq0XODSTKiPTw5e0oeJfE+VFtf0BC8VCjILZTbNE Nvhq6Q/CLliftNbckKHjXYgUNF9QT00= 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 1tmHyz-000000001hX-0TVa; Sun, 23 Feb 2025 14:49:45 -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 Subject: [PATCH v13 13/14] x86/mm: only invalidate final translations with INVLPGB Date: Sun, 23 Feb 2025 14:49:03 -0500 Message-ID: <20250223194943.3518952-14-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-Rspamd-Queue-Id: 76A768000A X-Stat-Signature: zkszf3ndtekofciy7b914ffde1mq5uen X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1740340274-160789 X-HE-Meta: U2FsdGVkX1+QP9pEo9aR+X3t0EGuwfBkfwfAyw/ojRveMEFZWHvXl0iN+7BZG8R7p6nNnCiz4qsKQJAAxNOPTKxwhe0c7RJVziRS6q1MDDplWQSNYcSSchjxqzwJhjnO7GJGPeg9/s0P3inkrnHvFcTJ7UZHAVH41qdxqWH6fvFUBOLfW1qgjitIN9Nnenold+9VOuAi37Q/ijwP0iJy4a4CAHz3lX5Ncnyum3bBzO3irJn9mtUMc+QbsyNKGXg+EbUxnikpH8CTP3WEcvKnfB0/KflA4Yz9V///QejGgwq0nYvAtjW83mOZBObpkFOgHZtAAgOOCiTeoSq3oYwauBaTZL34LE51rU6x9znH3If5DF3lpS7ORNb/PGjmxk4KgflWPJRgUhyCRPSpqyiw2KO0ybRZLgxdVzKi+7fvLopnPSKeBLWmwRR3ANGcW5N2vNrBkU6/mNUhbZfuDYbIxDF2SwAn1gmSx2VrXDqZsfOPljTy3rWBS3+jturZ0D/25TBmvfqSGnhdjachBY4o/RF1qd4qzLjnIGEpJ0tdEmyY+tdJUR0sGuO9b24jIYFl0WiIMAhcUElrZy7Upor56MNtZYHL2/bQBfOMVcNCSMuQ8e2EYFTdX5dghTEkjeMNrI1AoGw+W3BWIAyh0i3eH0amPGRvQtrh9x9U2Ip3myAP0l1zs2beIUR7H4YhkyXiA4yLQVfO40zLNcHAU1bk+oSb6PjXxgmdfmgG7SeAkrpITvjW6crv6sPv1MqKfZ59HPzSVuBjoRkCtv5aqxaqc2/2l7NJvTgJYf3i8w//l7iDWy39UHZx4MEmf2Sb4sKJt/hm4vEAOcu9Z5coesaqF1exdcjzqvPtxtN5xjhyHsSu4WdO/uMXfgDsqf0qBVBYw7pdbcEiiHUtfZR3KlHMcFfqkL8St3r90tbntWYYrktz4tlo86VPJZ4PKjqZtfuB/pPC1uv3FeJD/CcVInA lJQjZITc 0en+go7D+ShJHio6w6NNtZPBBjDRdl0PX7Iqbn5ObKvKi/fBnkpzV2zxNJ+ww9hy0iQ8Vdtb6CIhgMuXaan9k6EM9UHd2l0lkOaVLDSeZPQyJvqke2/V89bsXAVeGpGo38eACnYNRUtzA/WiL51PhD7kxP1eKWthf9rxvisrG3n84mKBAuVnMxxz0n402ApIV9cLqTmpAxH35o04TAKtyuUW65ggOXMoXcffuQ7e/dcRZmIboRRVRMyubkbrVYcpyRAhfyHMDCt5e+xjFHU6yoPGNrq4vURd0yDwOasB3iHJp3IGGsnlStJ9i00OEYzeDarX7bAESATwK1HlBj7n/tQKTsfs+CIyVRT/iS+wyJ183YogYghufDDDrDN50pyTinLDKURkoX9FbEMUZrRzuTkxr7qPgMHpzGwlK+Mlt1K0yv5ipLmJO2TUavsrwzz8RWt+lF7vIn8uazF0= 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: Use the INVLPGB_FINAL_ONLY flag when invalidating mappings with INVPLGB. This way only leaf mappings get removed from the TLB, leaving intermediate translations cached. On the (rare) occasions where we free page tables we do a full flush, ensuring intermediate translations get flushed from the TLB. Signed-off-by: Rik van Riel Tested-by: Manali Shukla Tested-by: Brendan Jackman Tested-by: Michael Kelley --- arch/x86/include/asm/tlb.h | 10 ++++++++-- arch/x86/mm/tlb.c | 13 +++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/arch/x86/include/asm/tlb.h b/arch/x86/include/asm/tlb.h index f69b243683e1..b1a18fe30d9b 100644 --- a/arch/x86/include/asm/tlb.h +++ b/arch/x86/include/asm/tlb.h @@ -86,9 +86,15 @@ static inline void __tlbsync(void) static inline void __invlpgb_flush_user_nr_nosync(unsigned long pcid, unsigned long addr, u16 nr, - bool pmd_stride) + bool pmd_stride, + bool freed_tables) { - __invlpgb(0, pcid, addr, nr, pmd_stride, INVLPGB_PCID | INVLPGB_VA); + u8 flags = INVLPGB_PCID | INVLPGB_VA; + + if (!freed_tables) + flags |= INVLPGB_FINAL_ONLY; + + __invlpgb(0, pcid, addr, nr, pmd_stride, flags); } /* Flush all mappings for a given PCID, not including globals. */ diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 9ca22c504f82..8494d14d2fb7 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -495,9 +495,10 @@ static inline void tlbsync(void) static inline void invlpgb_flush_user_nr_nosync(unsigned long pcid, unsigned long addr, - u16 nr, bool pmd_stride) + u16 nr, bool pmd_stride, + bool freed_tables) { - __invlpgb_flush_user_nr_nosync(pcid, addr, nr, pmd_stride); + __invlpgb_flush_user_nr_nosync(pcid, addr, nr, pmd_stride, freed_tables); if (!this_cpu_read(cpu_tlbstate.need_tlbsync)) this_cpu_write(cpu_tlbstate.need_tlbsync, true); } @@ -540,9 +541,9 @@ static void broadcast_tlb_flush(struct flush_tlb_info *info) nr = clamp_val(nr, 1, invlpgb_count_max); } - invlpgb_flush_user_nr_nosync(kern_pcid(asid), addr, nr, pmd); + invlpgb_flush_user_nr_nosync(kern_pcid(asid), addr, nr, pmd, info->freed_tables); if (static_cpu_has(X86_FEATURE_PTI)) - invlpgb_flush_user_nr_nosync(user_pcid(asid), addr, nr, pmd); + invlpgb_flush_user_nr_nosync(user_pcid(asid), addr, nr, pmd, info->freed_tables); addr += nr << info->stride_shift; } while (addr < info->end); @@ -1696,10 +1697,10 @@ void arch_tlbbatch_add_pending(struct arch_tlbflush_unmap_batch *batch, u16 asid = mm_global_asid(mm); if (asid) { - invlpgb_flush_user_nr_nosync(kern_pcid(asid), uaddr, 1, false); + invlpgb_flush_user_nr_nosync(kern_pcid(asid), uaddr, 1, false, false); /* Do any CPUs supporting INVLPGB need PTI? */ if (static_cpu_has(X86_FEATURE_PTI)) - invlpgb_flush_user_nr_nosync(user_pcid(asid), uaddr, 1, false); + invlpgb_flush_user_nr_nosync(user_pcid(asid), uaddr, 1, false, false); /* * Some CPUs might still be using a local ASID for this From patchwork Sun Feb 23 19:49:04 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: 13987224 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 14841C021B6 for ; Sun, 23 Feb 2025 19:51:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 420636B008A; Sun, 23 Feb 2025 14:51:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1E0376B0085; 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 D9D326B0085; Sun, 23 Feb 2025 14:51:15 -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 77D376B007B for ; Sun, 23 Feb 2025 14:51:15 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 172C5C0276 for ; Sun, 23 Feb 2025 19:51:15 +0000 (UTC) X-FDA: 83152253310.20.5CAA4E3 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf26.hostedemail.com (Postfix) with ESMTP id 89E3414000A for ; Sun, 23 Feb 2025 19:51:13 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf26.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=1740340273; 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=5Ozh2K5ZnxPN1bHVR0puhyzpgukNsFrGbCRsXE51vcg=; b=Au7jlo7BfkcWs8A2N+pTaaRiddu8o6vX8GZM97hANXjcu6/fOqiliYxX4TkWQ9m6cxCmNl DdPe7/slQ0LEy9tlvKorLkn0txQeK/9qPPjhFLChOF9UEDPjC5rtLaET9LppTTWo+Bu8Yc MHcpAJIwkwNo2Un89EPPasotOoVDTz0= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf26.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=1740340273; a=rsa-sha256; cv=none; b=B0VhsPGveN2LqD2ajOKIvuUJhQukQCPiWs2k6WmWw6D26NzrOuFeY/6p/HsQeFDHqqv6V+ OdM5vK3vgTDbr87IQpDpwg0gPpuZ5jMe1QObrN5dbeAVjliXoCWPz9xnb5zW7qXNWgn6ht CxTB13MftAE+Lqq3cEgKRG2Yc3SF8d0= 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 1tmHyz-000000001hX-0Zts; Sun, 23 Feb 2025 14:49:45 -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 Subject: [PATCH v13 14/14] x86/mm: add noinvlpgb commandline option Date: Sun, 23 Feb 2025 14:49:04 -0500 Message-ID: <20250223194943.3518952-15-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-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 89E3414000A X-Stat-Signature: grdbzmifg5moki97uxdbhdix3bb5sa8w X-HE-Tag: 1740340273-33068 X-HE-Meta: U2FsdGVkX18uVIfq0tBerVqRqB+mq97UroJ+i/84im7vwRNybjYHE3gR52GstmcNnd3YBxIESwFm3E4a+H/X/LDC4cc9QetomEcfOkKpYX97ucrZkMjYG4K0TF3CWK3Zv8gDuFrW1kOpLrFdKMIFdtvf1ABf0DaboubkkBmdrPbcQDiSeYkeoRQrwpUoATmQJJCwQ5BvVO+/DWAlIfNDA4/XrHHD28hof8dHmlbWCZVp/iYRyYYAwmsqlvnLJA5MzwU0EkTvlDknur1Vww0QOAs7q3vIZjd/CfRvgdgslzApZH4oK8r7HaiAfOr09RMUikAdJYwFikXJMYGrGcekHZJFI01NNlPhq21lqEGJZBncYrWkhL95wGm+gj7N5cxK5ftmpZf2slH+3UCLBhXHFnkschZi1Qg6d5RrgOYtmTyIAF2aUxhI/crVrP8sfmUY/o2sjXwQwM5qnRTfTDcDl8BYHigarPOHIcQI4063zjnxVUL5t/RybBSL1VZd4HeGqem1/9Z/bxzDRTD5CFCHjz7fgObPhvGjVgTOy3Vc9vy1e72kt97P+BlruGyPdI/SoKrIEy7zDaV5HWdZL2P8VBVesq5sgiD/fTlvvU2Zel2hi0K/ZfJVkWFYSnlsYyjBTAQDdMHomvtJ4FOKVrp6UzAyHCScGUz/utm2tV950UkYjDTJS+ZAhszFIne6XzQfeuYVCq6MXSvVjMPw9JGbPHuijwWQZYdYGIP9ou2j6JFVFanClIr32+dr6z/xw+it5JPSF3C6GFPaJ4EaQmEhxL+PfxDiREp7FTi+06FIq8RqnsT9rij+i70ugBOCBfTjdO/oLeOYGJ0daA8njR7xYmoFxtPKAax2aGSu74f79fv3zsRcW2ja2mIrAnOTGJZDOpohxfG7R0P3k2jLHfA2iux/H1u90h2zfjwyJlB/+w2e3uSN+8jq6Bi64/F5cJvaX8gdM7WXw/u53dctKJh my5KhjB3 ICkYarfMrP2fzhr2AENT4lvHORqQnf12tSpgBXVp5ROVAG96jRPp89wSFuOB1VcU/XNnCe4otHEfzbatYMJnO7Hb2ReKIszd9YlHicSZx4yRqEyEzjVSGlcgkC4FHov+c5iSAzKNx8F74D3VHeFyJRIZBRy7PSTu8/5STwuGc4v8o3M/nm5FYR/9+U5HwyuJ6skdZzT0VkmROJBac/hVgeF/s56ZqEBAYW7PJEYD3VnzI4EzudCTAZETbV3XrytjKd54z0NicTE6zl4Verza6KJd9RE/zmRyGImjo22h+W3B/8Btxyr/ik+3u6BLvY+BU4GXIDQh519yPmjTVHGD9G2cZmlIXhUUdajyE4Jzt4U4z2tUJHzJh5lWI3FgKUz/Q0cEXIDuBuxFxQVNxm2Qvc9eeiw== 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: Add a "noinvlpgb" commandline option to disable AMD broadcast TLB flushing at boot time. Also fix up the "nopcid" boot option to automatically disable INVLPGB functionality, which relies on processes to run on globally allocated PCIDs. Signed-off-by: Rik van Riel Suggested-by: Brendan Jackman --- .../admin-guide/kernel-parameters.txt | 3 ++ arch/x86/kernel/cpu/common.c | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index fb8752b42ec8..91260e1949fb 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -4182,6 +4182,8 @@ nomodule Disable module load + noinvlpgb [X86-64,EARLY] Disable the INVLPGB cpu feature. + nonmi_ipi [X86] Disable using NMI IPIs during panic/reboot to shutdown the other cpus. Instead use the REBOOT_VECTOR irq. @@ -4190,6 +4192,7 @@ pagetables) support. nopcid [X86-64,EARLY] Disable the PCID cpu feature. + This also disables INVLPGB, which relies on PCID. nopku [X86] Disable Memory Protection Keys CPU feature found in some Intel CPUs. diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 7cce91b19fb2..b038c9b50b32 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -243,6 +243,33 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { } }; EXPORT_PER_CPU_SYMBOL_GPL(gdt_page); +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH +static void disable_invlpgb(void) +{ + /* do not emit a message if the feature is not present */ + if (!boot_cpu_has(X86_FEATURE_INVLPGB)) + return; + + setup_clear_cpu_cap(X86_FEATURE_INVLPGB); + pr_info("INVLPGB feature disabled\n"); +} + +static int __init x86_noinvlpgb_setup(char *s) +{ + /* noinvlpgb doesn't accept parameters */ + if (s) + return -EINVAL; + + disable_invlpgb(); + return 0; +} +early_param("noinvlpgb", x86_noinvlpgb_setup); +#else +static void disable_invlpgb(void) +{ +} +#endif + #ifdef CONFIG_X86_64 static int __init x86_nopcid_setup(char *s) { @@ -256,6 +283,7 @@ static int __init x86_nopcid_setup(char *s) setup_clear_cpu_cap(X86_FEATURE_PCID); pr_info("nopcid: PCID feature disabled\n"); + disable_invlpgb(); return 0; } early_param("nopcid", x86_nopcid_setup);