perf/core: Fix invalid wait context in ctx_sched_in()
Namhyung Kim
maintainerPATCH 1/1 perf/core: Fix invalid wait context in ctx_sched_in()
Lockdep found a bug in the event scheduling when a pinned event was failed and wakes up the threads in the ring buffer like below.
It seems it should not grab a wait-queue lock under perf-context lock. Let's do it with irq_work.
[ 39.913691] =============================
[ 39.914157] [ BUG: Invalid wait context ]
[ 39.914623] 6.15.0-next-20250530-next-2025053 #1 Not tainted
[ 39.915271] -----------------------------
[ 39.915731] repro/837 is trying to lock:
[ 39.916191] ffff88801acfabd8 (&event->waitq){....}-{3:3}, at: __wake_up+0x26/0x60
[ 39.917182] other info that might help us debug this:
[ 39.917761] context-{5:5}
[ 39.918079] 4 locks held by repro/837:
[ 39.918530] #0: ffffffff8725cd00 (rcu_read_lock){....}-{1:3}, at: __perf_event_task_sched_in+0xd1/0xbc0
[ 39.919612] #1: ffff88806ca3c6f8 (&cpuctx_lock){....}-{2:2}, at: __perf_event_task_sched_in+0x1a7/0xbc0
[ 39.920748] #2: ffff88800d91fc18 (&ctx->lock){....}-{2:2}, at: __perf_event_task_sched_in+0x1f9/0xbc0
[ 39.921819] #3: ffffffff8725cd00 (rcu_read_lock){....}-{1:3}, at: perf_event_wakeup+0x6c/0x470Fixes f4b07fd62d4d ("perf/core: Use POLLHUP for a pinned event in error")
Reported-by "Lai, Yi" <[email protected]>
Tested-by "Lai, Yi" <[email protected]>
Signed-off-by Namhyung Kim <[email protected]>
--- kernel/events/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/events/core.c +2 -1
@@ -3995,7 +3995,8 @@ static int merge_sched_in(struct perf_event *event, void *data)if (*perf_event_fasync (event)) event->pending_kill =POLL_ERR ; -perf_event_wakeup (event); + event->pending_wakeup =1 ; +irq_work_queue (&event->pending_irq); }else {struct perf_cpu_pmu_context *cpc =this_cpc (event->pmu_ctx->pmu);
Signature · 1 line
2.49.0.1204.g71687c7c1d-goog
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 486ff5ad49bc50315bcaf6d45f04a33ef0a45ced Gitweb: https://git.kernel.org/tip/486ff5ad49bc50315bcaf6d45f04a33ef0a45ced Author: Namhyung Kim <[email protected]> AuthorDate: Mon, 02 Jun 2025 21:51:05 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 23 Feb 2026 11:19:25 +01:00
perf/core: Fix invalid wait context in ctx_sched_in()
Lockdep found a bug in the event scheduling when a pinned event was failed and wakes up the threads in the ring buffer like below.
It seems it should not grab a wait-queue lock under perf-context lock. Let's do it with irq_work.
[ 39.913691] =============================
[ 39.914157] [ BUG: Invalid wait context ]
[ 39.914623] 6.15.0-next-20250530-next-2025053 #1 Not tainted
[ 39.915271] -----------------------------
[ 39.915731] repro/837 is trying to lock:
[ 39.916191] ffff88801acfabd8 (&event->waitq){....}-{3:3}, at: __wake_up+0x26/0x60
[ 39.917182] other info that might help us debug this:
[ 39.917761] context-{5:5}
[ 39.918079] 4 locks held by repro/837:
[ 39.918530] #0: ffffffff8725cd00 (rcu_read_lock){....}-{1:3}, at: __perf_event_task_sched_in+0xd1/0xbc0
[ 39.919612] #1: ffff88806ca3c6f8 (&cpuctx_lock){....}-{2:2}, at: __perf_event_task_sched_in+0x1a7/0xbc0
[ 39.920748] #2: ffff88800d91fc18 (&ctx->lock){....}-{2:2}, at: __perf_event_task_sched_in+0x1f9/0xbc0
[ 39.921819] #3: ffffffff8725cd00 (rcu_read_lock){....}-{1:3}, at: perf_event_wakeup+0x6c/0x470Fixes f4b07fd62d4d ("perf/core: Use POLLHUP for a pinned event in error")
Reported-by "Lai, Yi" <[email protected]>
Signed-off-by Namhyung Kim <[email protected]>
Signed-off-by Peter Zijlstra (Intel) <[email protected]>
Tested-by "Lai, Yi" <[email protected]>
--- kernel/events/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/events/core.c +2 -1
@@ -4138,7 +4138,8 @@ static int merge_sched_in(struct perf_event *event, void *data)if (*perf_event_fasync (event)) event->pending_kill =POLL_ERR ; -perf_event_wakeup (event); + event->pending_wakeup =1 ; +irq_work_queue (&event->pending_irq); }else {struct perf_cpu_pmu_context *cpc =this_cpc (event->pmu_ctx->pmu);