Commit 255006ad authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-x86-vmx-6.5' of https://github.com/kvm-x86/linux into HEAD 

KVM VMX changes for 6.5:

 - Fix missing/incorrect #GP checks on ENCLS

 - Use standard mmu_notifier hooks for handling APIC access page

 - Misc cleanups
parents 24975ce8 0a3869e1

arch/x86/kvm/mmu/mmu.c

+4 −0
Original line number Diff line number Diff line
@@ -1603,6 +1603,10 @@ bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range) 
	if (tdp_mmu_enabled)

		flush = kvm_tdp_mmu_unmap_gfn_range(kvm, range, flush);



	if (kvm_x86_ops.set_apic_access_page_addr &&

	    range->slot->id == APIC_ACCESS_PAGE_PRIVATE_MEMSLOT)

		kvm_make_all_cpus_request(kvm, KVM_REQ_APIC_PAGE_RELOAD);



	return flush;

}

arch/x86/kvm/vmx/capabilities.h

+2 −2
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@ static inline bool cpu_has_vmx_ept(void) 


static inline bool vmx_umip_emulated(void)

{

	return vmcs_config.cpu_based_2nd_exec_ctrl &

		SECONDARY_EXEC_DESC;

	return !boot_cpu_has(X86_FEATURE_UMIP) &&

	       (vmcs_config.cpu_based_2nd_exec_ctrl & SECONDARY_EXEC_DESC);

}



static inline bool cpu_has_vmx_rdtscp(void)

arch/x86/kvm/vmx/nested.c

+1 −2
Original line number Diff line number Diff line
@@ -2328,8 +2328,7 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct loaded_vmcs *vmcs0 
		 * Preset *DT exiting when emulating UMIP, so that vmx_set_cr4()

		 * will not have to rewrite the controls just for this bit.

		 */

		if (!boot_cpu_has(X86_FEATURE_UMIP) && vmx_umip_emulated() &&

		    (vmcs12->guest_cr4 & X86_CR4_UMIP))

		if (vmx_umip_emulated() && (vmcs12->guest_cr4 & X86_CR4_UMIP))

			exec_control |= SECONDARY_EXEC_DESC;



		if (exec_control & SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY)

arch/x86/kvm/vmx/pmu_intel.c

+0 −2
Original line number Diff line number Diff line
@@ -385,8 +385,6 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
		}

		break;

	case MSR_IA32_DS_AREA:

		if (msr_info->host_initiated && data && !guest_cpuid_has(vcpu, X86_FEATURE_DS))

			return 1;

		if (is_noncanonical_address(data, vcpu))

			return 1;

arch/x86/kvm/vmx/sgx.c

+9 −6
Original line number Diff line number Diff line
@@ -357,11 +357,12 @@ static int handle_encls_einit(struct kvm_vcpu *vcpu) 


static inline bool encls_leaf_enabled_in_guest(struct kvm_vcpu *vcpu, u32 leaf)

{

	if (!enable_sgx || !guest_cpuid_has(vcpu, X86_FEATURE_SGX))

		return false;



	/*

	 * ENCLS generates a #UD if SGX1 isn't supported, i.e. this point will

	 * be reached if and only if the SGX1 leafs are enabled.

	 */

	if (leaf >= ECREATE && leaf <= ETRACK)

		return guest_cpuid_has(vcpu, X86_FEATURE_SGX1);

		return true;



	if (leaf >= EAUG && leaf <= EMODT)

		return guest_cpuid_has(vcpu, X86_FEATURE_SGX2);
@@ -380,9 +381,11 @@ int handle_encls(struct kvm_vcpu *vcpu) 
{

	u32 leaf = (u32)kvm_rax_read(vcpu);



	if (!encls_leaf_enabled_in_guest(vcpu, leaf)) {

	if (!enable_sgx || !guest_cpuid_has(vcpu, X86_FEATURE_SGX) ||

	    !guest_cpuid_has(vcpu, X86_FEATURE_SGX1)) {

		kvm_queue_exception(vcpu, UD_VECTOR);

	} else if (!sgx_enabled_in_guest_bios(vcpu)) {

	} else if (!encls_leaf_enabled_in_guest(vcpu, leaf) ||

		   !sgx_enabled_in_guest_bios(vcpu) || !is_paging(vcpu)) {

		kvm_inject_gp(vcpu, 0);

	} else {

		if (leaf == ECREATE)