Skip to content

Commit 2ef0cbb

Browse files
sean-jcgregkh
authored andcommitted
KVM: x86/mmu: Ensure NX huge page recovery thread is alive before waking
commit 43fb96a upstream. When waking a VM's NX huge page recovery thread, ensure the thread is actually alive before trying to wake it. Now that the thread is spawned on-demand during KVM_RUN, a VM without a recovery thread is reachable via the related module params. BUG: kernel NULL pointer dereference, address: 0000000000000040 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015 RIP: 0010:vhost_task_wake+0x5/0x10 Call Trace: <TASK> set_nx_huge_pages+0xcc/0x1e0 [kvm] param_attr_store+0x8a/0xd0 module_attr_store+0x1a/0x30 kernfs_fop_write_iter+0x12f/0x1e0 vfs_write+0x233/0x3e0 ksys_write+0x60/0xd0 do_syscall_64+0x5b/0x160 entry_SYSCALL_64_after_hwframe+0x4b/0x53 RIP: 0033:0x7f3b52710104 </TASK> Modules linked in: kvm_intel kvm CR2: 0000000000000040 Fixes: 931656b ("kvm: defer huge page recovery vhost task to later") Cc: [email protected] Cc: Keith Busch <[email protected]> Signed-off-by: Sean Christopherson <[email protected]> Message-ID: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b190232 commit 2ef0cbb

File tree

1 file changed

+26
-7
lines changed

1 file changed

+26
-7
lines changed

arch/x86/kvm/mmu/mmu.c

+26-7
Original file line numberDiff line numberDiff line change
@@ -7090,6 +7090,19 @@ static void mmu_destroy_caches(void)
70907090
kmem_cache_destroy(mmu_page_header_cache);
70917091
}
70927092

7093+
static void kvm_wake_nx_recovery_thread(struct kvm *kvm)
7094+
{
7095+
/*
7096+
* The NX recovery thread is spawned on-demand at the first KVM_RUN and
7097+
* may not be valid even though the VM is globally visible. Do nothing,
7098+
* as such a VM can't have any possible NX huge pages.
7099+
*/
7100+
struct vhost_task *nx_thread = READ_ONCE(kvm->arch.nx_huge_page_recovery_thread);
7101+
7102+
if (nx_thread)
7103+
vhost_task_wake(nx_thread);
7104+
}
7105+
70937106
static int get_nx_huge_pages(char *buffer, const struct kernel_param *kp)
70947107
{
70957108
if (nx_hugepage_mitigation_hard_disabled)
@@ -7150,7 +7163,7 @@ static int set_nx_huge_pages(const char *val, const struct kernel_param *kp)
71507163
kvm_mmu_zap_all_fast(kvm);
71517164
mutex_unlock(&kvm->slots_lock);
71527165

7153-
vhost_task_wake(kvm->arch.nx_huge_page_recovery_thread);
7166+
kvm_wake_nx_recovery_thread(kvm);
71547167
}
71557168
mutex_unlock(&kvm_lock);
71567169
}
@@ -7279,7 +7292,7 @@ static int set_nx_huge_pages_recovery_param(const char *val, const struct kernel
72797292
mutex_lock(&kvm_lock);
72807293

72817294
list_for_each_entry(kvm, &vm_list, vm_list)
7282-
vhost_task_wake(kvm->arch.nx_huge_page_recovery_thread);
7295+
kvm_wake_nx_recovery_thread(kvm);
72837296

72847297
mutex_unlock(&kvm_lock);
72857298
}
@@ -7415,14 +7428,20 @@ static void kvm_mmu_start_lpage_recovery(struct once *once)
74157428
{
74167429
struct kvm_arch *ka = container_of(once, struct kvm_arch, nx_once);
74177430
struct kvm *kvm = container_of(ka, struct kvm, arch);
7431+
struct vhost_task *nx_thread;
74187432

74197433
kvm->arch.nx_huge_page_last = get_jiffies_64();
7420-
kvm->arch.nx_huge_page_recovery_thread = vhost_task_create(
7421-
kvm_nx_huge_page_recovery_worker, kvm_nx_huge_page_recovery_worker_kill,
7422-
kvm, "kvm-nx-lpage-recovery");
7434+
nx_thread = vhost_task_create(kvm_nx_huge_page_recovery_worker,
7435+
kvm_nx_huge_page_recovery_worker_kill,
7436+
kvm, "kvm-nx-lpage-recovery");
74237437

7424-
if (kvm->arch.nx_huge_page_recovery_thread)
7425-
vhost_task_start(kvm->arch.nx_huge_page_recovery_thread);
7438+
if (!nx_thread)
7439+
return;
7440+
7441+
vhost_task_start(nx_thread);
7442+
7443+
/* Make the task visible only once it is fully started. */
7444+
WRITE_ONCE(kvm->arch.nx_huge_page_recovery_thread, nx_thread);
74267445
}
74277446

74287447
int kvm_mmu_post_init_vm(struct kvm *kvm)

0 commit comments

Comments
 (0)