From patchwork Thu Aug 3 17:39:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 130779 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1328196vqx; Thu, 3 Aug 2023 11:22:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlFqPJwZoS7t4+iAYfMZAkaeeH+h3WjTVgD244r/OR4vY6BEwFKH/6CZ3MwwbSlm35kNOgUi X-Received: by 2002:a05:6359:668b:b0:137:89ac:20d4 with SMTP id so11-20020a056359668b00b0013789ac20d4mr6483903rwb.18.1691086936056; Thu, 03 Aug 2023 11:22:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691086936; cv=none; d=google.com; s=arc-20160816; b=Jk48gRoldgSkzyLzfuVdSPmGbWEzOxUhAcamlT0KVsTsM+onZsmGaFisFKFbstaPJP 2qOwidgDfAF9UCSammA+qnQo2TLG11lzsQXuTogqDiDYq6Ygfs3DwOsub6od3O522Tg1 czpTsqjyTdaVprzyXAKWbdruFM0PvusR21aKux2CDdcrO7aYnfZnbjY+TPiux4mPNyAI EeAGZthHV9kXw6oqzVCg9PxyQIoKKXKaa81C50zS0w57SAChKcARmUlVFlktd2LoSuf8 Apo7gnU8Jh+US8gO2pROxG8pxH1rFw4v0pH/pXpYG4kGbkavYGNm84iNSGssGkA5G0ac vNdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=7bDsaV6hyYcOiwh9F6/VUEneRjm/h/xzE+3LGBYN8Ns=; fh=FYDkEUc8/WvDiKB0K/vqkISCCYuGMyE16t5/DGXbf9s=; b=nnHFgW/dN3hOFr+5ga4hLq+9oZb8KyAq68bjiIoZopKuc2bko2LFt9tp/9o5wFM8tF vWtXENx9+FfqSIQAMObwCpKa9BUgSb/axfGglz0kpyScyjxeBOYi7tZ7pKDjnJJOFyd6 /W0YNmZvwqnTAZPw1R7CZx5mRhv2MiBE1i9yYyU+SoQh9757NeMBIASJIJ/4q1h+MGgA udKElQ0sk3CbNLj6MXQ8yn7UoOm8Ue4Biem1jHwXKpLC0+Ph2KBElAxxoPHtnsA0uxOX v+UnAvW8u/bLxq1tdTK+lGsyRbKeD3MBjcKRNHBVWqKaI8AAR1uCRwg6UJ/s+QKgUylL YGBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=cwHZDNZo; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bg26-20020a056a02011a00b005641fc2684bsi300044pgb.527.2023.08.03.11.22.01; Thu, 03 Aug 2023 11:22:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=cwHZDNZo; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235117AbjHCRjx (ORCPT + 99 others); Thu, 3 Aug 2023 13:39:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235082AbjHCRjv (ORCPT ); Thu, 3 Aug 2023 13:39:51 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CD2D10B; Thu, 3 Aug 2023 10:39:49 -0700 (PDT) Date: Thu, 03 Aug 2023 17:39:47 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691084388; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7bDsaV6hyYcOiwh9F6/VUEneRjm/h/xzE+3LGBYN8Ns=; b=cwHZDNZoFYie9lHh7dVdLca+yPIkEDicEIgmBw1xVErlr7otutcmBRiseigsqDaEyQJtKB c8lQss4uoCCtmFo9Eb4L+rkMNhiiwclf0+EOfVAavDoqIR7D/aR2LoMYhv8k1QMqyrm+nl SUBZu3juLcnLgKMwcyb98rjy8h8Dl/6xpS7YqfGkBLB+rueaK+YynfvSaSFD72QiWQ8cAE vWNcBpk6Dv56TQXXEP5EMWgubIzmj+j++shSPqeleyNlguqrqYYyt9JhSX1aSl8iYYZMAT x+T6Acy9Z8bK+vuOdoYohbae87LHqO8eLZhJUBjBTZ4nXnFxVE07xzL2njet0g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691084388; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7bDsaV6hyYcOiwh9F6/VUEneRjm/h/xzE+3LGBYN8Ns=; b=EfBTOZT8ZCa2ZEw0MkIAWM8ngm7MQQceP86oxeiQBViA2e3+R5Gxowjb2EBmr0fDWZ/1o8 AwbBaN9KUeGLrqDg== From: "tip-bot2 for Dave Hansen" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/mm] x86/mm: Remove "INVPCID single" feature tracking Cc: Jann Horn , Dave Hansen , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169108438740.28540.12152477147812811555.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773233174783721531 X-GMAIL-MSGID: 1773233174783721531 The following commit has been merged into the x86/mm branch of tip: Commit-ID: 54e3d9434ef61b97fd3263c141b928dc5635e50d Gitweb: https://git.kernel.org/tip/54e3d9434ef61b97fd3263c141b928dc5635e50d Author: Dave Hansen AuthorDate: Tue, 18 Jul 2023 10:06:30 -07:00 Committer: Dave Hansen CommitterDate: Thu, 03 Aug 2023 10:34:05 -07:00 x86/mm: Remove "INVPCID single" feature tracking From: Dave Hansen tl;dr: Replace a synthetic X86_FEATURE with a hardware X86_FEATURE and check of existing per-cpu state. == Background == There are three features in play here: 1. Good old Page Table Isolation (PTI) 2. Process Context IDentifiers (PCIDs) which allow entries from multiple address spaces to be in the TLB at once. 3. Support for the "Invalidate PCID" (INVPCID) instruction, specifically the "individual address" mode (aka. mode 0). When all *three* of these are in place, INVPCID can and should be used to flush out individual addresses in the PTI user address space. But there's a wrinkle or two: First, this INVPCID mode is dependent on CR4.PCIDE. Even if X86_FEATURE_INVPCID==1, the instruction may #GP without setting up CR4. Second, TLB flushing is done very early, even before CR4 is fully set up. That means even if PTI, PCID and INVPCID are supported, there is *still* a window where INVPCID can #GP. == Problem == The current code seems to work, but mostly by chance and there are a bunch of ways it can go wrong. It's also somewhat hard to follow since X86_FEATURE_INVPCID_SINGLE is set far away from its lone user. == Solution == Make "INVPCID single" more robust and easier to follow by placing all the logic in one place. Remove X86_FEATURE_INVPCID_SINGLE. Make two explicit checks before using INVPCID: 1. Check that the system supports INVPCID itself (boot_cpu_has()) 2. Then check the CR4.PCIDE shadow to ensures that the CPU can safely use INVPCID for individual address invalidation. The CR4 check *always* works and is not affected by any X86_FEATURE_* twiddling or inconsistencies between the boot and secondary CPUs. This has been tested on non-Meltdown hardware by using pti=on and then flipping PCID and INVPCID support with qemu. == Aside == How does this code even work today? By chance, I think. First, PTI is initialized around the same time that the boot CPU sets CR4.PCIDE=1. There are currently no TLB invalidations when PTI=1 but CR4.PCIDE=0. That means that the X86_FEATURE_INVPCID_SINGLE check is never even reached. this_cpu_has() is also very nasty to use in this context because the boot CPU reaches here before cpu_data(0) has been initialized. It happens to work for X86_FEATURE_INVPCID_SINGLE since it's a software-defined feature but it would fall over for a hardware- derived X86_FEATURE. Reported-by: Jann Horn Signed-off-by: Dave Hansen Link: https://lore.kernel.org/all/20230718170630.7922E235%40davehans-spike.ostc.intel.com --- arch/x86/include/asm/cpufeatures.h | 1 - arch/x86/mm/init.c | 9 --------- arch/x86/mm/tlb.c | 19 +++++++++++++------ 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index cb8ca46..ec1bce0 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -198,7 +198,6 @@ #define X86_FEATURE_CAT_L3 ( 7*32+ 4) /* Cache Allocation Technology L3 */ #define X86_FEATURE_CAT_L2 ( 7*32+ 5) /* Cache Allocation Technology L2 */ #define X86_FEATURE_CDP_L3 ( 7*32+ 6) /* Code and Data Prioritization L3 */ -#define X86_FEATURE_INVPCID_SINGLE ( 7*32+ 7) /* Effectively INVPCID && CR4.PCIDE=1 */ #define X86_FEATURE_HW_PSTATE ( 7*32+ 8) /* AMD HW-PState */ #define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9) /* AMD ProcFeedbackInterface */ #define X86_FEATURE_XCOMPACTED ( 7*32+10) /* "" Use compacted XSTATE (XSAVES or XSAVEC) */ diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 8192452..4e152d8 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -307,15 +307,6 @@ static void setup_pcid(void) * start_secondary(). */ cr4_set_bits(X86_CR4_PCIDE); - - /* - * INVPCID's single-context modes (2/3) only work if we set - * X86_CR4_PCIDE, *and* we INVPCID support. It's unusable - * on systems that have X86_CR4_PCIDE clear, or that have - * no INVPCID support at all. - */ - if (boot_cpu_has(X86_FEATURE_INVPCID)) - setup_force_cpu_cap(X86_FEATURE_INVPCID_SINGLE); } else { /* * flush_tlb_all(), as currently implemented, won't work if diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 267acf2..6982b4f 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -1140,21 +1140,28 @@ void flush_tlb_one_kernel(unsigned long addr) */ STATIC_NOPV void native_flush_tlb_one_user(unsigned long addr) { - u32 loaded_mm_asid = this_cpu_read(cpu_tlbstate.loaded_mm_asid); + u32 loaded_mm_asid; + bool cpu_pcide; + /* Flush 'addr' from the kernel PCID: */ asm volatile("invlpg (%0)" ::"r" (addr) : "memory"); + /* If PTI is off there is no user PCID and nothing to flush. */ if (!static_cpu_has(X86_FEATURE_PTI)) return; + loaded_mm_asid = this_cpu_read(cpu_tlbstate.loaded_mm_asid); + cpu_pcide = this_cpu_read(cpu_tlbstate.cr4) & X86_CR4_PCIDE; + /* - * Some platforms #GP if we call invpcid(type=1/2) before CR4.PCIDE=1. - * Just use invalidate_user_asid() in case we are called early. + * invpcid_flush_one(pcid>0) will #GP if CR4.PCIDE==0. Check + * 'cpu_pcide' to ensure that *this* CPU will not trigger those + * #GP's even if called before CR4.PCIDE has been initialized. */ - if (!this_cpu_has(X86_FEATURE_INVPCID_SINGLE)) - invalidate_user_asid(loaded_mm_asid); - else + if (boot_cpu_has(X86_FEATURE_INVPCID) && cpu_pcide) invpcid_flush_one(user_pcid(loaded_mm_asid), addr); + else + invalidate_user_asid(loaded_mm_asid); } void flush_tlb_one_user(unsigned long addr)