Merge "perf: protect group_leader from races that cause ctx double-free"

1 files changed, 6 insertions, 0 deletions

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 490ff31d1d88..f501b8c0de4e 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -477,6 +477,12 @@ struct perf_event {
 	int				nr_siblings;
 	int				group_flags;
 	struct perf_event		*group_leader;
+
+	/*
+	 * Protect the pmu, attributes and context of a group leader.
+	 * Note: does not protect the pointer to the group_leader.
+	 */
+	struct mutex			group_leader_mutex;
 	struct pmu			*pmu;
 
 	enum perf_event_active_state	state;