4 Patches of v3 has been queued into kvm/queue branch. This v4 contains the rest to refactor the flow of KVM_SET_CPUID* as: 1. cpuid check: check if userspace provides legal CPUID settings; 2. cpuid update: Update userspace provided CPUID settings. It currently only contains kvm_update_cpuid_runtime, which updates special CPUID bits based on the vcpu state, e.g., OSXSAVE, OSPKE. In the future, we can re-introduce kvm_update_cpuid() if KVM needs to force on/off some bits. 3. update vcpu states: Update vcpu states/settings based on the final updated CPUID settings. v4: - remove 4 queued patches - rebased to kvm/queue: c16ced9cc67a "x86/kvm/vmx: Use native read/write_cr2()" - fix one bug in v3 to call kvfree(cpuid_entries) in kvm_vcpu_ioctl_set_cpuid() - rename "update_vcpu_model" to "vcpu_after_set_cpuid" [Paolo] - Add a new patch to extrace kvm_update_cpuid_runtime() v3: https://lkml.kernel.org/r/20200708065054.19713-1-xiaoyao.li@xxxxxxxxx - 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 (5): KVM: x86: Introduce kvm_check_cpuid() KVM: x86: Extract kvm_update_cpuid_runtime() from kvm_update_cpuid() KVM: x86: Rename kvm_update_cpuid() to kvm_vcpu_after_set_cpuid() KVM: x86: Rename cpuid_update() callback to vcpu_after_set_cpuid() KVM: x86: Move kvm_x86_ops.vcpu_after_set_cpuid() into kvm_vcpu_after_set_cpuid() arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/cpuid.c | 99 +++++++++++++++++++++------------ arch/x86/kvm/cpuid.h | 2 +- arch/x86/kvm/lapic.c | 2 +- arch/x86/kvm/svm/svm.c | 4 +- arch/x86/kvm/vmx/nested.c | 3 +- arch/x86/kvm/vmx/vmx.c | 4 +- arch/x86/kvm/x86.c | 10 ++-- 8 files changed, 76 insertions(+), 50 deletions(-) -- 2.18.4