From patchwork Wed Feb 26 03:00:48 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: 13991461 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 D38DBC18E7C for ; Wed, 26 Feb 2025 03:03:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 40CD828000F; Tue, 25 Feb 2025 22:02:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B616280014; Tue, 25 Feb 2025 22:02:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E1FE28000F; Tue, 25 Feb 2025 22:02:45 -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 DBA7B280014 for ; Tue, 25 Feb 2025 22:02:44 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 9F1F51A0840 for ; Wed, 26 Feb 2025 03:02:44 +0000 (UTC) X-FDA: 83160598248.06.12E1E6A Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf08.hostedemail.com (Postfix) with ESMTP id 20BCB16000A for ; Wed, 26 Feb 2025 03:02:42 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=none; spf=pass (imf08.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=1740538963; 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=8y9pAyo+xfIAz74sbhhKq0EqwZZPSxZox6JAjvfy64M=; b=ijwicfwanAlZjaR8jcnlSgIhkDICm5aOvbj4vPIBX6jmkRWFmEru4hPfYDaqJQN+5ulfpX hBgLwNHWLhxV59gBFI0WFePWUCaVmnpa+jtfmlh+Mgz/ptHf7HfZJv9eRdVV9xx+RqGHsI HdvHaQUHOGs6lp76eWlFBifCwrsfsX8= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; spf=pass (imf08.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=1740538963; a=rsa-sha256; cv=none; b=HDeQM4FCyZd5UKNDcEEpP6wPg+qRzMFFczXMqR4sz6g2Htx0Igh74/1StWGifTnasvi9Zn 9uXcXGZGf7vCAvSkft3a5dhgz5+2m6t1vCSM6oNTRc0pFaetGwOwV3+y3zDxJhnRNst23X I147eqQe4iZzsnnGt45DM3YFk8K3ncc= 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 1tn7fw-000000001Y5-1Tjt; Tue, 25 Feb 2025 22:01:32 -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 v14 13/13] x86/mm: only invalidate final translations with INVLPGB Date: Tue, 25 Feb 2025 22:00:48 -0500 Message-ID: <20250226030129.530345-14-riel@surriel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250226030129.530345-1-riel@surriel.com> References: <20250226030129.530345-1-riel@surriel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 20BCB16000A X-Stat-Signature: 3n1t83kt7r5cfwomee4or5tsmqu58zpw X-Rspam-User: X-HE-Tag: 1740538962-633597 X-HE-Meta: U2FsdGVkX19UF0Le2VYzQVlKlMEe2S+tZYKVG5doXhY8B5nlN7cyHa9FOTzvRdJh+c1mwbnDY3Fkf7BKP1vEoQFtcXhahWZY0Z9hoSypTp+yieEnPDsUqkLkzEe80me9K1nnpZtxK+SqGutRRd/PcRfayHXQtq4zwrhfCvtOZThTiZbFT/j3JDU7yXylGcvF6RQ2Rd8TPd7qCXo/ijIVLbEiRsuaQkc5qaWDR1OEuRPObSYfStHPfkOQZn/G8qmMj3MPSYsA8UbeD/uUI/dY4L0mc9azVBTjQ8UmQ3VjzLWtUcC6TEAQrJ0abFVBd5ycu64iIP9bTfE3lr/Gqc/P+Go5DbK8YSs1USSZy/fZ947dsBd70W1Q2x+N3LdygzAS8ueNraqZXf5NiEaiQpl8T/VpRfSYbpvfvVgcbowhPMI0+r+ggi7jj9aWKuJ4ECfsVGQfNtKLy9d76DREJMOjwuUeNYa2xN5yuC7PkMNH4McRY3LQ9LQgKTWWr/V6Gh0QgFyh9f/U7oIBmPMeE68mQU15sxLJgDdhf8XrLSCGKtrU96l4hVxST8EhmCR7zsUdfDqaqwTCXOm5tIbJ3D1XoirmCRNYRxUEJ7VFOj0syZhwD7OBrtUEa7ZnWZQtvUQp71G+uRO0AByY9fBvP2/qYbHjhw5Z5InSF9u+HsXk+CdwOD8DYD0difKsCQonj3n0/kFNpASxGkMhEsAn8OiZfNYNJXcQjKRUdffl9+y6UXoWN9U03pcSBVFzrSBRbzvLct7RI+s4Ddu1hibNCfSzSvzInol9mPAqJvWhJwSK8pYRb0gQdy8ErSKdW/IK7OQh2Y9TpZaA1qANJ89PX13czg/pmF77LYlME+Z8QJiEm4nkM3MBd9kZUfMd4r43QkabXeFC6288ltu3E2oejwzlXjIcvhxTv9fDgdw5mBg/7J/O1ZutAwaPZDv5gXdtJKzFh/7Y4Hf+Qd79o1e8hrD Q0SB5uLr JAHLMI6waCF9j/wJFO5LPjhB4CZpuOgepw/LkP6qkOS/G7S0nJvaq7fjCSY2m10G7Ry2p8wnPfcYSeZGa2X6FfFHaPn0BxKt/fRr4iXmBZfmr6ssWu7SKJDcq95ZWdtxyBC1H1yEbqkwjiFDjsouQ3tPHlqhr/VIOvG37xwbQbtI2Qz4CuMAuKg+MQigK0S4Q+kjR70IUu5Ymd6w7Eso1VLPbwsBuMbcJ/rOXAT905wBiY35c8vnAjhAoYgnn7qhelVXin86qMvI1G6c2VMLMU7CCOnw/0Mcu3n5Viz+IN/vQo/sxh+cIU77UcjCg134DOcC24M0ualQxUd6C9kiYYQHIwRQlcSzYPZqGSONg8cD6j7J9mtIhl93CEsK+PEuEWB6Awjp/lIfSTG6jt+1J/oVld6K2UnEz9FSAW3fsx9EIoUMWLSP0GoPEaR0i3GrFi/Zj2NKwP7eDur4= 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 e645884a1877..8d78667a2d1b 100644 --- a/arch/x86/include/asm/tlb.h +++ b/arch/x86/include/asm/tlb.h @@ -92,9 +92,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 4d56d22b9893..91680cfd5868 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -497,9 +497,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 (!cpu_need_tlbsync()) cpu_write_tlbsync(true); } @@ -542,9 +543,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); @@ -1688,10 +1689,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