Since VMFUNC is not supported for non-nested guests, and executing VMFUNC can cause a #UD directly, if the “enable VM functions” VM-execution control is 0, KVM can just disable it in VM-exectution control, instead of taking pains to trap it and emulate the #UD for L1 guests. Also, simplified the process of setting SECONDARY_EXEC_ENABLE_VMFUNC for nested VMX MSR configurations. Change log: ========== v1->v2 - Split the patch into two pieces. - Use KVM_BUG_ON() for unexpected VM Exits. - Comments changes. - Commit message changes, trying to better illustrate the reason. Yu Zhang (2): KVM: VMX: Do not trap VMFUNC instructions for L1 guests. KVM: nVMX: Simplify the setting of SECONDARY_EXEC_ENABLE_VMFUNC for nested. arch/x86/kvm/vmx/nested.c | 26 ++++++++++---------------- arch/x86/kvm/vmx/vmx.c | 7 ++++++- 2 files changed, 16 insertions(+), 17 deletions(-) -- 2.17.1