Skip to content

Commit 7e2c1e4

Browse files
mrutland-armPeter Zijlstra
authored andcommitted
perf: Fix perf_event_validate_size() lockdep splat
When lockdep is enabled, the for_each_sibling_event(sibling, event) macro checks that event->ctx->mutex is held. When creating a new group leader event, we call perf_event_validate_size() on a partially initialized event where event->ctx is NULL, and so when for_each_sibling_event() attempts to check event->ctx->mutex, we get a splat, as reported by Lucas De Marchi: WARNING: CPU: 8 PID: 1471 at kernel/events/core.c:1950 __do_sys_perf_event_open+0xf37/0x1080 This only happens for a new event which is its own group_leader, and in this case there cannot be any sibling events. Thus it's safe to skip the check for siblings, which avoids having to make invasive and ugly changes to for_each_sibling_event(). Avoid the splat by bailing out early when the new event is its own group_leader. Fixes: 382c27f ("perf: Fix perf_event_validate_size()") Closes: https://lore.kernel.org/lkml/20231214000620.3081018-1-lucas.demarchi@intel.com/ Closes: https://lore.kernel.org/lkml/ZXpm6gQ%2Fd59jGsuW@xpf.sh.intel.com/ Reported-by: Lucas De Marchi <lucas.demarchi@intel.com> Reported-by: Pengfei Xu <pengfei.xu@intel.com> Signed-off-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20231215112450.3972309-1-mark.rutland@arm.com
1 parent a39b6ac commit 7e2c1e4

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

kernel/events/core.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1947,6 +1947,16 @@ static bool perf_event_validate_size(struct perf_event *event)
19471947
group_leader->nr_siblings + 1) > 16*1024)
19481948
return false;
19491949

1950+
/*
1951+
* When creating a new group leader, group_leader->ctx is initialized
1952+
* after the size has been validated, but we cannot safely use
1953+
* for_each_sibling_event() until group_leader->ctx is set. A new group
1954+
* leader cannot have any siblings yet, so we can safely skip checking
1955+
* the non-existent siblings.
1956+
*/
1957+
if (event == group_leader)
1958+
return true;
1959+
19501960
for_each_sibling_event(sibling, group_leader) {
19511961
if (__perf_event_read_size(sibling->attr.read_format,
19521962
group_leader->nr_siblings + 1) > 16*1024)

0 commit comments

Comments
 (0)