From patchwork Thu Jan 26 10:12:25 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: 48554 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp198677wrn; Thu, 26 Jan 2023 02:18:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXuzjRSTgwwM+Sm62wkcx3zUOVU7TNz4rG5b8qoe9HvPpJhOenlXKKePEyighQBSZg9wisht X-Received: by 2002:a17:902:d888:b0:193:1f24:41c9 with SMTP id b8-20020a170902d88800b001931f2441c9mr33812010plz.65.1674728337116; Thu, 26 Jan 2023 02:18:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674728337; cv=none; d=google.com; s=arc-20160816; b=lWny+bQ/WBpPgqvVwbXAIgCVx+K1ySuEG57BA6AUBv5fihfe/lWCk6h3qu46c7DxgE NBmK2l2gWFuxu9gUTAK7Tn40qkLtZ37W8ecV+Z9E61HW6r/nVVs8EONnmwIe63tnd75f r6Nwv5nT6e0znS9PUIMECKQf0Xag/L15D/+wGTj8EA+5esy69wmsgiBMIdR59pVpsKLv WQjCYaTCtLdRkVcCD/m+c4DRXFKxPf/3+2R5xDIFZ23jAzqsbpwTN1+9d2UWGl460U/4 6FI9DDvdFQmDHblsFksoilXiWufjpoyodwPg1kInBloKvFFHL18eujkfWrLlB8Lwi7UN cutQ== 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=Xhy4KI1cdQuexajmtwp9AMy40WD664VjElg4+0XjfXE=; b=YXe03dBn/xuit3etEKm3oES3MSfcT9y9Fuk5HK7mUcavZ8oXPoPsiEyyTfp/Nu6Sel virceuuodlG2WP26NmW/uZBpPCFTmhF/DnH3M1Fq8f3OpYRZ4O4zKoEAckJx9hIzvRaN 5Nzvcp8fuWDfEn/BIbT+qbQgUj/bMHQnIncVi5dXNjIBmwdUSG/AN39DVu4mTmgxnEAm dRz0IkNRPtO0dRWSYzlB6ovajfdDIMVT8D0/XBz8IdAhc8MuW7JRPl/R3+Q7yr46PR/1 3Hw1cBSTaFSqt5Iou6Wfr+fr5FhNExvnY/MFLs1lcXbdT9H9WwaSZPzv5vDzQztFfuct pOsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=SEbBgVUP; dkim=neutral (no key) header.i=@linutronix.de; 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 t186-20020a6381c3000000b004d23a59d6e9si804130pgd.373.2023.01.26.02.18.44; Thu, 26 Jan 2023 02:18:57 -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=SEbBgVUP; dkim=neutral (no key) header.i=@linutronix.de; 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 S236957AbjAZKMn (ORCPT + 99 others); Thu, 26 Jan 2023 05:12:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236360AbjAZKMc (ORCPT ); Thu, 26 Jan 2023 05:12:32 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 596B66603A; Thu, 26 Jan 2023 02:12:28 -0800 (PST) Date: Thu, 26 Jan 2023 10:12:25 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1674727946; 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=Xhy4KI1cdQuexajmtwp9AMy40WD664VjElg4+0XjfXE=; b=SEbBgVUPwViQXOU8GxOzw0mo1MB4aGqFHzzacGrtarBxy6je16z4S8o+YkieudyhatUOez mbPdryGWpOtzgDLB9+/CPjtDa01AW6AalfJYqPn28NOhiqI0KYTaHIWS4gBPI9cKxwCKhN XHIkE5YRG9XOKiGy/iPsYll1ofXJq9H9b9G5sljXcxNgc5rlOVEVUQfXelAADo4w1H11dQ NRF2Rrcr1GOVklRxEsvgHiwXhiy2OwvLxYduXhWkJaelRPJWIlB/pcJd0Fi/S7O+qPcY4F ujCZfgMzwbbajLWM16v4rcFLb8T6kG6Baz10l3QbcV16uVM4oano0JGIiHi8VA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1674727946; 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=Xhy4KI1cdQuexajmtwp9AMy40WD664VjElg4+0XjfXE=; b=K5Dg0APaaLcWgeW5Uz5ke8l+XICRe8INlllo71RyAmDeEVksjz9ErAY7siKM98Q9H62hVF /8OdOi6WRbWCGsAQ== 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)" , Sean Christopherson , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230124163319.2277355-7-kim.phillips@amd.com> References: <20230124163319.2277355-7-kim.phillips@amd.com> MIME-Version: 1.0 Message-ID: <167472794585.4906.15706522387952091319.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?1755923011241217544?= X-GMAIL-MSGID: =?utf-8?q?1756079940916591901?= The following commit has been merged into the x86/cpu branch of tip: Commit-ID: faabfcb194a8d0686396e3fff6a5b42911f65191 Gitweb: https://git.kernel.org/tip/faabfcb194a8d0686396e3fff6a5b42911f65191 Author: Kim Phillips AuthorDate: Tue, 24 Jan 2023 10:33:17 -06:00 Committer: Borislav Petkov (AMD) CommitterDate: Wed, 25 Jan 2023 16:37:20 +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. Add it to its newly added CPUID leaf 0x80000021 EAX proper. Also drop the bit description comments now the code is more self-describing. Signed-off-by: Kim Phillips Signed-off-by: Borislav Petkov (AMD) Acked-by: Sean Christopherson Link: https://lore.kernel.org/r/20230124163319.2277355-7-kim.phillips@amd.com --- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/kvm/cpuid.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 dde8d6b..28071e9 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -760,7 +760,7 @@ void kvm_set_cpu_caps(void) 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_caps[CPUID_8000_0021_EAX] |= BIT(9) /* NO_SMM_CTL_MSR */; + 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) |