Christoph Egger
2012-Oct-17 08:36 UTC
[PATCH] nestedsvm: fix memory leak on shutdown/crash
Fix memory leak of l1 vmcb page when destroying a vcpu while l2 guest is running. Signed-off-by: Christoph Egger <Christoph.Egger@amd.com> -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85689 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
At 10:36 +0200 on 17 Oct (1350470161), Christoph Egger wrote:> > Fix memory leak of l1 vmcb page when destroying a vcpu while > l2 guest is running. > > Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>Acked-by: Tim Deegan <tim@xen.org> Content-Description: xen_nh_shutdown.diff> diff -r 6b73078a4403 xen/arch/x86/hvm/svm/nestedsvm.c > --- a/xen/arch/x86/hvm/svm/nestedsvm.c Fri Oct 12 14:38:20 2012 +0200 > +++ b/xen/arch/x86/hvm/svm/nestedsvm.c Wed Oct 17 09:08:20 2012 +0200 > @@ -122,6 +122,15 @@ void nsvm_vcpu_destroy(struct vcpu *v) > struct nestedvcpu *nv = &vcpu_nestedhvm(v); > struct nestedsvm *svm = &vcpu_nestedsvm(v); > > + /* > + * When destroying the vcpu, it may be running on behalf of l2 guest. > + * Therefore we need to switch the VMCB pointer back to the l1 vmcb, > + * in order to avoid double free of l2 vmcb and the possible memory leak > + * of l1 vmcb page. > + */ > + if (nv->nv_n1vmcx) > + v->arch.hvm_svm.vmcb = nv->nv_n1vmcx; > + > if (svm->ns_cached_msrpm) { > free_xenheap_pages(svm->ns_cached_msrpm, > get_order_from_bytes(MSRPM_SIZE));> _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel