diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2021-06-11 11:28:13 +0300 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2021-06-18 12:43:07 +0300 |
| commit | 3ba9f93b12361e005dd65fcc8072b42e3189f4f4 (patch) | |
| tree | ff7b3224fb4f03ea17ac76b0d1ad0c2431d0a7ab /kernel/events | |
| parent | b03fbd4ff24c5f075e58eb19261d5f8b3e40d7c6 (diff) | |
| download | linux-3ba9f93b12361e005dd65fcc8072b42e3189f4f4.tar.xz | |
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) <peterz@infradead.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20210611082838.285099381@infradead.org
Diffstat (limited to 'kernel/events')
| -rw-r--r-- | kernel/events/core.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index fe88d6eea3c2..fd89000c9bf5 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8682,13 +8682,12 @@ static void perf_event_switch(struct task_struct *task, }, }; - if (!sched_in && task->state == TASK_RUNNING) + if (!sched_in && task->on_rq) { switch_event.event_id.header.misc |= PERF_RECORD_MISC_SWITCH_OUT_PREEMPT; + } - perf_iterate_sb(perf_event_switch_output, - &switch_event, - NULL); + perf_iterate_sb(perf_event_switch_output, &switch_event, NULL); } /* |