Skip to contentSkip to conversation

perf tools: Fix dynamic libbpf link

PATCH Applied Jiri Olsa 3 participants 3 messages May 8, 2021 – May 10, 2021 perf events

lore
Share & tools
lore

Jiri Olsa

author reviewer
#0 lore raw

PATCH 1/1 perf tools: Fix dynamic libbpf link

Justin reported broken build with LIBBPF_DYNAMIC=1.

When linking libbpf dynamically we need to use perf's hashmap object, because it's not exported in libbpf.so (only in libbpf.a).

Following build is now passing:

  $ make LIBBPF_DYNAMIC=1
    BUILD:   Doing 'make -j8' parallel build
    ...
  $ ldd perf | grep libbpf
        libbpf.so.0 => /lib64/libbpf.so.0 (0x00007fa7630db000)
Fixes eee19501926d ("perf tools: Grab a copy of libbpf's hashmap")
Cc Ian Rogers <[email protected]>
Reported-by Justin M. Forbes <[email protected]>
Signed-off-by Jiri Olsa <[email protected]>
---
 tools/perf/Makefile.config | 1 +
 tools/perf/util/Build      | 7 +++++++
 2 files changed, 8 insertions(+)
tools/perf/Makefile.config +1 -0
index 7b195e16040e..dacd16874d3d 100644
@@ -546,6 +546,7 @@ ifndef NO_LIBELF
       ifdef LIBBPF_DYNAMIC
         ifeq ($(feature-libbpf), 1)
           EXTLIBS += -lbpf
+          $(call detected,CONFIG_LIBBPF_DYNAMIC)
         else
           dummy := $(error Error: No libbpf devel library found, please install libbpf-devel);
         endif
tools/perf/util/Build +7 -0
index e27a551acd3a..95e15d1035ab 100644
@@ -145,7 +145,14 @@ perf-$(CONFIG_LIBELF) += symbol-elf.o
 perf-$(CONFIG_LIBELF) += probe-file.o
 perf-$(CONFIG_LIBELF) += probe-event.o
 
+ifdef CONFIG_LIBBPF_DYNAMIC
+  hashmap := 1
+endif
 ifndef CONFIG_LIBBPF
+  hashmap := 1
+endif
+
+ifdef hashmap
 perf-y += hashmap.o
 endif
Signature · 1 line
2.31.1
maintainer Applied
#1 lore raw

Em Sat, May 08, 2021 at 10:50:20PM +0200, Jiri Olsa escreveu:

Quoted 6 lines

Justin reported broken build with LIBBPF_DYNAMIC=1.

When linking libbpf dynamically we need to use perf's hashmap object, because it's not exported in libbpf.so (only in libbpf.a).

Quoted 7 lines

Following build is now passing:

  $ make LIBBPF_DYNAMIC=1
    BUILD:   Doing 'make -j8' parallel build
    ...
  $ ldd perf | grep libbpf
        libbpf.so.0 => /lib64/libbpf.so.0 (0x00007fa7630db000)

Thanks, applied.

- Arnaldo

Quoted 43 lines
Fixes eee19501926d ("perf tools: Grab a copy of libbpf's hashmap")
Cc Ian Rogers <[email protected]>
Reported-by Justin M. Forbes <[email protected]>
Signed-off-by Jiri Olsa <[email protected]>
---
 tools/perf/Makefile.config | 1 +
 tools/perf/util/Build      | 7 +++++++
 2 files changed, 8 insertions(+)
tools/perf/Makefile.config +1 -0
index 7b195e16040e..dacd16874d3d 100644
@@ -546,6 +546,7 @@ ifndef NO_LIBELF
       ifdef LIBBPF_DYNAMIC
         ifeq ($(feature-libbpf), 1)
           EXTLIBS += -lbpf
+          $(call detected,CONFIG_LIBBPF_DYNAMIC)
         else
           dummy := $(error Error: No libbpf devel library found, please install libbpf-devel);
         endif
tools/perf/util/Build +7 -0
index e27a551acd3a..95e15d1035ab 100644
@@ -145,7 +145,14 @@ perf-$(CONFIG_LIBELF) += symbol-elf.o
 perf-$(CONFIG_LIBELF) += probe-file.o
 perf-$(CONFIG_LIBELF) += probe-event.o
 
+ifdef CONFIG_LIBBPF_DYNAMIC
+  hashmap := 1
+endif
 ifndef CONFIG_LIBBPF
+  hashmap := 1
+endif
+
+ifdef hashmap
 perf-y += hashmap.o
 endif
Signature · 1 line
2.31.1
Signature · 1 line
- Arnaldo
Tested-by Justin M. Forbes on v1 1/1
#2 lore raw
In reply to Jiri Olsa
Quoted 15 lines · Jiri Olsa

Justin reported broken build with LIBBPF_DYNAMIC=1.

When linking libbpf dynamically we need to use perf's hashmap object, because it's not exported in libbpf.so (only in libbpf.a).

Following build is now passing:

  $ make LIBBPF_DYNAMIC=1
    BUILD:   Doing 'make -j8' parallel build
    ...
  $ ldd perf | grep libbpf
        libbpf.so.0 => /lib64/libbpf.so.0 (0x00007fa7630db000)
Quoted 5 lines
Fixes eee19501926d ("perf tools: Grab a copy of libbpf's hashmap")
Cc Ian Rogers <[email protected]>
Reported-by Justin M. Forbes <[email protected]>
Signed-off-by Jiri Olsa <[email protected]>

---

This patch fixes it for me.

Tested-by Justin M. Forbes <[email protected]>
Quoted 38 lines
 tools/perf/Makefile.config | 1 +
 tools/perf/util/Build      | 7 +++++++
 2 files changed, 8 insertions(+)
tools/perf/Makefile.config +1 -0
index 7b195e16040e..dacd16874d3d 100644
@@ -546,6 +546,7 @@ ifndef NO_LIBELF
       ifdef LIBBPF_DYNAMIC
         ifeq ($(feature-libbpf), 1)
           EXTLIBS += -lbpf
+          $(call detected,CONFIG_LIBBPF_DYNAMIC)
         else
           dummy := $(error Error: No libbpf devel library found, please install libbpf-devel);
         endif
tools/perf/util/Build +7 -1
index e27a551acd3a..95e15d1035ab 100644
@@ -145,7 +145,14 @@ perf-$(CONFIG_LIBELF) += symbol-elf.o
 perf-$(CONFIG_LIBELF) += probe-file.o
 perf-$(CONFIG_LIBELF) += probe-event.o
 
+ifdef CONFIG_LIBBPF_DYNAMIC
+  hashmap := 1
+endif
 ifndef CONFIG_LIBBPF
+  hashmap := 1
+endif
+
+ifdef hashmap
 perf-y += hashmap.o
 endif
 
--

2.31.1