Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754678Ab0AEON6 (ORCPT ); Tue, 5 Jan 2010 09:13:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754658Ab0AEONw (ORCPT ); Tue, 5 Jan 2010 09:13:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:16464 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754636Ab0AEONm (ORCPT ); Tue, 5 Jan 2010 09:13:42 -0500 From: Gleb Natapov To: kvm@vger.kernel.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, avi@redhat.com, mingo@elte.hu, a.p.zijlstra@chello.nl, tglx@linutronix.de, hpa@zytor.com, riel@redhat.com, cl@linux-foundation.org Subject: [PATCH v3 08/12] Inject asynchronous page fault into a guest if page is swapped out. Date: Tue, 5 Jan 2010 16:12:50 +0200 Message-Id: <1262700774-1808-9-git-send-email-gleb@redhat.com> In-Reply-To: <1262700774-1808-1-git-send-email-gleb@redhat.com> References: <1262700774-1808-1-git-send-email-gleb@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 19156 Lines: 723 If guest access swapped out memory do not swap it in from vcpu thread context. Setup slow work to do swapping and send async page fault to a guest. Allow async page fault injection only when guest is in user mode since otherwise guest may be in non-sleepable context and will not be able to reschedule. Signed-off-by: Gleb Natapov --- arch/x86/include/asm/kvm_host.h | 14 +++ arch/x86/kvm/Kconfig | 2 + arch/x86/kvm/mmu.c | 36 ++++++- arch/x86/kvm/paging_tmpl.h | 16 +++- arch/x86/kvm/x86.c | 62 +++++++++- include/linux/kvm_host.h | 28 +++++ include/trace/events/kvm.h | 60 ++++++++++ virt/kvm/Kconfig | 3 + virt/kvm/kvm_main.c | 242 ++++++++++++++++++++++++++++++++++++++- 9 files changed, 456 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 01d3ec4..641943e 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -364,7 +364,9 @@ struct kvm_vcpu_arch { unsigned long singlestep_rip; u32 __user *apf_data; + u32 apf_memslot_ver; u64 apf_msr_val; + u32 async_pf_id; }; struct kvm_mem_alias { @@ -537,6 +539,10 @@ struct kvm_x86_ops { const struct trace_print_flags *exit_reasons_str; }; +struct kvm_arch_async_pf { + u32 token; +}; + extern struct kvm_x86_ops *kvm_x86_ops; int kvm_mmu_module_init(void); @@ -815,4 +821,12 @@ int kvm_cpu_get_interrupt(struct kvm_vcpu *v); void kvm_define_shared_msr(unsigned index, u32 msr); void kvm_set_shared_msr(unsigned index, u64 val, u64 mask); +struct kvm_async_pf; + +void kvm_arch_inject_async_page_not_present(struct kvm_vcpu *vcpu, + struct kvm_async_pf *work); +void kvm_arch_inject_async_page_present(struct kvm_vcpu *vcpu, + struct kvm_async_pf *work); +bool kvm_arch_can_inject_async_page_present(struct kvm_vcpu *vcpu); #endif /* _ASM_X86_KVM_HOST_H */ + diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index 0687111..2dc919b 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig @@ -28,6 +28,8 @@ config KVM select HAVE_KVM_IRQCHIP select HAVE_KVM_EVENTFD select KVM_APIC_ARCHITECTURE + select KVM_ASYNC_PF + select SLOW_WORK select USER_RETURN_NOTIFIER select KVM_MMIO ---help--- diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index ed4f1a3..7214f28 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -19,6 +19,7 @@ #include "mmu.h" #include "kvm_cache_regs.h" +#include "x86.h" #include #include @@ -30,6 +31,8 @@ #include #include #include +#include +#undef TRACE_INCLUDE_FILE #include #include @@ -2186,6 +2189,21 @@ static int nonpaging_page_fault(struct kvm_vcpu *vcpu, gva_t gva, error_code & PFERR_WRITE_MASK, gfn); } +int kvm_arch_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn) +{ + struct kvm_arch_async_pf arch; + arch.token = (vcpu->arch.async_pf_id++ << 12) | vcpu->vcpu_id; + return kvm_setup_async_pf(vcpu, gva, gfn, &arch); +} + +static bool can_do_async_pf(struct kvm_vcpu *vcpu) +{ + if (!vcpu->arch.apf_data || kvm_event_needs_reinjection(vcpu)) + return false; + + return !!kvm_x86_ops->get_cpl(vcpu); +} + static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa, u32 error_code) { @@ -2208,7 +2226,23 @@ static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa, mmu_seq = vcpu->kvm->mmu_notifier_seq; smp_rmb(); - pfn = gfn_to_pfn(vcpu->kvm, gfn); + + if (can_do_async_pf(vcpu)) { + r = gfn_to_pfn_async(vcpu->kvm, gfn, &pfn); + trace_kvm_try_async_get_page(r, pfn); + } else { +do_sync: + r = 1; + pfn = gfn_to_pfn(vcpu->kvm, gfn); + } + + if (!r) { + if (!kvm_arch_setup_async_pf(vcpu, gpa, gfn)) + goto do_sync; + return 0; + } + + /* mmio */ if (is_error_pfn(pfn)) { kvm_release_pfn_clean(pfn); return 1; diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 58a0f1e..1b2c605 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -419,7 +419,21 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, mmu_seq = vcpu->kvm->mmu_notifier_seq; smp_rmb(); - pfn = gfn_to_pfn(vcpu->kvm, walker.gfn); + + if (can_do_async_pf(vcpu)) { + r = gfn_to_pfn_async(vcpu->kvm, walker.gfn, &pfn); + trace_kvm_try_async_get_page(r, pfn); + } else { +do_sync: + r = 1; + pfn = gfn_to_pfn(vcpu->kvm, walker.gfn); + } + + if (!r) { + if (!kvm_arch_setup_async_pf(vcpu, addr, walker.gfn)) + goto do_sync; + return 0; + } /* mmio */ if (is_error_pfn(pfn)) { diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f6821b9..cfef357 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1031,6 +1031,8 @@ static int kvm_pv_enable_async_pf(struct kvm_vcpu *vcpu, u64 data) vcpu->arch.apf_data = NULL; return 1; } + vcpu->arch.apf_memslot_ver = vcpu->kvm->memslot_version; + kvm_async_pf_wakeup_all(vcpu); return 0; } @@ -4046,6 +4048,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) } } + kvm_check_async_pf_completion(vcpu); + preempt_disable(); kvm_x86_ops->prepare_guest_switch(vcpu); @@ -5319,8 +5323,10 @@ static void kvm_free_vcpus(struct kvm *kvm) /* * Unpin any mmu pages first. */ - kvm_for_each_vcpu(i, vcpu, kvm) + kvm_for_each_vcpu(i, vcpu, kvm) { + kvm_clear_async_pf_completion_queue(vcpu); kvm_unload_vcpu_mmu(vcpu); + } kvm_for_each_vcpu(i, vcpu, kvm) kvm_arch_vcpu_free(vcpu); @@ -5426,10 +5432,11 @@ void kvm_arch_flush_shadow(struct kvm *kvm) int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) { return vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE + || !list_empty_careful(&vcpu->async_pf_done) || vcpu->arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED - || vcpu->arch.nmi_pending || - (kvm_arch_interrupt_allowed(vcpu) && - kvm_cpu_has_interrupt(vcpu)); + || vcpu->arch.nmi_pending + || (kvm_arch_interrupt_allowed(vcpu) && + kvm_cpu_has_interrupt(vcpu)); } void kvm_vcpu_kick(struct kvm_vcpu *vcpu) @@ -5476,6 +5483,53 @@ void kvm_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags) } EXPORT_SYMBOL_GPL(kvm_set_rflags); +static int apf_put_user(struct kvm_vcpu *vcpu, u32 val) +{ + if (unlikely(vcpu->arch.apf_memslot_ver != + vcpu->kvm->memslot_version)) { + u64 gpa = vcpu->arch.apf_msr_val & ~0x3f; + unsigned long addr; + int offset = offset_in_page(gpa); + + addr = gfn_to_hva(vcpu->kvm, gpa >> PAGE_SHIFT); + vcpu->arch.apf_data = (u32 __user*)(addr + offset); + if (kvm_is_error_hva(addr)) { + vcpu->arch.apf_data = NULL; + return -EFAULT; + } + } + + return put_user(val, vcpu->arch.apf_data); +} + +void kvm_arch_inject_async_page_not_present(struct kvm_vcpu *vcpu, + struct kvm_async_pf *work) +{ + if (!apf_put_user(vcpu, KVM_PV_REASON_PAGE_NOT_PRESENT)) { + kvm_inject_page_fault(vcpu, work->arch.token, 0); + trace_kvm_send_async_pf(work->arch.token, work->gva, + KVM_PV_REASON_PAGE_NOT_PRESENT); + } +} + +void kvm_arch_inject_async_page_present(struct kvm_vcpu *vcpu, + struct kvm_async_pf *work) +{ + if (is_error_page(work->page)) + work->arch.token = ~0; /* broadcast wakeup */ + if (!apf_put_user(vcpu, KVM_PV_REASON_PAGE_READY)) { + kvm_inject_page_fault(vcpu, work->arch.token, 0); + trace_kvm_send_async_pf(work->arch.token, work->gva, + KVM_PV_REASON_PAGE_READY); + } +} + +bool kvm_arch_can_inject_async_page_present(struct kvm_vcpu *vcpu) +{ + return !kvm_event_needs_reinjection(vcpu) && + kvm_x86_ops->interrupt_allowed(vcpu); +} + EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_exit); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_inj_virq); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_page_fault); diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 3f5ebc2..d5695d4 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -72,6 +73,26 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, struct kvm_io_device *dev); +#ifdef CONFIG_KVM_ASYNC_PF +struct kvm_async_pf { + struct slow_work work; + struct list_head link; + struct kvm_vcpu *vcpu; + struct mm_struct *mm; + gva_t gva; + unsigned long addr; + struct kvm_arch_async_pf arch; + struct page *page; + atomic_t used; +}; + +void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu); +void kvm_check_async_pf_completion(struct kvm_vcpu *vcpu); +int kvm_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn, + struct kvm_arch_async_pf *arch); +int kvm_async_pf_wakeup_all(struct kvm_vcpu *vcpu); +#endif + struct kvm_vcpu { struct kvm *kvm; #ifdef CONFIG_PREEMPT_NOTIFIERS @@ -101,6 +122,12 @@ struct kvm_vcpu { gpa_t mmio_phys_addr; #endif +#ifdef CONFIG_KVM_ASYNC_PF + struct list_head async_pf_done; + spinlock_t async_pf_lock; + struct kvm_async_pf *async_pf_work; +#endif + struct kvm_vcpu_arch arch; }; @@ -276,6 +303,7 @@ void kvm_release_page_dirty(struct page *page); void kvm_set_page_dirty(struct page *page); void kvm_set_page_accessed(struct page *page); +int gfn_to_pfn_async(struct kvm *kvm, gfn_t gfn, pfn_t *pfn); pfn_t gfn_to_pfn(struct kvm *kvm, gfn_t gfn); pfn_t gfn_to_pfn_memslot(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn); diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h index dbe1084..ddfdd8e 100644 --- a/include/trace/events/kvm.h +++ b/include/trace/events/kvm.h @@ -145,6 +145,66 @@ TRACE_EVENT(kvm_mmio, __entry->len, __entry->gpa, __entry->val) ); +#ifdef CONFIG_KVM_ASYNC_PF +TRACE_EVENT( + kvm_try_async_get_page, + TP_PROTO(bool r, u64 pfn), + TP_ARGS(r, pfn), + + TP_STRUCT__entry( + __field(__u64, pfn) + ), + + TP_fast_assign( + __entry->pfn = r ? pfn : (u64)-1; + ), + + TP_printk("pfn %#llx", __entry->pfn) +); + +TRACE_EVENT( + kvm_send_async_pf, + TP_PROTO(u64 token, u64 gva, u64 reason), + TP_ARGS(token, gva, reason), + + TP_STRUCT__entry( + __field(__u64, token) + __field(__u64, gva) + __field(bool, np) + ), + + TP_fast_assign( + __entry->token = token; + __entry->gva = gva; + __entry->np = (reason == KVM_PV_REASON_PAGE_NOT_PRESENT); + ), + + TP_printk("token %#llx gva %#llx %s", __entry->token, __entry->gva, + __entry->np ? "not present" : "ready") +); + +TRACE_EVENT( + kvm_async_pf_completed, + TP_PROTO(unsigned long address, struct page *page, u64 gva), + TP_ARGS(address, page, gva), + + TP_STRUCT__entry( + __field(unsigned long, address) + __field(struct page*, page) + __field(u64, gva) + ), + + TP_fast_assign( + __entry->address = address; + __entry->page = page; + __entry->gva = gva; + ), + + TP_printk("gva %#llx address %#lx pfn %lx", __entry->gva, + __entry->address, page_to_pfn(__entry->page)) +); +#endif + #endif /* _TRACE_KVM_MAIN_H */ /* This part must be outside protection */ diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig index 7f1178f..f63ccb0 100644 --- a/virt/kvm/Kconfig +++ b/virt/kvm/Kconfig @@ -15,3 +15,6 @@ config KVM_APIC_ARCHITECTURE config KVM_MMIO bool + +config KVM_ASYNC_PF + bool diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index df3325c..3552be0 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -76,6 +76,10 @@ static atomic_t hardware_enable_failed; struct kmem_cache *kvm_vcpu_cache; EXPORT_SYMBOL_GPL(kvm_vcpu_cache); +#ifdef CONFIG_KVM_ASYNC_PF +static struct kmem_cache *async_pf_cache; +#endif + static __read_mostly struct preempt_ops kvm_preempt_ops; struct dentry *kvm_debugfs_dir; @@ -178,6 +182,10 @@ int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id) vcpu->kvm = kvm; vcpu->vcpu_id = id; init_waitqueue_head(&vcpu->wq); +#ifdef CONFIG_KVM_ASYNC_PF + INIT_LIST_HEAD(&vcpu->async_pf_done); + spin_lock_init(&vcpu->async_pf_lock); +#endif page = alloc_page(GFP_KERNEL | __GFP_ZERO); if (!page) { @@ -916,6 +924,51 @@ unsigned long gfn_to_hva(struct kvm *kvm, gfn_t gfn) } EXPORT_SYMBOL_GPL(gfn_to_hva); +int gfn_to_pfn_async(struct kvm *kvm, gfn_t gfn, pfn_t *pfn) +{ + struct page *page[1]; + unsigned long addr; + int npages = 0; + + *pfn = bad_pfn; + + addr = gfn_to_hva(kvm, gfn); + if (kvm_is_error_hva(addr)) { + get_page(bad_page); + return 1; + } + +#ifdef CONFIG_X86 + npages = __get_user_pages_fast(addr, 1, 1, page); +#endif + if (unlikely(npages != 1)) { + down_read(¤t->mm->mmap_sem); + npages = get_user_pages_noio(current, current->mm, addr, 1, 1, + 0, page, NULL); + up_read(¤t->mm->mmap_sem); + } + + if (unlikely(npages != 1)) { + struct vm_area_struct *vma; + + down_read(¤t->mm->mmap_sem); + vma = find_vma(current->mm, addr); + + if (vma == NULL || addr < vma->vm_start || + !(vma->vm_flags & VM_PFNMAP)) { + up_read(¤t->mm->mmap_sem); + return 0; /* do async fault in */ + } + + *pfn = ((addr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; + up_read(¤t->mm->mmap_sem); + BUG_ON(!kvm_is_mmio_pfn(*pfn)); + } else + *pfn = page_to_pfn(page[0]); + + return 1; +} + static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr) { struct page *page[1]; @@ -1187,6 +1240,169 @@ void mark_page_dirty(struct kvm *kvm, gfn_t gfn) } } +#ifdef CONFIG_KVM_ASYNC_PF +static void async_pf_work_free(struct kvm_async_pf *apf) +{ + if (atomic_dec_and_test(&apf->used)) + kmem_cache_free(async_pf_cache, apf); +} + +static int async_pf_get_ref(struct slow_work *work) +{ + struct kvm_async_pf *apf = + container_of(work, struct kvm_async_pf, work); + + atomic_inc(&apf->used); + return 0; +} + +static void async_pf_put_ref(struct slow_work *work) +{ + struct kvm_async_pf *apf = + container_of(work, struct kvm_async_pf, work); + + kvm_put_kvm(apf->vcpu->kvm); + async_pf_work_free(apf); +} + +static void async_pf_execute(struct slow_work *work) +{ + struct page *page; + struct kvm_async_pf *apf = + container_of(work, struct kvm_async_pf, work); + wait_queue_head_t *q = &apf->vcpu->wq; + + might_sleep(); + + down_read(&apf->mm->mmap_sem); + get_user_pages(current, apf->mm, apf->addr, 1, 1, 0, &page, NULL); + up_read(&apf->mm->mmap_sem); + + spin_lock(&apf->vcpu->async_pf_lock); + list_add_tail(&apf->link, &apf->vcpu->async_pf_done); + apf->page = page; + spin_unlock(&apf->vcpu->async_pf_lock); + + trace_kvm_async_pf_completed(apf->addr, apf->page, apf->gva); + + if (waitqueue_active(q)) + wake_up_interruptible(q); + + mmdrop(apf->mm); +} + +struct slow_work_ops async_pf_ops = { + .get_ref = async_pf_get_ref, + .put_ref = async_pf_put_ref, + .execute = async_pf_execute +}; + +void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu) +{ + while (!list_empty(&vcpu->async_pf_done)) { + struct kvm_async_pf *work = + list_entry(vcpu->async_pf_done.next, + typeof(*work), link); + list_del(&work->link); + put_page(work->page); + kmem_cache_free(async_pf_cache, work); + } +} + +void kvm_check_async_pf_completion(struct kvm_vcpu *vcpu) +{ + struct kvm_async_pf *work = vcpu->async_pf_work; + + if (work) { + vcpu->async_pf_work = NULL; + if (work->page == NULL) { + kvm_arch_inject_async_page_not_present(vcpu, work); + return; + } else { + spin_lock(&vcpu->async_pf_lock); + list_del(&work->link); + spin_unlock(&vcpu->async_pf_lock); + put_page(work->page); + async_pf_work_free(work); + } + } + + if (list_empty_careful(&vcpu->async_pf_done) || + !kvm_arch_can_inject_async_page_present(vcpu)) + return; + + spin_lock(&vcpu->async_pf_lock); + work = list_first_entry(&vcpu->async_pf_done, typeof(*work), link); + list_del(&work->link); + spin_unlock(&vcpu->async_pf_lock); + + kvm_arch_inject_async_page_present(vcpu, work); + + put_page(work->page); + async_pf_work_free(work); +} + +int kvm_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn, + struct kvm_arch_async_pf *arch) +{ + struct kvm_async_pf *work; + + /* setup slow work */ + + /* do alloc atomic since if we are going to sleep anyway we + may as well sleep faulting in page */ + work = kmem_cache_zalloc(async_pf_cache, GFP_ATOMIC); + if (!work) + return 0; + + atomic_set(&work->used, 1); + work->page = NULL; + work->vcpu = vcpu; + work->gva = gva; + work->addr = gfn_to_hva(vcpu->kvm, gfn); + work->arch = *arch; + work->mm = current->mm; + atomic_inc(&work->mm->mm_count); + kvm_get_kvm(work->vcpu->kvm); + + /* this can't really happen otherwise gfn_to_pfn_async + would succeed */ + if (unlikely(kvm_is_error_hva(work->addr))) + goto retry_sync; + + slow_work_init(&work->work, &async_pf_ops); + if (slow_work_enqueue(&work->work) != 0) + goto retry_sync; + + vcpu->async_pf_work = work; + return 1; +retry_sync: + kvm_put_kvm(work->vcpu->kvm); + mmdrop(work->mm); + kmem_cache_free(async_pf_cache, work); + return 0; +} + +int kvm_async_pf_wakeup_all(struct kvm_vcpu *vcpu) +{ + struct kvm_async_pf *work; + + if (!list_empty(&vcpu->async_pf_done)) + return 0; + + work = kmem_cache_zalloc(async_pf_cache, GFP_ATOMIC); + if (!work) + return -ENOMEM; + + atomic_set(&work->used, 1); + work->page = bad_page; + get_page(bad_page); + + list_add_tail(&work->link, &vcpu->async_pf_done); + return 0; +} +#endif + /* * The vCPU has executed a HLT instruction with in-kernel mode enabled. */ @@ -2224,6 +2440,19 @@ int kvm_init(void *opaque, unsigned int vcpu_size, goto out_free_5; } +#ifdef CONFIG_KVM_ASYNC_PF + async_pf_cache = KMEM_CACHE(kvm_async_pf, 0); + + if (!async_pf_cache) { + r = -ENOMEM; + goto out_free_6; + } + + r = slow_work_register_user(THIS_MODULE); + if (r) + goto out_free; +#endif + kvm_chardev_ops.owner = module; kvm_vm_fops.owner = module; kvm_vcpu_fops.owner = module; @@ -2231,7 +2460,7 @@ int kvm_init(void *opaque, unsigned int vcpu_size, r = misc_register(&kvm_dev); if (r) { printk(KERN_ERR "kvm: misc device register failed\n"); - goto out_free; + goto out_unreg; } kvm_preempt_ops.sched_in = kvm_sched_in; @@ -2241,7 +2470,13 @@ int kvm_init(void *opaque, unsigned int vcpu_size, return 0; +out_unreg: +#ifdef CONFIG_KVM_ASYNC_PF + slow_work_unregister_user(THIS_MODULE); out_free: + kmem_cache_destroy(async_pf_cache); +out_free_6: +#endif kmem_cache_destroy(kvm_vcpu_cache); out_free_5: sysdev_unregister(&kvm_sysdev); @@ -2270,6 +2505,11 @@ void kvm_exit(void) kvm_exit_debug(); misc_deregister(&kvm_dev); kmem_cache_destroy(kvm_vcpu_cache); +#ifdef CONFIG_KVM_ASYNC_PF + if (async_pf_cache) + kmem_cache_destroy(async_pf_cache); + slow_work_unregister_user(THIS_MODULE); +#endif sysdev_unregister(&kvm_sysdev); sysdev_class_unregister(&kvm_sysdev_class); unregister_reboot_notifier(&kvm_reboot_notifier); -- 1.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/