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

Commit 8343aae6 authored Nov 13, 2017 by Peter Zijlstra Committed by Ingo Molnar Mar 12, 2018

perf/core: Remove perf_event::group_entry



Now that all the grouping is done with RB trees, we no longer need
group_entry and can replace the whole thing with sibling_list.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Carrillo-Cisneros <davidcc@google.com>
Cc: Dmitri Prokhorov <Dmitry.Prohorov@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Valery Cherepennikov <valery.cherepennikov@intel.com>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 1cac7b1a

arch/alpha/kernel/perf_event.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -351,7 +351,7 @@ static int collect_events(struct perf_event *group, int max_count,
		evtype[n] = group->hw.event_base;
		current_idx[n++] = PMC_NO_INDEX;
		}
		list_for_each_entry(pe, &group->sibling_list, group_entry) {
		list_for_each_entry(pe, &group->sibling_list, sibling_list) {
		if (!is_software_event(pe) && pe->state != PERF_EVENT_STATE_OFF) {
		if (n >= max_count)
		return -1;

arch/arm/mach-imx/mmdc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -269,7 +269,7 @@ static bool mmdc_pmu_group_is_valid(struct perf_event *event)
		return false;
		}

		list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
		list_for_each_entry(sibling, &leader->sibling_list, sibling_list) {
		if (!mmdc_pmu_group_event_is_valid(sibling, pmu, &counter_mask))
		return false;
		}

arch/arm/mm/cache-l2x0-pmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -293,7 +293,7 @@ static bool l2x0_pmu_group_is_valid(struct perf_event *event)
		else if (!is_software_event(leader))
		return false;

		list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
		list_for_each_entry(sibling, &leader->sibling_list, sibling_list) {
		if (sibling->pmu == pmu)
		num_hw++;
		else if (!is_software_event(sibling))

arch/mips/kernel/perf_event_mipsxx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -711,7 +711,7 @@ static int validate_group(struct perf_event *event)
		if (mipsxx_pmu_alloc_counter(&fake_cpuc, &leader->hw) < 0)
		return -EINVAL;

		list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
		list_for_each_entry(sibling, &leader->sibling_list, sibling_list) {
		if (mipsxx_pmu_alloc_counter(&fake_cpuc, &sibling->hw) < 0)
		return -EINVAL;
		}

arch/powerpc/perf/core-book3s.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1426,7 +1426,7 @@ static int collect_events(struct perf_event *group, int max_count,
		flags[n] = group->hw.event_base;
		events[n++] = group->hw.config;
		}
		list_for_each_entry(event, &group->sibling_list, group_entry) {
		list_for_each_entry(event, &group->sibling_list, sibling_list) {
		if (event->pmu->task_ctx_nr == perf_hw_context &&
		event->state != PERF_EVENT_STATE_OFF) {
		if (n >= max_count)