86 lines
2.8 KiB
Diff
86 lines
2.8 KiB
Diff
From 3f6276d1f80d0ccef037e1e684f54d6b4db8c4c3 Mon Sep 17 00:00:00 2001
|
|
From: John Garry <john.garry@huawei.com>
|
|
Date: Fri, 4 Dec 2020 19:10:11 +0800
|
|
Subject: [PATCH 159/201] perf evlist: Change evlist__splice_list_tail()
|
|
ordering
|
|
|
|
mainline inclusion
|
|
from mainline-v5.11-rc1
|
|
commit 6d2783fe365fa5f571cf1416b5f5b1e352447a0e
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6d2783fe365fa5f571cf1416b5f5b1e352447a0e
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Function find_evsel_group() expects events to be ordered such that they
|
|
are grouped after their leader.
|
|
|
|
Modify evlist__splice_list_tail() to guarantee this (ordering).
|
|
|
|
[Should prob also change the function name]
|
|
|
|
Signed-off-by: John Garry <john.garry@huawei.com>
|
|
Acked-by: Kajol Jain <kjain@linux.ibm.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Ian Rogers <irogers@google.com>
|
|
Cc: Jiri Olsa <jolsa@redhat.com>
|
|
Cc: Joakim Zhang <qiangqing.zhang@nxp.com>
|
|
Cc: Kan Liang <kan.liang@linux.intel.com>
|
|
Cc: Kim Phillips <kim.phillips@amd.com>
|
|
Cc: Leo Yan <leo.yan@linaro.org>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Shaokun Zhang <zhangshaokun@hisilicon.com>
|
|
Cc: Will Deacon <will@kernel.org>
|
|
Cc: linux-arm-kernel@lists.infradead.org
|
|
Cc: linuxarm@huawei.com
|
|
Link: http://lore.kernel.org/lkml/1607080216-36968-6-git-send-email-john.garry@huawei.com
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
|
|
Conflicts:
|
|
tools/perf/util/evlist.c
|
|
---
|
|
tools/perf/util/evlist.c | 19 +++++++++++++++----
|
|
1 file changed, 15 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
|
|
index bd791f9af49b..39b41d9d2a24 100644
|
|
--- a/tools/perf/util/evlist.c
|
|
+++ b/tools/perf/util/evlist.c
|
|
@@ -200,11 +200,22 @@ void perf_evlist__remove(struct perf_evlist *evlist, struct perf_evsel *evsel)
|
|
void perf_evlist__splice_list_tail(struct perf_evlist *evlist,
|
|
struct list_head *list)
|
|
{
|
|
- struct perf_evsel *evsel, *temp;
|
|
+ while (!list_empty(list)) {
|
|
+ struct perf_evsel *evsel, *temp, *leader = NULL;
|
|
|
|
- __evlist__for_each_entry_safe(list, temp, evsel) {
|
|
- list_del_init(&evsel->node);
|
|
- perf_evlist__add(evlist, evsel);
|
|
+ __evlist__for_each_entry_safe(list, temp, evsel) {
|
|
+ list_del_init(&evsel->node);
|
|
+ perf_evlist__add(evlist, evsel);
|
|
+ leader = evsel;
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ __evlist__for_each_entry_safe(list, temp, evsel) {
|
|
+ if (evsel->leader == leader) {
|
|
+ list_del_init(&evsel->node);
|
|
+ perf_evlist__add(evlist, evsel);
|
|
+ }
|
|
+ }
|
|
}
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|