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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,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 59655C433E0 for ; Wed, 8 Jul 2020 12:08:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 28E27206E2 for ; Wed, 8 Jul 2020 12:08:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YFTDcKMg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728980AbgGHMI0 (ORCPT ); Wed, 8 Jul 2020 08:08:26 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:54818 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728765AbgGHMIZ (ORCPT ); Wed, 8 Jul 2020 08:08:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594210103; h=from:from: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=LgCGV9UQsMIs0HezRCCnnS+bW56cFI4HntGamwUOC9k=; b=YFTDcKMg2VyeMoPUSgOjtUZCcLzPekha3YW/p9Elv+Ts8qGp6e7J7hDFCDFjHzN/y+cYhd BnR0PkmU22zTLHhLkuvoYmwBXbxQAnZmU1bQjgle7ioRD3Y2/lFozmYUEWgjb+NWv+CzHd Vq1N5iLCwDBdDuq6ThaLvVA6w4rfV4U= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-91-sARhCh4TNCudXKNdbEy4aw-1; Wed, 08 Jul 2020 08:08:21 -0400 X-MC-Unique: sARhCh4TNCudXKNdbEy4aw-1 Received: by mail-wr1-f72.google.com with SMTP id o25so51684608wro.16 for ; Wed, 08 Jul 2020 05:08:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=LgCGV9UQsMIs0HezRCCnnS+bW56cFI4HntGamwUOC9k=; b=ZSRKRyUttR9gsUECN/LlJYmw8+TiexXA75sSDnHAp2WKkajMTB5Zu/iZM+OovdIj74 isqk0J1tmzOQygbzvAuVXc2XDiNJ4QCpa7dq0CrMi/nIyySQxIejWu4Ekk5tipaUwf2y kSUNbzw7hG/iF0ymozJmx0RJM0qq+kdOG+b8HRIF7bR5l4U7ogVt9iVLUmZ69qKZeX1j /bU3N0VnpmRy2DYXHcJpLGN7h1I4rdr0VQ9lZGFDbuD36j5e5CA4VmD95oxY1gukLdA1 bVf5lrrfXA2n7+ij1UDLw7Hf/VZYIu21/IbeazMfcdP0IVnqt1X39qKmeBQLndUuB8qB PPlQ== X-Gm-Message-State: AOAM533O/nUrWux5N66wA5t4QVRv5WXo+s4eEkA1OblEGtIvLhMOF977 v70vlESOLmU3odMPudp/VoQcMvFEzKJGAotRrcje5H+TeaZ0o8yaJXlOWaiLw2G7jr73oM7ZXci wKOrUOI6nb6I5B699A69kdSmS X-Received: by 2002:a7b:c2f7:: with SMTP id e23mr8983710wmk.175.1594210100771; Wed, 08 Jul 2020 05:08:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8TzlN5z0gOlf031ceUJoPlaYBeIvnWySmGs4nfTmzVvjRJvMC3luiOKvJTX8B6tbrH0d7eQ== X-Received: by 2002:a7b:c2f7:: with SMTP id e23mr8983678wmk.175.1594210100489; Wed, 08 Jul 2020 05:08:20 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:9541:9439:cb0f:89c? ([2001:b07:6468:f312:9541:9439:cb0f:89c]) by smtp.gmail.com with ESMTPSA id e5sm5647570wrs.33.2020.07.08.05.08.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 08 Jul 2020 05:08:19 -0700 (PDT) Subject: Re: [PATCH v3 5/8] KVM: X86: Rename cpuid_update() to update_vcpu_model() To: Xiaoyao Li , Sean Christopherson , Jim Mattson Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Jonathan Corbet , Vitaly Kuznetsov , Wanpeng Li , Joerg Roedel References: <20200708065054.19713-1-xiaoyao.li@intel.com> <20200708065054.19713-6-xiaoyao.li@intel.com> From: Paolo Bonzini Message-ID: Date: Wed, 8 Jul 2020 14:08:18 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200708065054.19713-6-xiaoyao.li@intel.com> Content-Type: text/plain; charset=utf-8 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 08/07/20 08:50, Xiaoyao Li wrote: > The name of callback cpuid_update() is misleading that it's not about > updating CPUID settings of vcpu but updating the configurations of vcpu > based on the CPUIDs. So rename it to update_vcpu_model(). > > Signed-off-by: Xiaoyao Li With the change suggested in the previous patch, this one becomes unnecessary (or you can rename it to update_cpuid). While you're at it, you could also move the call in kvm_update_cpuid. Paolo > --- > arch/x86/include/asm/kvm_host.h | 2 +- > arch/x86/kvm/cpuid.c | 4 ++-- > arch/x86/kvm/svm/svm.c | 4 ++-- > arch/x86/kvm/vmx/nested.c | 2 +- > arch/x86/kvm/vmx/vmx.c | 4 ++-- > 5 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h > index 97cb005c7aa7..c35d14b257c9 100644 > --- a/arch/x86/include/asm/kvm_host.h > +++ b/arch/x86/include/asm/kvm_host.h > @@ -1051,7 +1051,7 @@ struct kvm_x86_ops { > void (*hardware_unsetup)(void); > bool (*cpu_has_accelerated_tpr)(void); > bool (*has_emulated_msr)(u32 index); > - void (*cpuid_update)(struct kvm_vcpu *vcpu); > + void (*update_vcpu_model)(struct kvm_vcpu *vcpu); > > unsigned int vm_size; > int (*vm_init)(struct kvm *kvm); > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index 001f5a94880e..d2f93823f9fd 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -224,7 +224,7 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, > > cpuid_fix_nx_cap(vcpu); > kvm_apic_set_version(vcpu); > - kvm_x86_ops.cpuid_update(vcpu); > + kvm_x86_ops.update_vcpu_model(vcpu); > kvm_update_cpuid(vcpu); > kvm_update_vcpu_model(vcpu); > > @@ -254,7 +254,7 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, > } > > kvm_apic_set_version(vcpu); > - kvm_x86_ops.cpuid_update(vcpu); > + kvm_x86_ops.update_vcpu_model(vcpu); > kvm_update_cpuid(vcpu); > kvm_update_vcpu_model(vcpu); > out: > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c > index 74096aa72ad9..01f359e590d5 100644 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@ -3550,7 +3550,7 @@ static u64 svm_get_mt_mask(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio) > return 0; > } > > -static void svm_cpuid_update(struct kvm_vcpu *vcpu) > +static void svm_update_vcpu_model(struct kvm_vcpu *vcpu) > { > struct vcpu_svm *svm = to_svm(vcpu); > > @@ -4050,7 +4050,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { > > .get_exit_info = svm_get_exit_info, > > - .cpuid_update = svm_cpuid_update, > + .update_vcpu_model = svm_update_vcpu_model, > > .has_wbinvd_exit = svm_has_wbinvd_exit, > > diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c > index b627c5f36b9e..85080a5b8d3c 100644 > --- a/arch/x86/kvm/vmx/nested.c > +++ b/arch/x86/kvm/vmx/nested.c > @@ -6354,7 +6354,7 @@ void nested_vmx_setup_ctls_msrs(struct nested_vmx_msrs *msrs, u32 ept_caps) > > /* > * secondary cpu-based controls. Do not include those that > - * depend on CPUID bits, they are added later by vmx_cpuid_update. > + * depend on CPUID bits, they are added later by vmx_update_vcpu_model. > */ > if (msrs->procbased_ctls_high & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS) > rdmsr(MSR_IA32_VMX_PROCBASED_CTLS2, > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index 8187ca152ad2..4673c84b54ac 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -7257,7 +7257,7 @@ static void update_intel_pt_cfg(struct kvm_vcpu *vcpu) > vmx->pt_desc.ctl_bitmask &= ~(0xfULL << (32 + i * 4)); > } > > -static void vmx_cpuid_update(struct kvm_vcpu *vcpu) > +static void vmx_update_vcpu_model(struct kvm_vcpu *vcpu) > { > struct vcpu_vmx *vmx = to_vmx(vcpu); > > @@ -7915,7 +7915,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { > > .get_exit_info = vmx_get_exit_info, > > - .cpuid_update = vmx_cpuid_update, > + .update_vcpu_model = vmx_update_vcpu_model, > > .has_wbinvd_exit = cpu_has_vmx_wbinvd_exit, > >