Message ID | 05faf8cf48948cdadcf3757eb5fc0305497805c6.1724820993.git.scclevenger@os.amperecomputing.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | arm-cs-trace-disasm.py/perf must accommodate non-zero DSO text offset | expand |
On 8/28/2024 6:09 AM, Steve Clevenger wrote: > > Use dso__is_pie() to check whether the DSO file is a Position > Independent Executable (PIE). If PIE, change the MAPPING_TYPE to > MAPPING_TYPE__IDENTITY so a zero map pgoff (text offset) is passed > into the script. > > Signed-off-by: Steve Clevenger <scclevenger@os.amperecomputing.com> Reviewed-by: Leo Yan <leo.yan@arm.com> > --- > tools/perf/util/map.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c > index e781c8d56a9a..c846faec177b 100644 > --- a/tools/perf/util/map.c > +++ b/tools/perf/util/map.c > @@ -173,8 +173,8 @@ struct map *map__new(struct machine *machine, u64 start, u64 len, > assert(!dso__kernel(dso)); > map__init(result, start, start + len, pgoff, dso, prot, flags); > > - if (anon || no_dso) { > - map->mapping_type = MAPPING_TYPE__IDENTITY; > + if (anon || no_dso || dso__is_pie(dso)) { > + map__set_mapping_type(map, MAPPING_TYPE__IDENTITY); > > /* > * Set memory without DSO as loaded. All map__find_* > -- > 2.25.1 >
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index e781c8d56a9a..c846faec177b 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -173,8 +173,8 @@ struct map *map__new(struct machine *machine, u64 start, u64 len, assert(!dso__kernel(dso)); map__init(result, start, start + len, pgoff, dso, prot, flags); - if (anon || no_dso) { - map->mapping_type = MAPPING_TYPE__IDENTITY; + if (anon || no_dso || dso__is_pie(dso)) { + map__set_mapping_type(map, MAPPING_TYPE__IDENTITY); /* * Set memory without DSO as loaded. All map__find_*
Use dso__is_pie() to check whether the DSO file is a Position Independent Executable (PIE). If PIE, change the MAPPING_TYPE to MAPPING_TYPE__IDENTITY so a zero map pgoff (text offset) is passed into the script. Signed-off-by: Steve Clevenger <scclevenger@os.amperecomputing.com> --- tools/perf/util/map.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)