From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gleb Natapov Subject: Re: [PATCH 07/11] KVM: nVMX: Release shadow vmcs Date: Thu, 18 Apr 2013 12:12:18 +0300 Message-ID: <20130418091218.GP8997@redhat.com> References: <1366274066-abelg@il.ibm.com> <20130418083759.C3DFE3806E7@moren.haifa.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: kvm@vger.kernel.org, owasserm@redhat.com, nadav@harel.org.il, jun.nakajima@intel.com, dongxiao.xu@intel.com To: Abel Gordon Return-path: Received: from mx1.redhat.com ([209.132.183.28]:62126 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755965Ab3DRJMa (ORCPT ); Thu, 18 Apr 2013 05:12:30 -0400 Content-Disposition: inline In-Reply-To: <20130418083759.C3DFE3806E7@moren.haifa.ibm.com> Sender: kvm-owner@vger.kernel.org List-ID: On Thu, Apr 18, 2013 at 11:37:59AM +0300, Abel Gordon wrote: > Unmap vmcs12 and release the corresponding shadow vmcs > > Signed-off-by: Abel Gordon > --- > arch/x86/kvm/vmx.c | 20 ++++++++++++-------- > 1 file changed, 12 insertions(+), 8 deletions(-) > > --- .before/arch/x86/kvm/vmx.c 2013-04-18 11:28:23.000000000 +0300 > +++ .after/arch/x86/kvm/vmx.c 2013-04-18 11:28:23.000000000 +0300 > @@ -5607,6 +5607,12 @@ static int nested_vmx_check_permission(s > 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,8 +5623,9 @@ static void free_nested(struct vcpu_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); > + if (enable_shadow_vmcs) > + free_vmcs(vmx->nested.current_shadow_vmcs); Should be freed even if vmx->nested.current_vmptr == -1, no? > vmx->nested.current_vmptr = -1ull; > vmx->nested.current_vmcs12 = NULL; > } > @@ -5762,8 +5769,7 @@ static int handle_vmclear(struct kvm_vcp > } > > 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_vcp > 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; > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Gleb.