Messages in this thread | | | Date | Wed, 2 Nov 2022 19:00:56 +0100 | Subject | Re: [PATCH AUTOSEL 6.0 03/11] kvm: x86: Do proper cleanup if kvm_x86_ops->vm_init() fails | From | Paolo Bonzini <> |
| |
On 10/14/22 15:51, Sasha Levin wrote: > From: Junaid Shahid <junaids@google.com> > > [ Upstream commit b24ede22538b4d984cbe20532bbcb303692e7f52 ] > > If vm_init() fails [which can happen, for instance, if a memory > allocation fails during avic_vm_init()], we need to cleanup some > state in order to avoid resource leaks. > > Signed-off-by: Junaid Shahid <junaids@google.com> > Link: https://lore.kernel.org/r/20220729224329.323378-1-junaids@google.com > Signed-off-by: Sean Christopherson <seanjc@google.com> > Signed-off-by: Sasha Levin <sashal@kernel.org> > --- > arch/x86/kvm/x86.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index b0c47b41c264..11fbd42100be 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -12080,6 +12080,10 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) > if (ret) > goto out_page_track; > > + ret = static_call(kvm_x86_vm_init)(kvm); > + if (ret) > + goto out_uninit_mmu; > + > INIT_HLIST_HEAD(&kvm->arch.mask_notifier_list); > INIT_LIST_HEAD(&kvm->arch.assigned_dev_head); > atomic_set(&kvm->arch.noncoherent_dma_count, 0); > @@ -12115,8 +12119,10 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) > kvm_hv_init_vm(kvm); > kvm_xen_init_vm(kvm); > > - return static_call(kvm_x86_vm_init)(kvm); > + return 0; > > +out_uninit_mmu: > + kvm_mmu_uninit_vm(kvm); > out_page_track: > kvm_page_track_cleanup(kvm); > out:
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
| |