From patchwork Mon Dec 5 10:16:44 2022 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: 29629 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2166817wrr; Mon, 5 Dec 2022 02:25:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf5+rNA7K0kcIbjoYlZAdF61ZuNccoCwrRwYZyUPv6naaAfIJqJiJ/4Dva0SdlkHbxGsAIae X-Received: by 2002:a17:906:78b:b0:7c0:e813:e07e with SMTP id l11-20020a170906078b00b007c0e813e07emr5006816ejc.156.1670235904653; Mon, 05 Dec 2022 02:25:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670235904; cv=none; d=google.com; s=arc-20160816; b=wv2l+MiKQOSeowjxlol6KfsPAT8CnCp2goYsPCIK9I37CvvRiJS/9fgQ4e3nNDMfnZ 01vG+esPxfh65gqyteqC5w7u+rm/jWXr6ubWVgvTe/GZWmripRF49pRso/z+YLXhc/A9 Ui+TdK64OfeKlkLrt9xqewZam4z+ZOmyHnPqvz7lwXC1tj7hh29G5nmmY/fxkfkBAtog ViF1bymg/Fw6QQ4TyOeHx9Sc6yZhD7WcyiqxqEhUCeNMSIKiNb9rYfX4ckm3IKcsXWZ5 boBHcLI3DMIUzQzL8Saw6tTp6JJ5PanitxSvoYvOzKIHKN0sSElXjjeR4Zx6AFa4PgwX sbhQ== 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:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=61+hzAVOFJyLnP756gK5dY3fagK+vG6J+jByZXiS/dU=; b=hAlU8i8gS4oCIVa84RyEjCOgwj/lEYEILtLB7DxlVsImZvoRgaURKPfQXzHNdmrOsM TuhZJjUIj8KAQKsZx914UKq2/C8mwWEm4+vBP3FxlQatOxy8asyZ3yrT8GOv9nm6S7uo vVzv1y8+VIOiHVH3xMKFAj/Be+WhlvgNlYjFHma3A1rU0FH1HPEgDPuW/hFHSmnLafAI gJiNkMp1oDqEM2lL+TVHpxMgJD3G4DQU1K5MOzd6v2/hZihQZxG2ZM2I92iw0MrRwsSN J0E3eH3AsONNtvgdjCyqro3Lv2Rh5g022BYhnCCm1xyFCzRVTYHeaN6aww87Zoc564us B0xQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=pxGrNz2g; 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 r24-20020aa7da18000000b0046314dd20a0si6510938eds.3.2022.12.05.02.24.38; Mon, 05 Dec 2022 02:25:04 -0800 (PST) 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=pxGrNz2g; 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 S230189AbiLEKQv (ORCPT + 99 others); Mon, 5 Dec 2022 05:16:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230059AbiLEKQr (ORCPT ); Mon, 5 Dec 2022 05:16:47 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCBDF19030; Mon, 5 Dec 2022 02:16:46 -0800 (PST) Date: Mon, 05 Dec 2022 10:16:44 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1670235404; 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: in-reply-to:in-reply-to:references:references; bh=61+hzAVOFJyLnP756gK5dY3fagK+vG6J+jByZXiS/dU=; b=pxGrNz2gpwWLmwKVZllVaE37wVIaVQrT/L4xrAVAoI6bmOwrJr8k2AMvV6G7fzE+Ny+sU4 /JQqa7XtMBsfRxUdJxKTHPSGqgLdgDwWn/oDA4HqXl1nH8maLwFCg+y+1EY/8vndQsNATP nyG9e6wQivA2kP1o2UVC0WGRgg/iFm/kg5tMgxUHSrA81//nPFg4oe1BWA9mdC//qBWE1r APJ+OOM4M1c62owCLQwAHYb4Jr0FNEj6ewwbBuXBa2nIUD9uNaVTPz8HIIM8DXcP52NEyF YkRrX1D2AzvU5rEaD+3o4olrhvQ95mmdVd/0SaTt+o5LELtxippApBqusNlYdQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1670235404; 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: in-reply-to:in-reply-to:references:references; bh=61+hzAVOFJyLnP756gK5dY3fagK+vG6J+jByZXiS/dU=; b=Y83RZoF7SB8nLggYlalowwBpv5TeVyoF091YESBStFYYcl16F2Rtd5jGluCeiEWE3cRMRG vlBi4FVvuiX6esDA== From: "tip-bot2 for Juergen Gross" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cpu] x86/pat: Handle TDX guest PAT initialization Cc: Juergen Gross , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221205080433.16643-2-jgross@suse.com> References: <20221205080433.16643-2-jgross@suse.com> MIME-Version: 1.0 Message-ID: <167023540404.4906.9973783336476652949.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751369284131685016?= X-GMAIL-MSGID: =?utf-8?q?1751369284131685016?= The following commit has been merged into the x86/cpu branch of tip: Commit-ID: c11ca45441d56ed6d353548cad660e04f0b6605d Gitweb: https://git.kernel.org/tip/c11ca45441d56ed6d353548cad660e04f0b6605d Author: Juergen Gross AuthorDate: Mon, 05 Dec 2022 09:04:32 +01:00 Committer: Borislav Petkov (AMD) CommitterDate: Mon, 05 Dec 2022 11:03:27 +01:00 x86/pat: Handle TDX guest PAT initialization With the decoupling of PAT and MTRR initialization, PAT will be used even with MTRRs disabled. This seems to break booting up as TDX guest, as the recommended sequence to set the PAT MSR across CPUs can't work in TDX guests due to disabling caches via setting CR0.CD isn't allowed in TDX mode. This is an inconsistency in the Intel documentation between the SDM and the TDX specification. For now handle TDX mode the same way as Xen PV guest mode by just accepting the current PAT MSR setting without trying to modify it. [ bp: Align conditions for better readability. ] Signed-off-by: Juergen Gross Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20221205080433.16643-2-jgross@suse.com --- arch/x86/mm/pat/memtype.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index 9aab17d..46de9cf 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -296,8 +296,13 @@ void __init pat_bp_init(void) /* * Xen PV doesn't allow to set PAT MSR, but all cache modes are * supported. + * When running as TDX guest setting the PAT MSR won't work either + * due to the requirement to set CR0.CD when doing so. Rely on + * firmware to have set the PAT MSR correctly. */ - if (pat_disabled || cpu_feature_enabled(X86_FEATURE_XENPV)) { + if (pat_disabled || + cpu_feature_enabled(X86_FEATURE_XENPV) || + cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) { init_cache_modes(pat_msr_val); return; }