diff options
author | Peter Zijlstra <peterz@infradead.org> | 2023-11-15 10:15:40 +0100 |
---|---|---|
committer | Peter Zijlstra <peterz@infradead.org> | 2023-11-15 10:15:40 +0100 |
commit | 5d2d4a9f603a47403395408f64b1261ca61f6d50 (patch) | |
tree | 52d145a53bfe4f32a20bb621ac848623ae459510 /include/linux/perf_event.h | |
parent | 33744916196b4ed7a50f6f47af7c3ad46b730ce6 (diff) | |
parent | 889c58b3155ff4c8e8671c95daef63d6fabbb6b1 (diff) |
Merge branch 'tip/perf/urgent'
Avoid conflicts, base on fixes.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'include/linux/perf_event.h')
-rw-r--r-- | include/linux/perf_event.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index ac1a59c1f252..d2a15c0c6f8a 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -704,6 +704,7 @@ struct perf_event { /* The cumulative AND of all event_caps for events in this group. */ int group_caps; + unsigned int group_generation; struct perf_event *group_leader; /* * event->pmu will always point to pmu in which this event belongs. @@ -842,11 +843,11 @@ struct perf_event { }; /* - * ,-----------------------[1:n]----------------------. - * V V - * perf_event_context <-[1:n]-> perf_event_pmu_context <--- perf_event - * ^ ^ | | - * `--------[1:n]---------' `-[n:1]-> pmu <-[1:n]-' + * ,-----------------------[1:n]------------------------. + * V V + * perf_event_context <-[1:n]-> perf_event_pmu_context <-[1:n]- perf_event + * | | + * `--[n:1]-> pmu <-[1:n]--' * * * struct perf_event_pmu_context lifetime is refcount based and RCU freed @@ -864,6 +865,9 @@ struct perf_event { * ctx->mutex pinning the configuration. Since we hold a reference on * group_leader (through the filedesc) it can't go away, therefore it's * associated pmu_ctx must exist and cannot change due to ctx->mutex. + * + * perf_event holds a refcount on perf_event_context + * perf_event holds a refcount on perf_event_pmu_context */ struct perf_event_pmu_context { struct pmu *pmu; |