Commit 64749204 authored by Marcelo Tosatti's avatar Marcelo Tosatti
Browse files

KVM: fix cleanup_srcu_struct on vm destruction 



cleanup_srcu_struct on VM destruction remains broken:

BUG: unable to handle kernel paging request at ffffffffffffffff
IP: [<ffffffff802533d2>] srcu_read_lock+0x16/0x21
RIP: 0010:[<ffffffff802533d2>]  [<ffffffff802533d2>] srcu_read_lock+0x16/0x21
Call Trace:
 [<ffffffffa05354c4>] kvm_arch_vcpu_uninit+0x1b/0x48 [kvm]
 [<ffffffffa05339c6>] kvm_vcpu_uninit+0x9/0x15 [kvm]
 [<ffffffffa0569f7d>] vmx_free_vcpu+0x7f/0x8f [kvm_intel]
 [<ffffffffa05357b5>] kvm_arch_destroy_vm+0x78/0x111 [kvm]
 [<ffffffffa053315b>] kvm_put_kvm+0xd4/0xfe [kvm]

Move it to kvm_arch_destroy_vm.

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Reported-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
parent ccd46936

arch/ia64/kvm/kvm-ia64.c

+1 −0
Original line number Diff line number Diff line
@@ -1404,6 +1404,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) 
	kfree(kvm->arch.vioapic);

	kvm_release_vm_pages(kvm);

	kvm_free_physmem(kvm);

	cleanup_srcu_struct(&kvm->srcu);

	free_kvm(kvm);

}

arch/powerpc/kvm/powerpc.c

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) 
{

	kvmppc_free_vcpus(kvm);

	kvm_free_physmem(kvm);

	cleanup_srcu_struct(&kvm->srcu);

	kfree(kvm);

}

arch/s390/kvm/kvm-s390.c

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) 
	kvm_free_physmem(kvm);

	free_page((unsigned long)(kvm->arch.sca));

	debug_unregister(kvm->arch.dbf);

	cleanup_srcu_struct(&kvm->srcu);

	kfree(kvm);

}

arch/x86/kvm/x86.c

+1 −0
Original line number Diff line number Diff line
@@ -5547,6 +5547,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) 
		put_page(kvm->arch.apic_access_page);

	if (kvm->arch.ept_identity_pagetable)

		put_page(kvm->arch.ept_identity_pagetable);

	cleanup_srcu_struct(&kvm->srcu);

	kfree(kvm->arch.aliases);

	kfree(kvm);

}

virt/kvm/kvm_main.c

+0 −1
Original line number Diff line number Diff line
@@ -506,7 +506,6 @@ static void kvm_destroy_vm(struct kvm *kvm) 
#else

	kvm_arch_flush_shadow(kvm);

#endif

	cleanup_srcu_struct(&kvm->srcu);

	kvm_arch_destroy_vm(kvm);

	hardware_disable_all();

	mmdrop(mm);

CRA Git | Maintained and supported by SUSTech CRA and CCSE