Commit bf480f93 authored by Ravi Bangoria's avatar Ravi Bangoria Committed by Peter Zijlstra
Browse files

perf/core: Don't allow grouping events from different hw pmus 



Event group from different hw pmus does not make sense and thus perf
has never allowed it. However, with recent rewrite that restriction
has been inadvertently removed. Fix it.

Fixes: bd275681 ("perf: Rewrite core context handling")
Signed-off-by: default avatarRavi Bangoria <ravi.bangoria@amd.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20221122080326.228-1-ravi.bangoria@amd.com
parent 30093056

kernel/events/core.c

+15 −9
Original line number Diff line number Diff line
@@ -12503,8 +12503,8 @@ SYSCALL_DEFINE5(perf_event_open, 
			 * perf_event_pmu_context.

			 */

			pmu = group_leader->pmu_ctx->pmu;

		} else if (!is_software_event(event) &&

			is_software_event(group_leader) &&

		} else if (!is_software_event(event)) {

			if (is_software_event(group_leader) &&

			    (group_leader->group_caps & PERF_EV_CAP_SOFTWARE)) {

				/*

				 * In case the group is a pure software group, and we
@@ -12513,6 +12513,12 @@ SYSCALL_DEFINE5(perf_event_open, 
				 */

				move_group = 1;

			}



			/* Don't allow group of multiple hw events from different pmus */

			if (!in_software_context(group_leader) &&

			    group_leader->pmu_ctx->pmu != pmu)

				goto err_locked;

		}

	}



	/*