Skip to content

Commit 1606fd9

Browse files
committed
KVM: Always flush async #PF workqueue when vCPU is being destroyed
jira LE-3201 cve CVE-2024-26976 Rebuild_History Non-Buildable kernel-rt-4.18.0-553.27.1.rt7.368.el8_10 commit-author Sean Christopherson <[email protected]> commit 3d75b8a Always flush the per-vCPU async #PF workqueue when a vCPU is clearing its completion queue, e.g. when a VM and all its vCPUs is being destroyed. KVM must ensure that none of its workqueue callbacks is running when the last reference to the KVM _module_ is put. Gifting a reference to the associated VM prevents the workqueue callback from dereferencing freed vCPU/VM memory, but does not prevent the KVM module from being unloaded before the callback completes. Drop the misguided VM refcount gifting, as calling kvm_put_kvm() from async_pf_execute() if kvm_put_kvm() flushes the async #PF workqueue will result in deadlock. async_pf_execute() can't return until kvm_put_kvm() finishes, and kvm_put_kvm() can't return until async_pf_execute() finishes: WARNING: CPU: 8 PID: 251 at virt/kvm/kvm_main.c:1435 kvm_put_kvm+0x2d/0x320 [kvm] Modules linked in: vhost_net vhost vhost_iotlb tap kvm_intel kvm irqbypass CPU: 8 PID: 251 Comm: kworker/8:1 Tainted: G W 6.6.0-rc1-e7af8d17224a-x86/gmem-vm #119 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015 Workqueue: events async_pf_execute [kvm] RIP: 0010:kvm_put_kvm+0x2d/0x320 [kvm] Call Trace: <TASK> async_pf_execute+0x198/0x260 [kvm] process_one_work+0x145/0x2d0 worker_thread+0x27e/0x3a0 kthread+0xba/0xe0 ret_from_fork+0x2d/0x50 ret_from_fork_asm+0x11/0x20 </TASK> ---[ end trace 0000000000000000 ]--- INFO: task kworker/8:1:251 blocked for more than 120 seconds. Tainted: G W 6.6.0-rc1-e7af8d17224a-x86/gmem-vm #119 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. task:kworker/8:1 state:D stack:0 pid:251 ppid:2 flags:0x00004000 Workqueue: events async_pf_execute [kvm] Call Trace: <TASK> __schedule+0x33f/0xa40 schedule+0x53/0xc0 schedule_timeout+0x12a/0x140 __wait_for_common+0x8d/0x1d0 __flush_work.isra.0+0x19f/0x2c0 kvm_clear_async_pf_completion_queue+0x129/0x190 [kvm] kvm_arch_destroy_vm+0x78/0x1b0 [kvm] kvm_put_kvm+0x1c1/0x320 [kvm] async_pf_execute+0x198/0x260 [kvm] process_one_work+0x145/0x2d0 worker_thread+0x27e/0x3a0 kthread+0xba/0xe0 ret_from_fork+0x2d/0x50 ret_from_fork_asm+0x11/0x20 </TASK> If kvm_clear_async_pf_completion_queue() actually flushes the workqueue, then there's no need to gift async_pf_execute() a reference because all invocations of async_pf_execute() will be forced to complete before the vCPU and its VM are destroyed/freed. And that in turn fixes the module unloading bug as __fput() won't do module_put() on the last vCPU reference until the vCPU has been freed, e.g. if closing the vCPU file also puts the last reference to the KVM module. Note that kvm_check_async_pf_completion() may also take the work item off the completion queue and so also needs to flush the work queue, as the work will not be seen by kvm_clear_async_pf_completion_queue(). Waiting on the workqueue could theoretically delay a vCPU due to waiting for the work to complete, but that's a very, very small chance, and likely a very small delay. kvm_arch_async_page_present_queued() unconditionally makes a new request, i.e. will effectively delay entering the guest, so the remaining work is really just: trace_kvm_async_pf_completed(addr, cr2_or_gpa); __kvm_vcpu_wake_up(vcpu); mmput(mm); and mmput() can't drop the last reference to the page tables if the vCPU is still alive, i.e. the vCPU won't get stuck tearing down page tables. Add a helper to do the flushing, specifically to deal with "wakeup all" work items, as they aren't actually work items, i.e. are never placed in a workqueue. Trying to flush a bogus workqueue entry rightly makes __flush_work() complain (kudos to whoever added that sanity check). Note, commit 5f6de5c ("KVM: Prevent module exit until all VMs are freed") *tried* to fix the module refcounting issue by having VMs grab a reference to the module, but that only made the bug slightly harder to hit as it gave async_pf_execute() a bit more time to complete before the KVM module could be unloaded. Fixes: af585b9 ("KVM: Halt vcpu if page it tries to access is swapped out") Cc: [email protected] Cc: David Matlack <[email protected]> Reviewed-by: Xu Yilun <[email protected]> Reviewed-by: Vitaly Kuznetsov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sean Christopherson <[email protected]> (cherry picked from commit 3d75b8a) Signed-off-by: Jonathan Maple <[email protected]>
1 parent f144fc9 commit 1606fd9

File tree

1 file changed

+26
-5
lines changed

1 file changed

+26
-5
lines changed

virt/kvm/async_pf.c

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,27 @@ static void async_pf_execute(struct work_struct *work)
100100
__kvm_vcpu_wake_up(vcpu);
101101

102102
mmput(mm);
103-
kvm_put_kvm(vcpu->kvm);
103+
}
104+
105+
static void kvm_flush_and_free_async_pf_work(struct kvm_async_pf *work)
106+
{
107+
/*
108+
* The async #PF is "done", but KVM must wait for the work item itself,
109+
* i.e. async_pf_execute(), to run to completion. If KVM is a module,
110+
* KVM must ensure *no* code owned by the KVM (the module) can be run
111+
* after the last call to module_put(). Note, flushing the work item
112+
* is always required when the item is taken off the completion queue.
113+
* E.g. even if the vCPU handles the item in the "normal" path, the VM
114+
* could be terminated before async_pf_execute() completes.
115+
*
116+
* Wake all events skip the queue and go straight done, i.e. don't
117+
* need to be flushed (but sanity check that the work wasn't queued).
118+
*/
119+
if (work->wakeup_all)
120+
WARN_ON_ONCE(work->work.func);
121+
else
122+
flush_work(&work->work);
123+
kmem_cache_free(async_pf_cache, work);
104124
}
105125

106126
void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu)
@@ -127,7 +147,6 @@ void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu)
127147
#else
128148
if (cancel_work_sync(&work->work)) {
129149
mmput(work->mm);
130-
kvm_put_kvm(vcpu->kvm); /* == work->vcpu->kvm */
131150
kmem_cache_free(async_pf_cache, work);
132151
}
133152
#endif
@@ -139,7 +158,10 @@ void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu)
139158
list_first_entry(&vcpu->async_pf.done,
140159
typeof(*work), link);
141160
list_del(&work->link);
142-
kmem_cache_free(async_pf_cache, work);
161+
162+
spin_unlock(&vcpu->async_pf.lock);
163+
kvm_flush_and_free_async_pf_work(work);
164+
spin_lock(&vcpu->async_pf.lock);
143165
}
144166
spin_unlock(&vcpu->async_pf.lock);
145167

@@ -164,7 +186,7 @@ void kvm_check_async_pf_completion(struct kvm_vcpu *vcpu)
164186

165187
list_del(&work->queue);
166188
vcpu->async_pf.queued--;
167-
kmem_cache_free(async_pf_cache, work);
189+
kvm_flush_and_free_async_pf_work(work);
168190
}
169191
}
170192

@@ -199,7 +221,6 @@ bool kvm_setup_async_pf(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
199221
work->arch = *arch;
200222
work->mm = current->mm;
201223
mmget(work->mm);
202-
kvm_get_kvm(work->vcpu->kvm);
203224

204225
INIT_WORK(&work->work, async_pf_execute);
205226

0 commit comments

Comments
 (0)