| Message ID | 20231205103630.1391318-1-vkuznets@redhat.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | KVM: x86: Make Hyper-V emulation optional | expand |
On Tue, 05 Dec 2023 11:36:14 +0100, Vitaly Kuznetsov wrote: > v1: > https://lore.kernel.org/kvm/20231025152406.1879274-1-vkuznets@redhat.com/ > > Changes since RFC: > - "KVM: x86: hyper-v: Split off nested_evmcs_handle_vmclear()" patch added > [Sean] > - "KVM: nVMX: Move guest_cpuid_has_evmcs() to hyperv.h" patch added [Sean] > - Use evmptr_is_set()/nested_vmx_is_evmptr12_set() helpers instead of > nested_vmx_evmptr12() [Sean] > - Move "#ifdef CONFIG_KVM_HYPERV" inside certain functions instead of > adding stubs for !CONFIG_KVM_HYPERV case [Sean] > - Minor code re-shuffling [Sean] > - Collect R-b tags [Max] > > [...] Applied to kvm-x86 hyperv. I massaged a lot of the shortlogs to adjust the scope, shorten line lengths, and rephrase things using more conversational language. Re: the scopes, while I like the idea of "KVM: x86/hyper-v:", e.g. to pair with "KVM: x86/xen:", I think we should forego it for now. The Xen code is fairly well contained and doesn't have VMX or SVM code, let alone nVMX and nSVM code. Hyper-V... not so much. It has its greedy little hands in everything :-) That makes it rather difficult to have consistency and correctness, e.g. these three are all nVMX+hyper-v specific, yet managed to end up with three different scopes. KVM: nVMX: Move guest_cpuid_has_evmcs() to hyperv.h KVM: nVMX: hyper-v: Introduce nested_vmx_evmcs() accessor KVM: x86: hyper-v: Split off nested_evmcs_handle_vmclear() And things only get more confusing when KVM-on-Hyper-V comes into play. So kinda like we do with the TDP MMU, which is too intertwined with the regular/common MMU code to get its own scope, I think we should use existing scopes and then explicitly talk about Hyper-V in the shortlog to make up for the lack of precision. Please speak up if you disagree! I don't expect to apply any other patches to this branch, i.e. further massaging the shortlogs isn't a problem. [1/16] KVM: x86/xen: Remove unneeded xen context from kvm_arch when !CONFIG_KVM_XEN https://github.com/kvm-x86/linux/commit/87562052c965 [2/16] KVM: x86: Move Hyper-V partition assist page out of Hyper-V emulation context https://github.com/kvm-x86/linux/commit/cfef5af3cb0e [3/16] KVM: VMX: Split off vmx_onhyperv.{ch} from hyperv.{ch} https://github.com/kvm-x86/linux/commit/50a82b0eb88c [4/16] KVM: x86: Introduce helper to check if auto-EOI is set in Hyper-V SynIC https://github.com/kvm-x86/linux/commit/16e880bfa637 [5/16] KVM: x86: Introduce helper to check if vector is set in Hyper-V SynIC https://github.com/kvm-x86/linux/commit/0659262a2625 [6/16] KVM: VMX: Split off hyperv_evmcs.{ch} https://github.com/kvm-x86/linux/commit/e7ad84db4d71 [7/16] KVM: x86: Introduce helper to handle Hyper-V paravirt TLB flush requests https://github.com/kvm-x86/linux/commit/af9d544a4521 [8/16] KVM: nVMX: Split off helper for emulating VMCLEAR on Hyper-V eVMCS https://github.com/kvm-x86/linux/commit/b2e02f82b7f7 [9/16] KVM: selftests: Make Hyper-V tests explicitly require KVM Hyper-V support https://github.com/kvm-x86/linux/commit/6dac1195181c [10/16] KVM: selftests: Fix vmxon_pa == vmcs12_pa == -1ull nVMX testcase for !eVMCS https://github.com/kvm-x86/linux/commit/225b7c1117b2 [11/16] KVM: nVMX: Move guest_cpuid_has_evmcs() to hyperv.h https://github.com/kvm-x86/linux/commit/f97314626734 [12/16] KVM: x86: Make Hyper-V emulation optional https://github.com/kvm-x86/linux/commit/b4f69df0f65e [13/16] KVM: nVMX: Introduce helpers to check if Hyper-V evmptr12 is valid/set https://github.com/kvm-x86/linux/commit/453e42b05571 [14/16] KVM: nVMX: Introduce accessor to get Hyper-V eVMCS pointer https://github.com/kvm-x86/linux/commit/c98842b26c23 [15/16] KVM: nVMX: Hide more stuff under CONFIG_KVM_HYPERV https://github.com/kvm-x86/linux/commit/5a30f97683af [16/16] KVM: nSVM: Hide more stuff under CONFIG_KVM_HYPERV/CONFIG_HYPERV https://github.com/kvm-x86/linux/commit/017a99a966f1 -- https://github.com/kvm-x86/linux/tree/next
v1: https://lore.kernel.org/kvm/20231025152406.1879274-1-vkuznets@redhat.com/ Changes since RFC: - "KVM: x86: hyper-v: Split off nested_evmcs_handle_vmclear()" patch added [Sean] - "KVM: nVMX: Move guest_cpuid_has_evmcs() to hyperv.h" patch added [Sean] - Use evmptr_is_set()/nested_vmx_is_evmptr12_set() helpers instead of nested_vmx_evmptr12() [Sean] - Move "#ifdef CONFIG_KVM_HYPERV" inside certain functions instead of adding stubs for !CONFIG_KVM_HYPERV case [Sean] - Minor code re-shuffling [Sean] - Collect R-b tags [Max] KVM supports emulating Microsoft Hyper-V as well as running as a nested (L1) hypervisor on top of Hyper-V whileusing Hyper-V specific PV features. Support for the later is only compiled in when CONFIG_HYPERV is set. This series makes it possible to disable the former with a newly introduced CONFIG_KVM_HYPERV option. This helps to reduce sized of KVM modules as well as the attack surface for some specific deployments when no Windows/Hyper-V guests are expected. The size gain is significant: # CONFIG_KVM_HYPERV is not set # CONFIG_HYPERV is not set -rw-r--r--. 1 user user 3612632 Oct 10 16:53 arch/x86/kvm/kvm-amd.ko -rw-r--r--. 1 user user 5343968 Oct 10 16:53 arch/x86/kvm/kvm-intel.ko CONFIG_KVM_HYPERV=y # CONFIG_HYPERV is not set -rw-r--r--. 1 user user 3925704 Oct 10 16:51 arch/x86/kvm/kvm-amd.ko -rw-r--r--. 1 user user 5819192 Oct 10 16:51 arch/x86/kvm/kvm-intel.ko # CONFIG_KVM_HYPERV is not set CONFIG_HYPERV=m -rw-r--r--. 1 user user 3928440 Oct 10 16:40 arch/x86/kvm/kvm-amd.ko -rw-r--r--. 1 user user 8156464 Oct 10 16:40 arch/x86/kvm/kvm-intel.ko CONFIG_KVM_HYPERV=y CONFIG_HYPERV=m -rw-r--r--. 1 user user 4245440 Oct 10 16:37 arch/x86/kvm/kvm-amd.ko -rw-r--r--. 1 user user 8583872 Oct 10 16:37 arch/x86/kvm/kvm-intel.ko The series is not supposed to introduce any functional change for the "CONFIG_KVM_HYPERV=y && CONFIG_HYPERV=m/y" case. Tested with KVM selftests, kvm-unit-tests and real Windows guests on VMX and SVM. Note, kvm-unit-tests have to be updated to not fail miserably when CONFIG_KVM_HYPERV is not set: https://lore.kernel.org/kvm/20231025152915.1879661-1-vkuznets@redhat.com/ Vitaly Kuznetsov (16): KVM: x86: xen: Remove unneeded xen context from struct kvm_arch when !CONFIG_KVM_XEN KVM: x86: hyper-v: Move Hyper-V partition assist page out of Hyper-V emulation context KVM: VMX: Split off vmx_onhyperv.{ch} from hyperv.{ch} KVM: x86: hyper-v: Introduce kvm_hv_synic_auto_eoi_set() KVM: x86: hyper-v: Introduce kvm_hv_synic_has_vector() KVM: VMX: Split off hyperv_evmcs.{ch} KVM: x86: hyper-v: Introduce kvm_hv_nested_transtion_tlb_flush() helper KVM: x86: hyper-v: Split off nested_evmcs_handle_vmclear() KVM: selftests: Make all Hyper-V tests explicitly dependent on Hyper-V emulation support in KVM KVM: selftests: Fix vmxon_pa == vmcs12_pa == -1ull vmx_set_nested_state_test for !eVMCS case KVM: nVMX: Move guest_cpuid_has_evmcs() to hyperv.h KVM: x86: Make Hyper-V emulation optional KVM: nVMX: hyper-v: Introduce nested_vmx_is_evmptr12_{valid,set}() helpers KVM: nVMX: hyper-v: Introduce nested_vmx_evmcs() accessor KVM: nVMX: hyper-v: Hide more stuff under CONFIG_KVM_HYPERV KVM: nSVM: hyper-v: Hide more stuff under CONFIG_KVM_HYPERV/CONFIG_HYPERV arch/x86/include/asm/kvm_host.h | 13 +- arch/x86/kvm/Kconfig | 14 + arch/x86/kvm/Makefile | 16 +- arch/x86/kvm/cpuid.c | 6 + arch/x86/kvm/hyperv.h | 83 +++- arch/x86/kvm/irq.c | 2 + arch/x86/kvm/irq_comm.c | 9 +- arch/x86/kvm/kvm_onhyperv.h | 20 + arch/x86/kvm/lapic.c | 5 +- arch/x86/kvm/svm/hyperv.h | 9 + arch/x86/kvm/svm/nested.c | 30 +- arch/x86/kvm/svm/svm.h | 2 + arch/x86/kvm/svm/svm_onhyperv.c | 10 +- arch/x86/kvm/vmx/hyperv.c | 447 ------------------ arch/x86/kvm/vmx/hyperv.h | 204 ++------ arch/x86/kvm/vmx/hyperv_evmcs.c | 315 ++++++++++++ arch/x86/kvm/vmx/hyperv_evmcs.h | 166 +++++++ arch/x86/kvm/vmx/nested.c | 149 +++--- arch/x86/kvm/vmx/nested.h | 3 +- arch/x86/kvm/vmx/vmx.c | 20 +- arch/x86/kvm/vmx/vmx.h | 12 +- arch/x86/kvm/vmx/vmx_onhyperv.c | 36 ++ arch/x86/kvm/vmx/vmx_onhyperv.h | 125 +++++ arch/x86/kvm/vmx/vmx_ops.h | 2 +- arch/x86/kvm/x86.c | 66 ++- .../selftests/kvm/x86_64/hyperv_clock.c | 2 + .../selftests/kvm/x86_64/hyperv_evmcs.c | 5 +- .../kvm/x86_64/hyperv_extended_hypercalls.c | 2 + .../selftests/kvm/x86_64/hyperv_features.c | 2 + .../testing/selftests/kvm/x86_64/hyperv_ipi.c | 2 + .../selftests/kvm/x86_64/hyperv_svm_test.c | 1 + .../selftests/kvm/x86_64/hyperv_tlb_flush.c | 2 + .../kvm/x86_64/vmx_set_nested_state_test.c | 16 +- 33 files changed, 1054 insertions(+), 742 deletions(-) create mode 100644 arch/x86/kvm/vmx/hyperv_evmcs.c create mode 100644 arch/x86/kvm/vmx/hyperv_evmcs.h create mode 100644 arch/x86/kvm/vmx/vmx_onhyperv.c create mode 100644 arch/x86/kvm/vmx/vmx_onhyperv.h