qiurui
/
linux-kernelorg-stable
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

perf dlfilter: Fix use of addr_location__exit() in dlfilter__object_code() 

Stop calling addr_location__exit() when addr_location__init() was not
called.

Fixes: 0dd5041c9a ("perf addr_location: Add init/exit/copy functions")
Cc: stable@vger.kernel.org
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20230928071605.17624-1-adrian.hunter@intel.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
Adrian Hunter 2023-09-28 10:16:05 +03:00 committed by Namhyung Kim
parent 48a3adcf47
commit 7a48b58eb5
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/perf/util/dlfilter.c
View File

@ -282,13 +282,21 @@ static struct perf_event_attr *dlfilter__attr(void *ctx)
return &d->evsel->core.attr; return &d->evsel->core.attr;
} }
static __s32 code_read(__u64 ip, struct map *map, struct machine *machine, void *buf, __u32 len)
{
u64 offset = map__map_ip(map, ip);
if (ip + len >= map__end(map))
len = map__end(map) - ip;
return dso__data_read_offset(map__dso(map), machine, offset, buf, len);
}
static __s32 dlfilter__object_code(void *ctx, __u64 ip, void *buf, __u32 len) static __s32 dlfilter__object_code(void *ctx, __u64 ip, void *buf, __u32 len)
{ {
struct dlfilter *d = (struct dlfilter *)ctx; struct dlfilter *d = (struct dlfilter *)ctx;
struct addr_location *al; struct addr_location *al;
struct addr_location a; struct addr_location a;
struct map *map;
u64 offset;
__s32 ret; __s32 ret;
if (!d->ctx_valid) if (!d->ctx_valid)
@ -298,27 +306,17 @@ static __s32 dlfilter__object_code(void *ctx, __u64 ip, void *buf, __u32 len)
if (!al) if (!al)
return -1; return -1;
map = al->map; if (al->map && ip >= map__start(al->map) && ip < map__end(al->map) &&
if (map && ip >= map__start(map) && ip < map__end(map) &&
machine__kernel_ip(d->machine, ip) == machine__kernel_ip(d->machine, d->sample->ip)) machine__kernel_ip(d->machine, ip) == machine__kernel_ip(d->machine, d->sample->ip))
goto have_map; return code_read(ip, al->map, d->machine, buf, len);
addr_location__init(&a); addr_location__init(&a);
thread__find_map_fb(al->thread, d->sample->cpumode, ip, &a);
if (!a.map) {
ret = -1;
goto out;
}
map = a.map; thread__find_map_fb(al->thread, d->sample->cpumode, ip, &a);
have_map: ret = a.map ? code_read(ip, a.map, d->machine, buf, len) : -1;
offset = map__map_ip(map, ip);
if (ip + len >= map__end(map))
len = map__end(map) - ip;
ret = dso__data_read_offset(map__dso(map), d->machine, offset, buf, len);
out:
addr_location__exit(&a); addr_location__exit(&a);
return ret; return ret;
} }