Commit 1dae2765 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

KVM: VMX: Tweak the special handling of SECONDARY_EXEC_ENCLS_EXITING in setup_vmcs_config() 



SECONDARY_EXEC_ENCLS_EXITING is the only control which is conditionally
added to the 'optional' checklist in setup_vmcs_config() but the special
case can be avoided by always checking for its presence first and filtering
out the result later.

Note: the situation when SECONDARY_EXEC_ENCLS_EXITING is present but
cpu_has_sgx() is false is possible when SGX is "soft-disabled", e.g. if
software writes MCE control MSRs or there's an uncorrectable #MC.

Reviewed-by: default avatarJim Mattson <jmattson@google.com>
Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20220830133737.1539624-22-vkuznets@redhat.com


Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 378c4c18

arch/x86/kvm/vmx/vmx.c

+6 −3
Original line number Diff line number Diff line
@@ -2605,9 +2605,9 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf, 
			SECONDARY_EXEC_PT_CONCEAL_VMX |

			SECONDARY_EXEC_ENABLE_VMFUNC |

			SECONDARY_EXEC_BUS_LOCK_DETECTION |

			SECONDARY_EXEC_NOTIFY_VM_EXITING;

		if (cpu_has_sgx())

			opt2 |= SECONDARY_EXEC_ENCLS_EXITING;

			SECONDARY_EXEC_NOTIFY_VM_EXITING |

			SECONDARY_EXEC_ENCLS_EXITING;



		if (adjust_vmx_controls(min2, opt2,

					MSR_IA32_VMX_PROCBASED_CTLS2,

					&_cpu_based_2nd_exec_control) < 0)
@@ -2654,6 +2654,9 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf, 
		vmx_cap->vpid = 0;

	}



	if (!cpu_has_sgx())

		_cpu_based_2nd_exec_control &= ~SECONDARY_EXEC_ENCLS_EXITING;



	if (_cpu_based_exec_control & CPU_BASED_ACTIVATE_TERTIARY_CONTROLS) {

		u64 opt3 = TERTIARY_EXEC_IPI_VIRT;