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 X-Spam-Level: X-Spam-Status: No, score=-7.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, HK_RANDOM_FROM,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F167C433E0 for ; Thu, 2 Jul 2020 22:30:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6B2EE20780 for ; Thu, 2 Jul 2020 22:30:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726446AbgGBWaD (ORCPT ); Thu, 2 Jul 2020 18:30:03 -0400 Received: from mga12.intel.com ([192.55.52.136]:3107 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726110AbgGBWaC (ORCPT ); Thu, 2 Jul 2020 18:30:02 -0400 IronPort-SDR: OWRxiqE6aln2IKOszBWXEldzFrHvgzzmn7SPEo60vB4ckI2LiW5T7GYw9yv+4ImtbLwJjgGnrr WjUtZFfK3vlQ== X-IronPort-AV: E=McAfee;i="6000,8403,9670"; a="126653147" X-IronPort-AV: E=Sophos;i="5.75,305,1589266800"; d="scan'208";a="126653147" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jul 2020 15:30:02 -0700 IronPort-SDR: tbamLTMO62RorKJ/EX8T00IEQHunr51703Fh4c0rADVC1XeYG+dOuDJSxSinfY3/S3dQFBrO6B gSfMr5EO8T3Q== X-IronPort-AV: E=Sophos;i="5.75,305,1589266800"; d="scan'208";a="426100405" Received: from xiaoyaol-mobl.ccr.corp.intel.com (HELO [10.255.31.34]) ([10.255.31.34]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jul 2020 15:30:00 -0700 Subject: Re: [PATCH v2 6/7] KVM: X86: Move kvm_x86_ops.update_vcpu_model() into kvm_update_vcpu_model() To: Sean Christopherson Cc: Paolo Bonzini , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org References: <20200623115816.24132-1-xiaoyao.li@intel.com> <20200623115816.24132-7-xiaoyao.li@intel.com> <20200702185913.GI3575@linux.intel.com> From: Xiaoyao Li Message-ID: Date: Fri, 3 Jul 2020 06:29:58 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200702185913.GI3575@linux.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 7/3/2020 2:59 AM, Sean Christopherson wrote: > On Tue, Jun 23, 2020 at 07:58:15PM +0800, Xiaoyao Li wrote: >> kvm_x86_ops.update_vcpu_model() is used to update vmx/svm vcpu settings >> based on updated CPUID settings. So it's supposed to be called after >> CPUIDs are fully updated, i.e., kvm_update_cpuid(). >> >> Move it in kvm_update_vcpu_model(). > > The changelog needs to provide an in-depth analysis of VMX and SVM to prove > that there are no existing dependencies in the ordering. I've done the > analysis a few times over the past few years for a similar chage I carried > in my SGX code, but dropped that code a while back and haven't done the > analysis since. Anyways, it should be documented. No problem. Will add the analysis in next version. >> Signed-off-by: Xiaoyao Li >> --- >> --- >> arch/x86/kvm/cpuid.c | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c >> index d2f93823f9fd..5decc2dd5448 100644 >> --- a/arch/x86/kvm/cpuid.c >> +++ b/arch/x86/kvm/cpuid.c >> @@ -121,6 +121,8 @@ void kvm_update_vcpu_model(struct kvm_vcpu *vcpu) >> struct kvm_lapic *apic = vcpu->arch.apic; >> struct kvm_cpuid_entry2 *best; >> >> + kvm_x86_ops.update_vcpu_model(vcpu); >> + >> best = kvm_find_cpuid_entry(vcpu, 1, 0); >> if (best && apic) { >> if (cpuid_entry_has(best, X86_FEATURE_TSC_DEADLINE_TIMER)) >> @@ -136,6 +138,7 @@ void kvm_update_vcpu_model(struct kvm_vcpu *vcpu) >> vcpu->arch.guest_supported_xcr0 = >> (best->eax | ((u64)best->edx << 32)) & supported_xcr0; >> >> + > > Spurious whitespace. > >> /* Note, maxphyaddr must be updated before tdp_level. */ >> vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu); >> vcpu->arch.tdp_level = kvm_x86_ops.get_tdp_level(vcpu); >> @@ -224,7 +227,6 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, >> >> cpuid_fix_nx_cap(vcpu); >> kvm_apic_set_version(vcpu); >> - kvm_x86_ops.update_vcpu_model(vcpu); >> kvm_update_cpuid(vcpu); >> kvm_update_vcpu_model(vcpu); >> >> @@ -254,7 +256,6 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, >> } >> >> kvm_apic_set_version(vcpu); >> - kvm_x86_ops.update_vcpu_model(vcpu); >> kvm_update_cpuid(vcpu); >> kvm_update_vcpu_model(vcpu); >> out: >> -- >> 2.18.2 >>