From: Peter Zijlstra <peterz@infradead.org>
To: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: mingo@kernel.org, lucas.demarchi@intel.com,
linux-kernel@vger.kernel.org, acme@kernel.org,
namhyung@kernel.org, mark.rutland@arm.com,
alexander.shishkin@linux.intel.com, jolsa@kernel.org,
irogers@google.com, adrian.hunter@intel.com,
kan.liang@linux.intel.com
Subject: Re: [PATCH v3 7/7] perf: Make perf_pmu_unregister() useable
Date: Mon, 10 Mar 2025 17:14:45 +0100 [thread overview]
Message-ID: <20250310161445.GI19344@noisy.programming.kicks-ass.net> (raw)
In-Reply-To: <0f36ca48-09ab-4fca-8a8d-7ed3b2abc056@amd.com>
On Mon, Mar 10, 2025 at 09:05:45PM +0530, Ravi Bangoria wrote:
> > @@ -207,6 +207,7 @@ static void perf_ctx_unlock(struct perf_
> > }
> >
> > #define TASK_TOMBSTONE ((void *)-1L)
> > +#define EVENT_TOMBSTONE ((void *)-1L)
> >
> > static bool is_kernel_event(struct perf_event *event)
> > {
> > @@ -2348,6 +2349,11 @@ static void perf_child_detach(struct per
> >
> > sync_child_event(event);
> > list_del_init(&event->child_list);
> > + /*
> > + * Cannot set to NULL, as that would confuse the situation vs
> > + * not being a child event. See for example unaccount_event().
> > + */
> > + event->parent = EVENT_TOMBSTONE;
>
> This will cause issues where we do `event = event->parent`. No? For ex:
>
> perf_pmu_unregister()
> ...
> perf_event_exit_event()
> perf_event_wakeup()
> ring_buffer_wakeup()
> if (event->parent)
> event = event->parent;
It will. However, if we do not do this, we have a potential
use-after-free, and people seem to take a dim view of those too :-)
I had convinced myself all paths that were doing this 'event =
event->parent' were unreachable by the time we set the TOMBSTONE, but
clearly I missed one.
I suppose we can do something like so, not really pretty though.
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -13722,9 +13722,12 @@ perf_event_exit_event(struct perf_event
{
struct perf_event *parent_event = event->parent;
unsigned long detach_flags = DETACH_EXIT;
+ bool parent_dead = false;
- if (parent_event == EVENT_TOMBSTONE)
+ if (parent_event == EVENT_TOMBSTONE) {
parent_event = NULL;
+ parent_dead = true;
+ }
if (parent_event) {
/*
@@ -13748,6 +13751,9 @@ perf_event_exit_event(struct perf_event
perf_remove_from_context(event, detach_flags);
+ if (parent_dead)
+ return;
+
/*
* Child events can be freed.
*/
next prev parent reply other threads:[~2025-03-10 16:16 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-07 19:33 [PATCH v3 0/7] perf: Make perf_pmu_unregister() usable Peter Zijlstra
2025-03-07 19:33 ` [PATCH v3 1/7] perf: Ensure bpf_perf_link path is properly serialized Peter Zijlstra
2025-03-07 19:33 ` [PATCH v3 2/7] perf: Simplify child event tear-down Peter Zijlstra
2025-03-07 19:33 ` [PATCH v3 3/7] perf: Simplify perf_event_free_task() wait Peter Zijlstra
2025-03-17 6:49 ` Ravi Bangoria
2025-04-02 9:15 ` Peter Zijlstra
2025-04-08 19:05 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-04-09 13:01 ` Frederic Weisbecker
2025-04-10 9:34 ` Peter Zijlstra
2025-04-10 9:45 ` Frederic Weisbecker
2025-04-17 12:03 ` Ingo Molnar
2025-04-17 13:01 ` [tip: perf/core] perf/core: Fix put_ctx() ordering tip-bot2 for Frederic Weisbecker
2025-03-07 19:33 ` [PATCH v3 4/7] perf: Simplify perf_event_release_kernel() Peter Zijlstra
2025-04-08 19:05 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-03-07 19:33 ` [PATCH v3 5/7] perf: Unify perf_event_free_task() / perf_event_exit_task_context() Peter Zijlstra
2025-03-10 15:35 ` [PATCH v3a " Peter Zijlstra
2025-04-08 19:05 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-03-07 19:33 ` [PATCH v3 6/7] perf: Rename perf_event_exit_task(.child) Peter Zijlstra
2025-03-10 11:08 ` Ravi Bangoria
2025-03-10 14:47 ` Peter Zijlstra
2025-03-10 15:20 ` Ravi Bangoria
2025-03-10 15:27 ` Peter Zijlstra
2025-03-10 15:37 ` [PATCH v3a " Peter Zijlstra
2025-03-12 6:31 ` Ravi Bangoria
2025-03-12 10:16 ` Peter Zijlstra
2025-03-07 19:33 ` [PATCH v3 7/7] perf: Make perf_pmu_unregister() useable Peter Zijlstra
2025-03-10 15:35 ` Ravi Bangoria
2025-03-10 16:14 ` Peter Zijlstra [this message]
2025-03-10 16:46 ` Ravi Bangoria
2025-03-12 12:57 ` Peter Zijlstra
2025-03-12 13:57 ` Ravi Bangoria
2025-04-08 19:05 ` [tip: perf/core] " tip-bot2 for Peter Zijlstra
2025-04-17 8:08 ` Peter Zijlstra
2025-04-17 13:01 ` [tip: perf/core] perf/core: Fix event timekeeping merge tip-bot2 for Peter Zijlstra
2025-04-14 0:37 ` [PATCH v3 7/7] perf: Make perf_pmu_unregister() useable Mi, Dapeng
2025-04-17 8:07 ` Peter Zijlstra
2025-04-17 8:24 ` Mi, Dapeng
2025-04-17 11:30 ` [tip: perf/core] perf/core: Fix perf-stat / read() tip-bot2 for Peter Zijlstra
2025-04-17 13:01 ` tip-bot2 for Peter Zijlstra
2025-03-17 6:54 ` [PATCH v3 0/7] perf: Make perf_pmu_unregister() usable Ravi Bangoria
2025-04-08 19:05 ` [tip: perf/core] perf: Rename perf_event_exit_task(.child) tip-bot2 for Peter Zijlstra
2025-04-08 19:05 ` [tip: perf/core] perf: Simplify child event tear-down tip-bot2 for Peter Zijlstra
2025-04-08 19:05 ` [tip: perf/core] perf: Ensure bpf_perf_link path is properly serialized tip-bot2 for Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250310161445.GI19344@noisy.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lucas.demarchi@intel.com \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=ravi.bangoria@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox