From patchwork Wed Feb 5 01:40: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: 13960411 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 AA8B8C02196 for ; Wed, 5 Feb 2025 01:42:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 64EB528002E; Tue, 4 Feb 2025 20:42:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5FD5F280029; Tue, 4 Feb 2025 20:42:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D7F2280030; Tue, 4 Feb 2025 20:42:01 -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 00B4A28002E for ; Tue, 4 Feb 2025 20:42:00 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B03EAC049E for ; Wed, 5 Feb 2025 01:42:00 +0000 (UTC) X-FDA: 83084190000.30.9D4BD38 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf03.hostedemail.com (Postfix) with ESMTP id 1D0AE20004 for ; Wed, 5 Feb 2025 01:41:58 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=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; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738719719; 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=wRSak9HASRXfARy40PYBB0OHspKG9XBr6pShL4AyQA0=; b=7um5wZLcbrSNvh3wM88M6XKSOtY5dt8f/7ay29WuJUxf5o6v49T91tL6h5YYXMKBQl+GpE xS31CQMn0D5D1F6pRbANoAv36TvOGuYhBFIILdbYxSVA7ef8pZz2QUhyTT7wZ6716soLz5 OtSHe9zn9Nmy+KR6cofASRSWo4spFtc= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=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; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738719719; a=rsa-sha256; cv=none; b=ffA10TLa2OHZaza1jr+7MfmFj0FRht0QV1gM0O0hlL4GxBqAvVXIIgdEVB41tJsivLiPW4 QlBBFZZF2o8A4sZgOfLmNSGF+DYITy4B8qEHIUdwqzXN98XOzSKcYcuHUyPoo8A+qlhioY 4UgZXTMugvoQcjMpwI1JJA7ZCjKrsE0= 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 1tfUP4-000000004Cs-3UtC; Tue, 04 Feb 2025 20:40:34 -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 v8 12/12] x86/mm: only invalidate final translations with INVLPGB Date: Tue, 4 Feb 2025 20:40:01 -0500 Message-ID: <20250205014033.3626204-13-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250205014033.3626204-1-riel@surriel.com> References: <20250205014033.3626204-1-riel@surriel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 1D0AE20004 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: rftx3b5bzuc9ufs391mbhxdc3r6q6mud X-HE-Tag: 1738719718-504096 X-HE-Meta: U2FsdGVkX1+qluUWPjx7l9t0tLx+b2HADZaDoidubaFt+hkRvR1vNNhpZ4rsbz70RcdoZC+8l5tAFNy+wEA21FEE9Qoi+AeB7nFym1TGwbG4rBIZwXGvjsWkGdJQeJlqCPL1rtVB1xEYlk60Sd7XUYcqoMgawkcLXs0kCkydAGSYULh4DIkVIIDFczDbMsXS0PwHA0t2GxF2vIClNziqSh1/yI9WDaE6jM3mWY9ZKxeZ4l7rv+EGFyOZUnrk0Ed5KeEWoYJxVzBN8qu+TBo4ST2FKFGkVv/WcgQJdApNy/LqXg0JUBidg9WSuTZyJA2y25V/Bp4y76z9wSjC2HDXxzNMR2ZOAU/TNOQxC8h/gpjKHlXRa88DHdpH1Kqta4T99Nkos0T/usWWyOPLTuZbvzshDxMCbjonUYQ7iOgNLd/JHpTcDuL+hGSaK05qlG7gdnEyrCN+HhsXNjcHRroyCoezgqsfuUAN1l/A7kXAIcpR3I6r/Kjki5uIgDaijFFcVF3u6MCY0ZsIVudnwO0oW+Y0kkBjCi8d5pNb1SOg8h5FAhAr6By4YbmvHRC8V3z8VlHTcJTOJ4ZT3IrhXJAfDAIkRUerotZ562YEtT9MDcvmqdqJFimiwoK2rqJmCr/euBdlNZskgasTu2qbx9XXOvE4KL9nl14oRiyQLdc/bUTGOQdoLt9CDmz4LFO3huVLmDzQ0eWWzH3T++zRSMEZvIb1zQtwm21cRL8V1/gPeMUVXOgVOonPCylyhEo2VVdugeP9IIDghuT67lXmBcoUAFQ2Cni9/mNfnOyxWNLnnhb2czR5O5ftjAxCaxLlLkdLI08Ijgq2mYzSq2o44zAQcc04NIrZEj7a67St//zio7O1cAGWfuslva8WNCQIJrIDNnkrxVBeT6kvBPk6urpOZOfu43WsJ+SbMCkNm08B9y8TAJ5UUuO4OEzlezMlX3sThm+Tp1YM3wFTl4Ghhap Vvsywsut lAnN9k1580mJo5GED8hK9yoiDcelG4wvEy4QKGCUeGj2ZEdikrsPavsuXr+5wpKZb4L1asGN2v0uFEYL57LVMFWxKLtZrVkqmml1O4+4u6f7c0MQMQ1UdoqcpNpyOSRpPyfu4fvSbPPDyXG3jpH0JVodCJ2ITAMJ/DoE5XHoZYJ5Wi7sRibiArvOAtLWU2B5t4kRT65LPWPkbE+GLr1V9ykZpVYFB9xbljgBvWsux4GFCrWzfqIP+IyniMF4BOAxwhGLPe6Kkm+lsUEs+/aP9z2+X2XVg4LFzIIcOvkQFVt7Qibegj1rilCaHIGKeNVB2UdSrTVqyl6zOouu4sXz6yghY4QddNHr4ZNgu+asf7ilLetMnkVwvz03W1sv4nX9ErWNasE+t88yMRn4ZCYwSanoBZmJiZLdpi4QBy17uvFnyi7qY6mUj/xl4zlTc2StdutzURxRJeaExUqNQ9hsPoxbmGuG2FBq+1CCJcyV5/AkMNnErnJYN7IRtfw== 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 | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/invlpgb.h b/arch/x86/include/asm/invlpgb.h index a1d5dedd5217..5fba41671a6d 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); + unsigned long 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 c064e27df1f3..7b116898c547 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -518,10 +518,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); @@ -1688,10 +1688,10 @@ void arch_tlbbatch_add_pending(struct arch_tlbflush_unmap_batch *batch, batch->used_invlpgb = true; migrate_disable(); } - 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