From: Paolo Bonzini <pbonzini@redhat.com>
To: Xiaoyao Li <xiaoyao.li@intel.com>,
Sean Christopherson <sean.j.christopherson@intel.com>,
Jim Mattson <jmattson@google.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-doc@vger.kernel.org, Jonathan Corbet <corbet@lwn.net>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Joerg Roedel <joro@8bytes.org>
Subject: Re: [PATCH v3 5/8] KVM: X86: Rename cpuid_update() to update_vcpu_model()
Date: Wed, 8 Jul 2020 14:08:18 +0200 [thread overview]
Message-ID: <f4003675-105e-6574-fe46-50995ec69358@redhat.com> (raw)
In-Reply-To: <20200708065054.19713-6-xiaoyao.li@intel.com>
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 <xiaoyao.li@intel.com>
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,
>
>
next prev parent reply other threads:[~2020-07-08 12:08 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 6:50 [PATCH v3 0/8] Refactor handling flow of KVM_SET_CPUID* Xiaoyao Li
2020-07-08 6:50 ` [PATCH v3 1/8] KVM: X86: Reset vcpu->arch.cpuid_nent to 0 if SET_CPUID* fails Xiaoyao Li
2020-07-08 12:00 ` Paolo Bonzini
2020-07-08 6:50 ` [PATCH v3 2/8] KVM: X86: Go on updating other CPUID leaves when leaf 1 is absent Xiaoyao Li
2020-07-08 6:50 ` [PATCH v3 3/8] KVM: X86: Introduce kvm_check_cpuid() Xiaoyao Li
2020-07-08 12:28 ` Xiaoyao Li
2020-07-08 12:43 ` Paolo Bonzini
2020-07-08 6:50 ` [PATCH v3 4/8] KVM: X86: Split kvm_update_cpuid() Xiaoyao Li
2020-07-08 12:06 ` Paolo Bonzini
2020-07-08 12:33 ` Xiaoyao Li
2020-07-08 12:41 ` Paolo Bonzini
2020-07-08 13:27 ` Xiaoyao Li
2020-07-08 13:30 ` Paolo Bonzini
2020-07-08 6:50 ` [PATCH v3 5/8] KVM: X86: Rename cpuid_update() to update_vcpu_model() Xiaoyao Li
2020-07-08 12:08 ` Paolo Bonzini [this message]
2020-07-08 6:50 ` [PATCH v3 6/8] KVM: X86: Move kvm_x86_ops.update_vcpu_model() into kvm_update_vcpu_model() Xiaoyao Li
2020-07-08 6:50 ` [PATCH v3 7/8] KVM: lapic: Use guest_cpuid_has() in kvm_apic_set_version() Xiaoyao Li
2020-07-08 6:50 ` [PATCH v3 8/8] KVM: X86: Move kvm_apic_set_version() to kvm_update_vcpu_model() Xiaoyao Li
2020-07-08 12:10 ` [PATCH v3 0/8] Refactor handling flow of KVM_SET_CPUID* Paolo Bonzini
2020-07-09 4:27 ` Xiaoyao Li
2020-07-09 9:37 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f4003675-105e-6574-fe46-50995ec69358@redhat.com \
--to=pbonzini@redhat.com \
--cc=corbet@lwn.net \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sean.j.christopherson@intel.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=xiaoyao.li@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox