From patchwork Thu Feb 13 16:14: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: 13973614 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 DB954C021A0 for ; Thu, 13 Feb 2025 16:20:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 754C16B0089; Thu, 13 Feb 2025 11:20:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 705696B0092; Thu, 13 Feb 2025 11:20:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5CCF16B0093; Thu, 13 Feb 2025 11:20:35 -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 2A0356B0089 for ; Thu, 13 Feb 2025 11:20:35 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id AEF7A1C7E80 for ; Thu, 13 Feb 2025 16:20:34 +0000 (UTC) X-FDA: 83115434388.13.4D97AFE Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf30.hostedemail.com (Postfix) with ESMTP id 18EC480007 for ; Thu, 13 Feb 2025 16:20:32 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; dmarc=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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739463633; 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=2HvdZeAQcG3pHQbz4rlJXzf4Fkki4VYuMd6aUXqWTvA=; b=Q+sfFAgFeZAzuJWHVxfZD65SdCCufaqr8naqNJay1xEXMJfkr1prOLbS5D9tTPlm3ZQWBS iQ4gwk5eGcg6OMgW0zx8lRB2BflPJ24FGtoVwpT5jLt2xqveJ8EjBvyCCIFAS/ebTnbPKk dKhZ4cieJd+YT17w6X0mTp/DgpacDew= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; dmarc=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 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739463633; a=rsa-sha256; cv=none; b=Ruyd/mC9RzYze20LUsZv2h29P/HA1Ph2o1i6H5ZaV5PA1KqRHBRjEaoap2CZrEFXaTije8 UDwL+i+lfwIopqtm59xgFkhH3rwjOs+GXNMt5WMPmtjfypYKBtJzXZS0XxcC+DNjHnFov5 4A5n2DKeiRPbByBiCudKaNkklzOqAKU= Received: from fangorn.home.surriel.com ([10.0.13.7]) by shelob.surriel.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1tibr7-000000003xx-1N2E; Thu, 13 Feb 2025 11:14:25 -0500 From: Rik van Riel To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, bp@alien8.de, peterz@infradead.org, dave.hansen@linux.intel.com, zhengqi.arch@bytedance.com, nadav.amit@gmail.com, thomas.lendacky@amd.com, kernel-team@meta.com, linux-mm@kvack.org, akpm@linux-foundation.org, jackmanb@google.com, jannh@google.com, mhklinux@outlook.com, andrew.cooper3@citrix.com, Rik van Riel , Manali Shukla Subject: [PATCH v11 12/12] x86/mm: only invalidate final translations with INVLPGB Date: Thu, 13 Feb 2025 11:14:03 -0500 Message-ID: <20250213161423.449435-13-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250213161423.449435-1-riel@surriel.com> References: <20250213161423.449435-1-riel@surriel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 18EC480007 X-Stat-Signature: dj4iu1nuy37rc67xakn4yfgcb4spaan3 X-HE-Tag: 1739463632-23124 X-HE-Meta: U2FsdGVkX183fwO1Eo0Z202K3ucW8ATr9qaLlokHOUmHaQqMViDojL8CTQn5ZbtyiMWxxCsLVRlIBJAtl/UuMLsOVMOzzs5emSxshRs8tbm2VJdF5nYvu2INHBEyBE0EcH/EJt8ahB89cfg7gmbjDWokpxlKiKhuvHn2yTNX8YwffZPaDKUEbnDMfMwx5TnEndzBeIG3MRUPJaP/8dDrqZGEp1zaunC9RQqrdM4QeCoVAiD2xv/pfofKk7pbKnV87OZt+tZdl1KKprdlQ4L111vyCn8FcPsazEhmy1ffEIdGQt/bxEE2B1IuX4QoDgy9rhzQBE2gU52e8i7PSCw7RF8mjlXg3fP1+eshjeR6HNLbrRv3m3FtvvAt7wIZ9lQpvoxIgtqPJa94kqzNP1/f2USPrUQZkU6v7b2tp47X0429FunXPJhYduABnvUfeTPpMguqt3iVX24Sd5f3sAcqRJAgpoPSXS+Fm4Fb0xMWxUEq1tFS0psmWV12pWuV4RRQh8tM8GjzFVwKuYi0oK+Avghl+YO6OSHs4Ck8co8uzg+09Vu8LlKDKUTZAoZdEIEqj9havPuj04yc/8fZ1oZay+Er/2AZu7i+rRxvDYUg540l8dtZ1UHuO/3E24FdUd7zbzt3FqbgyOw0buWNGRgPOwY2UXcLw4APkVObfcoDma1K1OCTEoJXumLOXxhe1p7pC4VZefUumzWHRov5T8dOAYsVQyz1V5X+FxSIxKJIlADMQ2gZBp5Bt/Gw6hOCrNa5zy1rgHD2bR6PG/qUa4mKMX/c8W4GvFoBcLqvpA1E4f9JK4mxE0Bz71atFnOu8/GkFhGhm70zQytTfvVWeaaJ+CuCJC6qglVJ4IprYak7+SXzE1ATEwmuViEdqNtJI0R8MImK5fU8YXwmd7L1R/11l9PxUem0Vf3pHlcdC5C9GN9ceBA8oz180WHsR/n34n1+BTRt67IYaHbvxlv3WPV gmoNQTZR t1qz8fyA+hUgXZt8t2o+DIF9x5aZmvyaa5aFZ+UfNWNSzlBsf/REQY2Ahi6hjVB349JtbR/fEglTtMpnNRodeHu9AUDemb4huH5YVVvxB3EDmmTh93uOZt3vfqNCDug+0JjA5L+g70PYZB6nLPluys7cDdV+T5zhQKkgyMnJVIQD8EWThXymOXp222Jj9waJriIPgQUfRwMZnQ8UFHU4LQ2Ukxc3OicORllrwlQq3esXnwtefV677rNa3qse1mstWbcfXHD1B6Ax1BzkabDUvREw71xJtCc2rlt9RCq6qttJrx3KIwuXKEL2FFvLr9ByPZrR/Cr7ELmSZQig9kbyNNyXXnpxBnDjqZXHHgPhgS2Eyl0fn6jalyHfhzxroFD6eA+9pBeT/mVjod5Px9MgPyZWJCm/o/4vcVygnw82WLYH9yX+QdZda3RHUHxPXaEKKkfJvNTCHzJ3hgkpf+6OshpcBq6ZVwt1vXbhgb1ZDwkZ3AtpZX0apfCoDJ3YD4GfGojKaLPPDoSRDTwwbaHZSMVxB8hVUnViPzhaL 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/invlpgb.h | 10 ++++++++-- arch/x86/mm/tlb.c | 13 +++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/arch/x86/include/asm/invlpgb.h b/arch/x86/include/asm/invlpgb.h index 43c331507cc0..220aba708b72 100644 --- a/arch/x86/include/asm/invlpgb.h +++ b/arch/x86/include/asm/invlpgb.h @@ -67,9 +67,15 @@ static inline void invlpgb_flush_user(unsigned long pcid, 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 - 1, pmd_stride, INVLPGB_PCID | INVLPGB_VA); + u8 flags = INVLPGB_PCID | INVLPGB_VA; + + if (!freed_tables) + flags |= INVLPGB_FINAL_ONLY; + + __invlpgb(0, pcid, addr, nr - 1, 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 8880bc7456ed..f09049207b78 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -502,9 +502,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); } @@ -547,9 +548,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); @@ -1697,10 +1698,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