Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7953d7f authored by Abel Gordon's avatar Abel Gordon Committed by Gleb Natapov
Browse files

KVM: nVMX: Release shadow vmcs 



Unmap vmcs12 and release the corresponding shadow vmcs

Signed-off-by: default avatarAbel Gordon <abelg@il.ibm.com>
Reviewed-by: default avatarOrit Wasserman <owasserm@redhat.com>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
parent 8de48833

arch/x86/kvm/vmx.c

+12 −8
Original line number Diff line number Diff line
@@ -5607,6 +5607,12 @@ static int nested_vmx_check_permission(struct kvm_vcpu *vcpu) 
	return 1;

}



static inline void nested_release_vmcs12(struct vcpu_vmx *vmx)

{

	kunmap(vmx->nested.current_vmcs12_page);

	nested_release_page(vmx->nested.current_vmcs12_page);

}



/*

 * Free whatever needs to be freed from vmx->nested when L1 goes down, or

 * just stops using VMX.
@@ -5617,11 +5623,12 @@ static void free_nested(struct vcpu_vmx *vmx) 
		return;

	vmx->nested.vmxon = false;

	if (vmx->nested.current_vmptr != -1ull) {

		kunmap(vmx->nested.current_vmcs12_page);

		nested_release_page(vmx->nested.current_vmcs12_page);

		nested_release_vmcs12(vmx);

		vmx->nested.current_vmptr = -1ull;

		vmx->nested.current_vmcs12 = NULL;

	}

	if (enable_shadow_vmcs)

		free_vmcs(vmx->nested.current_shadow_vmcs);

	/* Unpin physical memory we referred to in current vmcs02 */

	if (vmx->nested.apic_access_page) {

		nested_release_page(vmx->nested.apic_access_page);
@@ -5762,8 +5769,7 @@ static int handle_vmclear(struct kvm_vcpu *vcpu) 
	}



	if (vmptr == vmx->nested.current_vmptr) {

		kunmap(vmx->nested.current_vmcs12_page);

		nested_release_page(vmx->nested.current_vmcs12_page);

		nested_release_vmcs12(vmx);

		vmx->nested.current_vmptr = -1ull;

		vmx->nested.current_vmcs12 = NULL;

	}
@@ -6045,10 +6051,8 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu) 
			skip_emulated_instruction(vcpu);

			return 1;

		}

		if (vmx->nested.current_vmptr != -1ull) {

			kunmap(vmx->nested.current_vmcs12_page);

			nested_release_page(vmx->nested.current_vmcs12_page);

		}

		if (vmx->nested.current_vmptr != -1ull)

			nested_release_vmcs12(vmx);



		vmx->nested.current_vmptr = vmptr;

		vmx->nested.current_vmcs12 = new_vmcs12;