Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df9a07e8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: perf: reject groups spanning multiple hardware PMUs"

parents 46c38e4f 263b928c

arch/arm/kernel/perf_event.c

+15 −6
Original line number Diff line number Diff line
@@ -252,20 +252,29 @@ out: 
}



static int

validate_event(struct pmu_hw_events *hw_events,

validate_event(struct pmu *pmu, struct pmu_hw_events *hw_events,

			       struct perf_event *event)

{

	struct arm_pmu *armpmu = to_arm_pmu(event->pmu);

	struct arm_pmu *armpmu;



	if (is_software_event(event))

		return 1;



	/*

	 * Reject groups spanning multiple HW PMUs (e.g. CPU + CCI). The

	 * core perf code won't check that the pmu->ctx == leader->ctx

	 * until after pmu->event_init(event).

	 */

	if (event->pmu != pmu)

		return 0;



	if (event->state < PERF_EVENT_STATE_OFF)

		return 1;



	if (event->state == PERF_EVENT_STATE_OFF && !event->attr.enable_on_exec)

		return 1;



	armpmu = to_arm_pmu(event->pmu);

	return armpmu->get_event_idx(hw_events, event) >= 0;

}
@@ -283,15 +292,15 @@ validate_group(struct perf_event *event) 
	memset(fake_used_mask, 0, sizeof(fake_used_mask));

	fake_pmu.used_mask = fake_used_mask;



	if (!validate_event(&fake_pmu, leader))

	if (!validate_event(event->pmu, &fake_pmu, leader))

		return -EINVAL;



	list_for_each_entry(sibling, &leader->sibling_list, group_entry) {

		if (!validate_event(&fake_pmu, sibling))

		if (!validate_event(event->pmu, &fake_pmu, sibling))

			return -EINVAL;

	}



	if (!validate_event(&fake_pmu, event))

	if (!validate_event(event->pmu, &fake_pmu, event))

		return -EINVAL;



	return 0;

arch/arm64/kernel/perf_event.c

+15 −6
Original line number Diff line number Diff line
@@ -330,22 +330,31 @@ out: 
}



static int

validate_event(struct pmu_hw_events *hw_events,

validate_event(struct pmu *pmu, struct pmu_hw_events *hw_events,

				struct perf_event *event)

{

	struct arm_pmu *armpmu = to_arm_pmu(event->pmu);

	struct arm_pmu *armpmu;

	struct hw_perf_event fake_event = event->hw;

	struct pmu *leader_pmu = event->group_leader->pmu;



	if (is_software_event(event))

		return 1;



	/*

	 * Reject groups spanning multiple HW PMUs (e.g. CPU + CCI). The

	 * core perf code won't check that the pmu->ctx == leader->ctx

	 * until after pmu->event_init(event).

	 */

	if (event->pmu != pmu)

		return 0;



	if (event->pmu != leader_pmu || event->state < PERF_EVENT_STATE_OFF)

		return 1;



	if (event->state == PERF_EVENT_STATE_OFF && !event->attr.enable_on_exec)

		return 1;



	armpmu = to_arm_pmu(event->pmu);

	return armpmu->get_event_idx(hw_events, &fake_event) >= 0;

}
@@ -363,15 +372,15 @@ validate_group(struct perf_event *event) 
	memset(fake_used_mask, 0, sizeof(fake_used_mask));

	fake_pmu.used_mask = fake_used_mask;



	if (!validate_event(&fake_pmu, leader))

	if (!validate_event(event->pmu, &fake_pmu, leader))

		return -EINVAL;



	list_for_each_entry(sibling, &leader->sibling_list, group_entry) {

		if (!validate_event(&fake_pmu, sibling))

		if (!validate_event(event->pmu, &fake_pmu, sibling))

			return -EINVAL;

	}



	if (!validate_event(&fake_pmu, event))

	if (!validate_event(event->pmu, &fake_pmu, event))

		return -EINVAL;



	return 0;