Skip to content

Commit fb928b8

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: stable@vger.kernel.org Cc: Keith Busch <kbusch@kernel.org> Signed-off-by: Sean Christopherson <seanjc@google.com> Message-ID: <20250124234623.3609069-1-seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2c89116 commit fb928b8

File tree

1 file changed

+26
-7
lines changed

1 file changed

+26
-7
lines changed

arch/x86/kvm/mmu/mmu.c

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7227,6 +7227,19 @@ static void mmu_destroy_caches(void)
72277227
kmem_cache_destroy(mmu_page_header_cache);
72287228
}
72297229

7230+
static void kvm_wake_nx_recovery_thread(struct kvm *kvm)
7231+
{
7232+
/*
7233+
* The NX recovery thread is spawned on-demand at the first KVM_RUN and
7234+
* may not be valid even though the VM is globally visible. Do nothing,
7235+
* as such a VM can't have any possible NX huge pages.
7236+
*/
7237+
struct vhost_task *nx_thread = READ_ONCE(kvm->arch.nx_huge_page_recovery_thread);
7238+
7239+
if (nx_thread)
7240+
vhost_task_wake(nx_thread);
7241+
}
7242+
72307243
static int get_nx_huge_pages(char *buffer, const struct kernel_param *kp)
72317244
{
72327245
if (nx_hugepage_mitigation_hard_disabled)
@@ -7287,7 +7300,7 @@ static int set_nx_huge_pages(const char *val, const struct kernel_param *kp)
72877300
kvm_mmu_zap_all_fast(kvm);
72887301
mutex_unlock(&kvm->slots_lock);
72897302

7290-
vhost_task_wake(kvm->arch.nx_huge_page_recovery_thread);
7303+
kvm_wake_nx_recovery_thread(kvm);
72917304
}
72927305
mutex_unlock(&kvm_lock);
72937306
}
@@ -7433,7 +7446,7 @@ static int set_nx_huge_pages_recovery_param(const char *val, const struct kernel
74337446
mutex_lock(&kvm_lock);
74347447

74357448
list_for_each_entry(kvm, &vm_list, vm_list)
7436-
vhost_task_wake(kvm->arch.nx_huge_page_recovery_thread);
7449+
kvm_wake_nx_recovery_thread(kvm);
74377450

74387451
mutex_unlock(&kvm_lock);
74397452
}
@@ -7569,14 +7582,20 @@ static void kvm_mmu_start_lpage_recovery(struct once *once)
75697582
{
75707583
struct kvm_arch *ka = container_of(once, struct kvm_arch, nx_once);
75717584
struct kvm *kvm = container_of(ka, struct kvm, arch);
7585+
struct vhost_task *nx_thread;
75727586

75737587
kvm->arch.nx_huge_page_last = get_jiffies_64();
7574-
kvm->arch.nx_huge_page_recovery_thread = vhost_task_create(
7575-
kvm_nx_huge_page_recovery_worker, kvm_nx_huge_page_recovery_worker_kill,
7576-
kvm, "kvm-nx-lpage-recovery");
7588+
nx_thread = vhost_task_create(kvm_nx_huge_page_recovery_worker,
7589+
kvm_nx_huge_page_recovery_worker_kill,
7590+
kvm, "kvm-nx-lpage-recovery");
75777591

7578-
if (kvm->arch.nx_huge_page_recovery_thread)
7579-
vhost_task_start(kvm->arch.nx_huge_page_recovery_thread);
7592+
if (!nx_thread)
7593+
return;
7594+
7595+
vhost_task_start(nx_thread);
7596+
7597+
/* Make the task visible only once it is fully started. */
7598+
WRITE_ONCE(kvm->arch.nx_huge_page_recovery_thread, nx_thread);
75807599
}
75817600

75827601
int kvm_mmu_post_init_vm(struct kvm *kvm)

0 commit comments

Comments
 (0)