From patchwork Thu Jan 26 10:12:26 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: 48553 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp198629wrn; Thu, 26 Jan 2023 02:18:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXtKFMA+jo3+TWRFMDJcaoB4sPdb+XXHABN/6hG7ByY/fBF3egWCstVld3xcXOD0VsbFktPi X-Received: by 2002:aa7:972e:0:b0:58d:b330:6e7d with SMTP id k14-20020aa7972e000000b0058db3306e7dmr38337547pfg.26.1674728330091; Thu, 26 Jan 2023 02:18:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674728330; cv=none; d=google.com; s=arc-20160816; b=DJf5wZP12dJmFYG+Kk73eHOJ5Oc5v++9tV38Z0AD9BLBSURBNbY24eO8cyGSvAqoL7 18zH+IJKy2exRvZCAU0a9yePdSoG8+pWZ0nFrTF377dvFc+e9a1a1CptaiXpkmfuG3yH cLEiVrcrPxmsIz/bX8Q07AJUjSEsmXamnZ8/ohrwxtWkarmfJ8JaCRd+T5rwQPE6eWtt ls41YyImWQjESfMQd84HzOqKqsBUBn7bM+nf0sC0O1G6ot/RzCLAAfzcEzQkb7TGCPPI 1Qfl1aHezWKguiGCBiesWBEhqu9xpcLm7mEvlIcT2JZnFFuRMKxocZghOclQx41mYXTN N5Kg== 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=QBspy/9u/nODFUtF2xe2bBtb9zVk8MUKnTJvgzkbWRU=; b=wJe9qoPe6o81bnAAn3x1+dMIXfBUZcAAHfVPG16povzKrvr76p2XdlCRqjizmafeoT sfoMRBUzExkdPuxUyxHgvGxV8b/iURJSSz1z3BXLeerllHkqrxmRSqVyeeERm3Iw9+QX kZfZYPEzwE8Jf9v3jsfcCuMGyLusnQq9+TMbuehh2AO4xTZRlruNNQ6MPFHtXevqSxjJ BpM4jAy0T0ZUkK+QFnU8/5w8s71lvdl4mS9tMM4wu8/KHs5kuvK/Hxxjyo5AyQU+MLZL DhMwV91lCAtBIceqqUAqXGxGsrvBPDRkuLX/n6lWvoqSLjgte/emHNOjjyQ+On8jjoyB Wajg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=AlRslMEQ; dkim=neutral (no key) header.i=@linutronix.de header.b=X3qYsXlu; 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 j64-20020a625543000000b0058bc338c9b2si671041pfb.372.2023.01.26.02.18.37; Thu, 26 Jan 2023 02:18:50 -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=AlRslMEQ; dkim=neutral (no key) header.i=@linutronix.de header.b=X3qYsXlu; 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 S237000AbjAZKMd (ORCPT + 99 others); Thu, 26 Jan 2023 05:12:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236679AbjAZKMc (ORCPT ); Thu, 26 Jan 2023 05:12:32 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 599686C575; Thu, 26 Jan 2023 02:12:28 -0800 (PST) Date: Thu, 26 Jan 2023 10:12:26 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1674727947; 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=QBspy/9u/nODFUtF2xe2bBtb9zVk8MUKnTJvgzkbWRU=; b=AlRslMEQiSDBzZCN9O1m+xdHNLy8zwDD34c74BCWoCjAqKJIUhHvwE322s+LlA+BjBEIUD Wg6/SSyvVTOKBUPpy8IiHp0u7SprpmbBHxPNcvjRyJRnvC4UAMHA8WMjEW/mtrDlOSGLn+ euVHFiuJJXHnwUkHk8FVfDIijhsTNhSS7VkK4pEVdAnN0WvBigR+UM1uK1ZpcSVIzi3DSP QsqrTi0oQc0jztz44WQhoPD/KLEPUq7hobvtvLQNiFc/ped2ID5tTUdsbszi55D5yD8PlD Q20WJmxDX+gWEX3ssehU9Nxi99c5vZjQxLpPKN3pkK15WitJQxfqFWyVYbZOdw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1674727947; 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=QBspy/9u/nODFUtF2xe2bBtb9zVk8MUKnTJvgzkbWRU=; b=X3qYsXlumnjOf8WMGRylrdD0PdDlQ2j2HQftaq3K8YX+AYpvgH3juICVb2H4T+491Ao48L pAygLgqI5Gsnd2Aw== 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 Null Selector Clears Base feature Cc: Kim Phillips , "Borislav Petkov (AMD)" , Sean Christopherson , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230124163319.2277355-6-kim.phillips@amd.com> References: <20230124163319.2277355-6-kim.phillips@amd.com> MIME-Version: 1.0 Message-ID: <167472794641.4906.9955765022898441469.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?1755923014416602272?= X-GMAIL-MSGID: =?utf-8?q?1756079933209892823?= The following commit has been merged into the x86/cpu branch of tip: Commit-ID: 5b909d4ae59aedc711b7a432da021be0e82c95a0 Gitweb: https://git.kernel.org/tip/5b909d4ae59aedc711b7a432da021be0e82c95a0 Author: Kim Phillips AuthorDate: Tue, 24 Jan 2023 10:33:16 -06:00 Committer: Borislav Petkov (AMD) CommitterDate: Wed, 25 Jan 2023 16:25:46 +01:00 x86/cpu, kvm: Add the Null Selector Clears Base feature The Null Selector Clears Base feature was being open-coded for KVM. Add it to its newly added native CPUID leaf 0x80000021 EAX proper. Also drop the bit description comments now it's more self-describing. [ bp: Convert test in check_null_seg_clears_base() too. ] Signed-off-by: Kim Phillips Signed-off-by: Borislav Petkov (AMD) Acked-by: Sean Christopherson Link: https://lore.kernel.org/r/20230124163319.2277355-6-kim.phillips@amd.com --- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/kernel/cpu/common.c | 4 +--- arch/x86/kvm/cpuid.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 901128e..6bed80c 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -430,6 +430,7 @@ /* 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 */ #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 */ /* * BUG word(s) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index e6f3234..e6bf9b1 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1685,9 +1685,7 @@ void check_null_seg_clears_base(struct cpuinfo_x86 *c) if (!IS_ENABLED(CONFIG_X86_64)) return; - /* Zen3 CPUs advertise Null Selector Clears Base in CPUID. */ - if (c->extended_cpuid_level >= 0x80000021 && - cpuid_eax(0x80000021) & BIT(6)) + if (cpu_has(c, X86_FEATURE_NULL_SEL_CLR_BASE)) return; /* diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 12455dc..dde8d6b 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -743,7 +743,7 @@ void kvm_set_cpu_caps(void) kvm_cpu_cap_mask(CPUID_8000_0021_EAX, F(NO_NESTED_DATA_BP) | F(LFENCE_RDTSC) | 0 /* SmmPgCfgLock */ | - BIT(6) /* NULL_SEL_CLR_BASE */ | 0 /* PrefetchCtlMsr */ + F(NULL_SEL_CLR_BASE) | 0 /* PrefetchCtlMsr */ ); /* @@ -759,7 +759,7 @@ void kvm_set_cpu_caps(void) 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_caps[CPUID_8000_0021_EAX] |= BIT(6) /* NULL_SEL_CLR_BASE */; + 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_mask(CPUID_C000_0001_EDX,