tools/perf/arch/common.c | 92 +++-- tools/perf/builtin-c2c.c | 40 +- tools/perf/builtin-inject.c | 10 +- tools/perf/builtin-kwork.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-sched.c | 4 +- tools/perf/builtin-top.c | 7 +- tools/perf/builtin-trace.c | 7 +- tools/perf/tests/symbols.c | 2 +- tools/perf/tests/topology.c | 8 +- tools/perf/tests/vmlinux-kallsyms.c | 2 +- tools/perf/trace/beauty/Build | 1 + tools/perf/trace/beauty/arch_errno_names.sh | 41 +- tools/perf/ui/browsers/annotate.c | 2 +- tools/perf/ui/browsers/map.c | 4 +- tools/perf/util/annotate.c | 5 +- tools/perf/util/auxtrace.c | 6 +- tools/perf/util/callchain.c | 4 +- tools/perf/util/capstone.c | 132 ++++--- tools/perf/util/data-convert-bt.c | 2 +- tools/perf/util/data-convert-json.c | 6 +- tools/perf/util/dlfilter.c | 2 +- tools/perf/util/dso.c | 19 +- tools/perf/util/dso.h | 14 +- tools/perf/util/env.c | 374 ++++++++++++++---- tools/perf/util/env.h | 14 +- tools/perf/util/evsel_fprintf.c | 6 +- tools/perf/util/header.c | 55 ++- tools/perf/util/intel-pt.c | 2 +- tools/perf/util/libdw.c | 2 +- tools/perf/util/lock-contention.c | 6 +- tools/perf/util/machine.c | 37 +- tools/perf/util/machine.h | 2 - tools/perf/util/print_insn.c | 23 +- tools/perf/util/print_insn.h | 2 + tools/perf/util/probe-event.c | 4 +- tools/perf/util/sample-raw.c | 21 +- tools/perf/util/sample-raw.h | 6 +- .../util/scripting-engines/trace-event-perl.c | 2 +- .../scripting-engines/trace-event-python.c | 4 +- tools/perf/util/session.c | 26 +- tools/perf/util/sort.c | 66 ++-- tools/perf/util/srcline.c | 10 +- tools/perf/util/symbol-elf.c | 5 +- tools/perf/util/symbol.c | 238 ++++++++--- tools/perf/util/symbol.h | 80 +++- tools/perf/util/symbol_fprintf.c | 4 +- tools/perf/util/thread.c | 58 ++- tools/perf/util/thread.h | 23 +- 49 files changed, 1064 insertions(+), 420 deletions(-)
Add a helper to perf_env to compute the e_machine if it is EM_NONE.
Derive the value from the arch string if available. Similarly derive
the arch string from the ELF machine if available, for consistency.
This means perf's arch (machine type) is no longer determined by uname
but set to match that of the perf ELF executable.
Migrate code away from strcmp on env->arch to using the e_machine
comparisons that are more accurate and not prone to uname and other
naming differences. While cleaning this up, also clean up the
capstone initialization code to cover more architectures and to set
the big endian flag based on ELF header information.
Introduce a mutex in perf_env to safely protect lazy metadata setup,
such as os_release or e_machine resolution, preventing concurrent
initialization data races and memory leaks during multi-threaded
profiling or symbol loading.
Switch the idle computation to the point of use and lazily compute it,
rather than computing it for every symbol. The current only user is
`perf top`. At the point of use the perf_env is available and this can
be used to make sure the idle function computation correctly accounts
for architecture-specific and kernel-version-specific patterns.
To prevent concurrent updates to shared symbol bitfield flags, migrate
bitfield variables in struct symbol to C11 atomic flags.
Ian Rogers (19):
perf env: Add perf_env__e_machine helper and use in perf_env__arch
perf tests topology: Switch env->arch use to env->e_machine
perf env, dso, thread: Add _endian variants for e_machine helpers
perf capstone: Determine architecture from e_machine
perf print_insn: Use e_machine for fallback IP length check
perf symbol: Avoid use of machine__is
perf machine: Use perf_env e_machine rather than arch
perf sample-raw: Use perf_env e_machine rather than arch
perf sort: Use perf_env e_machine rather than arch
perf arch common: Use perf_env e_machine rather than arch
perf header: In print_pmu_caps use perf_env e_machine
perf c2c: Use perf_env e_machine rather than arch
perf lock-contention: Use perf_env e_machine rather than arch
perf env: Refactor perf_env__arch_strerrno
perf env: Remove unused perf_env__raw_arch
perf env: Add mutex to protect lazy environment initialization
perf env: Add helper to lazily compute the os_release
perf symbol: Add setters for bitfields sharing a byte to avoid
concurrent update issues
perf symbol: Lazily compute idle
tools/perf/arch/common.c | 92 +++--
tools/perf/builtin-c2c.c | 40 +-
tools/perf/builtin-inject.c | 10 +-
tools/perf/builtin-kwork.c | 2 +-
tools/perf/builtin-report.c | 2 +-
tools/perf/builtin-sched.c | 4 +-
tools/perf/builtin-top.c | 7 +-
tools/perf/builtin-trace.c | 7 +-
tools/perf/tests/symbols.c | 2 +-
tools/perf/tests/topology.c | 8 +-
tools/perf/tests/vmlinux-kallsyms.c | 2 +-
tools/perf/trace/beauty/Build | 1 +
tools/perf/trace/beauty/arch_errno_names.sh | 41 +-
tools/perf/ui/browsers/annotate.c | 2 +-
tools/perf/ui/browsers/map.c | 4 +-
tools/perf/util/annotate.c | 5 +-
tools/perf/util/auxtrace.c | 6 +-
tools/perf/util/callchain.c | 4 +-
tools/perf/util/capstone.c | 132 ++++---
tools/perf/util/data-convert-bt.c | 2 +-
tools/perf/util/data-convert-json.c | 6 +-
tools/perf/util/dlfilter.c | 2 +-
tools/perf/util/dso.c | 19 +-
tools/perf/util/dso.h | 14 +-
tools/perf/util/env.c | 374 ++++++++++++++----
tools/perf/util/env.h | 14 +-
tools/perf/util/evsel_fprintf.c | 6 +-
tools/perf/util/header.c | 55 ++-
tools/perf/util/intel-pt.c | 2 +-
tools/perf/util/libdw.c | 2 +-
tools/perf/util/lock-contention.c | 6 +-
tools/perf/util/machine.c | 37 +-
tools/perf/util/machine.h | 2 -
tools/perf/util/print_insn.c | 23 +-
tools/perf/util/print_insn.h | 2 +
tools/perf/util/probe-event.c | 4 +-
tools/perf/util/sample-raw.c | 21 +-
tools/perf/util/sample-raw.h | 6 +-
.../util/scripting-engines/trace-event-perl.c | 2 +-
.../scripting-engines/trace-event-python.c | 4 +-
tools/perf/util/session.c | 26 +-
tools/perf/util/sort.c | 66 ++--
tools/perf/util/srcline.c | 10 +-
tools/perf/util/symbol-elf.c | 5 +-
tools/perf/util/symbol.c | 238 ++++++++---
tools/perf/util/symbol.h | 80 +++-
tools/perf/util/symbol_fprintf.c | 4 +-
tools/perf/util/thread.c | 58 ++-
tools/perf/util/thread.h | 23 +-
49 files changed, 1064 insertions(+), 420 deletions(-)
--
2.54.0.929.g9b7fa37559-goog
Add a helper to perf_env to compute the e_machine if it is EM_NONE.
Derive the value from the arch string if available. Similarly derive
the arch string from the ELF machine if available, for consistency.
This means perf's arch (machine type) is no longer determined by uname
but set to match that of the perf ELF executable.
Migrate code away from strcmp on env->arch to using the e_machine
comparisons that are more accurate and not prone to uname and other
naming differences. While cleaning this up, also clean up the
capstone initialization code to cover more architectures and to set
the big endian flag based on ELF header information.
Refactor perf_env__arch_strerrno to take an e_machine instead of an
architecture string, removing the HAVE_LIBTRACEEVENT dependency
entirely and making it unconditionally available. The generated errno
table includes fallback definitions for newer ELF machine constants to
ensure compatibility with older host glibc versions.
Introduce a mutex in perf_env to safely protect lazy metadata setup,
such as os_release or e_machine resolution, preventing concurrent
initialization data races and memory leaks during multi-threaded
profiling or symbol loading. Properly initialize stack-allocated
perf_env instances to ensure safe mutex destruction.
Switch the idle computation to the point of use and lazily compute it,
rather than computing it for every symbol. The current only user is
`perf top`. At the point of use the perf_env is available and this can
be used to make sure the idle function computation correctly accounts
for architecture-specific and kernel-version-specific patterns.
To prevent concurrent updates to shared symbol bitfield flags, migrate
bitfield variables in struct symbol to C11 atomic flags.
Ian Rogers (19):
perf env: Add perf_env__e_machine helper and use in perf_env__arch
perf tests topology: Switch env->arch use to env->e_machine
perf env, dso, thread: Add _endian variants for e_machine helpers
perf capstone: Determine architecture from e_machine
perf print_insn: Use e_machine for fallback IP length check
perf symbol: Avoid use of machine__is
perf machine: Use perf_env e_machine rather than arch
perf sample-raw: Use perf_env e_machine rather than arch
perf sort: Use perf_env e_machine rather than arch
perf arch common: Use perf_env e_machine rather than arch
perf header: In print_pmu_caps use perf_env e_machine
perf c2c: Use perf_env e_machine rather than arch
perf lock-contention: Use perf_env e_machine rather than arch
perf env: Refactor perf_env__arch_strerrno
perf env: Remove unused perf_env__raw_arch
perf env: Add mutex to protect lazy environment initialization
perf env: Add helper to lazily compute the os_release
perf symbol: Add setters for bitfields sharing a byte to avoid
concurrent update issues
perf symbol: Lazily compute idle
tools/perf/arch/common.c | 92 +++--
tools/perf/builtin-c2c.c | 40 +-
tools/perf/builtin-inject.c | 10 +-
tools/perf/builtin-kwork.c | 2 +-
tools/perf/builtin-report.c | 2 +-
tools/perf/builtin-sched.c | 4 +-
tools/perf/builtin-top.c | 7 +-
tools/perf/builtin-trace.c | 7 +-
tools/perf/tests/symbols.c | 2 +-
tools/perf/tests/topology.c | 8 +-
tools/perf/tests/vmlinux-kallsyms.c | 2 +-
tools/perf/trace/beauty/Build | 1 +
tools/perf/trace/beauty/arch_errno_names.sh | 53 ++-
tools/perf/ui/browsers/annotate.c | 2 +-
tools/perf/ui/browsers/map.c | 4 +-
tools/perf/util/annotate.c | 5 +-
tools/perf/util/auxtrace.c | 6 +-
tools/perf/util/callchain.c | 4 +-
tools/perf/util/capstone.c | 132 ++++--
tools/perf/util/data-convert-bt.c | 2 +-
tools/perf/util/data-convert-json.c | 6 +-
tools/perf/util/dlfilter.c | 2 +-
tools/perf/util/dso.c | 19 +-
tools/perf/util/dso.h | 14 +-
tools/perf/util/env.c | 376 ++++++++++++++----
tools/perf/util/env.h | 14 +-
tools/perf/util/evsel_fprintf.c | 6 +-
tools/perf/util/header.c | 55 ++-
tools/perf/util/intel-pt.c | 2 +-
tools/perf/util/libdw.c | 2 +-
tools/perf/util/lock-contention.c | 6 +-
tools/perf/util/machine.c | 37 +-
tools/perf/util/machine.h | 2 -
tools/perf/util/print_insn.c | 23 +-
tools/perf/util/print_insn.h | 2 +
tools/perf/util/probe-event.c | 4 +-
tools/perf/util/sample-raw.c | 21 +-
tools/perf/util/sample-raw.h | 6 +-
.../util/scripting-engines/trace-event-perl.c | 2 +-
.../scripting-engines/trace-event-python.c | 4 +-
tools/perf/util/session.c | 26 +-
tools/perf/util/sort.c | 66 +--
tools/perf/util/srcline.c | 10 +-
tools/perf/util/symbol-elf.c | 5 +-
tools/perf/util/symbol.c | 238 ++++++++---
tools/perf/util/symbol.h | 80 +++-
tools/perf/util/symbol_fprintf.c | 4 +-
tools/perf/util/thread.c | 58 ++-
tools/perf/util/thread.h | 23 +-
49 files changed, 1078 insertions(+), 420 deletions(-)
--
2.54.0.929.g9b7fa37559-goog
On Tue, Jun 2, 2026 at 8:25 AM Ian Rogers <irogers@google.com> wrote: > > Add a helper to perf_env to compute the e_machine if it is EM_NONE. > Derive the value from the arch string if available. Similarly derive > the arch string from the ELF machine if available, for consistency. > This means perf's arch (machine type) is no longer determined by uname > but set to match that of the perf ELF executable. > > Migrate code away from strcmp on env->arch to using the e_machine > comparisons that are more accurate and not prone to uname and other > naming differences. While cleaning this up, also clean up the > capstone initialization code to cover more architectures and to set > the big endian flag based on ELF header information. > > Refactor perf_env__arch_strerrno to take an e_machine instead of an > architecture string, removing the HAVE_LIBTRACEEVENT dependency > entirely and making it unconditionally available. The generated errno > table includes fallback definitions for newer ELF machine constants to > ensure compatibility with older host glibc versions. > > Introduce a mutex in perf_env to safely protect lazy metadata setup, > such as os_release or e_machine resolution, preventing concurrent > initialization data races and memory leaks during multi-threaded > profiling or symbol loading. Properly initialize stack-allocated > perf_env instances to ensure safe mutex destruction. > > Switch the idle computation to the point of use and lazily compute it, > rather than computing it for every symbol. The current only user is > `perf top`. At the point of use the perf_env is available and this can > be used to make sure the idle function computation correctly accounts > for architecture-specific and kernel-version-specific patterns. > To prevent concurrent updates to shared symbol bitfield flags, migrate > bitfield variables in struct symbol to C11 atomic flags. So I think this series is at the point where Sashiko [1] is giving warnings only for out-of-scope things and pre-existing conditions. I will give a detailed explanation below, but I'd appreciate help moving this forward with human review and submission. Thanks! > Ian Rogers (19): > perf env: Add perf_env__e_machine helper and use in perf_env__arch 1 critical 2 high issues. The issues relate to existing data races, the inaccurate arch string, and normalizing the arch string stored in the data file. The existing data races don't bite us currently due to the single threaded nature of most of perf - multithreading is on the TODO list. The arch string is inaccurate and the e_machine in newer perf.data files resolves this. If we were using the arch string without the e_machine then the concerns over its use are valid, but this series is trying to remove the use of the arch string and strongly prefer the e_machine. > perf tests topology: Switch env->arch use to env->e_machine No regressions. > perf env, dso, thread: Add _endian variants for e_machine helpers 1 high issue for a potential pre-existing SEGV if a thread lacks maps. Let's hope that doesn't happen, the example given assumes a multithreaded environment and multi-threading is on the TODO list. > perf capstone: Determine architecture from e_machine 1 low issue. A flag only present in capstone 4.0 is used. As capstone 4.0 was released in 2018, let's just assume the flag is there rather than adding yet more complexity. > perf print_insn: Use e_machine for fallback IP length check No regressions. > perf symbol: Avoid use of machine__is 1 high issue. Concerns over pre-existing cross-platform analysis problems. Cross-platform analysis fully working is on the TODO list. > perf machine: Use perf_env e_machine rather than arch > perf sample-raw: Use perf_env e_machine rather than arch > perf sort: Use perf_env e_machine rather than arch > perf arch common: Use perf_env e_machine rather than arch > perf header: In print_pmu_caps use perf_env e_machine > perf c2c: Use perf_env e_machine rather than arch > perf lock-contention: Use perf_env e_machine rather than arch > perf env: Refactor perf_env__arch_strerrno > perf env: Remove unused perf_env__raw_arch No regressions x9. > perf env: Add mutex to protect lazy environment initialization 1 medium issue requesting more locking on more bits of perf_env. Multi-threading is on the TODO list and let's stop the feature creep here. > perf env: Add helper to lazily compute the os_release 1 high issue. Concern over a perf data issue in pipe mode. Addressing this would require a fairly major overhail of perf data, so let's add fixing to the TODO list. > perf symbol: Add setters for bitfields sharing a byte to avoid > concurrent update issues > perf symbol: Lazily compute idle No regressions x2. Thanks, Ian [1] https://sashiko.dev/#/patchset/20260602152516.2831152-1-irogers%40google.com > > tools/perf/arch/common.c | 92 +++-- > tools/perf/builtin-c2c.c | 40 +- > tools/perf/builtin-inject.c | 10 +- > tools/perf/builtin-kwork.c | 2 +- > tools/perf/builtin-report.c | 2 +- > tools/perf/builtin-sched.c | 4 +- > tools/perf/builtin-top.c | 7 +- > tools/perf/builtin-trace.c | 7 +- > tools/perf/tests/symbols.c | 2 +- > tools/perf/tests/topology.c | 8 +- > tools/perf/tests/vmlinux-kallsyms.c | 2 +- > tools/perf/trace/beauty/Build | 1 + > tools/perf/trace/beauty/arch_errno_names.sh | 53 ++- > tools/perf/ui/browsers/annotate.c | 2 +- > tools/perf/ui/browsers/map.c | 4 +- > tools/perf/util/annotate.c | 5 +- > tools/perf/util/auxtrace.c | 6 +- > tools/perf/util/callchain.c | 4 +- > tools/perf/util/capstone.c | 132 ++++-- > tools/perf/util/data-convert-bt.c | 2 +- > tools/perf/util/data-convert-json.c | 6 +- > tools/perf/util/dlfilter.c | 2 +- > tools/perf/util/dso.c | 19 +- > tools/perf/util/dso.h | 14 +- > tools/perf/util/env.c | 376 ++++++++++++++---- > tools/perf/util/env.h | 14 +- > tools/perf/util/evsel_fprintf.c | 6 +- > tools/perf/util/header.c | 55 ++- > tools/perf/util/intel-pt.c | 2 +- > tools/perf/util/libdw.c | 2 +- > tools/perf/util/lock-contention.c | 6 +- > tools/perf/util/machine.c | 37 +- > tools/perf/util/machine.h | 2 - > tools/perf/util/print_insn.c | 23 +- > tools/perf/util/print_insn.h | 2 + > tools/perf/util/probe-event.c | 4 +- > tools/perf/util/sample-raw.c | 21 +- > tools/perf/util/sample-raw.h | 6 +- > .../util/scripting-engines/trace-event-perl.c | 2 +- > .../scripting-engines/trace-event-python.c | 4 +- > tools/perf/util/session.c | 26 +- > tools/perf/util/sort.c | 66 +-- > tools/perf/util/srcline.c | 10 +- > tools/perf/util/symbol-elf.c | 5 +- > tools/perf/util/symbol.c | 238 ++++++++--- > tools/perf/util/symbol.h | 80 +++- > tools/perf/util/symbol_fprintf.c | 4 +- > tools/perf/util/thread.c | 58 ++- > tools/perf/util/thread.h | 23 +- > 49 files changed, 1078 insertions(+), 420 deletions(-) > > -- > 2.54.0.929.g9b7fa37559-goog >
Hi Ian, On Tue, Jun 02, 2026 at 09:53:59AM -0700, Ian Rogers wrote: > On Tue, Jun 2, 2026 at 8:25 AM Ian Rogers <irogers@google.com> wrote: > > > > Add a helper to perf_env to compute the e_machine if it is EM_NONE. > > Derive the value from the arch string if available. Similarly derive > > the arch string from the ELF machine if available, for consistency. > > This means perf's arch (machine type) is no longer determined by uname > > but set to match that of the perf ELF executable. > > > > Migrate code away from strcmp on env->arch to using the e_machine > > comparisons that are more accurate and not prone to uname and other > > naming differences. While cleaning this up, also clean up the > > capstone initialization code to cover more architectures and to set > > the big endian flag based on ELF header information. > > > > Refactor perf_env__arch_strerrno to take an e_machine instead of an > > architecture string, removing the HAVE_LIBTRACEEVENT dependency > > entirely and making it unconditionally available. The generated errno > > table includes fallback definitions for newer ELF machine constants to > > ensure compatibility with older host glibc versions. > > > > Introduce a mutex in perf_env to safely protect lazy metadata setup, > > such as os_release or e_machine resolution, preventing concurrent > > initialization data races and memory leaks during multi-threaded > > profiling or symbol loading. Properly initialize stack-allocated > > perf_env instances to ensure safe mutex destruction. > > > > Switch the idle computation to the point of use and lazily compute it, > > rather than computing it for every symbol. The current only user is > > `perf top`. At the point of use the perf_env is available and this can > > be used to make sure the idle function computation correctly accounts > > for architecture-specific and kernel-version-specific patterns. > > To prevent concurrent updates to shared symbol bitfield flags, migrate > > bitfield variables in struct symbol to C11 atomic flags. > > So I think this series is at the point where Sashiko [1] is giving > warnings only for out-of-scope things and pre-existing conditions. I > will give a detailed explanation below, but I'd appreciate help moving > this forward with human review and submission. Thanks! > > > Ian Rogers (19): > > perf env: Add perf_env__e_machine helper and use in perf_env__arch > > 1 critical 2 high issues. > The issues relate to existing data races, the inaccurate arch string, > and normalizing the arch string stored in the data file. The existing > data races don't bite us currently due to the single threaded nature > of most of perf - multithreading is on the TODO list. The arch string > is inaccurate and the e_machine in newer perf.data files resolves > this. If we were using the arch string without the e_machine then the > concerns over its use are valid, but this series is trying to remove > the use of the arch string and strongly prefer the e_machine. > > > perf tests topology: Switch env->arch use to env->e_machine > > No regressions. > > > perf env, dso, thread: Add _endian variants for e_machine helpers > > 1 high issue for a potential pre-existing SEGV if a thread lacks maps. > Let's hope that doesn't happen, the example given assumes a > multithreaded environment and multi-threading is on the TODO list. > > > perf capstone: Determine architecture from e_machine > > 1 low issue. A flag only present in capstone 4.0 is used. As capstone > 4.0 was released in 2018, let's just assume the flag is there rather > than adding yet more complexity. > > > perf print_insn: Use e_machine for fallback IP length check > > No regressions. > > > perf symbol: Avoid use of machine__is > > 1 high issue. Concerns over pre-existing cross-platform analysis > problems. Cross-platform analysis fully working is on the TODO list. > > > perf machine: Use perf_env e_machine rather than arch > > perf sample-raw: Use perf_env e_machine rather than arch > > perf sort: Use perf_env e_machine rather than arch > > perf arch common: Use perf_env e_machine rather than arch > > perf header: In print_pmu_caps use perf_env e_machine > > perf c2c: Use perf_env e_machine rather than arch > > perf lock-contention: Use perf_env e_machine rather than arch > > perf env: Refactor perf_env__arch_strerrno > > perf env: Remove unused perf_env__raw_arch > > No regressions x9. > > > perf env: Add mutex to protect lazy environment initialization > > 1 medium issue requesting more locking on more bits of perf_env. > Multi-threading is on the TODO list and let's stop the feature creep > here. > > > perf env: Add helper to lazily compute the os_release > > 1 high issue. Concern over a perf data issue in pipe mode. Addressing > this would require a fairly major overhail of perf data, so let's add > fixing to the TODO list. > > > perf symbol: Add setters for bitfields sharing a byte to avoid > > concurrent update issues > > perf symbol: Lazily compute idle > > No regressions x2. Acked-by: Namhyung Kim <namhyung@kernel.org> Thanks, Namhyung
On Tue, Jun 02, 2026 at 10:39:49PM -0700, Namhyung Kim wrote: > On Tue, Jun 02, 2026 at 09:53:59AM -0700, Ian Rogers wrote: > > On Tue, Jun 2, 2026 at 8:25 AM Ian Rogers <irogers@google.com> wrote: > > > > > > Add a helper to perf_env to compute the e_machine if it is EM_NONE. > > > Derive the value from the arch string if available. Similarly derive > > > the arch string from the ELF machine if available, for consistency. > > > This means perf's arch (machine type) is no longer determined by uname > > > but set to match that of the perf ELF executable. > > > > > > Migrate code away from strcmp on env->arch to using the e_machine > > > comparisons that are more accurate and not prone to uname and other > > > naming differences. While cleaning this up, also clean up the > > > capstone initialization code to cover more architectures and to set > > > the big endian flag based on ELF header information. > > > > > > Refactor perf_env__arch_strerrno to take an e_machine instead of an > > > architecture string, removing the HAVE_LIBTRACEEVENT dependency > > > entirely and making it unconditionally available. The generated errno > > > table includes fallback definitions for newer ELF machine constants to > > > ensure compatibility with older host glibc versions. > > > > > > Introduce a mutex in perf_env to safely protect lazy metadata setup, > > > such as os_release or e_machine resolution, preventing concurrent > > > initialization data races and memory leaks during multi-threaded > > > profiling or symbol loading. Properly initialize stack-allocated > > > perf_env instances to ensure safe mutex destruction. > > > > > > Switch the idle computation to the point of use and lazily compute it, > > > rather than computing it for every symbol. The current only user is > > > `perf top`. At the point of use the perf_env is available and this can > > > be used to make sure the idle function computation correctly accounts > > > for architecture-specific and kernel-version-specific patterns. > > > To prevent concurrent updates to shared symbol bitfield flags, migrate > > > bitfield variables in struct symbol to C11 atomic flags. > > > > So I think this series is at the point where Sashiko [1] is giving > > warnings only for out-of-scope things and pre-existing conditions. I > > will give a detailed explanation below, but I'd appreciate help moving > > this forward with human review and submission. Thanks! > > > > > Ian Rogers (19): > > > perf env: Add perf_env__e_machine helper and use in perf_env__arch > > > > 1 critical 2 high issues. > > The issues relate to existing data races, the inaccurate arch string, > > and normalizing the arch string stored in the data file. The existing > > data races don't bite us currently due to the single threaded nature > > of most of perf - multithreading is on the TODO list. The arch string > > is inaccurate and the e_machine in newer perf.data files resolves > > this. If we were using the arch string without the e_machine then the > > concerns over its use are valid, but this series is trying to remove > > the use of the arch string and strongly prefer the e_machine. > > > > > perf tests topology: Switch env->arch use to env->e_machine > > > > No regressions. > > > > > perf env, dso, thread: Add _endian variants for e_machine helpers > > > > 1 high issue for a potential pre-existing SEGV if a thread lacks maps. > > Let's hope that doesn't happen, the example given assumes a > > multithreaded environment and multi-threading is on the TODO list. > > > > > perf capstone: Determine architecture from e_machine > > > > 1 low issue. A flag only present in capstone 4.0 is used. As capstone > > 4.0 was released in 2018, let's just assume the flag is there rather > > than adding yet more complexity. > > > > > perf print_insn: Use e_machine for fallback IP length check > > > > No regressions. > > > > > perf symbol: Avoid use of machine__is > > > > 1 high issue. Concerns over pre-existing cross-platform analysis > > problems. Cross-platform analysis fully working is on the TODO list. > > > > > perf machine: Use perf_env e_machine rather than arch > > > perf sample-raw: Use perf_env e_machine rather than arch > > > perf sort: Use perf_env e_machine rather than arch > > > perf arch common: Use perf_env e_machine rather than arch > > > perf header: In print_pmu_caps use perf_env e_machine > > > perf c2c: Use perf_env e_machine rather than arch > > > perf lock-contention: Use perf_env e_machine rather than arch > > > perf env: Refactor perf_env__arch_strerrno > > > perf env: Remove unused perf_env__raw_arch > > > > No regressions x9. > > > > > perf env: Add mutex to protect lazy environment initialization > > > > 1 medium issue requesting more locking on more bits of perf_env. > > Multi-threading is on the TODO list and let's stop the feature creep > > here. > > > > > perf env: Add helper to lazily compute the os_release > > > > 1 high issue. Concern over a perf data issue in pipe mode. Addressing > > this would require a fairly major overhail of perf data, so let's add > > fixing to the TODO list. > > > > > perf symbol: Add setters for bitfields sharing a byte to avoid > > > concurrent update issues > > > perf symbol: Lazily compute idle > > > > No regressions x2. > > Acked-by: Namhyung Kim <namhyung@kernel.org> Thanks, applied to perf-tools-next, for v7.2. - Arnaldo
On Wed, Jun 03, 2026 at 04:47:52PM -0300, Arnaldo Carvalho de Melo wrote:
> On Tue, Jun 02, 2026 at 10:39:49PM -0700, Namhyung Kim wrote:
> > On Tue, Jun 02, 2026 at 09:53:59AM -0700, Ian Rogers wrote:
> > > On Tue, Jun 2, 2026 at 8:25 AM Ian Rogers <irogers@google.com> wrote:
> > > 1 high issue. Concern over a perf data issue in pipe mode. Addressing
> > > this would require a fairly major overhail of perf data, so let's add
> > > fixing to the TODO list.
> > > > perf symbol: Add setters for bitfields sharing a byte to avoid
> > > > concurrent update issues
> > > > perf symbol: Lazily compute idle
> > > No regressions x2.
> > Acked-by: Namhyung Kim <namhyung@kernel.org>
> Thanks, applied to perf-tools-next, for v7.2.
Now trying to fix this, all old distros, but if the fix is cheap
enough, lets not drop support for them:
toolsbuilder@five:~$ cat dm.log/summary
Subject: tools build test for http://192.168.86.5/perf/perf-7.1.0-rc5.tar.xz
1 127.96 almalinux:8 : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-28) , clang version 21.1.8 ( 21.1.8-1.module_el8.10.0+4172+b6b13d75) flex 2.6.1
2 12.44 almalinux:9 : FAIL gcc version 11.5.0 20240719 (Red Hat 11.5.0-14) (GCC)
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS32
util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~
| CS_MODE_MICRO
3 17.54 almalinux:9-i386 : FAIL gcc version 11.4.1 20231218 (Red Hat 11.4.1-3) (GCC)
util/capstone.c: In function ‘e_machine_to_capstone’:
util/capstone.c:186:25: error: ‘CS_ARCH_RISCV’ undeclared (first use in this function); did you mean ‘CS_ARCH_SYSZ’?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:34: error: ‘CS_MODE_RISCV64’ undeclared (first use in this function); did you mean ‘CS_MODE_MIPS64’?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
util/capstone.c:187:52: error: ‘CS_MODE_RISCV32’ undeclared (first use in this function); did you mean ‘CS_MODE_MIPS32’?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS32
util/capstone.c:187:71: error: ‘CS_MODE_RISCVC’ undeclared (first use in this function); did you mean ‘CS_MODE_MICRO’?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~
| CS_MODE_MICRO
4 101.24 almalinux:10 : Ok gcc (GCC) 14.3.1 20251022 (Red Hat 14.3.1-4) , clang version 21.1.8 (AlmaLinux OS Foundation 21.1.8-1.el10.alma.1) flex 2.6.4
5 21.66 alpine:3.16 : FAIL gcc version 11.2.1 20220219 (Alpine 11.2.1_git20220219)
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS32
util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~
| CS_MODE_MICRO
make[3]: *** [/git/perf-7.1.0-rc5/tools/build/Makefile.build:158: util] Error 2
6 14.57 alpine:3.17 : FAIL gcc version 12.2.1 20220924 (Alpine 12.2.1_git20220924-r4)
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS32
util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~
| CS_MODE_MICRO
make[3]: *** [/git/perf-7.1.0-rc5/tools/build/Makefile.build:158: util] Error 2
7 13.58 alpine:3.18 : FAIL gcc version 12.2.1 20220924 (Alpine 12.2.1_git20220924-r10)
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS32
util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~
| CS_MODE_MICRO
8 127.15 alpine:3.19 : Ok gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014 , Alpine clang version 17.0.5 flex 2.6.4
9 124.98 alpine:3.20 : Ok gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309 , Alpine clang version 17.0.6 flex 2.6.4
10 134.36 alpine:3.22 : Ok gcc (Alpine 14.2.0) 14.2.0 , Alpine clang version 20.1.8 flex 2.6.4
11 128.47 alpine:3.23 : Ok gcc (Alpine 15.2.0) 15.2.0 , Alpine clang version 21.1.2 flex 2.6.4
12 134.59 alpine:edge : Ok gcc (Alpine 14.2.0) 14.2.0 , Alpine clang version 19.1.4 flex 2.6.4
13 13.41 amazonlinux:2023 : FAIL gcc version 11.5.0 20240719 (Red Hat 11.5.0-5) (GCC)
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS32
util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~
| CS_MODE_MICRO
make[3]: *** [/git/perf-7.1.0-rc5/tools/build/Makefile.build:158: util] Error 2
14 14.14 amazonlinux:devel : FAIL gcc version 11.3.1 20221121 (Red Hat 11.3.1-4) (GCC)
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS32
util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~
| CS_MODE_MICRO
make[3]: *** [/git/perf-7.1.0-rc5/tools/build/Makefile.build:158: util] Error 2
15 116.53 archlinux:base : Ok gcc (GCC) 15.2.1 20250813 , clang version 20.1.8 flex 2.6.4
16 130.36 centos:stream : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-21) , clang version 17.0.6 (Red Hat 17.0.6-1.module_el8+767+9fa966b8) flex 2.6.1
17 123.85 clearlinux:latest : Ok gcc (Clear Linux OS for Intel Architecture) 15.1.1 20250602 releases/gcc-15.1.0-174-gc096341a08 , clang version 20.1.0 flex 2.6.4
18 12.15 debian:10 : FAIL gcc version 8.3.0 (Debian 8.3.0-6)
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:11: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'?
*arch = CS_ARCH_RISCV;
^~~~~~~~~~~~~
CS_ARCH_SYSZ
util/capstone.c:186:11: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:20: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'?
*mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
^~~~~~~~~~~~~~~
CS_MODE_MIPS64
util/capstone.c:187:38: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'?
*mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
^~~~~~~~~~~~~~~
CS_MODE_MIPS32
util/capstone.c:187:57: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'?
*mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
^~~~~~~~~~~~~~
CS_MODE_MICRO
19 12.08 debian:11 : FAIL gcc version 10.2.1 20210110 (Debian 10.2.1-6)
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:11: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:11: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:20: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
util/capstone.c:187:38: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS32
util/capstone.c:187:57: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~
| CS_MODE_MICRO
20 12.30 debian:12 : FAIL gcc version 12.2.0 (Debian 12.2.0-14+deb12u1)
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS32
util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~
| CS_MODE_MICRO
21 94.47 debian:13 : Ok gcc (Debian 14.2.0-19) 14.2.0 , Debian clang version 19.1.7 (3+b1) flex 2.6.4
22 104.26 debian:experimental : Ok gcc (Debian 15.2.0-17) 15.2.0 , Debian clang version 21.1.8 (7+b1) flex 2.6.4
23 26.18 debian:experimental-x-arm64 : Ok aarch64-linux-gnu-gcc (Debian 15.2.0-17) 15.2.0 flex 2.6.4
24 19.18 debian:experimental-x-mips : Ok mips-linux-gnu-gcc (Debian 14.2.0-13) 14.2.0 flex 2.6.4
25 19.94 debian:experimental-x-mips64 : Ok mips64-linux-gnuabi64-gcc (Debian 14.2.0-13) 14.2.0 flex 2.6.4
26 19.03 debian:experimental-x-mipsel : Ok mipsel-linux-gnu-gcc (Debian 14.2.0-13) 14.2.0 flex 2.6.4
27 14.16 fedora:35 : FAIL gcc version 11.3.1 20220421 (Red Hat 11.3.1-3) (GCC)
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS32
util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~
| CS_MODE_MICRO
28 13.01 fedora:36 : FAIL gcc version 12.2.1 20221121 (Red Hat 12.2.1-4) (GCC)
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS32
util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~
| CS_MODE_MICRO
29 11.56 fedora:37 : FAIL gcc version 12.3.1 20230508 (Red Hat 12.3.1-1) (GCC)
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS32
util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~
| CS_MODE_MICRO
30 11.70 fedora:38 : FAIL gcc version 13.2.1 20231011 (Red Hat 13.2.1-4) (GCC)
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS32
util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~
| CS_MODE_MICRO
31 12.18 fedora:39 : FAIL gcc version 13.3.1 20240913 (Red Hat 13.3.1-3) (GCC)
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS32
util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~
| CS_MODE_MICRO
32 111.06 fedora:40 : Ok gcc (GCC) 14.2.1 20240912 (Red Hat 14.2.1-3) , clang version 18.1.8 (Fedora 18.1.8-2.fc40) flex 2.6.4
33 107.16 fedora:41 : Ok gcc (GCC) 14.3.1 20251022 (Red Hat 14.3.1-4) , clang version 19.1.7 (Fedora 19.1.7-5.fc41) flex 2.6.4
34 106.95 fedora:42 : Ok gcc (GCC) 15.2.1 20260123 (Red Hat 15.2.1-7) , clang version 20.1.8 (Fedora 20.1.8-4.fc42) flex 2.6.4
35 103.93 fedora:43 : Ok gcc (GCC) 15.2.1 20260123 (Red Hat 15.2.1-7) , clang version 21.1.8 (Fedora 21.1.8-4.fc43) flex 2.6.4
36 108.14 fedora:44 : Ok gcc (GCC) 16.1.1 20260515 (Red Hat 16.1.1-2) , clang version 22.1.6 (Fedora 22.1.6-1.fc44) flex 2.6.4
37 109.25 fedora:45 : Ok gcc (GCC) 16.1.1 20260515 (Red Hat 16.1.1-2) , clang version 22.1.6 (Fedora 22.1.6-1.fc45) flex 2.6.4
38 106.11 fedora:rawhide : Ok gcc (GCC) 16.1.1 20260515 (Red Hat 16.1.1-2) , clang version 22.1.6 (Fedora 22.1.6-1.fc45) flex 2.6.4
39 43.21 gentoo:stage3 : Ok gcc (Gentoo 13.3.1_p20240614 p17) 13.3.1 20240614 flex 2.6.4
toolsbuilder@five:~$
On Wed, Jun 03, 2026 at 06:41:27PM -0300, Arnaldo Carvalho de Melo wrote: > On Wed, Jun 03, 2026 at 04:47:52PM -0300, Arnaldo Carvalho de Melo wrote: > > On Tue, Jun 02, 2026 at 10:39:49PM -0700, Namhyung Kim wrote: > > > On Tue, Jun 02, 2026 at 09:53:59AM -0700, Ian Rogers wrote: > > > > On Tue, Jun 2, 2026 at 8:25 AM Ian Rogers <irogers@google.com> wrote: > > > > 1 high issue. Concern over a perf data issue in pipe mode. Addressing > > > > this would require a fairly major overhail of perf data, so let's add > > > > fixing to the TODO list. > > > > > > perf symbol: Add setters for bitfields sharing a byte to avoid > > > > > concurrent update issues > > > > > perf symbol: Lazily compute idle > > > > > No regressions x2. > > > > Acked-by: Namhyung Kim <namhyung@kernel.org> > > > Thanks, applied to perf-tools-next, for v7.2. > > Now trying to fix this, all old distros, but if the fix is cheap > enough, lets not drop support for them: It is an enum, so too much work to cope with that, I'll disable capstone build in these systems. - Arnaldo > toolsbuilder@five:~$ cat dm.log/summary > Subject: tools build test for http://192.168.86.5/perf/perf-7.1.0-rc5.tar.xz > > 1 127.96 almalinux:8 : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-28) , clang version 21.1.8 ( 21.1.8-1.module_el8.10.0+4172+b6b13d75) flex 2.6.1 > 2 12.44 almalinux:9 : FAIL gcc version 11.5.0 20240719 (Red Hat 11.5.0-14) (GCC) > util/capstone.c: In function 'e_machine_to_capstone': > util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'? > 186 | *arch = CS_ARCH_RISCV; > | ^~~~~~~~~~~~~ > | CS_ARCH_SYSZ > util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS64 > util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS32 > util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~ > | CS_MODE_MICRO > 3 17.54 almalinux:9-i386 : FAIL gcc version 11.4.1 20231218 (Red Hat 11.4.1-3) (GCC) > util/capstone.c: In function ‘e_machine_to_capstone’: > util/capstone.c:186:25: error: ‘CS_ARCH_RISCV’ undeclared (first use in this function); did you mean ‘CS_ARCH_SYSZ’? > 186 | *arch = CS_ARCH_RISCV; > | ^~~~~~~~~~~~~ > | CS_ARCH_SYSZ > util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:34: error: ‘CS_MODE_RISCV64’ undeclared (first use in this function); did you mean ‘CS_MODE_MIPS64’? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS64 > util/capstone.c:187:52: error: ‘CS_MODE_RISCV32’ undeclared (first use in this function); did you mean ‘CS_MODE_MIPS32’? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS32 > util/capstone.c:187:71: error: ‘CS_MODE_RISCVC’ undeclared (first use in this function); did you mean ‘CS_MODE_MICRO’? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~ > | CS_MODE_MICRO > 4 101.24 almalinux:10 : Ok gcc (GCC) 14.3.1 20251022 (Red Hat 14.3.1-4) , clang version 21.1.8 (AlmaLinux OS Foundation 21.1.8-1.el10.alma.1) flex 2.6.4 > 5 21.66 alpine:3.16 : FAIL gcc version 11.2.1 20220219 (Alpine 11.2.1_git20220219) > util/capstone.c: In function 'e_machine_to_capstone': > util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'? > 186 | *arch = CS_ARCH_RISCV; > | ^~~~~~~~~~~~~ > | CS_ARCH_SYSZ > util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS64 > util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS32 > util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~ > | CS_MODE_MICRO > make[3]: *** [/git/perf-7.1.0-rc5/tools/build/Makefile.build:158: util] Error 2 > 6 14.57 alpine:3.17 : FAIL gcc version 12.2.1 20220924 (Alpine 12.2.1_git20220924-r4) > util/capstone.c: In function 'e_machine_to_capstone': > util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'? > 186 | *arch = CS_ARCH_RISCV; > | ^~~~~~~~~~~~~ > | CS_ARCH_SYSZ > util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS64 > util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS32 > util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~ > | CS_MODE_MICRO > make[3]: *** [/git/perf-7.1.0-rc5/tools/build/Makefile.build:158: util] Error 2 > 7 13.58 alpine:3.18 : FAIL gcc version 12.2.1 20220924 (Alpine 12.2.1_git20220924-r10) > util/capstone.c: In function 'e_machine_to_capstone': > util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'? > 186 | *arch = CS_ARCH_RISCV; > | ^~~~~~~~~~~~~ > | CS_ARCH_SYSZ > util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS64 > util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS32 > util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~ > | CS_MODE_MICRO > 8 127.15 alpine:3.19 : Ok gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014 , Alpine clang version 17.0.5 flex 2.6.4 > 9 124.98 alpine:3.20 : Ok gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309 , Alpine clang version 17.0.6 flex 2.6.4 > 10 134.36 alpine:3.22 : Ok gcc (Alpine 14.2.0) 14.2.0 , Alpine clang version 20.1.8 flex 2.6.4 > 11 128.47 alpine:3.23 : Ok gcc (Alpine 15.2.0) 15.2.0 , Alpine clang version 21.1.2 flex 2.6.4 > 12 134.59 alpine:edge : Ok gcc (Alpine 14.2.0) 14.2.0 , Alpine clang version 19.1.4 flex 2.6.4 > 13 13.41 amazonlinux:2023 : FAIL gcc version 11.5.0 20240719 (Red Hat 11.5.0-5) (GCC) > util/capstone.c: In function 'e_machine_to_capstone': > util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'? > 186 | *arch = CS_ARCH_RISCV; > | ^~~~~~~~~~~~~ > | CS_ARCH_SYSZ > util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS64 > util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS32 > util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~ > | CS_MODE_MICRO > make[3]: *** [/git/perf-7.1.0-rc5/tools/build/Makefile.build:158: util] Error 2 > 14 14.14 amazonlinux:devel : FAIL gcc version 11.3.1 20221121 (Red Hat 11.3.1-4) (GCC) > util/capstone.c: In function 'e_machine_to_capstone': > util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'? > 186 | *arch = CS_ARCH_RISCV; > | ^~~~~~~~~~~~~ > | CS_ARCH_SYSZ > util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS64 > util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS32 > util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~ > | CS_MODE_MICRO > make[3]: *** [/git/perf-7.1.0-rc5/tools/build/Makefile.build:158: util] Error 2 > 15 116.53 archlinux:base : Ok gcc (GCC) 15.2.1 20250813 , clang version 20.1.8 flex 2.6.4 > 16 130.36 centos:stream : Ok gcc (GCC) 8.5.0 20210514 (Red Hat 8.5.0-21) , clang version 17.0.6 (Red Hat 17.0.6-1.module_el8+767+9fa966b8) flex 2.6.1 > 17 123.85 clearlinux:latest : Ok gcc (Clear Linux OS for Intel Architecture) 15.1.1 20250602 releases/gcc-15.1.0-174-gc096341a08 , clang version 20.1.0 flex 2.6.4 > 18 12.15 debian:10 : FAIL gcc version 8.3.0 (Debian 8.3.0-6) > util/capstone.c: In function 'e_machine_to_capstone': > util/capstone.c:186:11: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'? > *arch = CS_ARCH_RISCV; > ^~~~~~~~~~~~~ > CS_ARCH_SYSZ > util/capstone.c:186:11: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:20: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'? > *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > ^~~~~~~~~~~~~~~ > CS_MODE_MIPS64 > util/capstone.c:187:38: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'? > *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > ^~~~~~~~~~~~~~~ > CS_MODE_MIPS32 > util/capstone.c:187:57: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'? > *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > ^~~~~~~~~~~~~~ > CS_MODE_MICRO > 19 12.08 debian:11 : FAIL gcc version 10.2.1 20210110 (Debian 10.2.1-6) > util/capstone.c: In function 'e_machine_to_capstone': > util/capstone.c:186:11: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'? > 186 | *arch = CS_ARCH_RISCV; > | ^~~~~~~~~~~~~ > | CS_ARCH_SYSZ > util/capstone.c:186:11: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:20: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS64 > util/capstone.c:187:38: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS32 > util/capstone.c:187:57: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~ > | CS_MODE_MICRO > 20 12.30 debian:12 : FAIL gcc version 12.2.0 (Debian 12.2.0-14+deb12u1) > util/capstone.c: In function 'e_machine_to_capstone': > util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'? > 186 | *arch = CS_ARCH_RISCV; > | ^~~~~~~~~~~~~ > | CS_ARCH_SYSZ > util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS64 > util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS32 > util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~ > | CS_MODE_MICRO > 21 94.47 debian:13 : Ok gcc (Debian 14.2.0-19) 14.2.0 , Debian clang version 19.1.7 (3+b1) flex 2.6.4 > 22 104.26 debian:experimental : Ok gcc (Debian 15.2.0-17) 15.2.0 , Debian clang version 21.1.8 (7+b1) flex 2.6.4 > 23 26.18 debian:experimental-x-arm64 : Ok aarch64-linux-gnu-gcc (Debian 15.2.0-17) 15.2.0 flex 2.6.4 > 24 19.18 debian:experimental-x-mips : Ok mips-linux-gnu-gcc (Debian 14.2.0-13) 14.2.0 flex 2.6.4 > 25 19.94 debian:experimental-x-mips64 : Ok mips64-linux-gnuabi64-gcc (Debian 14.2.0-13) 14.2.0 flex 2.6.4 > 26 19.03 debian:experimental-x-mipsel : Ok mipsel-linux-gnu-gcc (Debian 14.2.0-13) 14.2.0 flex 2.6.4 > 27 14.16 fedora:35 : FAIL gcc version 11.3.1 20220421 (Red Hat 11.3.1-3) (GCC) > util/capstone.c: In function 'e_machine_to_capstone': > util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'? > 186 | *arch = CS_ARCH_RISCV; > | ^~~~~~~~~~~~~ > | CS_ARCH_SYSZ > util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS64 > util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS32 > util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~ > | CS_MODE_MICRO > 28 13.01 fedora:36 : FAIL gcc version 12.2.1 20221121 (Red Hat 12.2.1-4) (GCC) > util/capstone.c: In function 'e_machine_to_capstone': > util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'? > 186 | *arch = CS_ARCH_RISCV; > | ^~~~~~~~~~~~~ > | CS_ARCH_SYSZ > util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS64 > util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS32 > util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~ > | CS_MODE_MICRO > 29 11.56 fedora:37 : FAIL gcc version 12.3.1 20230508 (Red Hat 12.3.1-1) (GCC) > util/capstone.c: In function 'e_machine_to_capstone': > util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'? > 186 | *arch = CS_ARCH_RISCV; > | ^~~~~~~~~~~~~ > | CS_ARCH_SYSZ > util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS64 > util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS32 > util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~ > | CS_MODE_MICRO > 30 11.70 fedora:38 : FAIL gcc version 13.2.1 20231011 (Red Hat 13.2.1-4) (GCC) > util/capstone.c: In function 'e_machine_to_capstone': > util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'? > 186 | *arch = CS_ARCH_RISCV; > | ^~~~~~~~~~~~~ > | CS_ARCH_SYSZ > util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS64 > util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS32 > util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~ > | CS_MODE_MICRO > 31 12.18 fedora:39 : FAIL gcc version 13.3.1 20240913 (Red Hat 13.3.1-3) (GCC) > util/capstone.c: In function 'e_machine_to_capstone': > util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function); did you mean 'CS_ARCH_SYSZ'? > 186 | *arch = CS_ARCH_RISCV; > | ^~~~~~~~~~~~~ > | CS_ARCH_SYSZ > util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in > util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function); did you mean 'CS_MODE_MIPS64'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS64 > util/capstone.c:187:52: error: 'CS_MODE_RISCV32' undeclared (first use in this function); did you mean 'CS_MODE_MIPS32'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~~ > | CS_MODE_MIPS32 > util/capstone.c:187:71: error: 'CS_MODE_RISCVC' undeclared (first use in this function); did you mean 'CS_MODE_MICRO'? > 187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC; > | ^~~~~~~~~~~~~~ > | CS_MODE_MICRO > 32 111.06 fedora:40 : Ok gcc (GCC) 14.2.1 20240912 (Red Hat 14.2.1-3) , clang version 18.1.8 (Fedora 18.1.8-2.fc40) flex 2.6.4 > 33 107.16 fedora:41 : Ok gcc (GCC) 14.3.1 20251022 (Red Hat 14.3.1-4) , clang version 19.1.7 (Fedora 19.1.7-5.fc41) flex 2.6.4 > 34 106.95 fedora:42 : Ok gcc (GCC) 15.2.1 20260123 (Red Hat 15.2.1-7) , clang version 20.1.8 (Fedora 20.1.8-4.fc42) flex 2.6.4 > 35 103.93 fedora:43 : Ok gcc (GCC) 15.2.1 20260123 (Red Hat 15.2.1-7) , clang version 21.1.8 (Fedora 21.1.8-4.fc43) flex 2.6.4 > 36 108.14 fedora:44 : Ok gcc (GCC) 16.1.1 20260515 (Red Hat 16.1.1-2) , clang version 22.1.6 (Fedora 22.1.6-1.fc44) flex 2.6.4 > 37 109.25 fedora:45 : Ok gcc (GCC) 16.1.1 20260515 (Red Hat 16.1.1-2) , clang version 22.1.6 (Fedora 22.1.6-1.fc45) flex 2.6.4 > 38 106.11 fedora:rawhide : Ok gcc (GCC) 16.1.1 20260515 (Red Hat 16.1.1-2) , clang version 22.1.6 (Fedora 22.1.6-1.fc45) flex 2.6.4 > 39 43.21 gentoo:stage3 : Ok gcc (Gentoo 13.3.1_p20240614 p17) 13.3.1 20240614 flex 2.6.4 > toolsbuilder@five:~$ > >
Add a helper that lazily computes the e_machine and falls back to EM_HOST.
Use the perf_env's arch to compute the e_machine if available, using a
binary search for efficiency while handling duplicate rules.
Switch perf_env__arch to be derived from e_machine for consistency.
To support 32-bit compat binaries on 64-bit hosts during dynamic local
or live operations, unpopulated arch fallback paths query uname() at
runtime to dynamically resolve the correct host e_machine, safely
preventing bitness misclassification regressions.
Update session and header to use the helper to safely record e_machine
and flags without forcing premature thread scanning.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/env.c | 286 ++++++++++++++++++++++++++++++++------
tools/perf/util/env.h | 2 +
tools/perf/util/header.c | 32 +++--
tools/perf/util/session.c | 26 ++--
4 files changed, 282 insertions(+), 64 deletions(-)
diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c
index 20953ef7b9d8..0cd23b5fc651 100644
--- a/tools/perf/util/env.c
+++ b/tools/perf/util/env.c
@@ -1,10 +1,12 @@
// SPDX-License-Identifier: GPL-2.0
#include "cpumap.h"
+#include "dwarf-regs.h"
#include "debug.h"
#include "env.h"
#include "util/header.h"
#include "util/rwsem.h"
#include <linux/compiler.h>
+#include <linux/kernel.h>
#include <linux/ctype.h>
#include <linux/rbtree.h>
#include <linux/string.h>
@@ -309,15 +311,27 @@ void perf_env__init(struct perf_env *env)
static void perf_env__init_kernel_mode(struct perf_env *env)
{
- const char *arch = perf_env__raw_arch(env);
+ const char *arch = env->arch;
- if (!strncmp(arch, "x86_64", 6) || !strncmp(arch, "aarch64", 7) ||
- !strncmp(arch, "arm64", 5) || !strncmp(arch, "mips64", 6) ||
- !strncmp(arch, "parisc64", 8) || !strncmp(arch, "riscv64", 7) ||
- !strncmp(arch, "s390x", 5) || !strncmp(arch, "sparc64", 7))
- env->kernel_is_64_bit = 1;
- else
- env->kernel_is_64_bit = 0;
+ if (!arch) {
+ static struct utsname uts = { .machine[0] = '\0', };
+
+ if (uts.machine[0] == '\0')
+ uname(&uts);
+ if (uts.machine[0] != '\0')
+ arch = uts.machine;
+ }
+
+ if (arch) {
+ if (strstr(arch, "64") || strstr(arch, "s390x"))
+ env->kernel_is_64_bit = 1;
+ else
+ env->kernel_is_64_bit = 0;
+ return;
+ }
+
+ /* Fallback if completely unresolvable (assume host-bitness) */
+ env->kernel_is_64_bit = (sizeof(void *) == 8) ? 1 : 0;
}
int perf_env__kernel_is_64_bit(struct perf_env *env)
@@ -588,51 +602,237 @@ void cpu_cache_level__free(struct cpu_cache_level *cache)
zfree(&cache->size);
}
+struct arch_to_e_machine {
+ const char *prefix;
+ uint16_t e_machine;
+};
+
/*
- * Return architecture name in a normalized form.
- * The conversion logic comes from the Makefile.
+ * A mapping from an arch prefix string to an ELF machine that can be used in a
+ * bsearch. Some arch prefixes are shared an need additional processing as
+ * marked next to the architecture. The prefixes handle both perf's architecture
+ * naming and those from uname.
*/
-static const char *normalize_arch(char *arch)
-{
- if (!strcmp(arch, "x86_64"))
- return "x86";
- if (arch[0] == 'i' && arch[2] == '8' && arch[3] == '6')
- return "x86";
- if (!strcmp(arch, "sun4u") || !strncmp(arch, "sparc", 5))
- return "sparc";
- if (!strncmp(arch, "aarch64", 7) || !strncmp(arch, "arm64", 5))
- return "arm64";
- if (!strncmp(arch, "arm", 3) || !strcmp(arch, "sa110"))
- return "arm";
- if (!strncmp(arch, "s390", 4))
- return "s390";
- if (!strncmp(arch, "parisc", 6))
- return "parisc";
- if (!strncmp(arch, "powerpc", 7) || !strncmp(arch, "ppc", 3))
- return "powerpc";
- if (!strncmp(arch, "mips", 4))
- return "mips";
- if (!strncmp(arch, "sh", 2) && isdigit(arch[2]))
- return "sh";
- if (!strncmp(arch, "loongarch", 9))
- return "loongarch";
+static const struct arch_to_e_machine prefix_to_e_machine[] = {
+ {"aarch64", EM_AARCH64},
+ {"alpha", EM_ALPHA},
+ {"arc", EM_ARC},
+ {"arm", EM_ARM}, /* Check also for EM_AARCH64. */
+ {"avr", EM_AVR}, /* Check also for EM_AVR32. */
+ {"bfin", EM_BLACKFIN},
+ {"blackfin", EM_BLACKFIN},
+ {"cris", EM_CRIS},
+ {"csky", EM_CSKY},
+ {"hppa", EM_PARISC},
+ {"i386", EM_386},
+ {"i486", EM_386},
+ {"i586", EM_386},
+ {"i686", EM_386},
+ {"loongarch", EM_LOONGARCH},
+ {"m32r", EM_M32R},
+ {"m68k", EM_68K},
+ {"microblaze", EM_MICROBLAZE},
+ {"mips", EM_MIPS},
+ {"msp430", EM_MSP430},
+ {"parisc", EM_PARISC},
+ {"powerpc", EM_PPC}, /* Check also for EM_PPC64. */
+ {"ppc", EM_PPC}, /* Check also for EM_PPC64. */
+ {"riscv", EM_RISCV},
+ {"s390", EM_S390},
+ {"sa110", EM_ARM},
+ {"sh", EM_SH},
+ {"sparc", EM_SPARC}, /* Check also for EM_SPARCV9. */
+ {"sun4u", EM_SPARC},
+ {"x86", EM_X86_64}, /* Check also for EM_386. */
+ {"xtensa", EM_XTENSA},
+};
+
+static int compare_prefix(const void *key, const void *element)
+{
+ const char *search_key = key;
+ const struct arch_to_e_machine *map_element = element;
+ size_t prefix_len = strlen(map_element->prefix);
- return arch;
+ return strncmp(search_key, map_element->prefix, prefix_len);
+}
+
+static uint16_t perf_arch_to_e_machine(const char *perf_arch, int is_64_bit)
+{
+ /* Binary search for a matching prefix. */
+ const struct arch_to_e_machine *result;
+
+ if (!perf_arch)
+ return EM_HOST;
+
+ result = bsearch(perf_arch,
+ prefix_to_e_machine, ARRAY_SIZE(prefix_to_e_machine),
+ sizeof(prefix_to_e_machine[0]),
+ compare_prefix);
+
+ if (!result) {
+ pr_debug("Unknown perf arch for ELF machine mapping: %s\n", perf_arch);
+ return EM_NONE;
+ }
+
+ /*
+ * Handle conflicting prefixes. If the is_64_bit is unknown (-1) then
+ * assume 64-bit. We can't use perf_env__kernel_is_64_bit as that
+ * depends on the arch string.
+ */
+ switch (result->e_machine) {
+ case EM_ARM:
+ return !strcmp(perf_arch, "arm64") || !strcmp(perf_arch, "aarch64")
+ ? EM_AARCH64 : EM_ARM;
+ case EM_AVR:
+ return !strcmp(perf_arch, "avr32") ? EM_AVR32 : EM_AVR;
+ case EM_PPC:
+ if (is_64_bit == 1)
+ return EM_PPC64;
+ if (is_64_bit == 0)
+ return EM_PPC;
+ return strstarts(perf_arch, "ppc64") ? EM_PPC64 : EM_PPC;
+ case EM_SPARC:
+ if (is_64_bit == 1)
+ return EM_SPARCV9;
+ if (is_64_bit == 0)
+ return EM_SPARC;
+ return !strcmp(perf_arch, "sparc64") || !strcmp(perf_arch, "sun4u")
+ ? EM_SPARCV9 : EM_SPARC;
+ case EM_X86_64:
+ if (is_64_bit == 1)
+ return EM_X86_64;
+ if (is_64_bit == 0)
+ return EM_386;
+ return !strcmp(perf_arch, "x86_64") || !strcmp(perf_arch, "x86")
+ ? EM_X86_64 : EM_386;
+ default:
+ return result->e_machine;
+ }
+}
+
+static const char *e_machine_to_perf_arch(uint16_t e_machine)
+{
+ /*
+ * Table for if either the perf arch string differs from uname or there
+ * are >1 ELF machine with the prefix.
+ */
+ static const struct arch_to_e_machine extras[] = {
+ {"arm64", EM_AARCH64},
+ {"avr32", EM_AVR32},
+ {"powerpc", EM_PPC},
+ {"powerpc", EM_PPC64},
+ {"sparc", EM_SPARCV9},
+ {"x86", EM_386},
+ {"x86", EM_X86_64},
+ {"none", EM_NONE},
+ };
+
+ for (size_t i = 0; i < ARRAY_SIZE(extras); i++) {
+ if (extras[i].e_machine == e_machine)
+ return extras[i].prefix;
+ }
+
+ for (size_t i = 0; i < ARRAY_SIZE(prefix_to_e_machine); i++) {
+ if (prefix_to_e_machine[i].e_machine == e_machine)
+ return prefix_to_e_machine[i].prefix;
+
+ }
+ return "unknown";
+}
+
+uint16_t perf_env__e_machine_nocache(struct perf_env *env, uint32_t *e_flags)
+{
+ uint16_t e_machine = EM_NONE;
+ const char *arch = NULL;
+ int is_64_bit = -1;
+
+ if (e_flags)
+ *e_flags = 0;
+
+ if (env) {
+ arch = env->arch;
+ is_64_bit = env->kernel_is_64_bit;
+ }
+
+ if (!arch) {
+ static struct utsname uts = { .machine[0] = '\0', };
+
+ if (uts.machine[0] == '\0')
+ uname(&uts);
+ if (uts.machine[0] != '\0')
+ arch = uts.machine;
+ }
+
+ e_machine = perf_arch_to_e_machine(arch, is_64_bit);
+
+ if (e_flags)
+ *e_flags = (e_machine == EM_HOST) ? EF_HOST : 0;
+
+ return e_machine;
+}
+
+uint16_t perf_env__e_machine(struct perf_env *env, uint32_t *e_flags)
+{
+ uint16_t e_machine;
+ uint32_t local_e_flags = 0;
+
+ if (env && env->e_machine != EM_NONE) {
+ if (e_flags)
+ *e_flags = env->e_flags;
+
+ return env->e_machine;
+ }
+ e_machine = perf_env__e_machine_nocache(env, &local_e_flags);
+ /*
+ * Only cache the e_machine in perf_env if env->arch is not NULL.
+ * If env->arch is NULL, the e_machine is just a fallback to EM_HOST.
+ * Caching it permanently would prevent dynamic, more accurate
+ * thread-based session e_machine scanning later in
+ * perf_session__e_machine().
+ */
+ if (env && env->arch) {
+ env->e_machine = e_machine;
+ env->e_flags = local_e_flags;
+ }
+ if (e_flags)
+ *e_flags = local_e_flags;
+
+ return e_machine;
}
const char *perf_env__arch(struct perf_env *env)
{
- char *arch_name;
+ uint16_t e_machine;
+ const char *arch;
- if (!env || !env->arch) { /* Assume local operation */
+ if (!env) {
static struct utsname uts = { .machine[0] = '\0', };
- if (uts.machine[0] == '\0' && uname(&uts) < 0)
- return NULL;
- arch_name = uts.machine;
- } else
- arch_name = env->arch;
+ uint16_t host_e_machine;
- return normalize_arch(arch_name);
+ if (uts.machine[0] == '\0')
+ uname(&uts);
+ if (uts.machine[0] != '\0') {
+ host_e_machine = perf_arch_to_e_machine(uts.machine, -1);
+ return e_machine_to_perf_arch(host_e_machine);
+ }
+ return e_machine_to_perf_arch(EM_HOST);
+ }
+
+ /*
+ * Lazily compute/allocate arch. The e_machine may have been
+ * read from a data file and so may not be EM_HOST.
+ */
+ e_machine = perf_env__e_machine(env, /*e_flags=*/NULL);
+ arch = e_machine_to_perf_arch(e_machine);
+
+ if (e_machine == EM_RISCV && perf_env__kernel_is_64_bit(env) == 1)
+ arch = "riscv64";
+ else if (e_machine == EM_MIPS && perf_env__kernel_is_64_bit(env) == 1)
+ arch = "mips64";
+ else if (e_machine == EM_PARISC && perf_env__kernel_is_64_bit(env) == 1)
+ arch = "parisc64";
+
+ return arch;
}
const char *perf_env__arch_strerrno(struct perf_env *env __maybe_unused, int err __maybe_unused)
diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h
index 739d884fc236..bde192fd5be5 100644
--- a/tools/perf/util/env.h
+++ b/tools/perf/util/env.h
@@ -187,6 +187,8 @@ int perf_env__read_cpu_topology_map(struct perf_env *env);
void cpu_cache_level__free(struct cpu_cache_level *cache);
+uint16_t perf_env__e_machine_nocache(struct perf_env *env, uint32_t *e_flags);
+uint16_t perf_env__e_machine(struct perf_env *env, uint32_t *e_flags);
const char *perf_env__arch(struct perf_env *env);
const char *perf_env__arch_strerrno(struct perf_env *env, int err);
arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const char *arch);
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 5b1fa1653d2a..220e7720fbdb 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -441,21 +441,25 @@ static int write_osrelease(struct feat_fd *ff,
return do_write_string(ff, uts.release);
}
-static int write_arch(struct feat_fd *ff,
- struct evlist *evlist __maybe_unused)
+static int write_arch(struct feat_fd *ff, struct evlist *evlist)
{
struct utsname uts;
- int ret;
+ const char *arch = NULL;
- ret = uname(&uts);
- if (ret < 0)
- return -1;
+ if (evlist->session)
+ arch = perf_env__arch(perf_session__env(evlist->session));
+
+ if (!arch) {
+ int ret = uname(&uts);
- return do_write_string(ff, uts.machine);
+ if (ret < 0)
+ return -1;
+ arch = uts.machine;
+ }
+ return do_write_string(ff, arch);
}
-static int write_e_machine(struct feat_fd *ff,
- struct evlist *evlist __maybe_unused)
+static int write_e_machine(struct feat_fd *ff, struct evlist *evlist)
{
/* e_machine expanded from 16 to 32-bits for alignment. */
uint32_t e_flags;
@@ -2841,10 +2845,18 @@ static int process_##__feat(struct feat_fd *ff, void *data __maybe_unused) \
FEAT_PROCESS_STR_FUN(hostname, hostname);
FEAT_PROCESS_STR_FUN(osrelease, os_release);
FEAT_PROCESS_STR_FUN(version, version);
-FEAT_PROCESS_STR_FUN(arch, arch);
FEAT_PROCESS_STR_FUN(cpudesc, cpu_desc);
FEAT_PROCESS_STR_FUN(cpuid, cpuid);
+static int process_arch(struct feat_fd *ff, void *data __maybe_unused)
+{
+ free(ff->ph->env.arch);
+ ff->ph->env.arch = do_read_string(ff);
+ if (!ff->ph->env.arch)
+ return -ENOMEM;
+ return 0;
+}
+
static int process_e_machine(struct feat_fd *ff, void *data __maybe_unused)
{
int ret;
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index e2e821b77766..4791c052aebe 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -4080,14 +4080,19 @@ uint16_t perf_session__e_machine(struct perf_session *session, uint32_t *e_flags
return EM_HOST;
}
+ /*
+ * Is the env caching an e_machine? If not we want to compute from the
+ * more accurate threads.
+ */
env = perf_session__env(session);
- if (env && env->e_machine != EM_NONE) {
- if (e_flags)
- *e_flags = env->e_flags;
-
- return env->e_machine;
- }
+ if (env && env->e_machine != EM_NONE)
+ return perf_env__e_machine(env, e_flags);
+ /*
+ * Compute from threads, note this is more accurate than
+ * perf_env__e_machine that falls back on EM_HOST and doesn't consider
+ * mixed 32-bit and 64-bit threads.
+ */
machines__for_each_thread(&session->machines,
perf_session__e_machine_cb,
&args);
@@ -4105,10 +4110,9 @@ uint16_t perf_session__e_machine(struct perf_session *session, uint32_t *e_flags
/*
* Couldn't determine from the perf_env or current set of
- * threads. Default to the host.
+ * threads. Potentially use logic that uses the arch string otherwise
+ * default to the host. Don't cache in the perf_env in case later
+ * threads indicate a better ELF machine type.
*/
- if (e_flags)
- *e_flags = EF_HOST;
-
- return EM_HOST;
+ return perf_env__e_machine_nocache(env, e_flags);
}
--
2.54.0.929.g9b7fa37559-googSome arch string comparisons weren't normalized. Avoid potential
issues with normalized names vs uname values by swtiching to using the
e_machine.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/tests/topology.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c
index f54502ebef4b..bd7b859dea66 100644
--- a/tools/perf/tests/topology.c
+++ b/tools/perf/tests/topology.c
@@ -11,6 +11,7 @@
#include "pmus.h"
#include "target.h"
#include <linux/err.h>
+#include "dwarf-regs.h"
#define TEMPL "/tmp/perf-test-XXXXXX"
#define DATA_SIZE 10
@@ -74,6 +75,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)
struct aggr_cpu_id id;
struct perf_cpu cpu;
struct perf_env *env;
+ uint16_t e_machine;
session = perf_session__new(&data, NULL);
TEST_ASSERT_VAL("can't get session", !IS_ERR(session));
@@ -101,7 +103,9 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)
* condition is true (see do_core_id_test in header.c). So always
* run this test on those platforms.
*/
- if (!env->cpu && strncmp(env->arch, "s390", 4) && strncmp(env->arch, "aarch64", 7))
+ e_machine = perf_env__e_machine(env, NULL);
+
+ if (!env->cpu && e_machine != EM_S390 && e_machine != EM_AARCH64)
return TEST_SKIP;
/*
@@ -110,7 +114,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)
* physical_package_id will be set to -1. Hence skip this
* test if physical_package_id returns -1 for cpu from perf_cpu_map.
*/
- if (!strncmp(env->arch, "ppc64le", 7)) {
+ if (e_machine == EM_PPC64) {
if (cpu__get_socket_id(perf_cpu_map__cpu(map, 0)) == -1)
return TEST_SKIP;
}
--
2.54.0.929.g9b7fa37559-googAdd perf_arch_is_big_endian(), dso__read_e_machine_endian(),
dso__e_machine_endian(), and thread__e_machine_endian() to support
bi-endianness and cross-architecture analysis without breaking the
existing API.
These helpers allow querying the absolute endianness of a DSO or
thread, which is required for tools like Capstone that need to set the
correct disassembly mode.
Assisted-by: Gemini:gemini-3.1-pro-preview
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/dso.c | 19 ++++++++-----
tools/perf/util/dso.h | 14 ++++++++--
tools/perf/util/env.c | 16 +++++++++++
tools/perf/util/env.h | 1 +
tools/perf/util/thread.c | 58 ++++++++++++++++++++++++++++++----------
tools/perf/util/thread.h | 23 +++++++++++++++-
6 files changed, 108 insertions(+), 23 deletions(-)
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index b791e1b6b2cf..7dced896c64e 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -1220,7 +1220,8 @@ static enum dso_swap_type dso_swap_type__from_elf_data(unsigned char eidata)
}
/* Reads e_machine from fd, optionally caching data in dso. */
-uint16_t dso__read_e_machine(struct dso *optional_dso, int fd, uint32_t *e_flags)
+uint16_t dso__read_e_machine_endian(struct dso *optional_dso, int fd, uint32_t *e_flags,
+ bool *is_big_endian)
{
uint16_t e_machine = EM_NONE;
unsigned char e_ident[EI_NIDENT];
@@ -1250,6 +1251,9 @@ uint16_t dso__read_e_machine(struct dso *optional_dso, int fd, uint32_t *e_flags
if (swap_type == DSO_SWAP__UNSET)
return EM_NONE; // Bad ELF data encoding.
+ if (is_big_endian)
+ *is_big_endian = (e_ident[EI_DATA] == ELFDATA2MSB);
+
/* Cache the need for swapping. */
if (optional_dso) {
assert(dso__needs_swap(optional_dso) == DSO_SWAP__UNSET ||
@@ -1288,7 +1292,8 @@ uint16_t dso__read_e_machine(struct dso *optional_dso, int fd, uint32_t *e_flags
return e_machine;
}
-uint16_t dso__e_machine(struct dso *dso, struct machine *machine, uint32_t *e_flags)
+uint16_t dso__e_machine_endian(struct dso *dso, struct machine *machine, uint32_t *e_flags,
+ bool *is_big_endian)
{
uint16_t e_machine = EM_NONE;
int fd;
@@ -1308,9 +1313,11 @@ uint16_t dso__e_machine(struct dso *dso, struct machine *machine, uint32_t *e_fl
case DSO_BINARY_TYPE__BPF_IMAGE:
case DSO_BINARY_TYPE__OOL:
case DSO_BINARY_TYPE__JAVA_JIT:
- if (e_flags)
- *e_flags = EF_HOST;
- return EM_HOST;
+ if (is_big_endian) {
+ *is_big_endian = perf_arch_is_big_endian(
+ machine && machine->env ? perf_env__arch(machine->env) : NULL);
+ }
+ return perf_env__e_machine(machine ? machine->env : NULL, e_flags);
case DSO_BINARY_TYPE__DEBUGLINK:
case DSO_BINARY_TYPE__BUILD_ID_CACHE:
case DSO_BINARY_TYPE__BUILD_ID_CACHE_DEBUGINFO:
@@ -1338,7 +1345,7 @@ uint16_t dso__e_machine(struct dso *dso, struct machine *machine, uint32_t *e_fl
try_to_open_dso(dso, machine);
fd = dso__data(dso)->fd;
if (fd >= 0)
- e_machine = dso__read_e_machine(dso, fd, e_flags);
+ e_machine = dso__read_e_machine_endian(dso, fd, e_flags, is_big_endian);
else if (e_flags)
*e_flags = 0;
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index ede691e9a249..2916b954a804 100644
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -866,8 +866,18 @@ int dso__data_file_size(struct dso *dso, struct machine *machine);
off_t dso__data_size(struct dso *dso, struct machine *machine);
ssize_t dso__data_read_offset(struct dso *dso, struct machine *machine,
u64 offset, u8 *data, ssize_t size);
-uint16_t dso__read_e_machine(struct dso *optional_dso, int fd, uint32_t *e_flags);
-uint16_t dso__e_machine(struct dso *dso, struct machine *machine, uint32_t *e_flags);
+uint16_t dso__read_e_machine_endian(struct dso *optional_dso, int fd, uint32_t *e_flags,
+ bool *is_big_endian);
+static inline uint16_t dso__read_e_machine(struct dso *optional_dso, int fd, uint32_t *e_flags)
+{
+ return dso__read_e_machine_endian(optional_dso, fd, e_flags, NULL);
+}
+uint16_t dso__e_machine_endian(struct dso *dso, struct machine *machine, uint32_t *e_flags,
+ bool *is_big_endian);
+static inline uint16_t dso__e_machine(struct dso *dso, struct machine *machine, uint32_t *e_flags)
+{
+ return dso__e_machine_endian(dso, machine, e_flags, NULL);
+}
ssize_t dso__data_read_addr(struct dso *dso, struct map *map,
struct machine *machine, u64 addr,
u8 *data, ssize_t size);
diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c
index 0cd23b5fc651..fae70b07ba8d 100644
--- a/tools/perf/util/env.c
+++ b/tools/perf/util/env.c
@@ -342,6 +342,22 @@ int perf_env__kernel_is_64_bit(struct perf_env *env)
return env->kernel_is_64_bit;
}
+bool perf_arch_is_big_endian(const char *arch)
+{
+ if (!arch)
+ return __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__;
+
+ if (str_ends_with(arch, "_be") || !strcmp(arch, "sparc") || !strcmp(arch, "sparc64") ||
+ !strcmp(arch, "s390") || !strcmp(arch, "s390x") || !strcmp(arch, "powerpc") ||
+ !strcmp(arch, "ppc") || !strcmp(arch, "ppc64") ||
+ !strcmp(arch, "mips") || !strcmp(arch, "mips64") || !strcmp(arch, "parisc") ||
+ !strcmp(arch, "parisc64") || !strcmp(arch, "m68k") ||
+ !strcmp(arch, "armeb") || !strcmp(arch, "mipseb") || !strcmp(arch, "mips64eb"))
+ return true;
+
+ return false;
+}
+
int perf_env__set_cmdline(struct perf_env *env, int argc, const char *argv[])
{
int i;
diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h
index bde192fd5be5..dd9907dbc345 100644
--- a/tools/perf/util/env.h
+++ b/tools/perf/util/env.h
@@ -175,6 +175,7 @@ void free_cpu_domain_info(struct cpu_domain_map **cd_map, u32 schedstat_version,
void perf_env__exit(struct perf_env *env);
int perf_env__kernel_is_64_bit(struct perf_env *env);
+bool perf_arch_is_big_endian(const char *arch);
int perf_env__set_cmdline(struct perf_env *env, int argc, const char *argv[]);
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index aac9cb75dcf4..ba33c0dfc18f 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -56,6 +56,7 @@ struct thread *thread__new(pid_t pid, pid_t tid)
thread__set_cpu(thread, -1);
thread__set_guest_cpu(thread, -1);
thread__set_e_machine(thread, EM_NONE);
+ thread__set_e_is_big_endian(thread, false);
thread__set_lbr_stitch_enable(thread, false);
INIT_LIST_HEAD(thread__namespaces_list(thread));
INIT_LIST_HEAD(thread__comm_list(thread));
@@ -429,7 +430,7 @@ void thread__find_cpumode_addr_location(struct thread *thread, u64 addr,
}
}
-static uint16_t read_proc_e_machine_for_pid(pid_t pid, uint32_t *e_flags)
+static uint16_t read_proc_e_machine_for_pid(pid_t pid, uint32_t *e_flags, bool *is_big_endian)
{
char path[6 /* "/proc/" */ + 11 /* max length of pid */ + 5 /* "/exe\0" */];
int fd;
@@ -438,7 +439,8 @@ static uint16_t read_proc_e_machine_for_pid(pid_t pid, uint32_t *e_flags)
snprintf(path, sizeof(path), "/proc/%d/exe", pid);
fd = open(path, O_RDONLY);
if (fd >= 0) {
- e_machine = dso__read_e_machine(/*optional_dso=*/NULL, fd, e_flags);
+ e_machine = dso__read_e_machine_endian(/*optional_dso=*/NULL, fd, e_flags,
+ is_big_endian);
close(fd);
}
return e_machine;
@@ -448,6 +450,7 @@ struct thread__e_machine_callback_args {
struct machine *machine;
uint32_t e_flags;
uint16_t e_machine;
+ bool is_big_endian;
};
static int thread__e_machine_callback(struct map *map, void *_args)
@@ -458,24 +461,38 @@ static int thread__e_machine_callback(struct map *map, void *_args)
if (!dso)
return 0; // No dso, continue search.
- args->e_machine = dso__e_machine(dso, args->machine, &args->e_flags);
+ args->e_machine =
+ dso__e_machine_endian(dso, args->machine, &args->e_flags, &args->is_big_endian);
return args->e_machine != EM_NONE ? 1 /* stop search */ : 0 /* continue search */;
}
-uint16_t thread__e_machine(struct thread *thread, struct machine *machine, uint32_t *e_flags)
+uint16_t thread__e_machine_endian(struct thread *thread, struct machine *machine, uint32_t *e_flags,
+ bool *is_big_endian)
{
pid_t tid, pid;
- uint16_t e_machine = RC_CHK_ACCESS(thread)->e_machine;
+ uint16_t e_machine;
uint32_t local_e_flags = 0;
- struct thread__e_machine_callback_args args = {
- .machine = machine,
- .e_flags = 0,
- .e_machine = EM_NONE,
- };
+ struct thread__e_machine_callback_args args;
+
+ if (!thread) {
+ if (is_big_endian) {
+ *is_big_endian = perf_arch_is_big_endian(
+ machine && machine->env ? perf_env__arch(machine->env) : NULL);
+ }
+ return perf_env__e_machine(machine ? machine->env : NULL, e_flags);
+ }
+
+ e_machine = RC_CHK_ACCESS(thread)->e_machine;
+ args.machine = machine;
+ args.e_flags = 0;
+ args.e_machine = EM_NONE;
+ args.is_big_endian = false;
if (e_machine != EM_NONE) {
if (e_flags)
*e_flags = thread__e_flags(thread);
+ if (is_big_endian)
+ *is_big_endian = thread__e_is_big_endian(thread);
return e_machine;
}
@@ -483,6 +500,7 @@ uint16_t thread__e_machine(struct thread *thread, struct machine *machine, uint3
struct maps *maps = thread__maps(thread);
machine = maps__machine(maps);
+ args.machine = machine;
}
tid = thread__tid(thread);
pid = thread__pid(thread);
@@ -490,7 +508,8 @@ uint16_t thread__e_machine(struct thread *thread, struct machine *machine, uint3
struct thread *parent = machine__findnew_thread(machine, pid, pid);
if (parent) {
- e_machine = thread__e_machine(parent, machine, &local_e_flags);
+ e_machine = thread__e_machine_endian(parent, machine, &local_e_flags,
+ &args.is_big_endian);
thread__put(parent);
goto out;
}
@@ -515,16 +534,27 @@ uint16_t thread__e_machine(struct thread *thread, struct machine *machine, uint3
is_live = !!session->data;
}
/* Read from /proc/pid/exe if live. */
- if (is_live)
- e_machine = read_proc_e_machine_for_pid(pid, &local_e_flags);
+ if (is_live) {
+ e_machine = read_proc_e_machine_for_pid(pid, &local_e_flags,
+ &args.is_big_endian);
+ } else if (machine && machine->env) {
+ /* Offline analysis: fallback to environment metadata. */
+ e_machine = perf_env__e_machine(machine->env, &local_e_flags);
+ args.is_big_endian = perf_arch_is_big_endian(perf_env__arch(machine->env));
+ }
}
out:
if (e_machine != EM_NONE) {
- thread__set_e_machine(thread, e_machine);
thread__set_e_flags(thread, local_e_flags);
+ thread__set_e_is_big_endian(thread, args.is_big_endian);
+ thread__set_e_machine(thread, e_machine);
+ if (is_big_endian)
+ *is_big_endian = args.is_big_endian;
} else {
e_machine = EM_HOST;
local_e_flags = EF_HOST;
+ if (is_big_endian)
+ *is_big_endian = (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__);
}
if (e_flags)
*e_flags = local_e_flags;
diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
index f5792d3e8a16..d82fce8173ae 100644
--- a/tools/perf/util/thread.h
+++ b/tools/perf/util/thread.h
@@ -69,6 +69,11 @@ DECLARE_RC_STRUCT(thread) {
* computed.
*/
uint16_t e_machine;
+ /**
+ * @e_is_big_endian: True if the ELF architecture of the thread is big endian.
+ * Valid if e_machine != EM_NONE.
+ */
+ bool e_is_big_endian;
/* LBR call stack stitch */
bool lbr_stitch_enable;
struct lbr_stitch *lbr_stitch;
@@ -311,7 +316,13 @@ static inline void thread__set_filter_entry_depth(struct thread *thread, int dep
RC_CHK_ACCESS(thread)->filter_entry_depth = depth;
}
-uint16_t thread__e_machine(struct thread *thread, struct machine *machine, uint32_t *e_flags);
+uint16_t thread__e_machine_endian(struct thread *thread, struct machine *machine, uint32_t *e_flags,
+ bool *is_big_endian);
+static inline uint16_t thread__e_machine(struct thread *thread, struct machine *machine,
+ uint32_t *e_flags)
+{
+ return thread__e_machine_endian(thread, machine, e_flags, NULL);
+}
static inline void thread__set_e_machine(struct thread *thread, uint16_t e_machine)
{
@@ -328,6 +339,16 @@ static inline void thread__set_e_flags(struct thread *thread, uint32_t e_flags)
RC_CHK_ACCESS(thread)->e_flags = e_flags;
}
+static inline bool thread__e_is_big_endian(const struct thread *thread)
+{
+ return RC_CHK_ACCESS(thread)->e_is_big_endian;
+}
+
+static inline void thread__set_e_is_big_endian(struct thread *thread, bool is_big_endian)
+{
+ RC_CHK_ACCESS(thread)->e_is_big_endian = is_big_endian;
+}
+
static inline bool thread__lbr_stitch_enable(const struct thread *thread)
{
--
2.54.0.929.g9b7fa37559-googAvoid the use of arch string that is imprecise and use the
e_machine. Do more e_machine to capstone machine translations adding
MIPS and RISCV. Remove unnecessary maybe_unused annotations.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/capstone.c | 132 ++++++++++++++++++++++++-------------
1 file changed, 88 insertions(+), 44 deletions(-)
diff --git a/tools/perf/util/capstone.c b/tools/perf/util/capstone.c
index 25cf6e15ec27..5ad537fea436 100644
--- a/tools/perf/util/capstone.c
+++ b/tools/perf/util/capstone.c
@@ -1,7 +1,19 @@
// SPDX-License-Identifier: GPL-2.0
#include "capstone.h"
-#include "annotate.h"
+
+#include <errno.h>
+#include <inttypes.h>
+#include <string.h>
+
+#include <dlfcn.h>
+#include <elf.h>
+#include <fcntl.h>
+#include <linux/ctype.h>
+
+#include <capstone/capstone.h>
+
#include "addr_location.h"
+#include "annotate.h"
#include "debug.h"
#include "disasm.h"
#include "dso.h"
@@ -11,13 +23,6 @@
#include "print_insn.h"
#include "symbol.h"
#include "thread.h"
-#include <dlfcn.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <string.h>
-
-#include <capstone/capstone.h>
#ifdef LIBCAPSTONE_DLOPEN
static void *perf_cs_dll_handle(void)
@@ -137,37 +142,70 @@ static enum cs_err perf_cs_close(csh *handle)
#endif
}
-static int capstone_init(struct machine *machine, csh *cs_handle, bool is64,
+static bool e_machine_to_capstone(uint16_t e_machine, bool is64, bool is_big_endian,
+ enum cs_arch *arch, enum cs_mode *mode)
+{
+ *mode = is_big_endian ? CS_MODE_BIG_ENDIAN : CS_MODE_LITTLE_ENDIAN;
+
+ switch (e_machine) {
+ case EM_X86_64:
+ case EM_386:
+ *arch = CS_ARCH_X86;
+ *mode |= is64 ? CS_MODE_64 : CS_MODE_32;
+ return true;
+ case EM_AARCH64:
+ *arch = CS_ARCH_ARM64;
+ *mode |= CS_MODE_ARM;
+ return true;
+ case EM_ARM:
+ *arch = CS_ARCH_ARM;
+ *mode |= CS_MODE_ARM | CS_MODE_V8;
+ return true;
+ case EM_S390:
+ *arch = CS_ARCH_SYSZ;
+ return true;
+ case EM_MIPS:
+ *arch = CS_ARCH_MIPS;
+ *mode |= is64 ? CS_MODE_MIPS64 : CS_MODE_MIPS32;
+ return true;
+ case EM_PPC:
+ *arch = CS_ARCH_PPC;
+ return true;
+ case EM_PPC64:
+ *arch = CS_ARCH_PPC;
+ *mode |= CS_MODE_64;
+ return true;
+ case EM_SPARC:
+ *arch = CS_ARCH_SPARC;
+ return true;
+ case EM_SPARCV9:
+ *arch = CS_ARCH_SPARC;
+ *mode |= CS_MODE_V9;
+ return true;
+ case EM_RISCV:
+ *arch = CS_ARCH_RISCV;
+ *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
+ return true;
+ default:
+ return false;
+ }
+}
+
+static int capstone_init(uint16_t e_machine, csh *cs_handle, bool is64, bool is_big_endian,
bool disassembler_style)
{
enum cs_arch arch;
enum cs_mode mode;
- if (machine__is(machine, "x86_64") && is64) {
- arch = CS_ARCH_X86;
- mode = CS_MODE_64;
- } else if (machine__normalized_is(machine, "x86")) {
- arch = CS_ARCH_X86;
- mode = CS_MODE_32;
- } else if (machine__normalized_is(machine, "arm64")) {
- arch = CS_ARCH_ARM64;
- mode = CS_MODE_ARM;
- } else if (machine__normalized_is(machine, "arm")) {
- arch = CS_ARCH_ARM;
- mode = CS_MODE_ARM + CS_MODE_V8;
- } else if (machine__normalized_is(machine, "s390")) {
- arch = CS_ARCH_SYSZ;
- mode = CS_MODE_BIG_ENDIAN;
- } else {
+ if (!e_machine_to_capstone(e_machine, is64, is_big_endian, &arch, &mode))
return -1;
- }
if (perf_cs_open(arch, mode, cs_handle) != CS_ERR_OK) {
pr_warning_once("cs_open failed\n");
return -1;
}
- if (machine__normalized_is(machine, "x86")) {
+ if (arch == CS_ARCH_X86) {
/*
* In case of using capstone_init while symbol__disassemble
* setting CS_OPT_SYNTAX_ATT depends if disassembler_style opts
@@ -211,29 +249,28 @@ static size_t print_insn_x86(struct thread *thread, u8 cpumode, struct cs_insn *
return printed;
}
-
-ssize_t capstone__fprintf_insn_asm(struct machine *machine __maybe_unused,
- struct thread *thread __maybe_unused,
- u8 cpumode __maybe_unused, bool is64bit __maybe_unused,
- const uint8_t *code __maybe_unused,
- size_t code_size __maybe_unused,
- uint64_t ip __maybe_unused, int *lenp __maybe_unused,
- int print_opts __maybe_unused, FILE *fp __maybe_unused)
+ssize_t capstone__fprintf_insn_asm(struct machine *machine, struct thread *thread, u8 cpumode,
+ bool is64bit, const uint8_t *code, size_t code_size, uint64_t ip,
+ int *lenp, int print_opts, FILE *fp)
{
size_t printed;
struct cs_insn *insn;
csh cs_handle;
size_t count;
+ bool is_big_endian = false;
+ uint16_t e_machine = thread__e_machine_endian(thread, machine,
+ /*e_flags=*/NULL, &is_big_endian);
int ret;
/* TODO: Try to initiate capstone only once but need a proper place. */
- ret = capstone_init(machine, &cs_handle, is64bit, true);
+ ret = capstone_init(e_machine, &cs_handle, is64bit, is_big_endian,
+ /*disassembler_style=*/true);
if (ret < 0)
return ret;
count = perf_cs_disasm(cs_handle, code, code_size, ip, 1, &insn);
if (count > 0) {
- if (machine__normalized_is(machine, "x86"))
+ if (e_machine == EM_X86_64 || e_machine == EM_386)
printed = print_insn_x86(thread, cpumode, &insn[0], print_opts, fp);
else
printed = fprintf(fp, "%s %s", insn[0].mnemonic, insn[0].op_str);
@@ -322,9 +359,8 @@ static int find_file_offset(u64 start, u64 len, u64 pgoff, void *arg)
return 0;
}
-int symbol__disassemble_capstone(const char *filename __maybe_unused,
- struct symbol *sym __maybe_unused,
- struct annotate_args *args __maybe_unused)
+int symbol__disassemble_capstone(const char *filename, struct symbol *sym,
+ struct annotate_args *args)
{
struct annotation *notes = symbol__annotation(sym);
struct map *map = args->ms->map;
@@ -344,6 +380,8 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused,
char disasm_buf[512];
struct disasm_line *dl;
bool disassembler_style = false;
+ uint16_t e_machine;
+ bool is_big_endian = false;
if (args->options->objdump_path)
return -1;
@@ -373,8 +411,10 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused,
!strcmp(args->options->disassembler_style, "att"))
disassembler_style = true;
- if (capstone_init(maps__machine(thread__maps(args->ms->thread)), &handle, is_64bit,
- disassembler_style) < 0)
+ e_machine = thread__e_machine_endian(args->ms->thread,
+ /*machine=*/NULL,
+ /*e_flags=*/NULL, &is_big_endian);
+ if (capstone_init(e_machine, &handle, is_64bit, is_big_endian, disassembler_style) < 0)
goto err;
needs_cs_close = true;
@@ -466,6 +506,8 @@ int symbol__disassemble_capstone_powerpc(const char *filename __maybe_unused,
struct disasm_line *dl;
u32 *line;
bool disassembler_style = false;
+ uint16_t e_machine;
+ bool is_big_endian = false;
if (args->options->objdump_path)
return -1;
@@ -484,8 +526,10 @@ int symbol__disassemble_capstone_powerpc(const char *filename __maybe_unused,
!strcmp(args->options->disassembler_style, "att"))
disassembler_style = true;
- if (capstone_init(maps__machine(thread__maps(args->ms->thread)), &handle, is_64bit,
- disassembler_style) < 0)
+ e_machine = thread__e_machine_endian(args->ms->thread,
+ /*machine=*/NULL,
+ /*e_flags=*/NULL, &is_big_endian);
+ if (capstone_init(e_machine, &handle, is_64bit, is_big_endian, disassembler_style) < 0)
goto err;
needs_cs_close = true;
--
2.54.0.929.g9b7fa37559-googAvoid string comparisons with perf_env arch, switch to using the more
precise ELF machine.
Sort header files and fix missing definitions.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/print_insn.c | 23 ++++++++++++++---------
tools/perf/util/print_insn.h | 2 ++
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/tools/perf/util/print_insn.c b/tools/perf/util/print_insn.c
index 02e6fbb8ca04..4068436f26ea 100644
--- a/tools/perf/util/print_insn.c
+++ b/tools/perf/util/print_insn.c
@@ -4,19 +4,24 @@
*
* Author(s): Changbin Du <changbin.du@huawei.com>
*/
+#include "print_insn.h"
+
#include <inttypes.h>
-#include <string.h>
#include <stdbool.h>
+#include <string.h>
+
+#include <dwarf-regs.h>
+
#include "capstone.h"
#include "debug.h"
+#include "dso.h"
+#include "dump-insn.h"
+#include "env.h"
+#include "machine.h"
+#include "map.h"
#include "sample.h"
#include "symbol.h"
-#include "machine.h"
#include "thread.h"
-#include "print_insn.h"
-#include "dump-insn.h"
-#include "map.h"
-#include "dso.h"
size_t sample__fprintf_insn_raw(struct perf_sample *sample, FILE *fp)
{
@@ -33,13 +38,13 @@ size_t sample__fprintf_insn_raw(struct perf_sample *sample, FILE *fp)
static bool is64bitip(struct machine *machine, struct addr_location *al)
{
const struct dso *dso = al->map ? map__dso(al->map) : NULL;
+ uint16_t e_machine;
if (dso)
return dso__is_64_bit(dso);
- return machine__is(machine, "x86_64") ||
- machine__normalized_is(machine, "arm64") ||
- machine__normalized_is(machine, "s390");
+ e_machine = perf_env__e_machine(machine->env, /*e_flags=*/NULL);
+ return e_machine == EM_X86_64 || e_machine == EM_AARCH64 || e_machine == EM_S390;
}
ssize_t fprintf_insn_asm(struct machine *machine, struct thread *thread, u8 cpumode,
diff --git a/tools/perf/util/print_insn.h b/tools/perf/util/print_insn.h
index a54f7e858e49..cefa5c5f246e 100644
--- a/tools/perf/util/print_insn.h
+++ b/tools/perf/util/print_insn.h
@@ -5,6 +5,8 @@
#include <stddef.h>
#include <stdio.h>
+#include <linux/types.h>
+
struct addr_location;
struct machine;
struct perf_insn;
--
2.54.0.929.g9b7fa37559-googSwitch to using the ELF machine from the dso or running machine rather
than the machine perf_env arch that may fall back on EM_HOST. This
also avoids potentially imprecise string comparisons.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/symbol.c | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 714b6e6048fa..2ce512f08a1d 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -851,6 +851,23 @@ static int maps__split_kallsyms_for_kcore(struct maps *kmaps, struct dso *dso)
return count;
}
+static uint16_t machine_or_dso_e_machine(struct machine *machine, struct dso *dso)
+{
+ uint16_t e_machine = EM_NONE;
+ /* DSO should be most accurate */
+ if (dso)
+ e_machine = dso__e_machine(dso, machine, /*e_flags=*/NULL);
+
+ if (e_machine != EM_NONE)
+ return e_machine;
+
+ /* Check the global environment next. */
+ if (machine && machine->env && machine->env->e_machine != EM_NONE)
+ return machine->env->e_machine;
+
+ return perf_env__e_machine(machine ? machine->env : NULL, /*e_flags=*/NULL);
+}
+
/*
* Split the symbols into maps, making sure there are no overlaps, i.e. the
* kernel range is broken in several maps, named [kernel].N, as we don't have
@@ -866,14 +883,13 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,
struct rb_root_cached *root = dso__symbols(dso);
struct rb_node *next = rb_first_cached(root);
int kernel_range = 0;
- bool x86_64;
+ uint16_t e_machine = EM_NONE;
if (!kmaps)
return -1;
machine = maps__machine(kmaps);
-
- x86_64 = machine__is(machine, "x86_64");
+ e_machine = machine_or_dso_e_machine(machine, dso);
while (next) {
char *module;
@@ -925,7 +941,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,
*/
pos->start = map__map_ip(curr_map, pos->start);
pos->end = map__map_ip(curr_map, pos->end);
- } else if (x86_64 && is_entry_trampoline(pos->name)) {
+ } else if (e_machine == EM_X86_64 && is_entry_trampoline(pos->name)) {
/*
* These symbols are not needed anymore since the
* trampoline maps refer to the text section and it's
@@ -1428,7 +1444,7 @@ static int dso__load_kcore(struct dso *dso, struct map *map,
free(new_node);
}
- if (machine__is(machine, "x86_64")) {
+ if (machine_or_dso_e_machine(machine, dso) == EM_X86_64) {
u64 addr;
/*
@@ -1716,7 +1732,7 @@ int dso__load(struct dso *dso, struct map *map)
ret = dso__load_guest_kernel_sym(dso, map);
machine = maps__machine(map__kmaps(map));
- if (machine__is(machine, "x86_64"))
+ if (machine && machine_or_dso_e_machine(machine, dso) == EM_X86_64)
machine__map_x86_64_entry_trampolines(machine, dso);
goto out;
}
--
2.54.0.929.g9b7fa37559-googThe arch string is derived from uname and may be normalized causing
potential differences meaning the ELF machine can be more
precise. Reduce the scope of machine__is as often it is better to use
a thread for the e_machine rather than the machine. Switch from string
to ELF machine constant comparisons.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/machine.c | 35 ++++++++++++++++++-----------------
tools/perf/util/machine.h | 2 --
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index e5d1e8b882a9..47be7a44a5f7 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -9,6 +9,7 @@
#include "debug.h"
#include "dso.h"
#include "env.h"
+#include "dwarf-regs.h"
#include "event.h"
#include "evsel.h"
#include "hist.h"
@@ -1627,10 +1628,24 @@ static bool machine__uses_kcore(struct machine *machine)
return dsos__for_each_dso(&machine->dsos, machine__uses_kcore_cb, NULL) != 0 ? true : false;
}
+static bool machine__is(struct machine *machine, uint16_t e_machine)
+{
+ if (!machine)
+ return false;
+
+ if (!machine->env) {
+ if (machine__is_host(machine))
+ return e_machine == EM_HOST;
+ return false;
+ }
+
+ return perf_env__e_machine(machine->env, NULL) == e_machine;
+}
+
static bool perf_event__is_extra_kernel_mmap(struct machine *machine,
struct extra_kernel_map *xm)
{
- return machine__is(machine, "x86_64") &&
+ return machine__is(machine, EM_X86_64) &&
is_entry_trampoline(xm->name);
}
@@ -2786,7 +2801,7 @@ static int find_prev_cpumode(struct ip_callchain *chain, struct thread *thread,
static u64 get_leaf_frame_caller(struct perf_sample *sample,
struct thread *thread, int usr_idx)
{
- if (machine__normalized_is(maps__machine(thread__maps(thread)), "arm64"))
+ if (thread__e_machine(thread, /*machine=*/NULL, /*e_flags=*/NULL) == EM_AARCH64)
return get_leaf_frame_caller_aarch64(sample, thread, usr_idx);
else
return 0;
@@ -3157,20 +3172,6 @@ int machine__set_current_tid(struct machine *machine, int cpu, pid_t pid,
return 0;
}
-/*
- * Compares the raw arch string. N.B. see instead perf_env__arch() or
- * machine__normalized_is() if a normalized arch is needed.
- */
-bool machine__is(struct machine *machine, const char *arch)
-{
- return machine && !strcmp(perf_env__raw_arch(machine->env), arch);
-}
-
-bool machine__normalized_is(struct machine *machine, const char *arch)
-{
- return machine && !strcmp(perf_env__arch(machine->env), arch);
-}
-
int machine__nr_cpus_avail(struct machine *machine)
{
return machine ? perf_env__nr_cpus_avail(machine->env) : 0;
@@ -3197,7 +3198,7 @@ int machine__get_kernel_start(struct machine *machine)
* start of kernel text, but still above 2^63. So leave
* kernel_start = 1ULL << 63 for x86_64.
*/
- if (!err && !machine__is(machine, "x86_64"))
+ if (!err && !machine__is(machine, EM_X86_64))
machine->kernel_start = map__start(map);
}
return err;
diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index 048b24e9bd38..aaddfb70ea66 100644
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -224,8 +224,6 @@ static inline bool machine__is_host(struct machine *machine)
}
bool machine__is_lock_function(struct machine *machine, u64 addr);
-bool machine__is(struct machine *machine, const char *arch);
-bool machine__normalized_is(struct machine *machine, const char *arch);
int machine__nr_cpus_avail(struct machine *machine);
struct thread *machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid);
--
2.54.0.929.g9b7fa37559-googUse the e_machine rather than the arch to determine S390 and x86 types.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/sample-raw.c | 21 +++++++++++----------
tools/perf/util/sample-raw.h | 6 +++++-
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/tools/perf/util/sample-raw.c b/tools/perf/util/sample-raw.c
index bcf442574d6e..e20b73c0c5bd 100644
--- a/tools/perf/util/sample-raw.c
+++ b/tools/perf/util/sample-raw.c
@@ -1,11 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0 */
+#include "sample-raw.h"
-#include <string.h>
+#include <elf.h>
#include <linux/string.h>
-#include "evlist.h"
+
#include "env.h"
+#include "evlist.h"
#include "header.h"
-#include "sample-raw.h"
#include "session.h"
/*
@@ -14,14 +15,14 @@
*/
void evlist__init_trace_event_sample_raw(struct evlist *evlist, struct perf_env *env)
{
- const char *arch_pf = perf_env__arch(env);
- const char *cpuid = perf_env__cpuid(env);
+ uint16_t e_machine = perf_env__e_machine(env, /*e_flags=*/NULL);
- if (arch_pf && !strcmp("s390", arch_pf))
+ if (e_machine == EM_S390) {
evlist->trace_event_sample_raw = evlist__s390_sample_raw;
- else if (arch_pf && !strcmp("x86", arch_pf) &&
- cpuid && strstarts(cpuid, "AuthenticAMD") &&
- evlist__has_amd_ibs(evlist)) {
- evlist->trace_event_sample_raw = evlist__amd_sample_raw;
+ } else if (e_machine == EM_X86_64 || e_machine == EM_386) {
+ const char *cpuid = perf_env__cpuid(env);
+
+ if (cpuid && strstarts(cpuid, "AuthenticAMD") && evlist__has_amd_ibs(evlist))
+ evlist->trace_event_sample_raw = evlist__amd_sample_raw;
}
}
diff --git a/tools/perf/util/sample-raw.h b/tools/perf/util/sample-raw.h
index 896e9a87e373..c8d38c841c8c 100644
--- a/tools/perf/util/sample-raw.h
+++ b/tools/perf/util/sample-raw.h
@@ -2,7 +2,10 @@
#ifndef __SAMPLE_RAW_H
#define __SAMPLE_RAW_H 1
+#include <stdbool.h>
+
struct evlist;
+struct perf_env;
union perf_event;
struct perf_sample;
@@ -12,4 +15,5 @@ bool evlist__has_amd_ibs(struct evlist *evlist);
void evlist__amd_sample_raw(struct evlist *evlist, union perf_event *event,
struct perf_sample *sample);
void evlist__init_trace_event_sample_raw(struct evlist *evlist, struct perf_env *env);
-#endif /* __PERF_EVLIST_H */
+
+#endif /* __SAMPLE_RAW_H */
--
2.54.0.929.g9b7fa37559-googUse the e_machine rather than the arch to determine x86 or PPC types.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/sort.c | 58 +++++++++++++++++++++++-------------------
1 file changed, 32 insertions(+), 26 deletions(-)
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 0020089cb13c..90bc4a31bb55 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -1,40 +1,45 @@
// SPDX-License-Identifier: GPL-2.0
+#include "sort.h"
+
#include <ctype.h>
#include <errno.h>
#include <inttypes.h>
-#include <regex.h>
#include <stdlib.h>
+
+#include <elf.h>
+#include <linux/kernel.h>
#include <linux/mman.h>
+#include <linux/string.h>
#include <linux/time64.h>
+
+#include <regex.h>
+
+#include "annotate-data.h"
+#include "annotate.h"
+#include "branch.h"
+#include "cacheline.h"
+#include "cgroup.h"
+#include "comm.h"
#include "debug.h"
#include "dso.h"
-#include "sort.h"
+#include "event.h"
+#include "evlist.h"
+#include "evsel.h"
#include "hist.h"
-#include "cacheline.h"
-#include "comm.h"
+#include "machine.h"
#include "map.h"
-#include "maps.h"
-#include "symbol.h"
#include "map_symbol.h"
-#include "branch.h"
-#include "thread.h"
-#include "evsel.h"
-#include "evlist.h"
-#include "srcline.h"
-#include "strlist.h"
-#include "strbuf.h"
+#include "maps.h"
#include "mem-events.h"
#include "mem-info.h"
-#include "annotate.h"
-#include "annotate-data.h"
-#include "event.h"
-#include "time-utils.h"
-#include "cgroup.h"
-#include "machine.h"
#include "session.h"
+#include "srcline.h"
+#include "strbuf.h"
+#include "strlist.h"
+#include "symbol.h"
+#include "thread.h"
+#include "time-utils.h"
#include "trace-event.h"
-#include <linux/kernel.h>
-#include <linux/string.h>
#ifdef HAVE_LIBTRACEEVENT
#include <event-parse.h>
@@ -2673,9 +2678,10 @@ struct sort_dimension {
static int arch_support_sort_key(const char *sort_key, struct perf_env *env)
{
- const char *arch = perf_env__arch(env);
+ uint16_t e_machine = perf_env__e_machine(env, /*e_eflags=*/NULL);
- if (!strcmp("x86", arch) || !strcmp("powerpc", arch)) {
+ if (e_machine == EM_X86_64 || e_machine == EM_386 || e_machine == EM_PPC64 ||
+ e_machine == EM_PPC) {
if (!strcmp(sort_key, "p_stage_cyc"))
return 1;
if (!strcmp(sort_key, "local_p_stage_cyc"))
@@ -2686,14 +2692,14 @@ static int arch_support_sort_key(const char *sort_key, struct perf_env *env)
static const char *arch_perf_header_entry(const char *se_header, struct perf_env *env)
{
- const char *arch = perf_env__arch(env);
+ uint16_t e_machine = perf_env__e_machine(env, /*e_eflags=*/NULL);
- if (!strcmp("x86", arch)) {
+ if (e_machine == EM_X86_64 || e_machine == EM_386) {
if (!strcmp(se_header, "Local Pipeline Stage Cycle"))
return "Local Retire Latency";
else if (!strcmp(se_header, "Pipeline Stage Cycle"))
return "Retire Latency";
- } else if (!strcmp("powerpc", arch)) {
+ } else if (e_machine == EM_PPC64 || e_machine == EM_PPC) {
if (!strcmp(se_header, "Local INSTR Latency"))
return "Finish Cyc";
else if (!strcmp(se_header, "INSTR Latency"))
--
2.54.0.929.g9b7fa37559-googUse the e_machine rather than arch string matching.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/arch/common.c | 92 ++++++++++++++++++++++++++++++----------
1 file changed, 69 insertions(+), 23 deletions(-)
diff --git a/tools/perf/arch/common.c b/tools/perf/arch/common.c
index ad0cab830a4d..5ad50e331c55 100644
--- a/tools/perf/arch/common.c
+++ b/tools/perf/arch/common.c
@@ -1,13 +1,18 @@
// SPDX-License-Identifier: GPL-2.0
+#include "common.h"
+
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+
+#include <linux/zalloc.h>
#include <unistd.h>
-#include "common.h"
-#include "../util/env.h"
+
+#include <dwarf-regs.h>
+
#include "../util/debug.h"
-#include <linux/zalloc.h>
+#include "../util/env.h"
static const char *const arc_triplets[] = {
"arc-linux-",
@@ -141,11 +146,40 @@ static int lookup_triplets(const char *const *triplets, const char *name)
return -1;
}
+static bool is_native_compatible(struct perf_env *env, uint16_t target, uint16_t host)
+{
+ if (target != host) {
+ /* A 64-bit host can natively disassemble its 32-bit compat architecture */
+ if (host == EM_X86_64 && target == EM_386)
+ return true;
+ if (host == EM_AARCH64 && target == EM_ARM)
+ return true;
+ if (host == EM_PPC64 && target == EM_PPC)
+ return true;
+ if (host == EM_SPARCV9 && target == EM_SPARC)
+ return true;
+ return false;
+ }
+
+ /* target == host case */
+ if (target == EM_RISCV) {
+ bool target_is_64 = perf_env__kernel_is_64_bit(env);
+ bool host_is_64 = (sizeof(void *) == 8);
+
+ /* 32-bit host cannot natively disassemble 64-bit target */
+ if (!host_is_64 && target_is_64)
+ return false;
+ }
+
+ return true;
+}
+
static int perf_env__lookup_binutils_path(struct perf_env *env,
const char *name, char **path)
{
int idx;
- const char *arch = perf_env__arch(env), *cross_env;
+ uint16_t e_machine = perf_env__e_machine(env, /*e_flags=*/NULL);
+ const char *cross_env;
const char *const *path_list;
char *buf = NULL;
@@ -153,7 +187,7 @@ static int perf_env__lookup_binutils_path(struct perf_env *env,
* We don't need to try to find objdump path for native system.
* Just use default binutils path (e.g.: "objdump").
*/
- if (!strcmp(perf_env__arch(NULL), arch))
+ if (is_native_compatible(env, e_machine, EM_HOST))
goto out;
cross_env = getenv("CROSS_COMPILE");
@@ -170,30 +204,42 @@ static int perf_env__lookup_binutils_path(struct perf_env *env,
zfree(&buf);
}
- if (!strcmp(arch, "arc"))
+ switch (e_machine) {
+ case EM_ARC:
path_list = arc_triplets;
- else if (!strcmp(arch, "arm"))
+ break;
+ case EM_ARM:
path_list = arm_triplets;
- else if (!strcmp(arch, "arm64"))
+ break;
+ case EM_AARCH64:
path_list = arm64_triplets;
- else if (!strcmp(arch, "powerpc"))
+ break;
+ case EM_PPC:
+ case EM_PPC64:
path_list = powerpc_triplets;
- else if (!strcmp(arch, "riscv32"))
- path_list = riscv32_triplets;
- else if (!strcmp(arch, "riscv64"))
- path_list = riscv64_triplets;
- else if (!strcmp(arch, "sh"))
+ break;
+ case EM_RISCV:
+ path_list = perf_env__kernel_is_64_bit(env) ? riscv64_triplets : riscv32_triplets;
+ break;
+ case EM_SH:
path_list = sh_triplets;
- else if (!strcmp(arch, "s390"))
+ break;
+ case EM_S390:
path_list = s390_triplets;
- else if (!strcmp(arch, "sparc"))
+ break;
+ case EM_SPARC:
+ case EM_SPARCV9:
path_list = sparc_triplets;
- else if (!strcmp(arch, "x86"))
+ break;
+ case EM_X86_64:
+ case EM_386:
path_list = x86_triplets;
- else if (!strcmp(arch, "mips"))
+ break;
+ case EM_MIPS:
path_list = mips_triplets;
- else {
- ui__error("binutils for %s not supported.\n", arch);
+ break;
+ default:
+ ui__error("binutils for %s not supported.\n", perf_env__arch(env));
goto out_error;
}
@@ -202,7 +248,7 @@ static int perf_env__lookup_binutils_path(struct perf_env *env,
ui__error("Please install %s for %s.\n"
"You can add it to PATH, set CROSS_COMPILE or "
"override the default using --%s.\n",
- name, arch, name);
+ name, perf_env__arch(env), name);
goto out_error;
}
@@ -237,7 +283,7 @@ int perf_env__lookup_objdump(struct perf_env *env, char **path)
*/
bool perf_env__single_address_space(struct perf_env *env)
{
- const char *arch = perf_env__arch(env);
+ uint16_t e_machine = perf_env__e_machine(env, /*e_flags=*/NULL);
- return strcmp(arch, "s390") && strcmp(arch, "sparc");
+ return e_machine != EM_SPARC && e_machine != EM_SPARCV9 && e_machine != EM_S390;
}
--
2.54.0.929.g9b7fa37559-googSwitch from arch to e_machine in print_pmu_caps.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/header.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 220e7720fbdb..ecdac427d9c4 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2461,15 +2461,16 @@ static void print_cpu_pmu_caps(struct feat_fd *ff, FILE *fp)
static void print_pmu_caps(struct feat_fd *ff, FILE *fp)
{
struct perf_env *env = &ff->ph->env;
- struct pmu_caps *pmu_caps;
+ uint16_t e_machine = perf_env__e_machine(env, /*e_flags=*/NULL);
for (int i = 0; i < env->nr_pmus_with_caps; i++) {
- pmu_caps = &env->pmu_caps[i];
+ struct pmu_caps *pmu_caps = &env->pmu_caps[i];
+
__print_pmu_caps(fp, pmu_caps->nr_caps, pmu_caps->caps,
pmu_caps->pmu_name);
}
- if (strcmp(perf_env__arch(env), "x86") == 0 &&
+ if ((e_machine == EM_X86_64 || e_machine == EM_386) &&
perf_env__has_pmu_mapping(env, "ibs_op")) {
char *max_precise = perf_env__find_pmu_cap(env, "cpu", "max_precise");
--
2.54.0.929.g9b7fa37559-googUse the e_machine rather than arch string matching for AARCH64.
Add include of dwarf-regs.h in case the EM_AARCH64 isn't defined, sort
the headers given this include.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/builtin-c2c.c | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
index 36f386949923..def5ed395f17 100644
--- a/tools/perf/builtin-c2c.c
+++ b/tools/perf/builtin-c2c.c
@@ -12,41 +12,45 @@
*/
#include <errno.h>
#include <inttypes.h>
+
+#include <asm/bug.h>
#include <linux/compiler.h>
#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/stringify.h>
#include <linux/zalloc.h>
-#include <asm/bug.h>
#include <sys/param.h>
-#include "debug.h"
-#include "builtin.h"
+
+#include <dwarf-regs.h>
#include <perf/cpumap.h>
#include <subcmd/pager.h>
#include <subcmd/parse-options.h>
-#include "map_symbol.h"
-#include "mem-events.h"
-#include "session.h"
-#include "hist.h"
-#include "sort.h"
-#include "tool.h"
+
+#include "builtin.h"
#include "cacheline.h"
#include "data.h"
+#include "debug.h"
#include "event.h"
#include "evlist.h"
#include "evsel.h"
-#include "ui/browsers/hists.h"
-#include "thread.h"
-#include "mem2node.h"
+#include "hist.h"
+#include "map_symbol.h"
+#include "mem-events.h"
#include "mem-info.h"
-#include "symbol.h"
-#include "ui/ui.h"
-#include "ui/progress.h"
+#include "mem2node.h"
#include "pmus.h"
+#include "session.h"
+#include "sort.h"
#include "string2.h"
-#include "util/util.h"
-#include "util/symbol.h"
+#include "symbol.h"
+#include "thread.h"
+#include "tool.h"
+#include "ui/browsers/hists.h"
+#include "ui/progress.h"
+#include "ui/ui.h"
#include "util/annotate.h"
+#include "util/symbol.h"
+#include "util/util.h"
struct c2c_hists {
struct hists hists;
@@ -3202,7 +3206,7 @@ static int perf_c2c__report(int argc, const char **argv)
* default display type.
*/
if (!display) {
- if (!strcmp(perf_env__arch(env), "arm64"))
+ if (perf_env__e_machine(env, /*e_flags=*/NULL) == EM_AARCH64)
display = "peer";
else
display = "tot";
--
2.54.0.929.g9b7fa37559-googUse the e_machine rather than arch string matching for powerpc.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/lock-contention.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/lock-contention.c b/tools/perf/util/lock-contention.c
index 92e7b7b572a2..119a7206f3cd 100644
--- a/tools/perf/util/lock-contention.c
+++ b/tools/perf/util/lock-contention.c
@@ -104,7 +104,8 @@ bool match_callstack_filter(struct machine *machine, u64 *callstack, int max_sta
struct map *kmap;
struct symbol *sym;
u64 ip;
- const char *arch = perf_env__arch(machine->env);
+ uint16_t e_machine = perf_env__e_machine(machine->env, /*e_flags=*/NULL);
+ bool is_powerpc = e_machine == EM_PPC64 || e_machine == EM_PPC;
if (list_empty(&callstack_filters))
return true;
@@ -125,8 +126,7 @@ bool match_callstack_filter(struct machine *machine, u64 *callstack, int max_sta
* incase first or second callstack index entry has 0
* address for powerpc.
*/
- if (!callstack || (!callstack[i] && (strcmp(arch, "powerpc") ||
- (i != 1 && i != 2))))
+ if (!callstack || (!callstack[i] && (!is_powerpc || (i != 1 && i != 2))))
break;
ip = callstack[i];
--
2.54.0.929.g9b7fa37559-googThe previous approach maps an architecture string to a function
pointer to a function that takes an int errno value and returns a
string. The new approach takes an e_machine and an errno value and
returns a string.
As the only call site is in builtin-trace.c, the e_machine is already
present and potentially more specific than the perf_env arch string
that is a single global value.
Since the errno-to-name mapping is now generated statically and no
longer depends on libtraceevent, we can remove the HAVE_LIBTRACEEVENT
guards entirely, making perf_env__arch_strerrno unconditionally
available.
The major complication in this approach is having the shell script
that generates the C code map a linux directory name to the matching
ELF machine constants. To ensure compatibility with older hosts that
have older glibc versions, output fallback definitions for newer ELF
machine constants (EM_AARCH64, EM_CSKY, EM_LOONGARCH) if they are not
defined in the system <elf.h>.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/builtin-trace.c | 7 +--
tools/perf/trace/beauty/Build | 1 +
tools/perf/trace/beauty/arch_errno_names.sh | 53 +++++++++++++++++++--
tools/perf/util/env.c | 13 ++---
tools/perf/util/env.h | 6 +--
5 files changed, 58 insertions(+), 22 deletions(-)
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 2530b4035e4f..377f0a18b00e 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -3032,9 +3032,8 @@ static int trace__sys_exit(struct trace *trace,
} else if (ret < 0) {
errno_print: {
char bf[STRERR_BUFSIZE];
- struct perf_env *env = evsel__env(evsel) ?: &trace->host_env;
const char *emsg = str_error_r(-ret, bf, sizeof(bf));
- const char *e = perf_env__arch_strerrno(env, err);
+ const char *e = perf_env__arch_strerrno(e_machine, err);
fprintf(trace->output, "-1 %s (%s)", e, emsg);
}
@@ -4921,7 +4920,9 @@ static size_t syscall__dump_stats(struct trace *trace, int e_machine, FILE *fp,
for (e = 0; e < stats->max_errno; ++e) {
if (stats->errnos[e] != 0)
- fprintf(fp, "\t\t\t\t%s: %d\n", perf_env__arch_strerrno(trace->host->env, e + 1), stats->errnos[e]);
+ fprintf(fp, "\t\t\t\t%s: %d\n",
+ perf_env__arch_strerrno(e_machine, e + 1),
+ stats->errnos[e]);
}
}
lines++;
diff --git a/tools/perf/trace/beauty/Build b/tools/perf/trace/beauty/Build
index 996e63cdf765..bf9553f683f8 100644
--- a/tools/perf/trace/beauty/Build
+++ b/tools/perf/trace/beauty/Build
@@ -36,6 +36,7 @@ perf-y += signum.o
perf-y += socket_type.o
perf-y += waitid_options.o
perf-util-y += arch_errno_names.o
+
perf-y += tracepoints/
ifdef SHELLCHECK
diff --git a/tools/perf/trace/beauty/arch_errno_names.sh b/tools/perf/trace/beauty/arch_errno_names.sh
index d48d8561a7bb..8751bfa4a2b2 100755
--- a/tools/perf/trace/beauty/arch_errno_names.sh
+++ b/tools/perf/trace/beauty/arch_errno_names.sh
@@ -52,21 +52,50 @@ process_arch()
|IFS=, create_errno_lookup_func "$arch"
}
+arch_to_e_machine()
+{
+ case "$1" in
+ alpha) printf '\tcase EM_ALPHA:\n' ;;
+ arc) printf '\tcase EM_ARC:\n' ;;
+ arm) printf '\tcase EM_ARM:\n' ;;
+ arm64) printf '\tcase EM_AARCH64:\n' ;;
+ csky) printf '\tcase EM_CSKY:\n' ;;
+ hexagon) printf '\tcase EM_HEXAGON:\n' ;;
+ loongarch) printf '\tcase EM_LOONGARCH:\n' ;;
+ microblaze) printf '\tcase EM_MICROBLAZE:\n' ;;
+ mips) printf '\tcase EM_MIPS:\n' ;;
+ parisc) printf '\tcase EM_PARISC:\n' ;;
+ powerpc) printf '\tcase EM_PPC:\n\tcase EM_PPC64:\n' ;;
+ riscv) printf '\tcase EM_RISCV:\n' ;;
+ s390) printf '\tcase EM_S390:\n' ;;
+ sh) printf '\tcase EM_SH:\n' ;;
+ sparc) printf '\tcase EM_SPARC:\n\tcase EM_SPARCV9:\n' ;;
+ x86) printf '\tcase EM_386:\n\tcase EM_X86_64:\n' ;;
+ xtensa) printf '\tcase EM_XTENSA:\n' ;;
+ esac
+}
+
create_arch_errno_table_func()
{
archlist="$1"
default="$2"
- printf 'arch_syscalls__strerrno_t *\n'
- printf 'arch_syscalls__strerrno_function(const char *arch)\n'
+ printf 'const char *arch_syscalls__strerrno(uint16_t e_machine, int err);\n\n'
+ printf '__attribute__((unused)) const char *\n'
+ printf 'arch_syscalls__strerrno(uint16_t e_machine, int err)\n'
printf '{\n'
+ printf '\tswitch (e_machine) {\n'
for arch in $archlist; do
arch_str=$(arch_string "$arch")
- printf '\tif (!strcmp(arch, "%s"))\n' "$arch_str"
- printf '\t\treturn errno_to_name__%s;\n' "$arch_str"
+ ems=$(arch_to_e_machine "$arch_str")
+ if [ -n "$ems" ]; then
+ printf '%s\n' "$ems"
+ printf '\t\treturn errno_to_name__%s(err);\n' "$arch_str"
+ fi
done
arch_str=$(arch_string "$default")
- printf '\treturn errno_to_name__%s;\n' "$arch_str"
+ printf '\tdefault:\n\t\treturn errno_to_name__%s(err);\n' "$arch_str"
+ printf '\t}\n'
printf '}\n'
}
@@ -74,6 +103,20 @@ cat <<EoHEADER
/* SPDX-License-Identifier: GPL-2.0 */
#include <string.h>
+#include <stdint.h>
+#include <elf.h>
+
+#ifndef EM_AARCH64
+#define EM_AARCH64 183
+#endif
+
+#ifndef EM_CSKY
+#define EM_CSKY 252
+#endif
+
+#ifndef EM_LOONGARCH
+#define EM_LOONGARCH 258
+#endif
EoHEADER
diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c
index fae70b07ba8d..b41562fb06c6 100644
--- a/tools/perf/util/env.c
+++ b/tools/perf/util/env.c
@@ -851,16 +851,11 @@ const char *perf_env__arch(struct perf_env *env)
return arch;
}
-const char *perf_env__arch_strerrno(struct perf_env *env __maybe_unused, int err __maybe_unused)
-{
-#if defined(HAVE_LIBTRACEEVENT)
- if (env->arch_strerrno == NULL)
- env->arch_strerrno = arch_syscalls__strerrno_function(perf_env__arch(env));
+const char *arch_syscalls__strerrno(uint16_t e_machine, int err);
- return env->arch_strerrno ? env->arch_strerrno(err) : "no arch specific strerrno function";
-#else
- return "!HAVE_LIBTRACEEVENT";
-#endif
+const char *perf_env__arch_strerrno(uint16_t e_machine, int err)
+{
+ return arch_syscalls__strerrno(e_machine, err);
}
const char *perf_env__cpuid(struct perf_env *env)
diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h
index dd9907dbc345..5a917271ca0d 100644
--- a/tools/perf/util/env.h
+++ b/tools/perf/util/env.h
@@ -67,8 +67,6 @@ struct cpu_domain_map {
struct domain_info **domains;
};
-typedef const char *(arch_syscalls__strerrno_t)(int err);
-
struct perf_env {
char *hostname;
char *os_release;
@@ -158,7 +156,6 @@ struct perf_env {
*/
bool enabled;
} clock;
- arch_syscalls__strerrno_t *arch_strerrno;
};
enum perf_compress_type {
@@ -191,8 +188,7 @@ void cpu_cache_level__free(struct cpu_cache_level *cache);
uint16_t perf_env__e_machine_nocache(struct perf_env *env, uint32_t *e_flags);
uint16_t perf_env__e_machine(struct perf_env *env, uint32_t *e_flags);
const char *perf_env__arch(struct perf_env *env);
-const char *perf_env__arch_strerrno(struct perf_env *env, int err);
-arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const char *arch);
+const char *perf_env__arch_strerrno(uint16_t e_machine, int err);
const char *perf_env__cpuid(struct perf_env *env);
const char *perf_env__raw_arch(struct perf_env *env);
int perf_env__nr_cpus_avail(struct perf_env *env);
--
2.54.0.929.g9b7fa37559-googThe switch to using e_machine has made the perf_env__raw_arch function
unused so remove it.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/env.c | 18 ------------------
tools/perf/util/env.h | 1 -
2 files changed, 19 deletions(-)
diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c
index b41562fb06c6..28c54c58193e 100644
--- a/tools/perf/util/env.c
+++ b/tools/perf/util/env.c
@@ -470,19 +470,6 @@ int perf_env__read_cpuid(struct perf_env *env)
return 0;
}
-static int perf_env__read_arch(struct perf_env *env)
-{
- struct utsname uts;
-
- if (env->arch)
- return 0;
-
- if (!uname(&uts))
- env->arch = strdup(uts.machine);
-
- return env->arch ? 0 : -ENOMEM;
-}
-
static int perf_env__read_nr_cpus_avail(struct perf_env *env)
{
if (env->nr_cpus_avail == 0)
@@ -601,11 +588,6 @@ int perf_env__read_core_pmu_caps(struct perf_env *env)
return ret;
}
-const char *perf_env__raw_arch(struct perf_env *env)
-{
- return env && !perf_env__read_arch(env) ? env->arch : "unknown";
-}
-
int perf_env__nr_cpus_avail(struct perf_env *env)
{
return env && !perf_env__read_nr_cpus_avail(env) ? env->nr_cpus_avail : 0;
diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h
index 5a917271ca0d..83e74328798f 100644
--- a/tools/perf/util/env.h
+++ b/tools/perf/util/env.h
@@ -190,7 +190,6 @@ uint16_t perf_env__e_machine(struct perf_env *env, uint32_t *e_flags);
const char *perf_env__arch(struct perf_env *env);
const char *perf_env__arch_strerrno(uint16_t e_machine, int err);
const char *perf_env__cpuid(struct perf_env *env);
-const char *perf_env__raw_arch(struct perf_env *env);
int perf_env__nr_cpus_avail(struct perf_env *env);
void perf_env__init(struct perf_env *env);
--
2.54.0.929.g9b7fa37559-googIntroduce a mutex to 'struct perf_env' to safely protect lazy
metadata setup, such as os_release or e_machine resolution,
preventing concurrent initialization data races and memory leaks
during multi-threaded profiling or symbol loading.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/env.c | 5 +++++
tools/perf/util/env.h | 3 +++
2 files changed, 8 insertions(+)
diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c
index 28c54c58193e..03d90a45992c 100644
--- a/tools/perf/util/env.c
+++ b/tools/perf/util/env.c
@@ -250,6 +250,8 @@ void perf_env__exit(struct perf_env *env)
{
int i, j;
+ mutex_destroy(&env->lock);
+
perf_env__purge_bpf(env);
perf_env__purge_cgroups(env);
zfree(&env->hostname);
@@ -307,6 +309,7 @@ void perf_env__init(struct perf_env *env)
init_rwsem(&env->bpf_progs.lock);
#endif
env->kernel_is_64_bit = -1;
+ mutex_init(&env->lock);
}
static void perf_env__init_kernel_mode(struct perf_env *env)
@@ -1014,6 +1017,7 @@ bool x86__is_amd_cpu(void)
struct perf_env env = { .total_mem = 0, };
bool is_amd;
+ perf_env__init(&env);
perf_env__cpuid(&env);
is_amd = perf_env__is_x86_amd_cpu(&env);
perf_env__exit(&env);
@@ -1036,6 +1040,7 @@ bool x86__is_intel_cpu(void)
struct perf_env env = { .total_mem = 0, };
bool is_intel;
+ perf_env__init(&env);
perf_env__cpuid(&env);
is_intel = perf_env__is_x86_intel_cpu(&env);
perf_env__exit(&env);
diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h
index 83e74328798f..6aaf80c640bd 100644
--- a/tools/perf/util/env.h
+++ b/tools/perf/util/env.h
@@ -6,6 +6,7 @@
#include <linux/rbtree.h>
#include "cpumap.h"
#include "rwsem.h"
+#include "mutex.h"
struct perf_cpu_map;
@@ -156,6 +157,8 @@ struct perf_env {
*/
bool enabled;
} clock;
+ /* Protects lazy environment initialization (e.g. os_release, e_machine). */
+ struct mutex lock;
};
enum perf_compress_type {
--
2.54.0.929.g9b7fa37559-googIn live mode the os_release isn't being initialized, make a lazy
initialization helper that assumes when the os_release isn't
initialized this is live mode.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/data-convert-bt.c | 2 +-
tools/perf/util/data-convert-json.c | 6 +++--
tools/perf/util/env.c | 38 +++++++++++++++++++++++++++++
tools/perf/util/env.h | 1 +
tools/perf/util/header.c | 16 ++++++++----
tools/perf/util/symbol.c | 4 +--
6 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-convert-bt.c
index b3f745cff2a7..cc51b8677c8e 100644
--- a/tools/perf/util/data-convert-bt.c
+++ b/tools/perf/util/data-convert-bt.c
@@ -1414,7 +1414,7 @@ do { \
ADD("host", env->hostname);
ADD("sysname", "Linux");
- ADD("release", env->os_release);
+ ADD("release", perf_env__os_release(env));
ADD("version", env->version);
ADD("machine", env->arch);
ADD("domain", "kernel");
diff --git a/tools/perf/util/data-convert-json.c b/tools/perf/util/data-convert-json.c
index a7da93a7ff0e..c71dfb77c697 100644
--- a/tools/perf/util/data-convert-json.c
+++ b/tools/perf/util/data-convert-json.c
@@ -16,6 +16,7 @@
#include "linux/err.h"
#include "util/auxtrace.h"
#include "util/debug.h"
+#include "util/env.h"
#include "util/dso.h"
#include "util/event.h"
#include "util/evsel.h"
@@ -272,7 +273,7 @@ static void output_headers(struct perf_session *session, struct convert_json *c)
{
struct stat st;
const struct perf_header *header = &session->header;
- const struct perf_env *env = perf_session__env(session);
+ struct perf_env *env = perf_session__env(session);
int ret;
int fd = perf_data__fd(session->data);
int i;
@@ -296,7 +297,8 @@ static void output_headers(struct perf_session *session, struct convert_json *c)
output_json_key_format(out, true, 2, "feat-offset", "%" PRIu64, header->feat_offset);
output_json_key_string(out, true, 2, "hostname", env->hostname);
- output_json_key_string(out, true, 2, "os-release", env->os_release);
+ output_json_key_string(out, true, 2, "os-release",
+ perf_env__os_release(env));
output_json_key_string(out, true, 2, "arch", env->arch);
if (env->cpu_desc)
diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c
index 03d90a45992c..c0e2b9d5f0b2 100644
--- a/tools/perf/util/env.c
+++ b/tools/perf/util/env.c
@@ -361,6 +361,44 @@ bool perf_arch_is_big_endian(const char *arch)
return false;
}
+const char *perf_env__os_release(struct perf_env *env)
+{
+ struct utsname uts;
+ int ret;
+ const char *release;
+
+ if (!env)
+ return perf_version_string;
+
+ mutex_lock(&env->lock);
+ if (env->os_release) {
+ release = env->os_release;
+ goto out;
+ }
+
+ /*
+ * If env->arch is set, this is an offline target environment.
+ * If the os_release is not populated in the file, we do not want
+ * to poison it with the host's release which would break guest checks.
+ */
+ if (env->arch) {
+ release = NULL;
+ goto out;
+ }
+
+ /*
+ * The os_release is being accessed but wasn't initialized from a data
+ * file, assume this is 'live' mode and use the release from uname. If
+ * uname or strdup fails then use the current perf tool version.
+ */
+ ret = uname(&uts);
+ env->os_release = strdup(ret < 0 ? perf_version_string : uts.release);
+ release = env->os_release ?: perf_version_string;
+out:
+ mutex_unlock(&env->lock);
+ return release;
+}
+
int perf_env__set_cmdline(struct perf_env *env, int argc, const char *argv[])
{
int i;
diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h
index 6aaf80c640bd..7621d1f73b83 100644
--- a/tools/perf/util/env.h
+++ b/tools/perf/util/env.h
@@ -176,6 +176,7 @@ void perf_env__exit(struct perf_env *env);
int perf_env__kernel_is_64_bit(struct perf_env *env);
bool perf_arch_is_big_endian(const char *arch);
+const char *perf_env__os_release(struct perf_env *env);
int perf_env__set_cmdline(struct perf_env *env, int argc, const char *argv[]);
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index ecdac427d9c4..d7f41db7322c 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -432,13 +432,19 @@ static int write_osrelease(struct feat_fd *ff,
struct evlist *evlist __maybe_unused)
{
struct utsname uts;
- int ret;
+ const char *release = NULL;
- ret = uname(&uts);
- if (ret < 0)
- return -1;
+ if (evlist->session)
+ release = perf_env__os_release(perf_session__env(evlist->session));
- return do_write_string(ff, uts.release);
+ if (!release) {
+ int ret = uname(&uts);
+
+ if (ret < 0)
+ return -1;
+ release = uts.release;
+ }
+ return do_write_string(ff, release);
}
static int write_arch(struct feat_fd *ff, struct evlist *evlist)
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 2ce512f08a1d..077d19af5240 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -2225,7 +2225,7 @@ static int vmlinux_path__init(struct perf_env *env)
{
struct utsname uts;
char bf[PATH_MAX];
- char *kernel_version;
+ const char *kernel_version;
unsigned int i;
vmlinux_path = malloc(sizeof(char *) * (ARRAY_SIZE(vmlinux_paths) +
@@ -2242,7 +2242,7 @@ static int vmlinux_path__init(struct perf_env *env)
return 0;
if (env) {
- kernel_version = env->os_release;
+ kernel_version = perf_env__os_release(env);
} else {
if (uname(&uts) < 0)
goto out_fail;
--
2.54.0.929.g9b7fa37559-googA problem with putting bitfields into struct symbol is that other bits in
the symbol could be updated concurrently and only one update to the
underlying storage unit happen, leading to lost updates.
To avoid this, use atomics to atomically read or set part of 16-bits
of flags in the symbol. Add accessors to simplify this.
The idle value has 3 values in preparation for a later change that
will lazily update it.
Assisted-by: Gemini:gemini-3.1-pro-preview
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/builtin-inject.c | 10 +--
tools/perf/builtin-kwork.c | 2 +-
tools/perf/builtin-report.c | 2 +-
tools/perf/builtin-sched.c | 4 +-
tools/perf/builtin-top.c | 7 +-
tools/perf/tests/symbols.c | 2 +-
tools/perf/tests/vmlinux-kallsyms.c | 2 +-
tools/perf/ui/browsers/annotate.c | 2 +-
tools/perf/ui/browsers/map.c | 4 +-
tools/perf/util/annotate.c | 5 +-
tools/perf/util/auxtrace.c | 6 +-
tools/perf/util/callchain.c | 4 +-
tools/perf/util/dlfilter.c | 2 +-
tools/perf/util/evsel_fprintf.c | 6 +-
tools/perf/util/intel-pt.c | 2 +-
tools/perf/util/libdw.c | 2 +-
tools/perf/util/machine.c | 2 +-
tools/perf/util/probe-event.c | 4 +-
.../util/scripting-engines/trace-event-perl.c | 2 +-
.../scripting-engines/trace-event-python.c | 4 +-
tools/perf/util/sort.c | 8 +-
tools/perf/util/srcline.c | 10 +--
tools/perf/util/symbol-elf.c | 3 +-
tools/perf/util/symbol.c | 86 +++++++++++++++----
tools/perf/util/symbol.h | 78 +++++++++++++----
tools/perf/util/symbol_fprintf.c | 4 +-
26 files changed, 183 insertions(+), 80 deletions(-)
diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index d8cb1f562f69..75ffe31d03fe 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -549,13 +549,11 @@ static int perf_event__convert_sample_callchain(const struct perf_tool *tool,
node = cursor->first;
for (k = 0; k < cursor->nr && i < PERF_MAX_STACK_DEPTH; k++) {
- if (machine->single_address_space &&
- machine__kernel_ip(machine, node->ip))
- /* kernel IPs were added already */;
- else if (node->ms.sym && node->ms.sym->inlined)
- /* we can't handle inlined callchains */;
- else
+ if (!(machine->single_address_space &&
+ machine__kernel_ip(machine, node->ip)) &&
+ !(node->ms.sym && symbol__inlined(node->ms.sym))) {
inject->raw_callchain->ips[i++] = node->ip;
+ }
node = node->next;
}
diff --git a/tools/perf/builtin-kwork.c b/tools/perf/builtin-kwork.c
index 99dc293a0744..77e87e75613d 100644
--- a/tools/perf/builtin-kwork.c
+++ b/tools/perf/builtin-kwork.c
@@ -769,7 +769,7 @@ static void timehist_save_callchain(struct perf_kwork *kwork,
if (sym) {
if (!strcmp(sym->name, "__softirqentry_text_start") ||
!strcmp(sym->name, "__do_softirq"))
- sym->ignore = 1;
+ symbol__set_ignore(sym, true);
}
callchain_cursor_advance(cursor);
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 973d97af8501..b79001529d01 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -749,7 +749,7 @@ static int hists__resort_cb(struct hist_entry *he, void *arg)
struct report *rep = arg;
struct symbol *sym = he->ms.sym;
- if (rep->symbol_ipc && sym && !sym->annotate2) {
+ if (rep->symbol_ipc && sym && !symbol__is_annotate2(sym)) {
struct evsel *evsel = hists_to_evsel(he->hists);
symbol__annotate2(&he->ms, evsel, NULL);
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 812a1b0d56d6..b6da74c5befa 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -2367,7 +2367,7 @@ static void save_task_callchain(struct perf_sched *sched,
if (!strcmp(sym->name, "schedule") ||
!strcmp(sym->name, "__schedule") ||
!strcmp(sym->name, "preempt_schedule"))
- sym->ignore = 1;
+ symbol__set_ignore(sym, true);
}
callchain_cursor_advance(cursor);
@@ -3025,7 +3025,7 @@ static size_t callchain__fprintf_folded(FILE *fp, struct callchain_node *node)
list_for_each_entry(chain, &node->val, list) {
if (chain->ip >= PERF_CONTEXT_MAX)
continue;
- if (chain->ms.sym && chain->ms.sym->ignore)
+ if (chain->ms.sym && symbol__ignore(chain->ms.sym))
continue;
ret += fprintf(fp, "%s%s", first ? "" : sep,
callchain_list__sym_name(chain, bf, sizeof(bf),
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index c8474f7ac658..1211401616ee 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -186,8 +186,8 @@ static void ui__warn_map_erange(struct map *map, struct symbol *sym, u64 ip)
"Please report to linux-kernel@vger.kernel.org\n",
ip, dso__long_name(dso), dso__symtab_origin(dso),
map__start(map), map__end(map), sym->start, sym->end,
- sym->binding == STB_GLOBAL ? 'g' :
- sym->binding == STB_LOCAL ? 'l' : 'w', sym->name,
+ symbol__binding(sym) == STB_GLOBAL ? 'g' :
+ symbol__binding(sym) == STB_LOCAL ? 'l' : 'w', sym->name,
err ? "[unknown]" : uts.machine,
err ? "[unknown]" : uts.release, perf_version_string);
if (use_browser <= 0)
@@ -828,7 +828,8 @@ static void perf_event__process_sample(const struct perf_tool *tool,
}
}
- if (al.sym == NULL || !al.sym->idle) {
+ if (al.sym == NULL ||
+ !symbol__is_idle(al.sym, al.map ? map__dso(al.map) : NULL, machine->env)) {
struct hists *hists = evsel__hists(sample->evsel);
struct hist_entry_iter iter = {
.sample = sample,
diff --git a/tools/perf/tests/symbols.c b/tools/perf/tests/symbols.c
index f4ffe5804f40..c09e04f36035 100644
--- a/tools/perf/tests/symbols.c
+++ b/tools/perf/tests/symbols.c
@@ -125,7 +125,7 @@ static int test_dso(struct dso *dso)
for (nd = rb_first_cached(dso__symbols(dso)); nd; nd = rb_next(nd)) {
struct symbol *sym = rb_entry(nd, struct symbol, rb_node);
- if (sym->type != STT_FUNC && sym->type != STT_GNU_IFUNC)
+ if (symbol__type(sym) != STT_FUNC && symbol__type(sym) != STT_GNU_IFUNC)
continue;
/* Check for overlapping function symbols */
diff --git a/tools/perf/tests/vmlinux-kallsyms.c b/tools/perf/tests/vmlinux-kallsyms.c
index 524d46478364..7409abe4aa36 100644
--- a/tools/perf/tests/vmlinux-kallsyms.c
+++ b/tools/perf/tests/vmlinux-kallsyms.c
@@ -346,7 +346,7 @@ static int test__vmlinux_matches_kallsyms(struct test_suite *test __maybe_unused
* such as __indirect_thunk_end.
*/
continue;
- } else if (is_ignored_symbol(sym->name, sym->type)) {
+ } else if (is_ignored_symbol(sym->name, symbol__type(sym))) {
/*
* Ignore hidden symbols, see scripts/kallsyms.c for the details
*/
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index ea17e6d29a7e..e220c4dfc881 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -1185,7 +1185,7 @@ int __hist_entry__tui_annotate(struct hist_entry *he, struct map_symbol *ms,
if (dso__annotate_warned(dso))
return -1;
- if (not_annotated || !sym->annotate2) {
+ if (not_annotated || !symbol__is_annotate2(sym)) {
err = symbol__annotate2(ms, evsel, &browser.arch);
if (err) {
annotate_browser__symbol_annotate_error(&browser, err);
diff --git a/tools/perf/ui/browsers/map.c b/tools/perf/ui/browsers/map.c
index c61ba3174a24..075a575cdc5d 100644
--- a/tools/perf/ui/browsers/map.c
+++ b/tools/perf/ui/browsers/map.c
@@ -32,8 +32,8 @@ static void map_browser__write(struct ui_browser *browser, void *nd, int row)
ui_browser__set_percent_color(browser, 0, current_entry);
ui_browser__printf(browser, "%*" PRIx64 " %*" PRIx64 " %c ",
mb->addrlen, sym->start, mb->addrlen, sym->end,
- sym->binding == STB_GLOBAL ? 'g' :
- sym->binding == STB_LOCAL ? 'l' : 'w');
+ symbol__binding(sym) == STB_GLOBAL ? 'g' :
+ symbol__binding(sym) == STB_LOCAL ? 'l' : 'w');
width = browser->width - ((mb->addrlen * 2) + 4);
if (width > 0)
ui_browser__write_nstring(browser, sym->name, width);
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 470569745abe..02505222d8c2 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -236,7 +236,8 @@ static int __symbol__inc_addr_samples(struct map_symbol *ms,
h = annotated_source__histogram(src, evsel);
if (h == NULL) {
pr_debug("%s(%d): ENOMEM! sym->name=%s, start=%#" PRIx64 ", addr=%#" PRIx64 ", end=%#" PRIx64 ", func: %d\n",
- __func__, __LINE__, sym->name, sym->start, addr, sym->end, sym->type == STT_FUNC);
+ __func__, __LINE__, sym->name, sym->start, addr, sym->end,
+ symbol__type(sym) == STT_FUNC);
return -ENOMEM;
}
@@ -2223,7 +2224,7 @@ int symbol__annotate2(struct map_symbol *ms, struct evsel *evsel,
annotation__init_column_widths(notes, sym);
annotation__update_column_widths(notes);
- sym->annotate2 = 1;
+ symbol__set_annotate2(sym, true);
return 0;
}
diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index fcf564e0d777..5f4aa1701aef 100644
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -2694,7 +2694,7 @@ static bool dso_sym_match(struct symbol *sym, const char *name, int *cnt,
{
/* Same name, and global or the n'th found or any */
return !arch__compare_symbol_names(name, sym->name) &&
- ((!idx && sym->binding == STB_GLOBAL) ||
+ ((!idx && symbol__binding(sym) == STB_GLOBAL) ||
(idx > 0 && ++*cnt == idx) ||
idx < 0);
}
@@ -2712,8 +2712,8 @@ static void print_duplicate_syms(struct dso *dso, const char *sym_name)
if (dso_sym_match(sym, sym_name, &cnt, -1)) {
pr_err("#%d\t0x%"PRIx64"\t%c\t%s\n",
++cnt, sym->start,
- sym->binding == STB_GLOBAL ? 'g' :
- sym->binding == STB_LOCAL ? 'l' : 'w',
+ symbol__binding(sym) == STB_GLOBAL ? 'g' :
+ symbol__binding(sym) == STB_LOCAL ? 'l' : 'w',
sym->name);
near = true;
} else if (near) {
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 5c2282051e39..8981ae879ebb 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -801,7 +801,7 @@ static enum match_result match_chain(struct callchain_cursor_node *node,
* symbol start. Otherwise do a faster comparison based
* on the symbol start address.
*/
- if (cnode->ms.sym->inlined || node->ms.sym->inlined) {
+ if (symbol__inlined(cnode->ms.sym) || symbol__inlined(node->ms.sym)) {
match = match_chain_strings(cnode->ms.sym->name,
node->ms.sym->name);
if (match != MATCH_ERROR)
@@ -1245,7 +1245,7 @@ char *callchain_list__sym_name(struct callchain_list *cl,
int printed;
if (cl->ms.sym) {
- const char *inlined = cl->ms.sym->inlined ? " (inlined)" : "";
+ const char *inlined = symbol__inlined(cl->ms.sym) ? " (inlined)" : "";
if (show_srcline && cl->srcline)
printed = scnprintf(bf, bfsize, "%s %s%s",
diff --git a/tools/perf/util/dlfilter.c b/tools/perf/util/dlfilter.c
index dc31b5e7149e..e11e144af62b 100644
--- a/tools/perf/util/dlfilter.c
+++ b/tools/perf/util/dlfilter.c
@@ -56,7 +56,7 @@ static void al_to_d_al(struct addr_location *al, struct perf_dlfilter_al *d_al)
d_al->symoff = al->addr - map__start(al->map) - sym->start;
else
d_al->symoff = 0;
- d_al->sym_binding = sym->binding;
+ d_al->sym_binding = symbol__binding(sym);
} else {
d_al->sym = NULL;
d_al->sym_start = 0;
diff --git a/tools/perf/util/evsel_fprintf.c b/tools/perf/util/evsel_fprintf.c
index 5521d00bff2c..0f7a25500a44 100644
--- a/tools/perf/util/evsel_fprintf.c
+++ b/tools/perf/util/evsel_fprintf.c
@@ -146,7 +146,7 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,
sym = node->ms.sym;
map = node->ms.map;
- if (sym && sym->ignore && print_skip_ignored)
+ if (sym && symbol__ignore(sym) && print_skip_ignored)
goto next;
printed += fprintf(fp, "%-*.*s", left_alignment, left_alignment, " ");
@@ -182,7 +182,7 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,
addr_location__exit(&node_al);
}
- if (print_dso && (!sym || !sym->inlined))
+ if (print_dso && (!sym || !symbol__inlined(sym)))
printed += map__fprintf_dsoname_dsoff(map, print_dsoff, addr, fp);
if (print_srcline) {
@@ -192,7 +192,7 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,
printed += map__fprintf_srcline(map, addr, "\n ", fp);
}
- if (sym && sym->inlined)
+ if (sym && symbol__inlined(sym))
printed += fprintf(fp, " (inlined)");
if (!print_oneline)
diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index b8add2b20033..56a9e439f5f8 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -3000,7 +3000,7 @@ static u64 intel_pt_switch_ip(struct intel_pt *pt, u64 *ptss_ip)
start = dso__first_symbol(map__dso(map));
for (sym = start; sym; sym = dso__next_symbol(sym)) {
- if (sym->binding == STB_GLOBAL &&
+ if (symbol__binding(sym) == STB_GLOBAL &&
!strcmp(sym->name, "__switch_to")) {
ip = map__unmap_ip(map, sym->start);
if (ip >= map__start(map) && ip < map__end(map)) {
diff --git a/tools/perf/util/libdw.c b/tools/perf/util/libdw.c
index 84713b2a7ad5..d5d2958902c0 100644
--- a/tools/perf/util/libdw.c
+++ b/tools/perf/util/libdw.c
@@ -130,7 +130,7 @@ static int libdw_a2l_cb(Dwarf_Die *die, void *_args)
return 0;
abort_delete_sym:
- if (inline_sym->inlined)
+ if (symbol__inlined(inline_sym))
symbol__delete(inline_sym);
abort_enomem:
args->err = -ENOMEM;
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 47be7a44a5f7..da1ad58758af 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1095,7 +1095,7 @@ static u64 find_entry_trampoline(struct dso *dso)
unsigned int i;
for (; sym; sym = dso__next_symbol(sym)) {
- if (sym->binding != STB_GLOBAL)
+ if (symbol__binding(sym) != STB_GLOBAL)
continue;
for (i = 0; i < ARRAY_SIZE(syms); i++) {
if (!strcmp(sym->name, syms[i]))
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 34b4badd2c14..11ae4a09412c 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -416,7 +416,7 @@ static int find_alternative_probe_point(struct debuginfo *dinfo,
map__for_each_symbol_by_name(map, pp->function, sym, idx) {
if (uprobes) {
address = sym->start;
- if (sym->type == STT_GNU_IFUNC)
+ if (symbol__type(sym) == STT_GNU_IFUNC)
pr_warning("Warning: The probe function (%s) is a GNU indirect function.\n"
"Consider identifying the final function used at run time and set the probe directly on that.\n",
pp->function);
@@ -3189,7 +3189,7 @@ static int find_probe_trace_events_from_map(struct perf_probe_event *pev,
for (j = 0; j < num_matched_functions; j++) {
sym = syms[j];
- if (sym->type != STT_FUNC)
+ if (symbol__type(sym) != STT_FUNC)
continue;
/* There can be duplicated symbols in the map */
diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
index 7a18ea4b7d50..410dc4cd0600 100644
--- a/tools/perf/util/scripting-engines/trace-event-perl.c
+++ b/tools/perf/util/scripting-engines/trace-event-perl.c
@@ -303,7 +303,7 @@ static SV *perl_process_callchain(struct perf_sample *sample,
}
if (!hv_stores(sym, "start", newSVuv(node->ms.sym->start)) ||
!hv_stores(sym, "end", newSVuv(node->ms.sym->end)) ||
- !hv_stores(sym, "binding", newSVuv(node->ms.sym->binding)) ||
+ !hv_stores(sym, "binding", newSVuv(symbol__binding(node->ms.sym))) ||
!hv_stores(sym, "name", newSVpvn(node->ms.sym->name,
node->ms.sym->namelen)) ||
!hv_stores(elem, "sym", newRV_noinc((SV*)sym))) {
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index cee1f32d7022..8f832ae316ca 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -436,7 +436,7 @@ static PyObject *python_process_callchain(struct perf_sample *sample,
pydict_set_item_string_decref(pysym, "end",
PyLong_FromUnsignedLongLong(node->ms.sym->end));
pydict_set_item_string_decref(pysym, "binding",
- _PyLong_FromLong(node->ms.sym->binding));
+ _PyLong_FromLong(symbol__binding(node->ms.sym)));
pydict_set_item_string_decref(pysym, "name",
_PyUnicode_FromStringAndSize(node->ms.sym->name,
node->ms.sym->namelen));
@@ -1270,7 +1270,7 @@ static int python_export_symbol(struct db_export *dbe, struct symbol *sym,
tuple_set_d64(t, 1, dso__db_id(dso));
tuple_set_d64(t, 2, sym->start);
tuple_set_d64(t, 3, sym->end);
- tuple_set_s32(t, 4, sym->binding);
+ tuple_set_s32(t, 4, symbol__binding(sym));
tuple_set_string(t, 5, sym->name);
call_object(tables->symbol_handler, t, "symbol_table");
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 90bc4a31bb55..005e7d85dc4a 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -469,7 +469,7 @@ int64_t _sort__sym_cmp(struct symbol *sym_l, struct symbol *sym_r)
if (sym_l == sym_r)
return 0;
- if (sym_l->inlined || sym_r->inlined) {
+ if (symbol__inlined(sym_l) || symbol__inlined(sym_r)) {
int ret = strcmp(sym_l->name, sym_r->name);
if (ret)
@@ -536,7 +536,7 @@ static int _hist_entry__sym_snprintf(struct map_symbol *ms,
ret += repsep_snprintf(bf + ret, size - ret, "[%c] ", level);
if (sym && map) {
- if (sym->type == STT_OBJECT) {
+ if (symbol__type(sym) == STT_OBJECT) {
ret += repsep_snprintf(bf + ret, size - ret, "%s", sym->name);
ret += repsep_snprintf(bf + ret, size - ret, "+0x%llx",
ip - map__unmap_ip(map, sym->start));
@@ -544,7 +544,7 @@ static int _hist_entry__sym_snprintf(struct map_symbol *ms,
ret += repsep_snprintf(bf + ret, size - ret, "%.*s",
width - ret,
sym->name);
- if (sym->inlined)
+ if (symbol__inlined(sym))
ret += repsep_snprintf(bf + ret, size - ret,
" (inlined)");
}
@@ -1483,7 +1483,7 @@ static int _hist_entry__addr_snprintf(struct map_symbol *ms,
ret += repsep_snprintf(bf + ret, size - ret, "[%c] ", level);
if (sym && map) {
- if (sym->type == STT_OBJECT) {
+ if (symbol__type(sym) == STT_OBJECT) {
ret += repsep_snprintf(bf + ret, size - ret, "%s", sym->name);
ret += repsep_snprintf(bf + ret, size - ret, "+0x%llx",
ip - map__unmap_ip(map, sym->start));
diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index 62884428fb5a..b082178c279b 100644
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -113,16 +113,16 @@ struct symbol *new_inline_sym(struct dso *dso,
/* ensure that we don't alias an inlined symbol, which could
* lead to double frees in inline_node__delete
*/
- assert(!base_sym->inlined);
+ assert(!symbol__inlined(base_sym));
} else {
/* create a fake symbol for the inline frame */
inline_sym = symbol__new(base_sym ? base_sym->start : 0,
base_sym ? (base_sym->end - base_sym->start) : 0,
- base_sym ? base_sym->binding : 0,
- base_sym ? base_sym->type : 0,
+ base_sym ? symbol__binding(base_sym) : 0,
+ base_sym ? symbol__type(base_sym) : 0,
funcname);
if (inline_sym)
- inline_sym->inlined = 1;
+ symbol__set_inlined(inline_sym, true);
}
free(demangled);
@@ -440,7 +440,7 @@ void inline_node__clear_frames(struct inline_node *node)
list_del_init(&ilist->list);
zfree_srcline(&ilist->srcline);
/* only the inlined symbols are owned by the list */
- if (ilist->symbol && ilist->symbol->inlined)
+ if (ilist->symbol && symbol__inlined(ilist->symbol))
symbol__delete(ilist->symbol);
free(ilist);
}
diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index 77e6dcba8fda..c5ed5e051976 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -350,7 +350,8 @@ static bool get_ifunc_name(Elf *elf, struct dso *dso, GElf_Ehdr *ehdr,
sym = dso__find_symbol_nocache(dso, addr);
/* Expecting the address to be an IFUNC or IFUNC alias */
- if (!sym || sym->start != addr || (sym->type != STT_GNU_IFUNC && !sym->ifunc_alias))
+ if (!sym || sym->start != addr ||
+ (symbol__type(sym) != STT_GNU_IFUNC && !symbol__ifunc_alias(sym)))
return false;
snprintf(buf, buf_sz, "%s@plt", sym->name);
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 077d19af5240..ddd3106b03b1 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -50,7 +50,7 @@
static int dso__load_kernel_sym(struct dso *dso, struct map *map);
static int dso__load_guest_kernel_sym(struct dso *dso, struct map *map);
-static bool symbol__is_idle(const char *name);
+static bool symbol__compute_is_idle(const char *name);
int vmlinux_path__nr_entries;
char **vmlinux_path;
@@ -163,24 +163,24 @@ static int choose_best_symbol(struct symbol *syma, struct symbol *symb)
else if ((a == 0) && (b > 0))
return SYMBOL_B;
- if (syma->type != symb->type) {
- if (syma->type == STT_NOTYPE)
+ if (symbol__type(syma) != symbol__type(symb)) {
+ if (symbol__type(syma) == STT_NOTYPE)
return SYMBOL_B;
- if (symb->type == STT_NOTYPE)
+ if (symbol__type(symb) == STT_NOTYPE)
return SYMBOL_A;
}
/* Prefer a non weak symbol over a weak one */
- a = syma->binding == STB_WEAK;
- b = symb->binding == STB_WEAK;
+ a = symbol__binding(syma) == STB_WEAK;
+ b = symbol__binding(symb) == STB_WEAK;
if (b && !a)
return SYMBOL_A;
if (a && !b)
return SYMBOL_B;
/* Prefer a global symbol over a non global one */
- a = syma->binding == STB_GLOBAL;
- b = symb->binding == STB_GLOBAL;
+ a = symbol__binding(syma) == STB_GLOBAL;
+ b = symbol__binding(symb) == STB_GLOBAL;
if (a && !b)
return SYMBOL_A;
if (b && !a)
@@ -227,14 +227,14 @@ void symbols__fixup_duplicate(struct rb_root_cached *symbols)
continue;
if (choose_best_symbol(curr, next) == SYMBOL_A) {
- if (next->type == STT_GNU_IFUNC)
- curr->ifunc_alias = true;
+ if (symbol__type(next) == STT_GNU_IFUNC)
+ symbol__set_ifunc_alias(curr, true);
rb_erase_cached(&next->rb_node, symbols);
symbol__delete(next);
goto again;
} else {
- if (curr->type == STT_GNU_IFUNC)
- next->ifunc_alias = true;
+ if (symbol__type(curr) == STT_GNU_IFUNC)
+ symbol__set_ifunc_alias(next, true);
nd = rb_next(&curr->rb_node);
rb_erase_cached(&curr->rb_node, symbols);
symbol__delete(curr);
@@ -322,8 +322,8 @@ struct symbol *symbol__new(u64 start, u64 len, u8 binding, u8 type, const char *
sym->start = start;
sym->end = len ? start + len : start;
- sym->type = type;
- sym->binding = binding;
+ atomic_init(&sym->flags, (type << SYMBOL_FLAG_TYPE_SHIFT) |
+ (binding << SYMBOL_FLAG_BINDING_SHIFT));
sym->namelen = namelen - 1;
pr_debug4("%s: %s %#" PRIx64 "-%#" PRIx64 "\n",
@@ -345,6 +345,49 @@ void symbol__delete(struct symbol *sym)
free(((void *)sym) - symbol_conf.priv_size);
}
+void symbol__set_ignore(struct symbol *sym, bool ignore)
+{
+ if (ignore)
+ atomic_fetch_or(&sym->flags, SYMBOL_FLAG_IGNORE);
+ else
+ atomic_fetch_and(&sym->flags, ~SYMBOL_FLAG_IGNORE);
+}
+
+void symbol__set_annotate2(struct symbol *sym, bool annotate2)
+{
+ if (annotate2)
+ atomic_fetch_or(&sym->flags, SYMBOL_FLAG_ANNOTATE2);
+ else
+ atomic_fetch_and(&sym->flags, ~SYMBOL_FLAG_ANNOTATE2);
+}
+
+void symbol__set_inlined(struct symbol *sym, bool inlined)
+{
+ if (inlined)
+ atomic_fetch_or(&sym->flags, SYMBOL_FLAG_INLINED);
+ else
+ atomic_fetch_and(&sym->flags, ~SYMBOL_FLAG_INLINED);
+}
+
+void symbol__set_ifunc_alias(struct symbol *sym, bool ifunc_alias)
+{
+ if (ifunc_alias)
+ atomic_fetch_or(&sym->flags, SYMBOL_FLAG_IFUNC_ALIAS);
+ else
+ atomic_fetch_and(&sym->flags, ~SYMBOL_FLAG_IFUNC_ALIAS);
+}
+
+static void symbol__set_idle(struct symbol *sym, bool idle)
+{
+ uint16_t old_flags = atomic_load(&sym->flags);
+ uint16_t new_flags;
+ uint16_t idle_val = idle ? SYMBOL_IDLE__IDLE : SYMBOL_IDLE__NOT_IDLE;
+
+ do {
+ new_flags = old_flags & ~SYMBOL_FLAG_IDLE_MASK;
+ new_flags |= (idle_val << SYMBOL_FLAG_IDLE_SHIFT);
+ } while (!atomic_compare_exchange_weak(&sym->flags, &old_flags, new_flags));
+}
void symbols__delete(struct rb_root_cached *symbols)
{
struct symbol *pos;
@@ -375,7 +418,7 @@ void __symbols__insert(struct rb_root_cached *symbols,
*/
if (name[0] == '.')
name++;
- sym->idle = symbol__is_idle(name);
+ symbol__set_idle(sym, symbol__compute_is_idle(name));
}
while (*p != NULL) {
@@ -717,11 +760,21 @@ int modules__parse(const char *filename, void *arg,
return err;
}
+bool symbol__is_idle(struct symbol *sym,
+ const struct dso *dso __maybe_unused,
+ struct perf_env *env __maybe_unused)
+{
+ uint16_t flags = atomic_load_explicit(&sym->flags, memory_order_relaxed);
+ uint16_t idle_val = (flags & SYMBOL_FLAG_IDLE_MASK) >> SYMBOL_FLAG_IDLE_SHIFT;
+
+ return idle_val == SYMBOL_IDLE__IDLE;
+}
+
/*
* These are symbols in the kernel image, so make sure that
* sym is from a kernel DSO.
*/
-static bool symbol__is_idle(const char *name)
+static bool symbol__compute_is_idle(const char *name)
{
const char * const idle_symbols[] = {
"acpi_idle_do_entry",
@@ -2492,6 +2545,7 @@ void symbol__exit(void)
{
if (!symbol_conf.initialized)
return;
+
strlist__delete(symbol_conf.bt_stop_list);
strlist__delete(symbol_conf.sym_list);
strlist__delete(symbol_conf.dso_list);
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 95592779eb77..16a27074a474 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -6,6 +6,7 @@
#include <linux/refcount.h>
#include <stdbool.h>
#include <stdint.h>
+#include <stdatomic.h>
#include <linux/list.h>
#include <linux/rbtree.h>
#include <stdio.h>
@@ -27,6 +28,7 @@ struct map;
struct maps;
struct option;
struct build_id;
+struct perf_env;
/*
* Ignore kernel mapping symbols, matching kernel is_mapping_symbol() logic.
@@ -58,6 +60,23 @@ Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep,
GElf_Shdr *shp, const char *name, size_t *idx);
#endif
+enum symbol_idle_kind {
+ SYMBOL_IDLE__UNKNOWN = 0,
+ SYMBOL_IDLE__NOT_IDLE = 1,
+ SYMBOL_IDLE__IDLE = 2,
+};
+
+#define SYMBOL_FLAG_TYPE_SHIFT 0
+#define SYMBOL_FLAG_TYPE_MASK (0xF << SYMBOL_FLAG_TYPE_SHIFT)
+#define SYMBOL_FLAG_BINDING_SHIFT 4
+#define SYMBOL_FLAG_BINDING_MASK (0xF << SYMBOL_FLAG_BINDING_SHIFT)
+#define SYMBOL_FLAG_IDLE_SHIFT 8
+#define SYMBOL_FLAG_IDLE_MASK (0x3 << SYMBOL_FLAG_IDLE_SHIFT)
+#define SYMBOL_FLAG_IGNORE (1 << 10)
+#define SYMBOL_FLAG_INLINED (1 << 11)
+#define SYMBOL_FLAG_ANNOTATE2 (1 << 12)
+#define SYMBOL_FLAG_IFUNC_ALIAS (1 << 13)
+
/**
* A symtab entry. When allocated this may be preceded by an annotation (see
* symbol__annotation) and/or a browser_index (see symbol__browser_index).
@@ -69,20 +88,7 @@ struct symbol {
u64 end;
/** Length of the string name. */
u16 namelen;
- /** ELF symbol type as defined for st_info. E.g STT_OBJECT or STT_FUNC. */
- u8 type:4;
- /** ELF binding type as defined for st_info. E.g. STB_WEAK or STB_GLOBAL. */
- u8 binding:4;
- /** Set true for kernel symbols of idle routines. */
- u8 idle:1;
- /** Resolvable but tools ignore it (e.g. idle routines). */
- u8 ignore:1;
- /** Symbol for an inlined function. */
- u8 inlined:1;
- /** Has symbol__annotate2 been performed. */
- u8 annotate2:1;
- /** Symbol is an alias of an STT_GNU_IFUNC */
- u8 ifunc_alias:1;
+ _Atomic uint16_t flags;
/** Architecture specific. Unused except on PPC where it holds st_other. */
u8 arch_sym;
/** The name of length namelen associated with the symbol. */
@@ -92,6 +98,49 @@ struct symbol {
void symbol__delete(struct symbol *sym);
void symbols__delete(struct rb_root_cached *symbols);
+static inline u8 symbol__type(const struct symbol *sym)
+{
+ return (atomic_load_explicit(&sym->flags, memory_order_relaxed) &
+ SYMBOL_FLAG_TYPE_MASK) >> SYMBOL_FLAG_TYPE_SHIFT;
+}
+
+static inline u8 symbol__binding(const struct symbol *sym)
+{
+ return (atomic_load_explicit(&sym->flags, memory_order_relaxed) &
+ SYMBOL_FLAG_BINDING_MASK) >> SYMBOL_FLAG_BINDING_SHIFT;
+}
+
+static inline bool symbol__ignore(const struct symbol *sym)
+{
+ return (atomic_load_explicit(&sym->flags, memory_order_relaxed) &
+ SYMBOL_FLAG_IGNORE) != 0;
+}
+
+static inline bool symbol__inlined(const struct symbol *sym)
+{
+ return (atomic_load_explicit(&sym->flags, memory_order_relaxed) &
+ SYMBOL_FLAG_INLINED) != 0;
+}
+
+static inline bool symbol__is_annotate2(const struct symbol *sym)
+{
+ return (atomic_load_explicit(&sym->flags, memory_order_relaxed) &
+ SYMBOL_FLAG_ANNOTATE2) != 0;
+}
+
+static inline bool symbol__ifunc_alias(const struct symbol *sym)
+{
+ return (atomic_load_explicit(&sym->flags, memory_order_relaxed) &
+ SYMBOL_FLAG_IFUNC_ALIAS) != 0;
+}
+
+bool symbol__is_idle(struct symbol *sym, const struct dso *dso, struct perf_env *env);
+
+void symbol__set_ignore(struct symbol *sym, bool ignore);
+void symbol__set_annotate2(struct symbol *sym, bool annotate2);
+void symbol__set_inlined(struct symbol *sym, bool inlined);
+void symbol__set_ifunc_alias(struct symbol *sym, bool ifunc_alias);
+
/* symbols__for_each_entry - iterate over symbols (rb_root)
*
* @symbols: the rb_root of symbols
@@ -169,7 +218,6 @@ int filename__read_debuglink(const char *filename, char *debuglink,
size_t size);
bool filename__has_section(const char *filename, const char *sec);
-struct perf_env;
int symbol__init(struct perf_env *env);
void symbol__exit(void);
void symbol__elf_init(void);
diff --git a/tools/perf/util/symbol_fprintf.c b/tools/perf/util/symbol_fprintf.c
index 53e1af4ed9ac..4dc8d5761f52 100644
--- a/tools/perf/util/symbol_fprintf.c
+++ b/tools/perf/util/symbol_fprintf.c
@@ -11,8 +11,8 @@ size_t symbol__fprintf(struct symbol *sym, FILE *fp)
{
return fprintf(fp, " %" PRIx64 "-%" PRIx64 " %c %s\n",
sym->start, sym->end,
- sym->binding == STB_GLOBAL ? 'g' :
- sym->binding == STB_LOCAL ? 'l' : 'w',
+ symbol__binding(sym) == STB_GLOBAL ? 'g' :
+ symbol__binding(sym) == STB_LOCAL ? 'l' : 'w',
sym->name);
}
--
2.54.0.929.g9b7fa37559-googSwitch from an idle boolean to a helper symbol__is_idle function. In
the function lazily compute whether a symbol is an idle function
taking into consideration the kernel version and architecture of the
machine. As symbols__insert no longer needs to know if a symbol is for
the kernel, remove the argument.
To protect against drop-filtering of legitimate setup, online, or hotplug
management functions (such as intel_idle_init), x86 matches are strictly
constrained to exact known run-loops (intel_idle, intel_idle_irq,
mwait_idle, mwait_idle_with_hints).
If the target environment OS release is unresolvable (such as on guest
traces), default to treating psw_idle as idle to prevent false
negatives and match legacy trace behavior safely.
This change is inspired by mailing list discussion, particularly from
Thomas Richter <tmricht@linux.ibm.com> and Heiko Carstens
<hca@linux.ibm.com>:
https://lore.kernel.org/lkml/20260219113850.354271-1-tmricht@linux.ibm.com/
Assisted-by: Gemini:gemini-3.1-pro-preview
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/symbol-elf.c | 2 +-
tools/perf/util/symbol.c | 146 +++++++++++++++++++++++------------
tools/perf/util/symbol.h | 4 +-
3 files changed, 100 insertions(+), 52 deletions(-)
diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index c5ed5e051976..186e6d92ac3d 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -1734,7 +1734,7 @@ dso__load_sym_internal(struct dso *dso, struct map *map, struct symsrc *syms_ss,
arch__sym_update(f, &sym);
- __symbols__insert(dso__symbols(curr_dso), f, dso__kernel(dso));
+ __symbols__insert(dso__symbols(curr_dso), f);
nr++;
}
dso__put(curr_dso);
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index ddd3106b03b1..0c46b24ee098 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -50,7 +50,6 @@
static int dso__load_kernel_sym(struct dso *dso, struct map *map);
static int dso__load_guest_kernel_sym(struct dso *dso, struct map *map);
-static bool symbol__compute_is_idle(const char *name);
int vmlinux_path__nr_entries;
char **vmlinux_path;
@@ -379,7 +378,7 @@ void symbol__set_ifunc_alias(struct symbol *sym, bool ifunc_alias)
static void symbol__set_idle(struct symbol *sym, bool idle)
{
- uint16_t old_flags = atomic_load(&sym->flags);
+ uint16_t old_flags = atomic_load_explicit(&sym->flags, memory_order_relaxed);
uint16_t new_flags;
uint16_t idle_val = idle ? SYMBOL_IDLE__IDLE : SYMBOL_IDLE__NOT_IDLE;
@@ -401,8 +400,7 @@ void symbols__delete(struct rb_root_cached *symbols)
}
}
-void __symbols__insert(struct rb_root_cached *symbols,
- struct symbol *sym, bool kernel)
+void __symbols__insert(struct rb_root_cached *symbols, struct symbol *sym)
{
struct rb_node **p = &symbols->rb_root.rb_node;
struct rb_node *parent = NULL;
@@ -410,17 +408,6 @@ void __symbols__insert(struct rb_root_cached *symbols,
struct symbol *s;
bool leftmost = true;
- if (kernel) {
- const char *name = sym->name;
- /*
- * ppc64 uses function descriptors and appends a '.' to the
- * start of every instruction address. Remove it.
- */
- if (name[0] == '.')
- name++;
- symbol__set_idle(sym, symbol__compute_is_idle(name));
- }
-
while (*p != NULL) {
parent = *p;
s = rb_entry(parent, struct symbol, rb_node);
@@ -437,7 +424,7 @@ void __symbols__insert(struct rb_root_cached *symbols,
void symbols__insert(struct rb_root_cached *symbols, struct symbol *sym)
{
- __symbols__insert(symbols, sym, false);
+ __symbols__insert(symbols, sym);
}
static struct symbol *symbols__find(struct rb_root_cached *symbols, u64 ip)
@@ -598,7 +585,7 @@ void dso__reset_find_symbol_cache(struct dso *dso)
void dso__insert_symbol(struct dso *dso, struct symbol *sym)
{
- __symbols__insert(dso__symbols(dso), sym, dso__kernel(dso));
+ __symbols__insert(dso__symbols(dso), sym);
/* update the symbol cache if necessary */
if (dso__last_find_result_addr(dso) >= sym->start &&
@@ -760,57 +747,120 @@ int modules__parse(const char *filename, void *arg,
return err;
}
-bool symbol__is_idle(struct symbol *sym,
- const struct dso *dso __maybe_unused,
- struct perf_env *env __maybe_unused)
-{
- uint16_t flags = atomic_load_explicit(&sym->flags, memory_order_relaxed);
- uint16_t idle_val = (flags & SYMBOL_FLAG_IDLE_MASK) >> SYMBOL_FLAG_IDLE_SHIFT;
-
- return idle_val == SYMBOL_IDLE__IDLE;
-}
/*
* These are symbols in the kernel image, so make sure that
* sym is from a kernel DSO.
*/
-static bool symbol__compute_is_idle(const char *name)
+static int sym_name_cmp(const void *a, const void *b)
+{
+ const char *name = a;
+ const char *const *sym = b;
+
+ return strcmp(name, *sym);
+}
+
+static bool match_x86_idle_routine(const char *name, const char *base)
{
- const char * const idle_symbols[] = {
+ if (strstarts(name, base)) {
+ size_t len = strlen(base);
+
+ if (name[len] == '\0' || name[len] == '.')
+ return true;
+ }
+ return false;
+}
+
+bool symbol__is_idle(struct symbol *sym, const struct dso *dso, struct perf_env *env)
+{
+ static const char * const idle_symbols[] = {
"acpi_idle_do_entry",
"acpi_processor_ffh_cstate_enter",
"arch_cpu_idle",
"cpu_idle",
"cpu_startup_entry",
- "idle_cpu",
- "intel_idle",
- "intel_idle_ibrs",
"default_idle",
- "native_safe_halt",
"enter_idle",
"exit_idle",
- "mwait_idle",
- "mwait_idle_with_hints",
- "mwait_idle_with_hints.constprop.0",
+ "idle_cpu",
+ "native_safe_halt",
"poll_idle",
- "ppc64_runlatch_off",
"pseries_dedicated_idle_sleep",
- "psw_idle",
- "psw_idle_exit",
- NULL
};
- int i;
- static struct strlist *idle_symbols_list;
+ const char *name = sym->name;
+ uint16_t e_machine;
- if (idle_symbols_list)
- return strlist__has_entry(idle_symbols_list, name);
+ {
+ uint16_t flags = atomic_load_explicit(&sym->flags, memory_order_relaxed);
+ uint16_t idle_val = (flags & SYMBOL_FLAG_IDLE_MASK) >> SYMBOL_FLAG_IDLE_SHIFT;
- idle_symbols_list = strlist__new(NULL, NULL);
+ if (idle_val != SYMBOL_IDLE__UNKNOWN)
+ return idle_val == SYMBOL_IDLE__IDLE;
+ }
- for (i = 0; idle_symbols[i]; i++)
- strlist__add(idle_symbols_list, idle_symbols[i]);
+ if (!dso || dso__kernel(dso) == DSO_SPACE__USER) {
+ symbol__set_idle(sym, /*idle=*/false);
+ return false;
+ }
+
+ /*
+ * ppc64 uses function descriptors and appends a '.' to the
+ * start of every instruction address. Remove it.
+ */
+ if (name[0] == '.')
+ name++;
+
+ if (bsearch(name, idle_symbols, ARRAY_SIZE(idle_symbols),
+ sizeof(idle_symbols[0]), sym_name_cmp)) {
+ symbol__set_idle(sym, /*idle=*/true);
+ return true;
+ }
+
+ e_machine = (env && env->arch) ? perf_env__e_machine(env, NULL) : EM_NONE;
+ if (e_machine == EM_NONE && dso)
+ e_machine = dso__e_machine((struct dso *)dso, NULL, NULL);
+ if (e_machine == EM_NONE && env)
+ e_machine = perf_env__e_machine(env, NULL);
+
+ if (e_machine == EM_386 || e_machine == EM_X86_64) {
+ if (match_x86_idle_routine(name, "intel_idle") ||
+ match_x86_idle_routine(name, "intel_idle_irq") ||
+ match_x86_idle_routine(name, "intel_idle_ibrs") ||
+ match_x86_idle_routine(name, "mwait_idle") ||
+ match_x86_idle_routine(name, "mwait_idle_with_hints")) {
+ symbol__set_idle(sym, /*idle=*/true);
+ return true;
+ }
+ }
+
+ if (e_machine == EM_PPC64 && !strcmp(name, "ppc64_runlatch_off")) {
+ symbol__set_idle(sym, /*idle=*/true);
+ return true;
+ }
+
+ if (e_machine == EM_S390 && strstarts(name, "psw_idle")) {
+ int major = 0, minor = 0;
+ const char *release = env ? perf_env__os_release(env) : NULL;
- return strlist__has_entry(idle_symbols_list, name);
+ /*
+ * If we can't determine the release (e.g. unpopulated guest traces),
+ * default to idle.
+ */
+ if (!release) {
+ symbol__set_idle(sym, /*idle=*/true);
+ return true;
+ }
+
+ /* Before v6.10, s390 used psw_idle. */
+ if (sscanf(release, "%d.%d", &major, &minor) == 2 &&
+ (major < 6 || (major == 6 && minor < 10))) {
+ symbol__set_idle(sym, /*idle=*/true);
+ return true;
+ }
+ }
+
+ symbol__set_idle(sym, /*idle=*/false);
+ return false;
}
static int map__process_kallsym_symbol(void *arg, const char *name,
@@ -839,7 +889,7 @@ static int map__process_kallsym_symbol(void *arg, const char *name,
* We will pass the symbols to the filter later, in
* map__split_kallsyms, when we have split the maps per module
*/
- __symbols__insert(root, sym, !strchr(name, '['));
+ __symbols__insert(root, sym);
return 0;
}
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 16a27074a474..a71525335703 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -76,7 +76,6 @@ enum symbol_idle_kind {
#define SYMBOL_FLAG_INLINED (1 << 11)
#define SYMBOL_FLAG_ANNOTATE2 (1 << 12)
#define SYMBOL_FLAG_IFUNC_ALIAS (1 << 13)
-
/**
* A symtab entry. When allocated this may be preceded by an annotation (see
* symbol__annotation) and/or a browser_index (see symbol__browser_index).
@@ -257,8 +256,7 @@ int dso__synthesize_plt_symbols(struct dso *dso, struct symsrc *ss);
char *dso__demangle_sym(struct dso *dso, int kmodule, const char *elf_name);
-void __symbols__insert(struct rb_root_cached *symbols, struct symbol *sym,
- bool kernel);
+void __symbols__insert(struct rb_root_cached *symbols, struct symbol *sym);
void symbols__insert(struct rb_root_cached *symbols, struct symbol *sym);
void symbols__fixup_duplicate(struct rb_root_cached *symbols);
void symbols__fixup_end(struct rb_root_cached *symbols, bool is_kallsyms);
--
2.54.0.929.g9b7fa37559-goog© 2016 - 2026 Red Hat, Inc.