From mboxrd@z Thu Jan 1 00:00:00 1970 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 F318BC0219B for ; Thu, 6 Feb 2025 04:45:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7209D6B0088; Wed, 5 Feb 2025 23:45:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 679116B0083; Wed, 5 Feb 2025 23:45:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 42F566B008C; Wed, 5 Feb 2025 23:45:12 -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 112A46B0085 for ; Wed, 5 Feb 2025 23:45:12 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A96054B2BA for ; Thu, 6 Feb 2025 04:45:11 +0000 (UTC) X-FDA: 83088280422.08.CEC0862 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf25.hostedemail.com (Postfix) with ESMTP id EC89DA0006 for ; Thu, 6 Feb 2025 04:45:09 +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=1738817110; a=rsa-sha256; cv=none; b=rOqbWW+BiWsicbFN+uqWzFZzxJx3FQIkWMMGlrzcrS1iVRfRNyFy5BwsCiMFQxfhXV8Lx0 984696IYig0I4wa+BZM6+GK+wZI08eS5dCFrkHwpflQL23LG2xmYKjq+Zu0Vn7kRQVr+IT 1BR6dbMo9D5LhC5NQnAHf1fq18JNdAE= 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=1738817110; 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=Q4bAwfsuDmxWS9pEuNJnAJuyAkhvxVxPhIXeu22xxqo=; b=KHktb5SBWE19I8p1rNj+8c2gRnF88OgvdPytMrQvElVot/eltnR4OzRpU+9+riopa/2lri 8Vno5X7wrmbb2wFc/H6+ZHmDehdY6Kkw+zj2O4G0eBZQczUUvFEAJQ/EIXfvgvLTyqQIqa F35ur458RsgfwoGa/EA6EvmWRvCgm/A= 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 1tftjw-000000004tQ-2vlx; Wed, 05 Feb 2025 23:43:48 -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, jannh@google.com, mhklinux@outlook.com, andrew.cooper3@citrix.com, Rik van Riel , Manali Shukla Subject: [PATCH v9 12/12] x86/mm: only invalidate final translations with INVLPGB Date: Wed, 5 Feb 2025 23:43:31 -0500 Message-ID: <20250206044346.3810242-13-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250206044346.3810242-1-riel@surriel.com> References: <20250206044346.3810242-1-riel@surriel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: EC89DA0006 X-Stat-Signature: 763cdm5c1oui6ux5w6kpkhhe7hfx6zuh X-HE-Tag: 1738817109-400251 X-HE-Meta: U2FsdGVkX1/j8WYS2fJBxm4ksACMB1peFFPu5ITE4ICwr/hPaiKFk8E5zK1O/ROv7JF2disAELPvwNqZO7Nzqw8rZj4RR1fgtrThFzB3S95VRMf9sSCHnOlNGxvvTUq1nWtefexie5rgAl3MZkEC40Nk+ZSXRdQJHEbkTF5QjBfxgN3YbTmGm6v/o/2uihkU0n6ATYJkeYcWu40R1QY92Hth6VWucKx1SCkrG/wWoyL+2liAZmuUTTY8hhgkl5bVVTQVYvBSFXDn18cyqvGBvJL8R8sszvW4b8MsBIbuDU5YoLZJ3DU9K+zMW+Wx0LKyWCIt+FX/rDs9m6oL8760kFFgCYzF/VXxgsUuKaDNX0gU46YR3sT6fl2BwOIVIEbY7EXLDbtT/0YlIe8La7q8Z5hubhi7IXDCiwOxTJfN65NTLPJS+fEiQaMqQGRBEcinE1nQTPWBH1hPa/REASox0Rwa1gacCsNri4DCbMpZKu/DS+5jnp8wH7vz2oBqWVnEntEiu6km0E1R7YoRy4XW8OV4d3OwM3Paukv+NbW4FEEiGApRFiRW7KZqK1wrE97Sn0JG1kZ66pwhMqB4Q5lcrGJB+XSB6HkwUxR0lIDSLs3w3al3ZYhaAWv8sQydczgW+LdViSQOf4z5tp/xX09P4ToFy0TLP6Yc06SeHZupXOqwR56SiC6hJ3aWYLBCodl2rTjT7pjHjnJ2E9vVJlQQlViAFWucIhg1axsB6ss80mxWqPSfvmxssMAITIsYXqzCuy02gPpn/V4C24xAPY6RHLAVGZT0dbQ30D6TC/pWEg/uCW6789bwPSNA8ZXw9ucJvjT1MO5MdERHSTegrxIxTQRyEmLwNVj4dHAEUzwQJpvID6kvZCPrjMPG4FPM+OoUgO1L1+pDPZGlyYGhO5klZI5suMZeDfWpC9aZ0ZrXzbtrkczKL8+gmfE3nP/QDWdg7wpTpR4xoVTEAHtBUWD wpw97wLR LQtTsQO508J1RqAPDvYqQrB+o2P1daFRhUnv0XiPGyYltSTPwJJH3S+KojSNX078NoRHTsaQ5H5efW+4cWr8k534nXYYmUSXPdzgjeDsEWW/ir0Y8TR2sgM39LRajkMbyezKfg1p7DYrm6hkXA6ge6iNdMbyoCTY3zBBfo/SBMRsUsknuomB5DUvCG9wMoxe1NeBFfsbqDk9w2PUuPd6+X4kkym6rQ5pm/KxzfWoNm/WFqcVSon2mus0CEhitTd9JIfAwBDikWsnODBazEMb63AYF5C0XC/Qk49O8wRV+DQZzoQu/yF0zAXRjitFerjpujfzhtrn8atp4UYU6sUuO4xvat59JV2wywhotAtiWrN051BH4gcuyjdP2MkxbF3G7XyWoAFoOR942naYdAUm4R8ZO8K94r+S0lg+x41JbhC27/3HgH37CU0ft3Ia7WaNAQ5jnIHuql8NLQXjG1hx3/ZQORTqjiwImLvH4bse0cj2aU6FN3ktobYeOog== 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 --- 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 357e3cc417e4..9df559974f78 100644 --- a/arch/x86/include/asm/invlpgb.h +++ b/arch/x86/include/asm/invlpgb.h @@ -66,9 +66,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 4253c3efd7e4..b9aa5ab1b1af 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -498,9 +498,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); } @@ -549,10 +550,10 @@ static void broadcast_tlb_flush(struct flush_tlb_info *info) nr = min(maxnr, (info->end - addr) >> info->stride_shift); nr = max(nr, 1); - 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); /* Do any CPUs supporting INVLPGB need PTI? */ 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); @@ -1715,10 +1716,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 -- 2.47.1