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) <[email protected]>
Acked-by: Mark Rutland <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Alexey Budankov <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: David Carrillo-Cisneros <[email protected]>
Cc: Dmitri Prokhorov <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Kan Liang <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Stephane Eranian <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Valery Cherepennikov <[email protected]>
Cc: Vince Weaver <[email protected]>
Cc: [email protected]
Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Peter Zijlstra 2017-11-13 14:28:33 +01:00 • committed by Ingo Molnar
commit 8343aae661
19 changed files with 36 additions and 43 deletions

View file

@ -536,7 +536,7 @@ static bool dsu_pmu_validate_group(struct perf_event *event)
memset(fake_hw.used_mask, 0, sizeof(fake_hw.used_mask));
if (!dsu_pmu_validate_event(event->pmu, &fake_hw, leader))
return false;
list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
list_for_each_entry(sibling, &leader->sibling_list, sibling_list) {
if (!dsu_pmu_validate_event(event->pmu, &fake_hw, sibling))
return false;
}

View file

@ -311,7 +311,7 @@ validate_group(struct perf_event *event)
if (!validate_event(event->pmu, &fake_pmu, leader))
return -EINVAL;
list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
list_for_each_entry(sibling, &leader->sibling_list, sibling_list) {
if (!validate_event(event->pmu, &fake_pmu, sibling))
return -EINVAL;
}

View file

@ -82,8 +82,7 @@ static bool hisi_validate_event_group(struct perf_event *event)
counters++;
}
list_for_each_entry(sibling, &event->group_leader->sibling_list,
group_entry) {
list_for_each_entry(sibling, &event->group_leader->sibling_list, sibling_list) {
if (is_software_event(sibling))
continue;
if (sibling->pmu != event->pmu)

View file

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

View file

@ -468,7 +468,7 @@ static bool qcom_l3_cache__validate_event_group(struct perf_event *event)
counters = event_num_counters(event);
counters += event_num_counters(leader);
list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
list_for_each_entry(sibling, &leader->sibling_list, sibling_list) {
if (is_software_event(sibling))
continue;
if (sibling->pmu != event->pmu)

View file

@ -950,7 +950,7 @@ static int xgene_perf_event_init(struct perf_event *event)
return -EINVAL;
list_for_each_entry(sibling, &event->group_leader->sibling_list,
group_entry)
sibling_list)
if (sibling->pmu != event->pmu &&
!is_software_event(sibling))
return -EINVAL;