Re: [PATCH v3 0/8] Refactor handling flow of KVM_SET_CPUID*

From: Paolo Bonzini
Date: Thu Jul 09 2020 - 05:37:51 EST


On 09/07/20 06:27, Xiaoyao Li wrote:
> On 7/8/2020 8:10 PM, Paolo Bonzini wrote:
>> On 08/07/20 08:50, Xiaoyao Li wrote:
>>> This serial is the extended version of
>>> https://lkml.kernel.org/r/20200528151927.14346-1-xiaoyao.li@xxxxxxxxx
>>>
>>> First two patches are bug fixing, and the others aim to refactor the
>>> flow
>>> of SET_CPUID* as:
>>>
>>> 1. cpuid check: check if userspace provides legal CPUID settings;
>>>
>>> 2. cpuid update: Update some special CPUID bits based on current vcpu
>>> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ state, e.g., OSXSAVE, OSPKE, ...
>>>
>>> 3. update vcpu model: Update vcpu model (settings) based on the final
>>> CPUID
>>> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ settings.
>>>
>>> v3:
>>> Â - Add a note in KVM api doc to state the previous CPUID configuration
>>> ÂÂÂ is not reliable if current KVM_SET_CPUID* fails [Jim]
>>> Â - Adjust Patch 2 to reduce code churn [Sean]
>>> Â - Commit message refine to add more justification [Sean]
>>> Â - Add a new patch (7)
>>>
>>> v2:
>>> https://lkml.kernel.org/r/20200623115816.24132-1-xiaoyao.li@xxxxxxxxx
>>> Â - rebase to kvm/queue: a037ff353ba6 ("Merge branch 'kvm-master'
>>> into HEAD")
>>> Â - change the name of kvm_update_state_based_on_cpuid() to
>>> ÂÂÂ kvm_update_vcpu_model() [Sean]
>>> Â - Add patch 5 to rename kvm_x86_ops.cpuid_date() to
>>> ÂÂÂ kvm_x86_ops.update_vcpu_model()
>>>
>>> v1:
>>> https://lkml.kernel.org/r/20200529085545.29242-1-xiaoyao.li@xxxxxxxxx
>>>
>>> Xiaoyao Li (8):
>>> ÂÂ KVM: X86: Reset vcpu->arch.cpuid_nent to 0 if SET_CPUID* fails
>>> ÂÂ KVM: X86: Go on updating other CPUID leaves when leaf 1 is absent
>>> ÂÂ KVM: X86: Introduce kvm_check_cpuid()
>>> ÂÂ KVM: X86: Split kvm_update_cpuid()
>>> ÂÂ KVM: X86: Rename cpuid_update() to update_vcpu_model()
>>> ÂÂ KVM: X86: Move kvm_x86_ops.update_vcpu_model() into
>>> ÂÂÂÂ kvm_update_vcpu_model()
>>> ÂÂ KVM: lapic: Use guest_cpuid_has() in kvm_apic_set_version()
>>> ÂÂ KVM: X86: Move kvm_apic_set_version() to kvm_update_vcpu_model()
>>>
>>>  Documentation/virt/kvm/api.rst | 4 ++
>>> Â arch/x86/include/asm/kvm_host.h |ÂÂ 2 +-
>>> Â arch/x86/kvm/cpuid.cÂÂÂÂÂÂÂÂÂÂÂ | 107 ++++++++++++++++++++------------
>>> Â arch/x86/kvm/cpuid.hÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 3 +-
>>> Â arch/x86/kvm/lapic.cÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 4 +-
>>> Â arch/x86/kvm/svm/svm.cÂÂÂÂÂÂÂÂÂ |ÂÂ 4 +-
>>> Â arch/x86/kvm/vmx/nested.cÂÂÂÂÂÂ |ÂÂ 2 +-
>>> Â arch/x86/kvm/vmx/vmx.cÂÂÂÂÂÂÂÂÂ |ÂÂ 4 +-
>>> Â arch/x86/kvm/x86.cÂÂÂÂÂÂÂÂÂÂÂÂÂ |ÂÂ 1 +
>>> Â 9 files changed, 81 insertions(+), 50 deletions(-)
>>>
>>
>> Queued patches 1/2/3/7/8, thanks.
>
> Paolo,
>
> I notice that you queued patch 8 into kvm/queue branch as
> commit 84dd4897524e "KVM: X86: Move kvm_apic_set_version() to
> kvm_update_vcpu_model()"
>
> Can you change the subject of that commit to "KVM: X86: Move
> kvm_apic_set_version() to kvm_update_cpuid()" ?

Good catch, thanks.

Paolo