From patchwork Tue Jan 17 21:25:23 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: 44862 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2041006wrn; Tue, 17 Jan 2023 15:39:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXuFAHZZgnPconlOY/qJ9YYiofCdfK4iD6NRMSQtwqAsUkzPq3VWBaM0qrrQEP0Ha/H2zcl8 X-Received: by 2002:aa7:c9ca:0:b0:49e:28c1:936c with SMTP id i10-20020aa7c9ca000000b0049e28c1936cmr4734670edt.26.1673998751677; Tue, 17 Jan 2023 15:39:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673998751; cv=none; d=google.com; s=arc-20160816; b=FwIFTKVdX/UltIDwrMTPUCQPJY6UQIgde9cjlb98yj2Lpc4awAmFV+JhazWBdli7YX C05dhntSYMVSvNgqZG6MDW/cN0dIMefsAR1mdptDmWoSFQwm9zrtfr+2fG+pO07LrBf3 a2CxAPtdWNvR9mtkHeawp2KbvByKiTaJgNJlZKdtv1ozzfIAvzQCi3p7ZfNPeLkbjw2z iVjZzCEURrpjRol7AqU+lrz4WiCJNzReNdOYzlH8GZ/Oug2JaoH9UgfLRZZSJe7E7uTd ueSKhpWS7T89no6h5/1y4iV3Jo1STrcpKslAJKzL08FjVYURFbnGE867oq0upzjzmLB0 erzw== 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=p3d4/mw4/hl5F2osNMsKbz5Kf5C7LrsmOauvGACysVo=; b=ERm7qA/1gYA899eEk13uUhw891OWDOIeHcpgBEd5WiMJFUb655Kc7Ujw5cyHd49j4g ytSqrpWSdPD2o3RaSqP/YUNxBfkqmE4ZrI3qhYStbQcoYPLbj6E48VIVBvb/AwpoQKZc QLtvYyj3QVlbHHtyBugO7JBT6/9PMvzsdPgcE+dfkqWjXK6R19H7TKbLHovuCbE1hcAW aMo7tlccpFqdsf/u2AqWW5ctha6CdoD6Rkx53cjbuN0Pma6rY9AdZlZoxBeZq5HVFMnB iqj7qZb1dx4B03PDohOzrGiXB7xCUhAWUHuku/xy3jX3JzVjJIqSa/mtCH5SyApkzBdP KYhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Sy6bzriS; dkim=neutral (no key) header.i=@linutronix.de header.b=Ks3Ri6OB; 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 v17-20020a056402349100b0049e1b840be0si8581448edc.9.2023.01.17.15.38.48; Tue, 17 Jan 2023 15:39:11 -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=Sy6bzriS; dkim=neutral (no key) header.i=@linutronix.de header.b=Ks3Ri6OB; 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 S230113AbjAQXgA (ORCPT + 99 others); Tue, 17 Jan 2023 18:36:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230095AbjAQXex (ORCPT ); Tue, 17 Jan 2023 18:34:53 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15F694A1F0; Tue, 17 Jan 2023 13:25:25 -0800 (PST) Date: Tue, 17 Jan 2023 21:25:23 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1673990723; 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=p3d4/mw4/hl5F2osNMsKbz5Kf5C7LrsmOauvGACysVo=; b=Sy6bzriSYRFwCy9YK/JC6ZHEA0An2srqcJKqxG2B7NvqVeSrDCh/ZRYIB0GtApJvy2uo1b +zt96SwmnB4LxtDvCL9cB1LgCE+BjUfhbzg5YYu/vxZhA8YW4PYvvxKo3E3yqST7z9KqiE COoDBvi2kLOgulGQdv9EU3wpTqexHUWCPebjlrQtFGCYSzeKjSOfJ3RLjdfz5dS6W4NdHp h5rINzVRgRIWD+B56pnENr6XXOtYYgWDTLUIchHmMSfKMCMaeY6SYw5stIzv+VtjcD0hap sCBYNZtZNWE/yEGMhQF6RIOt5HT5NZNvME3qeftA3igKBmY3OWESZjnPDirtNA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1673990723; 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=p3d4/mw4/hl5F2osNMsKbz5Kf5C7LrsmOauvGACysVo=; b=Ks3Ri6OBVU2nUefClXqC7YzdSXGSs4s3NfZXkC2ppSCJAt5PkB4n7fVsC9TQUPoIzmfk3z lCotcenyagBsn9Ag== From: "tip-bot2 for Kim Phillips" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cpu] x86/cpu, kvm: Add the SMM_CTL MSR not present feature Cc: Kim Phillips , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230116230159.1511393-6-kim.phillips@amd.com> References: <20230116230159.1511393-6-kim.phillips@amd.com> MIME-Version: 1.0 Message-ID: <167399072322.4906.11768615436512605695.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?1755222514507283917?= X-GMAIL-MSGID: =?utf-8?q?1755314914934838831?= The following commit has been merged into the x86/cpu branch of tip: Commit-ID: b7059f21b1c1c4ca5966d16bd3d9fa45cee89a87 Gitweb: https://git.kernel.org/tip/b7059f21b1c1c4ca5966d16bd3d9fa45cee89a87 Author: Kim Phillips AuthorDate: Mon, 16 Jan 2023 17:01:57 -06:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 17 Jan 2023 13:00:12 +01:00 x86/cpu, kvm: Add the SMM_CTL MSR not present feature The SMM_CTL MSR not present feature was being open-coded for KVM in __do_cpuid_func(). Add it to its newly added CPUID leaf 0x80000021 EAX proper, and propagate it in kvm_set_cpu_caps() instead. Also drop the bit description comments now the code is more self-describing, and retain the SmmPgCfgLock and PrefetchCtlMsr feature bit comments at the kvm_cpu_cap_mask() callsite. Signed-off-by: Kim Phillips Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20230116230159.1511393-6-kim.phillips@amd.com --- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/kvm/cpuid.c | 13 +++---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 6bed80c..86e98bd 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -431,6 +431,7 @@ #define X86_FEATURE_NO_NESTED_DATA_BP (20*32+ 0) /* "" No Nested Data Breakpoints */ #define X86_FEATURE_LFENCE_RDTSC (20*32+ 2) /* "" LFENCE always serializing / synchronizes RDTSC */ #define X86_FEATURE_NULL_SEL_CLR_BASE (20*32+ 6) /* "" Null Selector Clears Base */ +#define X86_FEATURE_NO_SMM_CTL_MSR (20*32+ 9) /* "" SMM_CTL MSR is not present */ /* * BUG word(s) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 04f2f48..56f00d9 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -742,12 +742,14 @@ void kvm_set_cpu_caps(void) F(SME_COHERENT)); kvm_cpu_cap_mask(CPUID_8000_0021_EAX, - F(NO_NESTED_DATA_BP) | F(LFENCE_RDTSC) | F(NULL_SEL_CLR_BASE) + F(NO_NESTED_DATA_BP) | F(LFENCE_RDTSC) | 0 /* SmmPgCfgLock */ | + F(NULL_SEL_CLR_BASE) | 0 /* PrefetchCtlMsr */ ); if (cpu_feature_enabled(X86_FEATURE_LFENCE_RDTSC)) kvm_cpu_cap_set(X86_FEATURE_LFENCE_RDTSC); if (!static_cpu_has_bug(X86_BUG_NULL_SEG)) kvm_cpu_cap_set(X86_FEATURE_NULL_SEL_CLR_BASE); + kvm_cpu_cap_set(X86_FEATURE_NO_SMM_CTL_MSR); kvm_cpu_cap_mask(CPUID_C000_0001_EDX, F(XSTORE) | F(XSTORE_EN) | F(XCRYPT) | F(XCRYPT_EN) | @@ -1231,15 +1233,6 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) case 0x80000021: entry->ebx = entry->ecx = entry->edx = 0; cpuid_entry_override(entry, CPUID_8000_0021_EAX); - /* - * Other defined bits are for MSRs that KVM does not expose: - * EAX 3 SPCL, SMM page configuration lock - * EAX 13 PCMSR, Prefetch control MSR - * - * KVM doesn't support SMM_CTL. - * EAX 9 SMM_CTL MSR is not supported - */ - entry->eax |= BIT(9); break; /*Add support for Centaur's CPUID instruction*/ case 0xC0000000: