From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF629C6FA82 for ; Tue, 20 Sep 2022 22:53:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230311AbiITWxA (ORCPT ); Tue, 20 Sep 2022 18:53:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230287AbiITWw7 (ORCPT ); Tue, 20 Sep 2022 18:52:59 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BC2371BD8 for ; Tue, 20 Sep 2022 15:52:57 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id q9-20020a17090a178900b0020265d92ae3so12315697pja.5 for ; Tue, 20 Sep 2022 15:52:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date; bh=oq3iuYqgpVztglY7H/NFsHDhvYDb/9kInx41v+sCUYo=; b=TkcBPM4T6KPghdH6FXzD+gnd3xzgIIgXHLbx3JCrzl7bSBgzPXNoOqNEA3VqRKkwbc m/6/lmQ7AzVMA5hzx/4/MSYmc1xwU6qGE3PltYGdF4ZCy70rAfLPV69ysEo0YtEK5qua I/CB7fY5z4Eu2SaU2TQL5y3d+TobopeELw0pLGbEYTK7NxEWVw2K/uKaKWFwGgwb14no KqgKg7mgdWW0RDYK03mNz2ppfJM5iASv+IYzhqcpJm/Rmdr7qaJewRWIQa4Dl2CSC96o EjpRxK6dWK46cxcMmCeRQxgXCMieB+337c0Xnz8BFfVp+srnP1Iu49SekUTLshfXW/g1 1X3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=oq3iuYqgpVztglY7H/NFsHDhvYDb/9kInx41v+sCUYo=; b=qbW7hNY512tJf1ku2EyRcG6uLStlwTbciD1Z4V7eHi6N1Kjii+6zs/uLcyhSlZMmDp pqQLnZnRjXg/iOK0lPhO+30KGy7C0Rawbv3ZXC+v8vLNKS1d4Jx+MONn1e8KElnLyp0T STwJTS9Y7AaTe7wb1zVwFeeM9jvw05yITgyuEXGIyiLYnnsngxw1WcvUkRH9A9lgaTyA ZPj/sELgTfXnkdjdQ/8KnQM5tNQN95Ffz2ZnP+hFCRhLre26wo9NvOULTwNjH1gG5bs5 IOC3G2BT8EEwsGElQNsp6uqlo0RRi8LfKHexk8I1C7c3uBv1eNcQeyhHVSwotj1Jb92b 2Ueg== X-Gm-Message-State: ACrzQf3Mnk05smnySQ8NtiQqP9t5aIdfi3LGGWIjw/F2DhG1TMxGwoF1 iCamQALfwckkTPmcKKfNMcl3Kg== X-Google-Smtp-Source: AMsMyM5gkpKq6OvOszMaHIpqHSNccl7/7urVrT0Gij2fXPU9+iu3UyR3X+REdjCc9Z/UvK+KtvuVOQ== X-Received: by 2002:a17:90a:1b6e:b0:1f5:1902:af92 with SMTP id q101-20020a17090a1b6e00b001f51902af92mr6307754pjq.238.1663714377221; Tue, 20 Sep 2022 15:52:57 -0700 (PDT) Received: from google.com (7.104.168.34.bc.googleusercontent.com. [34.168.104.7]) by smtp.gmail.com with ESMTPSA id e11-20020a17090301cb00b00176c431e7e2sm469518plh.13.2022.09.20.15.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 15:52:56 -0700 (PDT) Date: Tue, 20 Sep 2022 22:52:53 +0000 From: Sean Christopherson To: Vitaly Kuznetsov Cc: kvm@vger.kernel.org, Paolo Bonzini , Wanpeng Li , Jim Mattson , Michael Kelley , Maxim Levitsky , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 2/6] KVM: x86: Introduce CPUID_8000_0007_EDX 'scattered' leaf Message-ID: References: <20220916135205.3185973-1-vkuznets@redhat.com> <20220916135205.3185973-3-vkuznets@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220916135205.3185973-3-vkuznets@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-hyperv@vger.kernel.org On Fri, Sep 16, 2022, Vitaly Kuznetsov wrote: > CPUID_8000_0007_EDX may come handy when X86_FEATURE_CONSTANT_TSC > needs to be checked. > > No functional change intended. > > Signed-off-by: Vitaly Kuznetsov > --- > arch/x86/kvm/cpuid.c | 4 ++++ > arch/x86/kvm/reverse_cpuid.h | 9 ++++++++- > 2 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index 75dcf7a72605..f68b14053c9b 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -669,6 +669,10 @@ void kvm_set_cpu_caps(void) > if (!tdp_enabled && IS_ENABLED(CONFIG_X86_64)) > kvm_cpu_cap_set(X86_FEATURE_GBPAGES); > > + kvm_cpu_cap_init_scattered(CPUID_8000_0007_EDX, > + SF(CONSTANT_TSC) > + ); The scattered leaf needs to be used in __do_cpuid_func(), e.g. diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index ffdc28684cb7..c91f23bb3605 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -1137,8 +1137,8 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) /* L2 cache and TLB: pass through host info. */ break; case 0x80000007: /* Advanced power management */ - /* invariant TSC is CPUID.80000007H:EDX[8] */ - entry->edx &= (1 << 8); + cpuid_entry_override(entry, CPUID_8000_0007_EDX); + /* mask against host */ entry->edx &= boot_cpu_data.x86_power; entry->eax = entry->ebx = entry->ecx = 0;