perf util: Fix wrong processing when closing evsel fd
PATCH 1/1 perf util: Fix wrong processing when closing evsel fd
In current xyarray code, xyarray__max_x() returns max_y, and xyarray__max_y() returns max_x.
It's confusing and for code logic it looks not correct. Error happens when closing evsel fd. Let's see this scenario:
1. Allocate an fd (pseudo-code)
-------------------------------
perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads)
{
evsel->fd = xyarray__new(ncpus, nthreads, sizeof(int));
}xyarray__new(int xlen, int ylen, size_t entry_size)
{
size_t row_size = ylen * entry_size;
struct xyarray *xy = zalloc(sizeof(*xy) + xlen * row_size);
xy->entry_size = entry_size;
xy->row_size = row_size;
xy->entries = xlen * ylen;
xy->max_x = xlen;
xy->max_y = ylen;
......
}So max_x is ncpus, max_y is nthreads and row_size = nthreads * 4.
2. Use perf syscall and get the fd
----------------------------------
int perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
struct thread_map *threads)
{
for (cpu = 0; cpu < cpus->nr; cpu++) {
for (thread = 0; thread < nthreads; thread++) {
int fd, group_fd;
fd = sys_perf_event_open(&evsel->attr, pid, cpus->map[cpu],
group_fd, flags);
FD(evsel, cpu, thread) = fd;
}
}static inline void *xyarray__entry(struct xyarray *xy, int x, int y)
{
return &xy->contents[x * xy->row_size + y * xy->entry_size];
}These codes don't have issues. The issue happens in the closing of fd.
3. Close fd.
-----------
void perf_evsel__close_fd(struct perf_evsel *evsel)
{
int cpu, thread;
for (cpu = 0; cpu < xyarray__max_x(evsel->fd); cpu++)
for (thread = 0; thread < xyarray__max_y(evsel->fd); ++thread) {
close(FD(evsel, cpu, thread));
FD(evsel, cpu, thread) = -1;
}
}Since xyarray__max_x() returns max_y (nthreads) and xyarry__max_y() returns max_x (ncpus), so above code is actually to be:
for (cpu = 0; cpu < nthreads; cpu++)
for (thread = 0; thread < ncpus; ++thread) {
close(FD(evsel, cpu, thread));
FD(evsel, cpu, thread) = -1;
}It's not correct!
This change is introduced by "475fb533fb7d" ("perf evsel: Fix buffer overflow while freeing events")
This fix is to let xyarray__max_x() return max_x (ncpus) and let xyarry__max_y() return max_y (nthreads)
--- tools/perf/util/xyarray.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/xyarray.h +2 -2
@@ -23,12 +23,12 @@ static inline void *xyarray__entry(struct xyarray *xy, int x, int y)static inline int xyarray__max_y (struct xyarray *xy) { -return xy->max_x; +return xy->max_y; }static inline int xyarray__max_x (struct xyarray *xy) { -return xy->max_y; +return xy->max_x; }#endif /* _PERF_XYARRAY_H_ */
Signature · 1 line
2.7.4
On Wed, Oct 18, 2017 at 11:11:18PM +0800, Jin Yao wrote:
SNIP
Quoted 18 lines
This change is introduced by "
475fb533fb7d" ("perf evsel: Fix buffer overflow while freeing events")This fix is to let
xyarray__max_x()returnmax_x(ncpus) and letxyarry__max_y()returnmax_y(nthreads)Signed-off-by Jin Yao <[email protected]>--- tools/perf/util/xyarray.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/perf/util/xyarray.h +0
-0@@ -23,12 +23,12 @@ static inline void *xyarray__entry(struct xyarray *xy, int x, int y)static inline int xyarray__max_y (struct xyarray *xy)
tools/perf/util/xyarray.h static inline void *xyarray__entry(struct xyarray *xy, int x, int y) · line 32
Quoted 10 lines
tools/perf/util/xyarray.h +2
-2{ -return xy->max_x; +return xy->max_y; }static inline int xyarray__max_x (struct xyarray *xy) { -return xy->max_y; +return xy->max_x; }
oops, thanks!
jirka
Em Wed, Oct 18, 2017 at 10:12:51AM +0200, Jiri Olsa escreveu:
Quoted 35 lines · Jin Yao
SNIP
Quoted 18 lines
This change is introduced by "
475fb533fb7d" ("perf evsel: Fix buffer overflow while freeing events")This fix is to let
xyarray__max_x()returnmax_x(ncpus) and letxyarry__max_y()returnmax_y(nthreads)Signed-off-by Jin Yao <[email protected]>--- tools/perf/util/xyarray.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/perf/util/xyarray.h +0
-0@@ -23,12 +23,12 @@ static inline void *xyarray__entry(struct xyarray *xy, int x, int y)static inline int xyarray__max_y (struct xyarray *xy)tools/perf/util/xyarray.h static inline void *xyarray__entry(struct xyarray *xy, int x, int y) · line 32
Quoted 10 lines
tools/perf/util/xyarray.h +2
-2{ -return xy->max_x; +return xy->max_y; }static inline int xyarray__max_x (struct xyarray *xy) { -return xy->max_y; +return xy->max_x; }oops, thanks!
Quoted 1 line
Acked-by Jiri Olsa <[email protected]>
Thanks, applied, I should've caught this, ouch.
- Arnaldo
PATCH 1/1 perf record: Fix tool crash with xyarray
I see 'perf record -p <pid>' crashes with following log:
*** Error in `./perf': free(): invalid next size (normal): 0x000000000298b340 *** ======= Backtrace: ========= /lib/x86_64-linux-gnu/libc.so.6(+0x777e5)[0x7f7fd85c87e5] /lib/x86_64-linux-gnu/libc.so.6(+0x8037a)[0x7f7fd85d137a] /lib/x86_64-linux-gnu/libc.so.6(cfree+0x4c)[0x7f7fd85d553c] ./perf(perf_evsel__close+0xb4)[0x4b7614] ./perf(perf_evlist__delete+0x100)[0x4ab180] ./perf(cmd_record+0x1d9)[0x43a5a9]
./perf[0x49aa2f]
./perf(main+0x631)[0x427841] /lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xf0)[0x7f7fd8571830] ./perf(_start+0x29)[0x427a59]
This is because functions xyarray__max_x() and xyarray__max_y() are returning incorrect values, causing crash while accessing xyarray.
--- tools/perf/util/xyarray.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/xyarray.h +2 -2
@@ -21,12 +21,12 @@ static inline void *xyarray__entry(struct xyarray *xy, int x, int y)return &xy->contents[x * xy->row_size + y * xy->entry_size]; } -static inline int xyarray__max_y (struct xyarray *xy) +static inline int xyarray__max_x (struct xyarray *xy) {return xy->max_x; } -static inline int xyarray__max_x (struct xyarray *xy) +static inline int xyarray__max_y (struct xyarray *xy) {return xy->max_y; }
Signature · 1 line
2.7.4
Arnaldo Carvalho de Melo
maintainerRe: [PATCH] perf record: Fix tool crash with xyarray
Em Wed, Oct 18, 2017 at 05:20:46PM +0530, Ravi Bangoria escreveu:
Quoted 1 line
I see 'perf record -p <pid>' crashes with following log:
I just applied the same patch, coming from Jin Yao, thanks! I'll add a reported-by you there,
- Arnaldo
Quoted 44 lines
*** Error in `./perf': free(): invalid next size (normal): 0x000000000298b340 *** ======= Backtrace: ========= /lib/x86_64-linux-gnu/libc.so.6(+0x777e5)[0x7f7fd85c87e5] /lib/x86_64-linux-gnu/libc.so.6(+0x8037a)[0x7f7fd85d137a] /lib/x86_64-linux-gnu/libc.so.6(cfree+0x4c)[0x7f7fd85d553c] ./perf(perf_evsel__close+0xb4)[0x4b7614] ./perf(perf_evlist__delete+0x100)[0x4ab180] ./perf(cmd_record+0x1d9)[0x43a5a9] ./perf[0x49aa2f] ./perf(main+0x631)[0x427841] /lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xf0)[0x7f7fd8571830] ./perf(_start+0x29)[0x427a59]This is because functions
xyarray__max_x()andxyarray__max_y()are returning incorrect values, causing crash while accessing xyarray.Fixes d74be4767367 ("perf xyarray: Save max_x, max_y")Signed-off-by Ravi Bangoria <[email protected]>--- tools/perf/util/xyarray.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/perf/util/xyarray.h +2
-2@@ -21,12 +21,12 @@ static inline void *xyarray__entry(struct xyarray *xy, int x, int y)return &xy->contents[x * xy->row_size + y * xy->entry_size]; } -static inline int xyarray__max_y (struct xyarray *xy) +static inline int xyarray__max_x (struct xyarray *xy) {return xy->max_x; } -static inline int xyarray__max_x (struct xyarray *xy) +static inline int xyarray__max_y (struct xyarray *xy) {return xy->max_y; }Signature · 1 line
2.7.4
tip-bot for Jin Yao
merge bot[tip:perf/urgent] perf xyarray: Fix wrong processing when closing evsel fd
In reply to Ravi Bangoriaperf xyarray: Fix wrong processing when closing evsel fd
Commit-ID: 3d8bba9535ac6e79453c769dd0c8ea852a51ad60 Gitweb: https://git.kernel.org/tip/3d8bba9535ac6e79453c769dd0c8ea852a51ad60 Author: Jin Yao <[email protected]> AuthorDate: Wed, 18 Oct 2017 23:11:18 +0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 18 Oct 2017 09:09:36 -0300
perf xyarray: Fix wrong processing when closing evsel fd
In current xyarray code, xyarray__max_x() returns max_y, and xyarray__max_y() returns max_x.
It's confusing and for code logic it looks not correct.
Error happens when closing evsel fd. Let's see this scenario:
1. Allocate an fd (pseudo-code)
perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads)
{
evsel->fd = xyarray__new(ncpus, nthreads, sizeof(int));}
xyarray__new(int xlen, int ylen, size_t entry_size)
{
size_t row_size = ylen * entry_size;
struct xyarray *xy = zalloc(sizeof(*xy) + xlen * row_size);
xy->entry_size = entry_size;
xy->row_size = row_size;
xy->entries = xlen * ylen;
xy->max_x = xlen;
xy->max_y = ylen;
......}
So max_x is ncpus, max_y is nthreads and row_size = nthreads * 4.
2. Use perf syscall and get the fd
int perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
struct thread_map *threads)
{
for (cpu = 0; cpu < cpus->nr; cpu++) {
for (thread = 0; thread < nthreads; thread++) {
int fd, group_fd;
fd = sys_perf_event_open(&evsel->attr, pid, cpus->map[cpu],
group_fd, flags);
FD(evsel, cpu, thread) = fd;
}}
static inline void *xyarray__entry(struct xyarray *xy, int x, int y)
{
return &xy->contents[x * xy->row_size + y * xy->entry_size];}
These codes don't have issues. The issue happens in the closing of fd.
3. Close fd.
void perf_evsel__close_fd(struct perf_evsel *evsel)
{
int cpu, thread;
for (cpu = 0; cpu < xyarray__max_x(evsel->fd); cpu++)
for (thread = 0; thread < xyarray__max_y(evsel->fd); ++thread) {
close(FD(evsel, cpu, thread));
FD(evsel, cpu, thread) = -1;
}}
Since xyarray__max_x() returns max_y (nthreads) and xyarry__max_y() returns max_x (ncpus), so above code is actually to be:
for (cpu = 0; cpu < nthreads; cpu++)
for (thread = 0; thread < ncpus; ++thread) {
close(FD(evsel, cpu, thread));
FD(evsel, cpu, thread) = -1;
}It's not correct!
This change is introduced by "475fb533fb7d" ("perf evsel: Fix buffer overflow while freeing events")
This fix is to let xyarray__max_x() return max_x (ncpus) and let xyarry__max_y() return max_y (nthreads)
Committer note:
This was also fixed by Ravi Bangoria, who provided the same patch, noticing the problem with 'perf record':
<quote Ravi>
I see 'perf record -p <pid>' crashes with following log:
*** Error in `./perf': free(): invalid next size (normal): 0x000000000298b340 *** ======= Backtrace: ========= /lib/x86_64-linux-gnu/libc.so.6(+0x777e5)[0x7f7fd85c87e5] /lib/x86_64-linux-gnu/libc.so.6(+0x8037a)[0x7f7fd85d137a] /lib/x86_64-linux-gnu/libc.so.6(cfree+0x4c)[0x7f7fd85d553c] ./perf(perf_evsel__close+0xb4)[0x4b7614] ./perf(perf_evlist__delete+0x100)[0x4ab180] ./perf(cmd_record+0x1d9)[0x43a5a9]
./perf[0x49aa2f]
./perf(main+0x631)[0x427841] /lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xf0)[0x7f7fd8571830] ./perf(_start+0x29)[0x427a59]
</>
--- tools/perf/util/xyarray.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/xyarray.h +2 -2
@@ -23,12 +23,12 @@ static inline void *xyarray__entry(struct xyarray *xy, int x, int y)static inline int xyarray__max_y (struct xyarray *xy) { -return xy->max_x; +return xy->max_y; }static inline int xyarray__max_x (struct xyarray *xy) { -return xy->max_y; +return xy->max_x; }#endif /* _PERF_XYARRAY_H_ */