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