path: root/virt
diff options
authorPeter Zijlstra <>2021-06-11 10:28:13 +0200
committerPeter Zijlstra <>2021-06-18 11:43:07 +0200
commit3ba9f93b12361e005dd65fcc8072b42e3189f4f4 (patch)
treeff7b3224fb4f03ea17ac76b0d1ad0c2431d0a7ab /virt
parentb03fbd4ff24c5f075e58eb19261d5f8b3e40d7c6 (diff)
sched,perf,kvm: Fix preemption condition
When ran from the sched-out path (preempt_notifier or perf_event), p->state is irrelevant to determine preemption. You can get preempted with !task_is_running() just fine. The right indicator for preemption is if the task is still on the runqueue in the sched-out path. Signed-off-by: Peter Zijlstra (Intel) <> Acked-by: Mark Rutland <> Link:
Diffstat (limited to 'virt')
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 6a6bc7af0e28..5f166eb8ee2e 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -5025,7 +5025,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
struct kvm_vcpu *vcpu = preempt_notifier_to_vcpu(pn);
- if (current->state == TASK_RUNNING) {
+ if (current->on_rq) {
WRITE_ONCE(vcpu->preempted, true);
WRITE_ONCE(vcpu->ready, true);