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.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, HK_RANDOM_FROM,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,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 6D1F6ECE59D for ; Wed, 16 Oct 2019 01:27:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C5532084B for ; Wed, 16 Oct 2019 01:27:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388864AbfJPB1m (ORCPT ); Tue, 15 Oct 2019 21:27:42 -0400 Received: from mga17.intel.com ([192.55.52.151]:60711 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726786AbfJPB1l (ORCPT ); Tue, 15 Oct 2019 21:27:41 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Oct 2019 18:27:40 -0700 X-IronPort-AV: E=Sophos;i="5.67,301,1566889200"; d="scan'208";a="186003653" Received: from unknown (HELO [10.239.13.123]) ([10.239.13.123]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/AES256-SHA; 15 Oct 2019 18:27:38 -0700 Subject: Re: [PATCH 1/4] KVM: VMX: rename {vmx,nested_vmx}_vcpu_setup functions To: Krish Sadhukhan , Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , Sean Christopherson , Vitaly Kuznetsov , Jim Mattson , Joerg Roedel Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org References: <20191015164033.87276-1-xiaoyao.li@intel.com> <20191015164033.87276-2-xiaoyao.li@intel.com> <82a41967-98ca-1bc8-fce3-77aaf18b0c1a@oracle.com> From: Xiaoyao Li Message-ID: <7d4f2202-d200-f24c-d4cb-dcdfdda7f3b7@intel.com> Date: Wed, 16 Oct 2019 09:27:37 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <82a41967-98ca-1bc8-fce3-77aaf18b0c1a@oracle.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/16/2019 6:05 AM, Krish Sadhukhan wrote: > > > On 10/15/2019 09:40 AM, Xiaoyao Li wrote: >> Rename {vmx,nested_vmx}_vcpu_setup to {vmx,nested_vmx}_vmcs_setup, >> to match what they really do. >> >> No functional change. >> >> Signed-off-by: Xiaoyao Li >> --- >>   arch/x86/kvm/vmx/nested.c | 2 +- >>   arch/x86/kvm/vmx/nested.h | 2 +- >>   arch/x86/kvm/vmx/vmx.c    | 9 +++------ >>   3 files changed, 5 insertions(+), 8 deletions(-) >> >> diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c >> index 5e231da00310..7935422d311f 100644 >> --- a/arch/x86/kvm/vmx/nested.c >> +++ b/arch/x86/kvm/vmx/nested.c >> @@ -5768,7 +5768,7 @@ static int vmx_set_nested_state(struct kvm_vcpu >> *vcpu, >>       return ret; >>   } >> -void nested_vmx_vcpu_setup(void) >> +void nested_vmx_vmcs_setup(void) >>   { >>       if (enable_shadow_vmcs) { >>           vmcs_write64(VMREAD_BITMAP, __pa(vmx_vmread_bitmap)); >> diff --git a/arch/x86/kvm/vmx/nested.h b/arch/x86/kvm/vmx/nested.h >> index 187d39bf0bf1..2be1ba7482c9 100644 >> --- a/arch/x86/kvm/vmx/nested.h >> +++ b/arch/x86/kvm/vmx/nested.h >> @@ -11,7 +11,7 @@ void nested_vmx_setup_ctls_msrs(struct >> nested_vmx_msrs *msrs, u32 ept_caps, >>                   bool apicv); >>   void nested_vmx_hardware_unsetup(void); >>   __init int nested_vmx_hardware_setup(int (*exit_handlers[])(struct >> kvm_vcpu *)); >> -void nested_vmx_vcpu_setup(void); >> +void nested_vmx_vmcs_setup(void); >>   void nested_vmx_free_vcpu(struct kvm_vcpu *vcpu); >>   int nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, bool >> from_vmentry); >>   bool nested_vmx_exit_reflected(struct kvm_vcpu *vcpu, u32 exit_reason); >> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c >> index e660e28e9ae0..58b77a882426 100644 >> --- a/arch/x86/kvm/vmx/vmx.c >> +++ b/arch/x86/kvm/vmx/vmx.c >> @@ -4161,15 +4161,12 @@ static void ept_set_mmio_spte_mask(void) >>   #define VMX_XSS_EXIT_BITMAP 0 >> -/* >> - * Sets up the vmcs for emulated real mode. >> - */ >> -static void vmx_vcpu_setup(struct vcpu_vmx *vmx) >> +static void vmx_vmcs_setup(struct vcpu_vmx *vmx) >>   { >>       int i; >>       if (nested) >> -        nested_vmx_vcpu_setup(); >> +        nested_vmx_vmcs_setup(); >>       if (cpu_has_vmx_msr_bitmap()) >>           vmcs_write64(MSR_BITMAP, __pa(vmx->vmcs01.msr_bitmap)); >> @@ -6777,7 +6774,7 @@ static struct kvm_vcpu *vmx_create_vcpu(struct >> kvm *kvm, unsigned int id) >>       cpu = get_cpu(); >>       vmx_vcpu_load(&vmx->vcpu, cpu); >>       vmx->vcpu.cpu = cpu; >> -    vmx_vcpu_setup(vmx); >> +    vmx_vmcs_setup(vmx); >>       vmx_vcpu_put(&vmx->vcpu); >>       put_cpu(); >>       if (cpu_need_virtualize_apic_accesses(&vmx->vcpu)) { > > May be we should rename vmx_vcpu_reset() to vmx_vmcs_reset()  as well  ? Not really. vmx_vcpu_reset() not only resets vmcs but also the emulated field of vmx vcpu.