Commit 6c17c1c3 authored Jul 24, 2017 by Neil Leeder Committed by Will Deacon Jul 26, 2017

perf: qcom_l2: fix column exclusion check



The check for column exclusion did not verify that the event being
checked was an L2 event, and not a software event.
Software events should not be checked for column exclusion.
This resulted in a group with both software and L2 events sometimes
incorrectly rejecting the L2 event for column exclusion and
not counting it.

Add a check for PMU type before applying column exclusion logic.

Fixes: 21bdbb71 ("perf: add qcom l2 cache perf events driver")
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Neil Leeder <nleeder@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent 288be97c

drivers/perf/qcom_l2_pmu.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -546,6 +546,7 @@ static int l2_cache_event_init(struct perf_event *event)
		}

		if ((event != event->group_leader) &&
		!is_software_event(event->group_leader) &&
		(L2_EVT_GROUP(event->group_leader->attr.config) ==
		L2_EVT_GROUP(event->attr.config))) {
		dev_dbg_ratelimited(&l2cache_pmu->pdev->dev,
		@@ -558,6 +559,7 @@ static int l2_cache_event_init(struct perf_event *event)
		list_for_each_entry(sibling, &event->group_leader->sibling_list,
		group_entry) {
		if ((sibling != event) &&
		!is_software_event(sibling) &&
		(L2_EVT_GROUP(sibling->attr.config) ==
		L2_EVT_GROUP(event->attr.config))) {
		dev_dbg_ratelimited(&l2cache_pmu->pdev->dev,