* [PATCH] perf: enable libtraceevent dynamic linking
@ 2021-04-28 9:20 Michael Petlan
2021-04-28 16:29 ` Jiri Olsa
0 siblings, 1 reply; 5+ messages in thread
From: Michael Petlan @ 2021-04-28 9:20 UTC (permalink / raw)
To: acme, jolsa, linux-perf-users
Currently we support only static linking with kernel's libtraceevent
(tools/lib/traceevent). This patch adds libtraceevent package detection
and support to link perf with it dynamically.
The libtraceevent package status is displayed with:
$ make VF=1 LIBTRACEEVENT_DYNAMIC=1
...
... libtraceevent: [ on ]
Default behavior remains the same (static linking).
Signed-off-by: Michael Petlan <mpetlan@redhat.com>
---
tools/build/Makefile.feature | 1 +
tools/build/feature/Makefile | 4 ++++
tools/build/feature/test-libtraceevent.c | 12 ++++++++++++
tools/perf/Makefile.config | 9 +++++++++
tools/perf/Makefile.perf | 8 ++++++--
5 files changed, 32 insertions(+), 2 deletions(-)
create mode 100644 tools/build/feature/test-libtraceevent.c
diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
index 74e255d58d8d..b3221a43fa65 100644
--- a/tools/build/Makefile.feature
+++ b/tools/build/Makefile.feature
@@ -52,6 +52,7 @@ FEATURE_TESTS_BASIC := \
libpython-version \
libslang \
libslang-include-subdir \
+ libtraceevent \
libcrypto \
libunwind \
pthread-attr-setaffinity-np \
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index 3e55edb3ea54..ec203e28407f 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -36,6 +36,7 @@ FILES= \
test-libpython-version.bin \
test-libslang.bin \
test-libslang-include-subdir.bin \
+ test-libtraceevent.bin \
test-libcrypto.bin \
test-libunwind.bin \
test-libunwind-debug-frame.bin \
@@ -196,6 +197,9 @@ $(OUTPUT)test-libslang.bin:
$(OUTPUT)test-libslang-include-subdir.bin:
$(BUILD) -lslang
+$(OUTPUT)test-libtraceevent.bin:
+ $(BUILD) -ltraceevent
+
$(OUTPUT)test-libcrypto.bin:
$(BUILD) -lcrypto
diff --git a/tools/build/feature/test-libtraceevent.c b/tools/build/feature/test-libtraceevent.c
new file mode 100644
index 000000000000..416b11ffd4b4
--- /dev/null
+++ b/tools/build/feature/test-libtraceevent.c
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <traceevent/trace-seq.h>
+
+int main(void)
+{
+ int rv = 0;
+ struct trace_seq s;
+ trace_seq_init(&s);
+ rv += !(s.state == TRACE_SEQ__GOOD);
+ trace_seq_destroy(&s);
+ return rv;
+}
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 3514fe956ed1..99c73a7b6a26 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -1079,6 +1079,15 @@ ifdef LIBPFM4
endif
endif
+ifdef LIBTRACEEVENT_DYNAMIC
+ $(call feature_check,libtraceevent)
+ ifeq ($(feature-libtraceevent), 1)
+ EXTLIBS += -ltraceevent
+ else
+ dummy := $(error Error: No libtraceevent devel library found, please install libtraceevent-devel);
+ endif
+endif
+
# Among the variables below, these:
# perfexecdir
# perf_include_dir
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 090fb9d62665..fde8ca22d117 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -128,6 +128,8 @@ include ../scripts/utilities.mak
#
# Define BUILD_BPF_SKEL to enable BPF skeletons
#
+# Define LIBTRACEEVENT_DYNAMIC to enable libtraceevent dynamic linking
+#
# As per kernel Makefile, avoid funny character set dependencies
unexport LC_ALL
@@ -309,7 +311,6 @@ endif
LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
export LIBTRACEEVENT
-
LIBTRACEEVENT_DYNAMIC_LIST = $(PLUGINS_PATH)libtraceevent-dynamic-list
#
@@ -374,12 +375,15 @@ endif
export PERL_PATH
-PERFLIBS = $(LIBAPI) $(LIBTRACEEVENT) $(LIBSUBCMD) $(LIBPERF)
+PERFLIBS = $(LIBAPI) $(LIBSUBCMD) $(LIBPERF)
ifndef NO_LIBBPF
ifndef LIBBPF_DYNAMIC
PERFLIBS += $(LIBBPF)
endif
endif
+ifndef LIBTRACEEVENT_DYNAMIC
+ PERFLIBS += $(LIBTRACEEVENT)
+endif
# We choose to avoid "if .. else if .. else .. endif endif"
# because maintaining the nesting to match is a pain. If
--
2.18.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] perf: enable libtraceevent dynamic linking
2021-04-28 9:20 [PATCH] perf: enable libtraceevent dynamic linking Michael Petlan
@ 2021-04-28 16:29 ` Jiri Olsa
2021-04-30 12:59 ` Michael Petlan
0 siblings, 1 reply; 5+ messages in thread
From: Jiri Olsa @ 2021-04-28 16:29 UTC (permalink / raw)
To: Michael Petlan; +Cc: acme, linux-perf-users
On Wed, Apr 28, 2021 at 11:20:23AM +0200, Michael Petlan wrote:
SNIP
> unexport LC_ALL
> @@ -309,7 +311,6 @@ endif
>
> LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
> export LIBTRACEEVENT
> -
> LIBTRACEEVENT_DYNAMIC_LIST = $(PLUGINS_PATH)libtraceevent-dynamic-list
>
> #
> @@ -374,12 +375,15 @@ endif
>
> export PERL_PATH
>
> -PERFLIBS = $(LIBAPI) $(LIBTRACEEVENT) $(LIBSUBCMD) $(LIBPERF)
> +PERFLIBS = $(LIBAPI) $(LIBSUBCMD) $(LIBPERF)
> ifndef NO_LIBBPF
> ifndef LIBBPF_DYNAMIC
> PERFLIBS += $(LIBBPF)
> endif
> endif
> +ifndef LIBTRACEEVENT_DYNAMIC
> + PERFLIBS += $(LIBTRACEEVENT)
> +endif
there's also install-traceevent-plugins target called during install,
which should be skipped for LIBTRACEEVENT_DYNAMIC
jirka
>
> # We choose to avoid "if .. else if .. else .. endif endif"
> # because maintaining the nesting to match is a pain. If
> --
> 2.18.4
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] perf: enable libtraceevent dynamic linking
2021-04-28 16:29 ` Jiri Olsa
@ 2021-04-30 12:59 ` Michael Petlan
2021-04-30 13:28 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 5+ messages in thread
From: Michael Petlan @ 2021-04-30 12:59 UTC (permalink / raw)
To: Jiri Olsa; +Cc: acme, linux-perf-users
On Wed, 28 Apr 2021, Jiri Olsa wrote:
> On Wed, Apr 28, 2021 at 11:20:23AM +0200, Michael Petlan wrote:
>
> SNIP
>
> > unexport LC_ALL
> > @@ -309,7 +311,6 @@ endif
> >
> > LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
> > export LIBTRACEEVENT
> > -
> > LIBTRACEEVENT_DYNAMIC_LIST = $(PLUGINS_PATH)libtraceevent-dynamic-list
> >
> > #
> > @@ -374,12 +375,15 @@ endif
> >
> > export PERL_PATH
> >
> > -PERFLIBS = $(LIBAPI) $(LIBTRACEEVENT) $(LIBSUBCMD) $(LIBPERF)
> > +PERFLIBS = $(LIBAPI) $(LIBSUBCMD) $(LIBPERF)
> > ifndef NO_LIBBPF
> > ifndef LIBBPF_DYNAMIC
> > PERFLIBS += $(LIBBPF)
> > endif
> > endif
> > +ifndef LIBTRACEEVENT_DYNAMIC
> > + PERFLIBS += $(LIBTRACEEVENT)
> > +endif
>
> there's also install-traceevent-plugins target called during install,
> which should be skipped for LIBTRACEEVENT_DYNAMIC
Oh, didn't notice that. Thanks.
However, it seems that's not all what we miss in the patch.
Seems that libtraceevent-dynamic-list should be also taken
from external libtraceevent, when linked dynamically, shouldn't
it.
>
> jirka
>
> >
> > # We choose to avoid "if .. else if .. else .. endif endif"
> > # because maintaining the nesting to match is a pain. If
> > --
> > 2.18.4
> >
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] perf: enable libtraceevent dynamic linking
2021-04-30 12:59 ` Michael Petlan
@ 2021-04-30 13:28 ` Arnaldo Carvalho de Melo
2021-04-30 13:53 ` Michael Petlan
0 siblings, 1 reply; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-04-30 13:28 UTC (permalink / raw)
To: Michael Petlan; +Cc: Jiri Olsa, acme, linux-perf-users
Em Fri, Apr 30, 2021 at 02:59:00PM +0200, Michael Petlan escreveu:
> On Wed, 28 Apr 2021, Jiri Olsa wrote:
> > On Wed, Apr 28, 2021 at 11:20:23AM +0200, Michael Petlan wrote:
> >
> > SNIP
> >
> > > unexport LC_ALL
> > > @@ -309,7 +311,6 @@ endif
> > >
> > > LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
> > > export LIBTRACEEVENT
> > > -
> > > LIBTRACEEVENT_DYNAMIC_LIST = $(PLUGINS_PATH)libtraceevent-dynamic-list
> > >
> > > #
> > > @@ -374,12 +375,15 @@ endif
> > >
> > > export PERL_PATH
> > >
> > > -PERFLIBS = $(LIBAPI) $(LIBTRACEEVENT) $(LIBSUBCMD) $(LIBPERF)
> > > +PERFLIBS = $(LIBAPI) $(LIBSUBCMD) $(LIBPERF)
> > > ifndef NO_LIBBPF
> > > ifndef LIBBPF_DYNAMIC
> > > PERFLIBS += $(LIBBPF)
> > > endif
> > > endif
> > > +ifndef LIBTRACEEVENT_DYNAMIC
> > > + PERFLIBS += $(LIBTRACEEVENT)
> > > +endif
> >
> > there's also install-traceevent-plugins target called during install,
> > which should be skipped for LIBTRACEEVENT_DYNAMIC
>
> Oh, didn't notice that. Thanks.
>
> However, it seems that's not all what we miss in the patch.
> Seems that libtraceevent-dynamic-list should be also taken
> from external libtraceevent, when linked dynamically, shouldn't
> it.
Please send patches on top of what you already sent, that I have already
merged and sent upstream, since it is opt-in.
- Arnaldo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] perf: enable libtraceevent dynamic linking
2021-04-30 13:28 ` Arnaldo Carvalho de Melo
@ 2021-04-30 13:53 ` Michael Petlan
0 siblings, 0 replies; 5+ messages in thread
From: Michael Petlan @ 2021-04-30 13:53 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo; +Cc: Jiri Olsa, acme, linux-perf-users
On Fri, 30 Apr 2021, Arnaldo Carvalho de Melo wrote:
> Em Fri, Apr 30, 2021 at 02:59:00PM +0200, Michael Petlan escreveu:
> > On Wed, 28 Apr 2021, Jiri Olsa wrote:
> > > On Wed, Apr 28, 2021 at 11:20:23AM +0200, Michael Petlan wrote:
> > >
> > > SNIP
> > >
> > > > unexport LC_ALL
> > > > @@ -309,7 +311,6 @@ endif
> > > >
> > > > LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
> > > > export LIBTRACEEVENT
> > > > -
> > > > LIBTRACEEVENT_DYNAMIC_LIST = $(PLUGINS_PATH)libtraceevent-dynamic-list
> > > >
> > > > #
> > > > @@ -374,12 +375,15 @@ endif
> > > >
> > > > export PERL_PATH
> > > >
> > > > -PERFLIBS = $(LIBAPI) $(LIBTRACEEVENT) $(LIBSUBCMD) $(LIBPERF)
> > > > +PERFLIBS = $(LIBAPI) $(LIBSUBCMD) $(LIBPERF)
> > > > ifndef NO_LIBBPF
> > > > ifndef LIBBPF_DYNAMIC
> > > > PERFLIBS += $(LIBBPF)
> > > > endif
> > > > endif
> > > > +ifndef LIBTRACEEVENT_DYNAMIC
> > > > + PERFLIBS += $(LIBTRACEEVENT)
> > > > +endif
> > >
> > > there's also install-traceevent-plugins target called during install,
> > > which should be skipped for LIBTRACEEVENT_DYNAMIC
> >
> > Oh, didn't notice that. Thanks.
> >
> > However, it seems that's not all what we miss in the patch.
> > Seems that libtraceevent-dynamic-list should be also taken
> > from external libtraceevent, when linked dynamically, shouldn't
> > it.
>
> Please send patches on top of what you already sent, that I have already
> merged and sent upstream, since it is opt-in.
OK, this is great. I can already use the patch downstream, and polish it
later.
Thank you!
>
> - Arnaldo
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-04-30 13:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-28 9:20 [PATCH] perf: enable libtraceevent dynamic linking Michael Petlan
2021-04-28 16:29 ` Jiri Olsa
2021-04-30 12:59 ` Michael Petlan
2021-04-30 13:28 ` Arnaldo Carvalho de Melo
2021-04-30 13:53 ` Michael Petlan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.