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: 44865 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2044076wrn; Tue, 17 Jan 2023 15:48:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXtYWtJQukUO6nShj+we/3wbGLNNY+Celex+OSTZ2oOD+Epu/0B7aXBcapwqjn2lKfyrqn1h X-Received: by 2002:a17:90a:ba11:b0:229:ab5e:e123 with SMTP id s17-20020a17090aba1100b00229ab5ee123mr3545180pjr.40.1673999291257; Tue, 17 Jan 2023 15:48:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673999291; cv=none; d=google.com; s=arc-20160816; b=KnJyukr49afITk52YMavqoCFkco+yRzz2cHsVlyTO4QhBcGXlx03gI+Hetpy9TyMZ/ OOLJFCjRv7UXwPdyReAuo/z2Fctmif1xLFDykC0ySuaEIVx/VgMfGUgHe2b6Ch6eJ1PK Jat+88nn53wm+fxlcuPFvR3LlKqTDNsrseJIeKsiIfBp+8OLTgspTXCpqvGCkYdBQqrt fpmzrbZrFLNWESlOWHdoJ6Wsfoc/0O4oG8u6UpZO6fSpkwGAdS9klagcp9qhu2EsfGFc UpAR2YM2izaNrvaxU5uV4hImzJTgiSaS+IIyff64PzxzMwLykdAjDzJH4QXsPWGtbiZR 23zA== 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=qemyooB/R5fkfvoXHg6fr0JWKSxbyvNUaaVFTJolBQE=; b=H1bYQ506MYl4JLOu8DTBVnZHAmD4aiBSJVto1Kqrke0mijxjoWS7qHJVkbrKu8eGfj XazOKnEGNH0Mp48U9Fz+wPyd3ddvPrN1cBS7kFT+nKSuDBjzrTBq1l5MxOQowy2TIcW/ g/8Vi0GpF+H7jKbXM8euSzGqd2eY2tLWUH7tRQ0Q0gdDZdAsAvAqPLI3zxm9EmU+mSsn ab60wu+8ywSxTP1JqRn1/RS5lvNjQ5vBZUILq0dSVYaCeUmBSMfnwxE9IO00M9bRxjUD NkXyY+J3HwKrcCjmam3moD880/9tlLU6ECuBCZr2Ci+SxZjiAsgMvhq2Sp8xvbO1B6iO uJpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=DeJRLCkQ; 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 b7-20020a656687000000b00439d86cf509si33701752pgw.645.2023.01.17.15.47.58; Tue, 17 Jan 2023 15:48: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=DeJRLCkQ; 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 S229768AbjAQXgH (ORCPT + 99 others); Tue, 17 Jan 2023 18:36:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230108AbjAQXez (ORCPT ); Tue, 17 Jan 2023 18:34:55 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA0E84ABFB; Tue, 17 Jan 2023 13:25:28 -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=1673990724; 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=qemyooB/R5fkfvoXHg6fr0JWKSxbyvNUaaVFTJolBQE=; b=DeJRLCkQ7agYKvTwDJZqXYhXjaiPkKp0j5f2tBbo4sIP9xMi5+oNNJyuXuStQHFX7/nDZs bJHwE2+ORPkEeNCjJiM55izUBIAvD6XpA3dM7xjcs7rk49CBMnwKfZKAO4uHXPVV4fX0re 9j4piZqLnW6iIJLt394SwppZ3T++eLJDqOrv3ysMNydraHwvra6+GZgwYrzybP3WM2s7cF BL/XFJqKvekbP2/8CSJ9GwHjeMxxgRSS5kbSyARtJKtP6aGFjhN1MPQsAK8xVY+mRH16MH WPSJsz8HU2IXal1O/J6HblC5QdOBlzQAyoTGH7PatT4HlVEEUu1aHX7jAVd6TA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1673990724; 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=qemyooB/R5fkfvoXHg6fr0JWKSxbyvNUaaVFTJolBQE=; b=ekwjsFXJLYUGVEJqQZUFJ6Ip6/Hx4s5tVIaev2D+XHv3LQOJ03+PcD+LT91Fd9mRdS54Se TNRgvKLhC1VkVuDw== 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 NO_NESTED_DATA_BP feature Cc: Kim Phillips , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230110224643.452273-4-kim.phillips@amd.com> References: <20230110224643.452273-4-kim.phillips@amd.com> MIME-Version: 1.0 Message-ID: <167399072399.4906.743551278544320617.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?1754677617245289263?= X-GMAIL-MSGID: =?utf-8?q?1755315480815736103?= The following commit has been merged into the x86/cpu branch of tip: Commit-ID: dcf67f724b8ada6aa73b77733243024519c35a71 Gitweb: https://git.kernel.org/tip/dcf67f724b8ada6aa73b77733243024519c35a71 Author: Kim Phillips AuthorDate: Tue, 10 Jan 2023 16:46:38 -06:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 17 Jan 2023 13:00:12 +01:00 x86/cpu, kvm: Add the NO_NESTED_DATA_BP feature The "Processor ignores nested data breakpoints" 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 it's more self-describing. Signed-off-by: Kim Phillips Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20230110224643.452273-4-kim.phillips@amd.com --- arch/x86/include/asm/cpufeatures.h | 3 +++ arch/x86/kvm/cpuid.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index b890058..1b2d40a 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -427,6 +427,9 @@ #define X86_FEATURE_V_TSC_AUX (19*32+ 9) /* "" Virtual TSC_AUX */ #define X86_FEATURE_SME_COHERENT (19*32+10) /* "" AMD hardware-enforced cache coherency */ +/* AMD-defined Extended Feature 2 EAX, CPUID level 0x80000021 (EAX), word 20 */ +#define X86_FEATURE_NO_NESTED_DATA_BP (20*32+ 0) /* "" No Nested Data Breakpoints */ + /* * BUG word(s) */ diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index b14653b..69e433e 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -741,6 +741,10 @@ void kvm_set_cpu_caps(void) 0 /* SME */ | F(SEV) | 0 /* VM_PAGE_FLUSH */ | F(SEV_ES) | F(SME_COHERENT)); + kvm_cpu_cap_mask(CPUID_8000_0021_EAX, + F(NO_NESTED_DATA_BP) + ); + kvm_cpu_cap_mask(CPUID_C000_0001_EDX, F(XSTORE) | F(XSTORE_EN) | F(XCRYPT) | F(XCRYPT_EN) | F(ACE2) | F(ACE2_EN) | F(PHE) | F(PHE_EN) | @@ -1222,9 +1226,9 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) break; case 0x80000021: entry->ebx = entry->ecx = entry->edx = 0; + cpuid_entry_override(entry, CPUID_8000_0021_EAX); /* * Pass down these bits: - * EAX 0 NNDBP, Processor ignores nested data breakpoints * EAX 2 LAS, LFENCE always serializing * EAX 6 NSCB, Null selector clear base * @@ -1235,7 +1239,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) * KVM doesn't support SMM_CTL. * EAX 9 SMM_CTL MSR is not supported */ - entry->eax &= BIT(0) | BIT(2) | BIT(6); + entry->eax &= BIT(2) | BIT(6); entry->eax |= BIT(9); if (static_cpu_has(X86_FEATURE_LFENCE_RDTSC)) entry->eax |= BIT(2);