Skip to contentSkip to conversation

perf build: Allow C++ demangle without libelf

PATCH Applied Ian Rogers 2 participants 3 messages Apr 3, 2023 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/2 perf build: Allow C++ demangle without libelf

The cxa demangle support isn't dependent on libelf and so we no longer need to disable demangling if libelf isn't present.

---
 tools/perf/Makefile.config | 1 -
 1 file changed, 1 deletion(-)
tools/perf/Makefile.config +0 -1
index 236d763181c5..dd203f0a2b7e 100644
@@ -412,7 +412,6 @@ endif
 
 ifdef NO_LIBELF
   NO_DWARF := 1
-  NO_DEMANGLE := 1
   NO_LIBUNWIND := 1
   NO_LIBDW_DWARF_UNWIND := 1
   NO_LIBBPF := 1
Signature · 1 line
2.40.0.348.gf938b09366-goog
author reviewer
#1 lore raw

PATCH 2/2 perf build: Warn for BPF skeletons if endian mismatches

Done as a warning as I'm not fully confident of the test's robustness of comparing the macro definition of __BYTE_ORDER__.

---
 tools/perf/Makefile.config | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
tools/perf/Makefile.config +10 -7
index dd203f0a2b7e..4be817ea4a59 100644
@@ -659,14 +659,17 @@ ifndef NO_BPF_SKEL
   $(call feature_check,clang-bpf-co-re)
   ifeq ($(feature-clang-bpf-co-re), 0)
     dummy := $(error: ERROR: BPF skeletons unsupported. clang too old/not installed or build with NO_BPF_SKEL=1.)
-  else
-    ifeq ($(filter -DHAVE_LIBBPF_SUPPORT, $(CFLAGS)),)
-      dummy := $(error: ERROR: BPF skeletons unsupported. BPF skeleton support requires libbpf or build with NO_BPF_SKEL=1.)
-    else
-      $(call detected,CONFIG_PERF_BPF_SKEL)
-      CFLAGS += -DHAVE_BPF_SKEL
-    endif
   endif
+  ifeq ($(filter -DHAVE_LIBBPF_SUPPORT, $(CFLAGS)),)
+    dummy := $(error: ERROR: BPF skeletons unsupported. BPF skeleton support requires libbpf or build with NO_BPF_SKEL=1.)
+  endif
+  host_byte_order=$(echo ""|$(HOSTCC) -dM -E -|grep __BYTE_ORDER__)
+  target_byte_order=$(echo ""|$(CC) -dM -E -|grep __BYTE_ORDER__)
+  ifneq ($(host_byte_order), $(target_byte_order))
+    $(warning Possibly mismatched host and target endianness may break BPF skeletons)
+  endif
+  $(call detected,CONFIG_PERF_BPF_SKEL)
+  CFLAGS += -DHAVE_BPF_SKEL
 endif
 
 dwarf-post-unwind := 1
Signature · 1 line
2.40.0.348.gf938b09366-goog
maintainer Applied
#2 lore raw
In reply to Ian Rogers

Em Mon, Apr 03, 2023 at 02:10:20PM -0700, Ian Rogers escreveu:

Quoted 2 lines

The cxa demangle support isn't dependent on libelf and so we no longer need to disable demangling if libelf isn't present.

Thanks, applied.

- Arnaldo

Quoted 20 lines
---
 tools/perf/Makefile.config | 1 -
 1 file changed, 1 deletion(-)
tools/perf/Makefile.config +0 -1
index 236d763181c5..dd203f0a2b7e 100644
@@ -412,7 +412,6 @@ endif
 
 ifdef NO_LIBELF
   NO_DWARF := 1
-  NO_DEMANGLE := 1
   NO_LIBUNWIND := 1
   NO_LIBDW_DWARF_UNWIND := 1
   NO_LIBBPF := 1
Signature · 1 line
2.40.0.348.gf938b09366-goog
Signature · 1 line
- Arnaldo