Skip to contentSkip to conversation

perf hist: Don't set hpp_fmt_value for members in --no-group

PATCH Applied [email protected] 3 participants 3 messages Aug 20, 2024 – Aug 26, 2024 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf hist: Don't set hpp_fmt_value for members in --no-group

From: Kan Liang <[email protected]>

Perf crashes as below when applying --no-group

perf record -e "{cache-misses,branches"} -b sleep 1 perf report --stdio --no-group
free(): invalid next size (fast)
Aborted (core dumped)

In the __hpp__fmt(), only 1 hpp_fmt_value is allocated for the current event when --no-group is applied. However, the current implementation tries to assign the hists from all members to the hpp_fmt_value, which exceeds the allocated memory.

Fixes 8f6071a3dce4 ("perf hist: Simplify __hpp_fmt() using hpp_fmt_data")
---
 tools/perf/ui/hist.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
tools/perf/ui/hist.c +5 -5
index 5d1f04f66a5a..e5491995adf0 100644
@@ -62,7 +62,7 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
 	struct evsel *pos;
 	char *buf = hpp->buf;
 	size_t size = hpp->size;
-	int i, nr_members = 1;
+	int i = 0, nr_members = 1;
 	struct hpp_fmt_value *values;
 
 	if (evsel__is_group_event(evsel))
@@ -72,16 +72,16 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
 	if (values == NULL)
 		return 0;
 
-	i = 0;
-	for_each_group_evsel(pos, evsel)
-		values[i++].hists = evsel__hists(pos);
-
+	values[0].hists = evsel__hists(evsel);
 	values[0].val = get_field(he);
 	values[0].samples = he->stat.nr_events;
 
 	if (evsel__is_group_event(evsel)) {
 		struct hist_entry *pair;
 
+		for_each_group_member(pos, evsel)
+			values[++i].hists = evsel__hists(pos);
+
 		list_for_each_entry(pair, &he->pairs.head, pairs.node) {
 			for (i = 0; i < nr_members; i++) {
 				if (values[i].hists != pair->hists)
Signature · 1 line
2.38.1
maintainer Acked-by on v1 1/1
#1 lore raw

Hi Kan,

Quoted 10 lines · On Tue, Aug 20, 2024 at 11:31 AM <[email protected]> wrote:

From: Kan Liang <[email protected]>

Perf crashes as below when applying --no-group

perf record -e "{cache-misses,branches"} -b sleep 1 perf report --stdio --no-group
free(): invalid next size (fast)
Aborted (core dumped)

Quoted 7 lines

In the __hpp__fmt(), only 1 hpp_fmt_value is allocated for the current event when --no-group is applied. However, the current implementation tries to assign the hists from all members to the hpp_fmt_value, which exceeds the allocated memory.

Fixes 8f6071a3dce4 ("perf hist: Simplify __hpp_fmt() using hpp_fmt_data")

Thanks,
Namhyung

Quoted 41 lines
---
 tools/perf/ui/hist.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
tools/perf/ui/hist.c +5 -6
index 5d1f04f66a5a..e5491995adf0 100644
@@ -62,7 +62,7 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
        struct evsel *pos;
        char *buf = hpp->buf;
        size_t size = hpp->size;
-       int i, nr_members = 1;
+       int i = 0, nr_members = 1;
        struct hpp_fmt_value *values;
 
        if (evsel__is_group_event(evsel))
@@ -72,16 +72,16 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
        if (values == NULL)
                return 0;
 
-       i = 0;
-       for_each_group_evsel(pos, evsel)
-               values[i++].hists = evsel__hists(pos);
-
+       values[0].hists = evsel__hists(evsel);
        values[0].val = get_field(he);
        values[0].samples = he->stat.nr_events;
 
        if (evsel__is_group_event(evsel)) {
                struct hist_entry *pair;
 
+               for_each_group_member(pos, evsel)
+                       values[++i].hists = evsel__hists(pos);
+
                list_for_each_entry(pair, &he->pairs.head, pairs.node) {
                        for (i = 0; i < nr_members; i++) {
                                if (values[i].hists != pair->hists)
--

2.38.1

maintainer Applied
#2 lore raw
Quoted 18 lines · Namhyung Kim

Hi Kan,

Quoted 15 lines · On Tue, Aug 20, 2024 at 11:31 AM <[email protected]> wrote:

From: Kan Liang <[email protected]>

Perf crashes as below when applying --no-group

perf record -e "{cache-misses,branches"} -b sleep 1 perf report --stdio --no-group
free(): invalid next size (fast)
Aborted (core dumped)

In the __hpp__fmt(), only 1 hpp_fmt_value is allocated for the current event when --no-group is applied. However, the current implementation tries to assign the hists from all members to the hpp_fmt_value, which exceeds the allocated memory.

Quoted 4 lines
Quoted 2 lines
Fixes 8f6071a3dce4 ("perf hist: Simplify __hpp_fmt() using hpp_fmt_data")

Thanks, applied to perf-tools-next,

- Arnaldo