KVM: Fix bugs in vCPUs xarray usage
Status from this message: Applied to kvm-x86 vcpu_array to get coverage in -next, and to force Paolo's
Get series with b4
b4 am [email protected]Versions newest first
Patches in v1 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/6 | KVM: Explicitly verify target vCPU is online in kvm_get_vcpu()include/ | +9 | 3 replies | |
| 2/6 | KVM: Verify there's at least one online vCPU when iterating over all vCPUsinclude/ | +4 | 0 replies | |
| 3/6 | KVM: Grab vcpu->mutex across installing the vCPU's fd and bumping online_vcpusvirt/ | +46 | 0 replies | |
| 4/6 | Revert "KVM: Fix vcpu_array[0] races"virt/ | +5 | 4 replies | |
| 5/6 | KVM: Don't BUG() the kernel if xa_insert() fails with -EBUSYvirt/ | +1 | 1 reply | |
| 6/6 | KVM: Drop hack that "manually" informs lockdep of kvm->lock vs. vcpu->mutexvirt/ | +2 | 0 replies |
Reviews trailers per patch
2 of 6 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.
| Patch | Pankaj Gupta | Will Deacon |
|---|---|---|
| Series | A-b | |
| 1/6 | R-b | |
| 2/6 | ||
| 3/6 | ||
| 4/6 | ||
| 5/6 | R-b | |
| 6/6 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH 0/6] KVM: Fix bugs in vCPUs xarray usage
This series stems from Will's observation[*] that kvm_vm_ioctl_create_vcpu()'s handling of xa_store() failure when inserting into vcpu_array is technically broken, although in practice it's impossible for xa_store() to fail.
After much back and forth and staring, I realized that commit afb2acb2e3a3 ("KVM: Fix vcpu_array[0] races") papered over underlying bugs in kvm_get_vcpu() and kvm_for_each_vcpu(). The core problem is that KVM allowed other tasks to see vCPU0 while online_vcpus==0, and thus trying to gracefully error out of vCPU creation led to use-after-free failures.
So, rather than trying to solve the unsolvable problem for an error path that should be impossible to hit, fix the underlying issue and ensure that vcpu_array[0] is accessed if and only if online_vcpus is non-zero.
Patch 3 fixes a race Michal identified when we were trying to figure out how to handle the xa_store() mess.
Patch 4 reverts afb2acb2e3a3.
Patches 5 and 6 are tangentially related cleanups.
[*] https://lkml.kernel.org/r/20240730155646.1687-1-will%40kernel.org
Sean Christopherson (6):
KVM: Explicitly verify target vCPU is online in kvm_get_vcpu()
KVM: Verify there's at least one online vCPU when iterating over all
vCPUs
KVM: Grab vcpu->mutex across installing the vCPU's fd and bumping
online_vcpus
Revert "KVM: Fix vcpu_array[0] races"
KVM: Don't BUG() the kernel if xa_insert() fails with -EBUSY
KVM: Drop hack that "manually" informs lockdep of kvm->lock vs.
vcpu->mutex
include/linux/kvm_host.h | 16 ++++++++-- virt/kvm/kvm_main.c | 68 ++++++++++++++++++++++++++++++---------- 2 files changed, 65 insertions(+), 19 deletions(-)
base-commit: 8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b
Signature · 1 line
2.47.0.rc0.187.ge670bccf7e-goog