From patchwork Tue Feb 11 21:08:07 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: 13970702 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 103F4C0219B for ; Tue, 11 Feb 2025 21:09:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 54D66280005; Tue, 11 Feb 2025 16:09:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4D828280004; Tue, 11 Feb 2025 16:09:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2054F280006; Tue, 11 Feb 2025 16:09:09 -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 ED852280004 for ; Tue, 11 Feb 2025 16:09:08 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A7D19140ABF for ; Tue, 11 Feb 2025 21:09:08 +0000 (UTC) X-FDA: 83108903976.21.91373CD Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf12.hostedemail.com (Postfix) with ESMTP id 1F70640003 for ; Tue, 11 Feb 2025 21:09:06 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=none; spf=pass (imf12.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=1739308147; 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=3DNTI2DQKwqgHBk5qLmMNVCGYTRMRarISEI9fPhmoWI=; b=pdYybMvgg3y+TNbYT/UHpPnPmTX1knlNSXXtsTjK5qpR6Ek+HYlvkzVIIwCqOl1K58SomT EF9ibTTR2kWM7KIpsGom4l6ywmHcMI5bsHy3+fmsYLBntB0REnTakicgLGMgprx8JDIZk7 UhZQ0XwA5Eg5L0YTQYv4opRTMBBFPYw= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=none; spf=pass (imf12.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=1739308147; a=rsa-sha256; cv=none; b=Ik/UKSEl9dd28pNf9r7sy5Ax+5egqxcBs+5xvL7mEijZf0iF1h4FWmownltOBWYvDlIe5R LKEGs00S+fXillFMwYEm8yYoR6kX1jC1KZaJgmGKUQPMaOXvSTjiY4FvORcO+xSN2d09zX yPZXgNTOaibLhuZXa9GPWNRPFqckP0Q= 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 1thxUX-000000008HU-3Y2i; Tue, 11 Feb 2025 16:08: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 v10 12/12] x86/mm: only invalidate final translations with INVLPGB Date: Tue, 11 Feb 2025 16:08:07 -0500 Message-ID: <20250211210823.242681-13-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250211210823.242681-1-riel@surriel.com> References: <20250211210823.242681-1-riel@surriel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 1F70640003 X-Stat-Signature: yhbig3nset9k53zjy6843k3osa4b85w5 X-HE-Tag: 1739308146-438987 X-HE-Meta: U2FsdGVkX187MAozRRkWuzpQM4PfY+SkGc3agO075Mqj9Kp97WpdGWaYLirUk25KcSQp79zO5hl6GR44CJXVSdSgrOK/Gn3Db7df6Qbs6zz2xWW1DB+CAbAlazrIHTzzHY4yFJ3igeW053Al/HjortEvREK7Rv0xW2t2SP+V0B6a7vrVEH6w57BU6ADPSEuYug56Ho1bDjE8PSlD4FVnW9tq4QZk9ELb/3sbQdeWfpxTyRd0YFlkrXgVG/Tqxvv3KpgXSc6UfIV38JusfFVPV7RRG1opfxPhCr0WSJRRWcbpQFWUqjfD0gjBfislksESCZRra95F1m1BY3jGTSJQl0S3oT85ibu2h007S6GJiMtsYV38GJgbifOTYw6NMPUy4FqkbcZLoLz/75WfGPAIk7dMg5l/NhW+XRJCCNbVqH9GSwctT8jcsIOtEM5WvHBXN8rMuATKCzsAfirSfxIaXHjPxcw+WCpt/L6ecMWH+VnjwgkOVmhc7fOo3LwQa/DVR35u9SoEHa/7mBWIYVf+gAk5cxlEeGmlsX88C/8KqvmTaI4Mhcin9P7Rk6XsSI0lztvnTcG0kyBggMU68aA0BcKwho7rk2Hvg8NAg+SzvtxK8MuYOPeM32E9mAM4yU2Pz9zYMbjVfiD7ojhUqRqcAhKnNUPRb5LGrffXftQ1JDq4aCtSsCkSgPgNpXVTfKA9lbGNTOuYmcy1JVG1khU8tr+P7yqulbM2KAmzolTJ7B2CmMXKbdYrh72V7zHwBcXyMaT0Y9w2ODVtHKQTnWrKG9FiAz5HpQma/n3fBcEYJjK/vMiN76yuH+aMnyuRrcYjIzxiLylD0A8/4jtaZxqSIh/Cr+Z8MiV25VkXeGbVQrhTByUJHu4dZS/XU+XlvngI+K8OZkDdsmR3o/yi0Gf7VlPwrBUiObD/Ydo8Nt3h1o5Lfbi4BJwjanN2wJvvj95wFfXZU8r9DoB9/Oowm07 B95YZh1O Jrx5O2igullgomzX5ZDQJhfTeNU9Wuvv7S7MZROhDLTOMdtevWtMG6rR0MdMm6+wpRxDXyjxjGx+/cSnOFDN4nyKa2fvvh3AQ/ibjadUMxRmE3IAes8OcQpBN379EF+2vY/SSoLvddj+GXmTXc4rJSnqO0iALJfK17aT3Uik6+xfYDJcXyLktW7BFfcAI+lQYY/OvOE21t66KxRwggbfv/0KoVaYrUyNrY2J7FF7JknHOs0X0qP9wLA22Ls1X0NPB6o6OUlPmyouZHjPMdY29B5sq+qArBl1MDjxevVk5LK+mHab+hwnNIZkVx41MCNv9MvgUG71OUBEHsiwjBAIInCi7UIdc+MxgwNtL4mKhTxh9FMHsRRQmXmsNHtdlVrEg2uSyizl7KI5iE4sp95kkRYCbnPvxF+123ySGb5YTqgL8mTvvvGkcmBQnwImLDCwFwRvvTEhK5i2ua0YNqBgYj2q0IkZk8xBkXxiq9isTTmfa/GpUp7GvmOjtYm+hrBXL6LlMZbrbXMv1rpY= 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 --- 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 41ac2d121d76..bef0811dfa27 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); } @@ -553,10 +554,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); @@ -1704,10 +1705,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