Commit a6816314 authored by David Matlack's avatar David Matlack Committed by Sean Christopherson

KVM: Introduce vcpu->wants_to_run

Introduce vcpu->wants_to_run to indicate when a vCPU is in its core run
loop, i.e. when the vCPU is running the KVM_RUN ioctl and immediate_exit
was not set.

Replace all references to vcpu->run->immediate_exit with
!vcpu->wants_to_run to avoid TOCTOU races with userspace. For example, a
malicious userspace could invoked KVM_RUN with immediate_exit=true and
then after KVM reads it to set wants_to_run=false, flip it to false.
This would result in the vCPU running in KVM_RUN with
wants_to_run=false. This wouldn't cause any real bugs today but is a
dangerous landmine.
Signed-off-by: default avatarDavid Matlack <dmatlack@google.com>
Link: https://lore.kernel.org/r/20240503181734.1467938-2-dmatlack@google.comSigned-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 438a496b
...@@ -1099,7 +1099,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) ...@@ -1099,7 +1099,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
vcpu_load(vcpu); vcpu_load(vcpu);
if (run->immediate_exit) { if (!vcpu->wants_to_run) {
ret = -EINTR; ret = -EINTR;
goto out; goto out;
} }
......
...@@ -1266,7 +1266,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) ...@@ -1266,7 +1266,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
kvm_complete_iocsr_read(vcpu, run); kvm_complete_iocsr_read(vcpu, run);
} }
if (run->immediate_exit) if (!vcpu->wants_to_run)
return r; return r;
/* Clear exit_reason */ /* Clear exit_reason */
......
...@@ -436,7 +436,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) ...@@ -436,7 +436,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
vcpu->mmio_needed = 0; vcpu->mmio_needed = 0;
} }
if (vcpu->run->immediate_exit) if (!vcpu->wants_to_run)
goto out; goto out;
lose_fpu(1); lose_fpu(1);
......
...@@ -1852,7 +1852,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) ...@@ -1852,7 +1852,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
kvm_sigset_activate(vcpu); kvm_sigset_activate(vcpu);
if (run->immediate_exit) if (!vcpu->wants_to_run)
r = -EINTR; r = -EINTR;
else else
r = kvmppc_vcpu_run(vcpu); r = kvmppc_vcpu_run(vcpu);
......
...@@ -760,7 +760,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) ...@@ -760,7 +760,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
return ret; return ret;
} }
if (run->immediate_exit) { if (!vcpu->wants_to_run) {
kvm_vcpu_srcu_read_unlock(vcpu); kvm_vcpu_srcu_read_unlock(vcpu);
return -EINTR; return -EINTR;
} }
......
...@@ -5026,7 +5026,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) ...@@ -5026,7 +5026,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
if (vcpu->kvm->arch.pv.dumping) if (vcpu->kvm->arch.pv.dumping)
return -EINVAL; return -EINVAL;
if (kvm_run->immediate_exit) if (!vcpu->wants_to_run)
return -EINTR; return -EINTR;
if (kvm_run->kvm_valid_regs & ~KVM_SYNC_S390_VALID_FIELDS || if (kvm_run->kvm_valid_regs & ~KVM_SYNC_S390_VALID_FIELDS ||
......
...@@ -11407,7 +11407,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) ...@@ -11407,7 +11407,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
kvm_vcpu_srcu_read_lock(vcpu); kvm_vcpu_srcu_read_lock(vcpu);
if (unlikely(vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)) { if (unlikely(vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)) {
if (kvm_run->immediate_exit) { if (!vcpu->wants_to_run) {
r = -EINTR; r = -EINTR;
goto out; goto out;
} }
...@@ -11485,7 +11485,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) ...@@ -11485,7 +11485,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
WARN_ON_ONCE(vcpu->mmio_needed); WARN_ON_ONCE(vcpu->mmio_needed);
} }
if (kvm_run->immediate_exit) { if (!vcpu->wants_to_run) {
r = -EINTR; r = -EINTR;
goto out; goto out;
} }
......
...@@ -378,6 +378,7 @@ struct kvm_vcpu { ...@@ -378,6 +378,7 @@ struct kvm_vcpu {
bool dy_eligible; bool dy_eligible;
} spin_loop; } spin_loop;
#endif #endif
bool wants_to_run;
bool preempted; bool preempted;
bool ready; bool ready;
bool scheduled_out; bool scheduled_out;
......
...@@ -4435,7 +4435,10 @@ static long kvm_vcpu_ioctl(struct file *filp, ...@@ -4435,7 +4435,10 @@ static long kvm_vcpu_ioctl(struct file *filp,
synchronize_rcu(); synchronize_rcu();
put_pid(oldpid); put_pid(oldpid);
} }
vcpu->wants_to_run = !READ_ONCE(vcpu->run->immediate_exit);
r = kvm_arch_vcpu_ioctl_run(vcpu); r = kvm_arch_vcpu_ioctl_run(vcpu);
vcpu->wants_to_run = false;
trace_kvm_userspace_exit(vcpu->run->exit_reason, r); trace_kvm_userspace_exit(vcpu->run->exit_reason, r);
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment