mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [tip: perf/urgent] perf: Fix perf_remove_from_context() event scheduling
@ 2026-10-24 11:34 tip-bot2 for Peter Zijlstra
  2026-10-27 15:13 ` Peter Zijlstra
  0 siblings, 1 reply; 2+ messages in thread
From: tip-bot2 for Peter Zijlstra @ 2026-10-24 11:34 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: Q8, Peter Zijlstra (Intel), x86, linux-kernel

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     d095321349222961813333277881b3c74f10b17b
Gitweb:        https://git.kernel.org/tip/d095321349222961813333277881b3c74f10b17b
Author:        Peter Zijlstra <peterz@infradead.org>
AuthorDate:    Wed, 14 Oct 2026 14:45:51 +02:00
Committer:     Peter Zijlstra <peterz@infradead.org>
CommitterDate: Fri, 23 Oct 2026 19:09:52 +02:00

perf: Fix perf_remove_from_context() event scheduling

Q8 noted that it is possible to get into an inconsistent state when
using perf_remove_from_context() on a group leader event.

Specifically, when the leader gets scheduled out, we should (when not
destroying the grouping) schedule out the complete group, similar to
__perf_event_disable().

Reported-by: Q8 <cipher.gnep@gmail.com>
Tested-by: Q8 <cipher.gnep@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
 kernel/events/core.c |  9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index e248f34..f36a3bb 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -2590,6 +2590,7 @@ __perf_remove_from_context(struct perf_event *event,
 	enum perf_event_state state = PERF_EVENT_STATE_OFF;
 	unsigned long flags = (unsigned long)info;
 
+	perf_pmu_disable(pmu_ctx->pmu);
 	ctx_time_update(cpuctx, ctx);
 
 	/*
@@ -2603,6 +2604,13 @@ __perf_remove_from_context(struct perf_event *event,
 	if (flags & DETACH_DEAD)
 		state = PERF_EVENT_STATE_DEAD;
 
+	/*
+	 * When disabling a group leader, the whole group becomes ineligible
+	 * to run, so schedule out the full group.
+	 */
+	if (!(flags & DETACH_GROUP) && event == event->group_leader)
+		group_sched_out(event, ctx);
+
 	__event_disable(event, ctx, state);
 
 	if (flags & DETACH_GROUP)
@@ -2632,6 +2640,7 @@ __perf_remove_from_context(struct perf_event *event,
 			cpuctx->task_ctx = NULL;
 		}
 	}
+	perf_pmu_enable(pmu_ctx->pmu);
 }
 
 /*

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [tip: perf/urgent] perf: Fix perf_remove_from_context() event scheduling
  2026-10-24 11:34 [tip: perf/urgent] perf: Fix perf_remove_from_context() event scheduling tip-bot2 for Peter Zijlstra
@ 2026-10-27 15:13 ` Peter Zijlstra
  0 siblings, 0 replies; 2+ messages in thread
From: Peter Zijlstra @ 2026-10-27 15:13 UTC (permalink / raw)
  To: linux-kernel, stable; +Cc: linux-tip-commits, Q8, x86

On Sat, Oct 24, 2026 at 11:34:03AM -0000, tip-bot2 for Peter Zijlstra wrote:
> The following commit has been merged into the perf/urgent branch of tip:
> 
> Commit-ID:     d095321349222961813333277881b3c74f10b17b
> Gitweb:        https://git.kernel.org/tip/d095321349222961813333277881b3c74f10b17b
> Author:        Peter Zijlstra <peterz@infradead.org>
> AuthorDate:    Wed, 14 Oct 2026 14:45:51 +02:00
> Committer:     Peter Zijlstra <peterz@infradead.org>
> CommitterDate: Fri, 23 Oct 2026 19:09:52 +02:00
> 
> perf: Fix perf_remove_from_context() event scheduling
> 
> Q8 noted that it is possible to get into an inconsistent state when
> using perf_remove_from_context() on a group leader event.
> 
> Specifically, when the leader gets scheduled out, we should (when not
> destroying the grouping) schedule out the complete group, similar to
> __perf_event_disable().
> 

I noticed that I forgot the Fixes line :-/ This is an ancient oversight
afaict and needs backporting to all still maintained kernels.

Fixes: b04243ef7006 ("perf: Complete software pmu grouping")

> Reported-by: Q8 <cipher.gnep@gmail.com>
> Tested-by: Q8 <cipher.gnep@gmail.com>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> ---
>  kernel/events/core.c |  9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/kernel/events/core.c b/kernel/events/core.c
> index e248f34..f36a3bb 100644
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -2590,6 +2590,7 @@ __perf_remove_from_context(struct perf_event *event,
>  	enum perf_event_state state = PERF_EVENT_STATE_OFF;
>  	unsigned long flags = (unsigned long)info;
>  
> +	perf_pmu_disable(pmu_ctx->pmu);
>  	ctx_time_update(cpuctx, ctx);
>  
>  	/*
> @@ -2603,6 +2604,13 @@ __perf_remove_from_context(struct perf_event *event,
>  	if (flags & DETACH_DEAD)
>  		state = PERF_EVENT_STATE_DEAD;
>  
> +	/*
> +	 * When disabling a group leader, the whole group becomes ineligible
> +	 * to run, so schedule out the full group.
> +	 */
> +	if (!(flags & DETACH_GROUP) && event == event->group_leader)
> +		group_sched_out(event, ctx);
> +
>  	__event_disable(event, ctx, state);
>  
>  	if (flags & DETACH_GROUP)
> @@ -2632,6 +2640,7 @@ __perf_remove_from_context(struct perf_event *event,
>  			cpuctx->task_ctx = NULL;
>  		}
>  	}
> +	perf_pmu_enable(pmu_ctx->pmu);
>  }
>  
>  /*

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-10-27 15:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-24 11:34 [tip: perf/urgent] perf: Fix perf_remove_from_context() event scheduling tip-bot2 for Peter Zijlstra
2026-10-27 15:13 ` Peter Zijlstra

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®