* [PATCH v2] perf/cgroup: correct indirection in perf_less_group_idx
@ 2020-03-21 16:43 Ian Rogers
2020-04-08 12:20 ` [tip: perf/urgent] perf/cgroup: Correct indirection in perf_less_group_idx() tip-bot2 for Ian Rogers
0 siblings, 1 reply; 2+ messages in thread
From: Ian Rogers @ 2020-03-21 16:43 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
Kan Liang, linux-kernel
Cc: Stephane Eranian, Ian Rogers, John Sperbeck
The void* in perf_less_group_idx is to a cell in the array which points
at a perf_event*, as such it is a perf_event**.
Fixes: 6eef8a7116de ("perf/core: Use min_heap in visit_groups_merge()")
Reported-By: John Sperbeck <jsperbeck@google.com>
Signed-off-by: Ian Rogers <irogers@google.com>
---
kernel/events/core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index d22e4ba59dfa..a758c2311c53 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3503,7 +3503,8 @@ static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
static bool perf_less_group_idx(const void *l, const void *r)
{
- const struct perf_event *le = l, *re = r;
+ const struct perf_event *le = *(const struct perf_event **)l;
+ const struct perf_event *re = *(const struct perf_event **)r;
return le->group_index < re->group_index;
}
--
2.25.1.696.g5e7596f4ac-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: perf/urgent] perf/cgroup: Correct indirection in perf_less_group_idx()
2020-03-21 16:43 [PATCH v2] perf/cgroup: correct indirection in perf_less_group_idx Ian Rogers
@ 2020-04-08 12:20 ` tip-bot2 for Ian Rogers
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Ian Rogers @ 2020-04-08 12:20 UTC (permalink / raw)
To: linux-tip-commits
Cc: Ian Rogers, Peter Zijlstra (Intel), Ingo Molnar, x86, LKML
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 24fb6b8e7c2280000966e3f2c9c8069a538518eb
Gitweb: https://git.kernel.org/tip/24fb6b8e7c2280000966e3f2c9c8069a538518eb
Author: Ian Rogers <irogers@google.com>
AuthorDate: Sat, 21 Mar 2020 09:43:31 -07:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 08 Apr 2020 11:33:45 +02:00
perf/cgroup: Correct indirection in perf_less_group_idx()
The void* in perf_less_group_idx() is to a member in the array which points
at a perf_event*, as such it is a perf_event**.
Reported-By: John Sperbeck <jsperbeck@google.com>
Fixes: 6eef8a7116de ("perf/core: Use min_heap in visit_groups_merge()")
Signed-off-by: Ian Rogers <irogers@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lkml.kernel.org/r/20200321164331.107337-1-irogers@google.com
---
kernel/events/core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 7afd0b5..26de0a5 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3522,7 +3522,8 @@ static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
static bool perf_less_group_idx(const void *l, const void *r)
{
- const struct perf_event *le = l, *re = r;
+ const struct perf_event *le = *(const struct perf_event **)l;
+ const struct perf_event *re = *(const struct perf_event **)r;
return le->group_index < re->group_index;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-08 12:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-21 16:43 [PATCH v2] perf/cgroup: correct indirection in perf_less_group_idx Ian Rogers
2020-04-08 12:20 ` [tip: perf/urgent] perf/cgroup: Correct indirection in perf_less_group_idx() tip-bot2 for Ian Rogers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).