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
